From patchwork Tue Jun 18 06:54:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13701840 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BAD0C27C4F for ; Tue, 18 Jun 2024 06:54:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2155A6B014C; Tue, 18 Jun 2024 02:54:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 176146B0154; Tue, 18 Jun 2024 02:54:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 03C8C6B0155; Tue, 18 Jun 2024 02:54:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D361E6B014C for ; Tue, 18 Jun 2024 02:54:38 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9C42CA1F76 for ; Tue, 18 Jun 2024 06:54:38 +0000 (UTC) X-FDA: 82243096236.01.B18A079 Received: from out30-97.freemail.mail.aliyun.com (out30-97.freemail.mail.aliyun.com [115.124.30.97]) by imf18.hostedemail.com (Postfix) with ESMTP id 959CA1C000E for ; Tue, 18 Jun 2024 06:54:36 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="yRYct/UF"; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718693673; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=eA6kyRQ9XEpy05GdpwvXfCDvN4imeajWIAzdeARsgKo=; b=HPm/6CjfI5qOc/H5vhm5Iw8OXfRAA8UAyyZfAdeKjaP8PTi1/1O1DEonyzMNUieNsonHV5 6aKTEwTwqf+XlXP2C90Y4HtxaqVum2QXdV3C0zzqpgYEZmMUfGmfGeuTdZlqSy+gZbkYGV G1iMAx9tquY2W9UOQ7V6a+aGFohaeUM= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="yRYct/UF"; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718693673; a=rsa-sha256; cv=none; b=Q0DwaAb5T7YTgzH5tFLp10hEdO2rKs6R8UDcqkiFK+0ZfuVh7vBdgaxSziDGdlbywbj12O 5kn8W3jnY/wAeXSyrXZ3/H7RnwV8qLq9xUWF9kpf4/irPi2ialwgRn0y1t94h13y2b3qlB gw9UaKOrYfuMKxSvTqTcp8RxOy/x4uk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1718693673; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=eA6kyRQ9XEpy05GdpwvXfCDvN4imeajWIAzdeARsgKo=; b=yRYct/UFaYNmmeZK5qcyA8QOZ3CAsn+smy8uqjBqePugsHlZ44p8OjReZj4Xu5pUhK+XvsQ9P7e4q6fPIbCx5rSgGPfU09vJUsnvUnFKZLhPFiI6aTOcuv7WAFYnecuylPRwEOqP8w9uuiH0IHfX+QYLZI9M0w3GKBDi/+BSEMg= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R531e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045046011;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=17;SR=0;TI=SMTPD_---0W8jH7ld_1718693670; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W8jH7ld_1718693670) by smtp.aliyun-inc.com; Tue, 18 Jun 2024 14:54:30 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, chrisl@kernel.org, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, ioworker0@gmail.com, da.gomez@samsung.com, p.raghav@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/9] mm: shmem: extend shmem_partial_swap_usage() to support large folio swap Date: Tue, 18 Jun 2024 14:54:15 +0800 Message-Id: <61c49050a8aeffecade8c2c407280bf6b92f359e.1718690645.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 959CA1C000E X-Stat-Signature: cn8yscf3zerkdfd9m55d55ndcdyosgpo X-Rspam-User: X-HE-Tag: 1718693676-353167 X-HE-Meta: U2FsdGVkX1+F6ZZgJVnmnVoLWDEuZckssA1NrcB0oP9PHAbZEHu/G5gciC/VpON1V/z+vQn3bINc7nYvsWJg10phsnFUiYIOo8p2RY5rQFShoWaCadsa1UoQDfB6MxUrbFdedFqfcv11ZPrapz94pBxDSh+H/fpnpWPFJyL3B75HkpAARP7+SPwrNMHwFJ4NGiZrGhf3aupQ6OW1X7Yqf4TPama4T0kPtmrFRa7e20wgctpTLZfCAZbgifyJGEfkWeVRb2S99SGPf8DftjQLeSOw5yQbRC5QWvfcIoApN/rhO5oQhsBAk9aDBqNkEdGi30Ayli7Yg9uyxDHmXVc8QmpzDLQtGdMXc22+Hb2TtJ83r/FGr8uupQt8LkWvrbRc21VZH3/v97/mfb1QuCRUjOPOAnDiH6TNsGbiHShyTiu/uBYNwZcp31eSwzwtkKOFRlTX1nr101Una9v3b4qJEZJ63AG+5veKyq3mUta2xKVCaesVzwFjROrtTvgrRWSt+rPLAS9OT6oIhkGeditGqIybDYgFPnNRgc86/nqakcQEejVlPzWHuDn2xJmHeLEiKJu3xHVBMaF9KwLkgZz1Da6+r6I1aHxaLWPKmY5QLaTPiNxdAwnAsf0OcClQOMGBDOQxEblr/2snciegOrL1XZqaH+EbjlCbWwkNUCH0HbyVIepxNS0+3SQDXlmq8oyxTQr8koLfnu8mphPEF/WtA5IAygiMyOPB8YJttQVZcpP8F1v9b/svRvLL0tCgHysI3ujL+tYV5gQw1r18wueAxY/IXivmqib827r7/WohvY9c7I7aXEbb0DmGYj4YDPbTB6RN1uH4+W26pQMmztoF+bDzdPNnLWFvlpvLC+T9SdhfM+n1TtjeatiXP3J6FsZh8gJe8dbw+3sYTQViof+zKkYSVwyWSlHoVK3SU/OMXP6QRMovFKbn4dbyCshlYP7J9FVjUF+2rPAv7xshgsz 1cGuJfO/ f+rG55lQW9fwyb9hQc/3r8soGgoSPciw8q9NiyLP1FyXQSQVSXUCyHSnHOwExTkuh9kNUbVOIGQVLyPYL9B39t7G3i4Aodbo8qNwVvhegXGyBUka/KMql8bII/ZRDfsBBy9Ab3zXm8vyLfC7fr2/twocaMP2TUh3djKnfCW7eXSlPNdZjQQ7qcB2lmkYjSKDq1297xzwXMy6iWbpIoNjGlsfgEgrhwMCH6IG0NSjp8x1La5lYi7XYIUt/bJ0Zlgz54lY0pQEXr8FJDKjVR4SGj3SSEQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: To support shmem large folio swapout in the following patches, using xa_get_order() to get the order of the swap entry to calculate the swap usage of shmem. Signed-off-by: Baolin Wang --- mm/shmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/shmem.c b/mm/shmem.c index b90965486631..012a06ef39aa 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -870,7 +870,7 @@ unsigned long shmem_partial_swap_usage(struct address_space *mapping, if (xas_retry(&xas, page)) continue; if (xa_is_value(page)) - swapped++; + swapped += 1 << xa_get_order(xas.xa, xas.xa_index); if (xas.xa_index == max) break; if (need_resched()) {