From patchwork Mon Jul 8 06:26:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ran xiaokai X-Patchwork-Id: 13726186 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 88ECEC3DA42 for ; Mon, 8 Jul 2024 06:26:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1ECE66B0089; Mon, 8 Jul 2024 02:26:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 19C6E6B008A; Mon, 8 Jul 2024 02:26:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 08B896B008C; Mon, 8 Jul 2024 02:26:52 -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 E0C0A6B0089 for ; Mon, 8 Jul 2024 02:26:51 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5C7F0410F5 for ; Mon, 8 Jul 2024 06:26:51 +0000 (UTC) X-FDA: 82315602222.02.B272E80 Received: from m15.mail.163.com (m15.mail.163.com [45.254.50.219]) by imf25.hostedemail.com (Postfix) with ESMTP id 3DD90A0017 for ; Mon, 8 Jul 2024 06:26:47 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=163.com header.s=s110527 header.b=nfZCbNCa; spf=pass (imf25.hostedemail.com: domain of ranxiaokai627@163.com designates 45.254.50.219 as permitted sender) smtp.mailfrom=ranxiaokai627@163.com; dmarc=pass (policy=none) header.from=163.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720419994; 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:references:dkim-signature; bh=upyb937w393WAml9P6J+oTFNrAbx52a2d5ij2dreU80=; b=t2Q2JbdAleGztLGQSSpV+K6tVjuEnnPEfhdO/EV3KY11HBsP5blxVJPZ6v7Qa23XPRtS5U JR0bSKC543gMW1D/GfNV8BnlLCQeXNIbmkiE65S7HUWaGwi2Rn8gZZPwCuUsSeiIUzl6BP 2FszJ7btNkUDaaDXPwAF62oWJvM2JZI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=163.com header.s=s110527 header.b=nfZCbNCa; spf=pass (imf25.hostedemail.com: domain of ranxiaokai627@163.com designates 45.254.50.219 as permitted sender) smtp.mailfrom=ranxiaokai627@163.com; dmarc=pass (policy=none) header.from=163.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720419994; a=rsa-sha256; cv=none; b=GpCVRkHQLFuboN/fMRK8Od0Ani6CGfN9RUM+VMP7wMrYs/+nrZJTXmkxqAqDoogwe9KmQA XcNgkSD2QR3CNczY2BvQ1tz1xds/Ir9iSPH5soomxMJx54C4CVKQG4gVLX/w+1EkygS6j4 OcLFp2skxEJqeGCwAOVqWDC9FEKNZFo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=upyb9 37w393WAml9P6J+oTFNrAbx52a2d5ij2dreU80=; b=nfZCbNCa4H7AdMPv7hY7B L9r4HrgedrZUogKfP71wz79mkP462VsGZXGP9EHsmoonmnCpL7PmKQAuQuAvh/Ve +Usli8W12WC1ynDqALgzgG74Oh3z23RvZOE1kHyu+Zlx67dqC6ahRBd5sAqRoSar fwSgXMFiw3usn67/uERigg= Received: from localhost.localdomain (unknown [193.203.214.57]) by gzga-smtp-mta-g0-5 (Coremail) with SMTP id _____wDHr1h7hotm9x0lCA--.18455S4; Mon, 08 Jul 2024 14:26:09 +0800 (CST) From: ran xiaokai To: akpm@linux-foundation.org, david@redhat.com, corbet@lwn.net, usama.anjum@collabora.com, avagin@google.com Cc: linux-mm@kvack.org, vbabka@suse.cz, svetly.todorov@memverge.com, ran.xiaokai@zte.com.cn, si.hao@zte.com.cn, yang.yang29@zte.com.cn, ryan.roberts@arm.com, ziy@nvidia.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3] kpageflags: detect isolated KPF_THP folios Date: Mon, 8 Jul 2024 06:26:01 +0000 Message-Id: <20240708062601.165215-1-ranxiaokai627@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: _____wDHr1h7hotm9x0lCA--.18455S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxAw18KFW5GrW8Kr4xXw4fXwb_yoW5ArW7pa 98GasFvF4kJ3ZxJryxJrn2yr13KrZxWayjka4akw1SvFnxJ34vgF1xK34Fka4aqFy8Aa10 vFWjgF1fua4UAFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UCYLPUUUUU= X-Originating-IP: [193.203.214.57] X-CM-SenderInfo: xudq5x5drntxqwsxqiywtou0bp/1tbiqRATTGVOBTu8eQABs3 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 3DD90A0017 X-Stat-Signature: qi1wt3wxpc8fjfxep15f3gii7focx98z X-Rspam-User: X-HE-Tag: 1720420007-279758 X-HE-Meta: U2FsdGVkX1/+AQjPnxek5U/5L1iB3CAOLaaiwQV7zNHAc1L8/90aVBy9fVMzI4+k7nXimVB8xpcFoqcRqoy4vjZi82LUfZV6efKfkC3nAzzXcV4eAzXIkktllj4ltOFXfNRNT+AAwK6+DhSw7knrCl3eGQLldx+1Pfq/VawMEuVRJjxonF8YCDHr42hSzvt6WDXaoKx3TZ946rWzdvEcph68RkovDornDM1ATZkVEib4e61062rm/YjDVgasV97N4+6HoeX5HTjfGe9/vg4wo7AwJLaGfemz91OeZdOzBIbmJ1Yrn5XkEqCidZNETmd98iiBxDxs2CvEBeH9VNudTjeHkuLO91BA+r+nImFpLJ4aB6PbfRAhm4HRDNtsXsJ6yxfPG02Kcq2sKE6jGBzgGFkUA7Zp/bdWwiTZdgakst/Afi/pANZqBQ1Sseorw0YFHSY66FhNrIN9Uo15qDeCb7JBtKMeLazvgxwgz01c3Twk0rvaS3q3ieaHdym7fRPU+NllFEQuFs7dq5DJXUKBd6x/sYwIVYsnzElFdWEDzEGDQxe7mFC2+ae6HtWQncr5l6afq8Gvpq+UPMA1tQLkw64zhfO6Bqq3V72qCmVG1JcBvS8nSSHIxtp7fFCzzzJY9tUxcECv6/CDK3Kb7b1mZAU/fcwQnYAunq1vnY4bngTr159O/CUzIpEdhjd8sn+BMjuixHS5nIex58Ic8Bf+aHTbaBa9QqqyhYfGcqwvO6P40SuqEyiBOJ5weF+T5Hq3PmVax0VHNV2WPNr+R+QLneNNTv+i3JqtTD7pAFqSK9i7CyxwPrLGml2Ev4fHT2FGLEb7x1qUh/a4IdNMtbTcai9QFjdFMKarj8+2c+ZWwFMKkV3XCIEc0WbyclLwwA829+j/XNU8DUUGLdIXyj+QuOeYYtCoZ5ka9C2pWEkDIoau3q9l5p8OIuSGG/MzAIh4HkDDBESnxO6+1YM4Xfm jq+V4OjD 7wfcaRPJK6Kme0qkgnFX8jE0VcYAyfd97TTLz27MDI9iY17f7uTE7MCDN3yqP71p5jBXGwgiuJuPPtzyw+/vK428+dRmdyRReODcxnYOu7nNa3lSKF3DKnnLRcFq1SxzFwCcIxUbJmep2YQjNM95yMcI6sg/Qv2z7E29Jqhbhrk0oYI1psPczD87yLqNpf5u25YhBgYm58Cu3CfPhhTT3Euz9mzyWcUjaP3vqLABbpnyRSsv3xyZbOZpFoV40yO2PS2IXI2jtHsp1TobRXNl4jS35S7zhkFgcsKBYBO0x0yZARKVsMEWquDTJHL+iDT7tY47SuI7Td17unIsD7fglc4PtMz3EgV1FhmTELBULS8x7eK+O6kawUdwCnSCHMqDeoMCuavuIOKiIPM6DZynptHAgepdtBQ40Q/RzOlTfBl6e2ti1/ZMGUgVQWlIIMlRKsa7s7RRrqZo1DgctDgy6dePwbQLlbC8B5FZt4idthvx8OJo= 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: From: Ran Xiaokai When folio is isolated, the PG_lru bit is cleared. So the PG_lru check in stable_page_flags() will miss this kind of isolated folios. Use folio_test_large_rmappable() instead to also include isolated folios. Since pagecache supports large folios and the introduction of mTHP, the semantics of KPF_THP have been expanded, now it indicates not only PMD-sized THP. Update related documentation to clearly state that KPF_THP indicates multiple order THPs. Changes since v2: - directly use is_zero_folio() suggested by David Acked-by: David Hildenbrand Signed-off-by: Ran Xiaokai --- Documentation/admin-guide/mm/pagemap.rst | 4 ++-- fs/proc/page.c | 21 +++++++++------------ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Documentation/admin-guide/mm/pagemap.rst b/Documentation/admin-guide/mm/pagemap.rst index f5f065c67615..0a8a4decdb72 100644 --- a/Documentation/admin-guide/mm/pagemap.rst +++ b/Documentation/admin-guide/mm/pagemap.rst @@ -118,7 +118,7 @@ Short descriptions to the page flags 21 - KSM Identical memory pages dynamically shared between one or more processes. 22 - THP - Contiguous pages which construct transparent hugepages. + Contiguous pages which construct THP of any size and mapped by any granularity. 23 - OFFLINE The page is logically offline. 24 - ZERO_PAGE @@ -252,7 +252,7 @@ Following flags about pages are currently supported: - ``PAGE_IS_PRESENT`` - Page is present in the memory - ``PAGE_IS_SWAPPED`` - Page is in swapped - ``PAGE_IS_PFNZERO`` - Page has zero PFN -- ``PAGE_IS_HUGE`` - Page is THP or Hugetlb backed +- ``PAGE_IS_HUGE`` - Page is PMD-mapped THP or Hugetlb backed - ``PAGE_IS_SOFT_DIRTY`` - Page is soft-dirty The ``struct pm_scan_arg`` is used as the argument of the IOCTL. diff --git a/fs/proc/page.c b/fs/proc/page.c index 2fb64bdb64eb..a718ddc43bdf 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -148,19 +148,16 @@ u64 stable_page_flags(const struct page *page) u |= 1 << KPF_COMPOUND_TAIL; if (folio_test_hugetlb(folio)) u |= 1 << KPF_HUGE; - /* - * We need to check PageLRU/PageAnon - * to make sure a given page is a thp, not a non-huge compound page. - */ - else if (folio_test_large(folio)) { - if ((k & (1 << PG_lru)) || is_anon) - u |= 1 << KPF_THP; - else if (is_huge_zero_folio(folio)) { - u |= 1 << KPF_ZERO_PAGE; - u |= 1 << KPF_THP; - } - } else if (is_zero_pfn(page_to_pfn(page))) + else if (folio_test_large(folio) && + folio_test_large_rmappable(folio)) { + /* Note: we indicate any THPs here, not just PMD-sized ones */ + u |= 1 << KPF_THP; + } else if (is_huge_zero_folio(folio)) { u |= 1 << KPF_ZERO_PAGE; + u |= 1 << KPF_THP; + } else if (is_zero_folio(folio)) { + u |= 1 << KPF_ZERO_PAGE; + } /* * Caveats on high order pages: PG_buddy and PG_slab will only be set