From patchwork Tue Oct 10 14:27:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naoya Horiguchi X-Patchwork-Id: 13415667 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 A0639CD8C91 for ; Tue, 10 Oct 2023 14:33:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 323EB8D00BD; Tue, 10 Oct 2023 10:33:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D4738D0002; Tue, 10 Oct 2023 10:33:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C2E48D00BD; Tue, 10 Oct 2023 10:33:13 -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 055068D0002 for ; Tue, 10 Oct 2023 10:33:13 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 753341CA6B5 for ; Tue, 10 Oct 2023 14:33:12 +0000 (UTC) X-FDA: 81329794224.04.91CEFA0 Received: from out-192.mta0.migadu.com (out-192.mta0.migadu.com [91.218.175.192]) by imf10.hostedemail.com (Postfix) with ESMTP id D878FC0379 for ; Tue, 10 Oct 2023 14:28:52 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="bpjtc/LF"; spf=pass (imf10.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 91.218.175.192 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696948133; 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=ct5h8XiEF6Z6bh0u0KQdOShLvibauoLK/pnF+aCIbHs=; b=HtPD20XxhBwQC01li0yHFhtFleEWhjWyKnChInV8xOGWlBHmyiJHJlJhhIkYQCDAuDOch3 WgeN0ytkry2XeVBB0FcOChb20rGnvybSOJyrEt8NCgDMI33rAJlCSMTxuGgS8qxyWCrLHC 4shn2tjmf0kW5GrTuCt22FRsG5xSr+w= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696948133; a=rsa-sha256; cv=none; b=mcVoAf7kHTYkQ/5GvAcZILaKPT5qA0zViTtdTw20KAxRolMXwp0iwd8yYnjPupm1GqKQ9b AVq1eYly8QC59NjyNB398OBMWaEf06+utPVoP27OKnjiX//dn/IV7fFEhl3Jq5e0/0T+t0 +xUsUiB6CPTOh0f7qUP5uoAMFRLhjBU= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="bpjtc/LF"; spf=pass (imf10.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 91.218.175.192 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1696948131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ct5h8XiEF6Z6bh0u0KQdOShLvibauoLK/pnF+aCIbHs=; b=bpjtc/LFwjIYuknqBdChdrg6pH5LhH0gERemOAwGNiqO/B0yhaIPcKkXhCyk1Y+6QiAB6D pdmVPLFHqF8iWcxI7QpWy2AkvCdR7eOxKKaViIq1Qya/PPl2bRQHZMcyklBZ8+34tDxuvO QoG/rGqvVIFHC+5eFcdEu8fJDv1/1Hs= From: Naoya Horiguchi To: linux-mm@kvack.org Cc: Andrew Morton , Matthew Wilcox , David Hildenbrand , "Kirill A. Shutemov" , Mike Kravetz , Miaohe Lin , Vlastimil Babka , Muchun Song , Naoya Horiguchi , linux-kernel@vger.kernel.org Subject: [PATCH v1 2/5] mm: kpageflags: distinguish thp and folio Date: Tue, 10 Oct 2023 23:27:58 +0900 Message-Id: <20231010142801.3780917-3-naoya.horiguchi@linux.dev> In-Reply-To: <20231010142801.3780917-1-naoya.horiguchi@linux.dev> References: <20231010142801.3780917-1-naoya.horiguchi@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: D878FC0379 X-Rspam-User: X-Stat-Signature: gtqf63ibwqur6d75dc1sbh9nc48nwre7 X-Rspamd-Server: rspam03 X-HE-Tag: 1696948132-238300 X-HE-Meta: U2FsdGVkX188f+PjL2PQPkp+h2DPL53X47CEvIJJv+GxId20CASTcBVxXcdFj4ExwfdYPDY5fL5VSO3XOZNw+jo9BuxloHrgfiQbsQ6bPNSVOwudd1ESTB3d9jGEaRnsjbZ39q7BYA4qwjMbcnGiWU4L20zYdopyPpZscpvWdiLwp/sBUIPvRL5/yEo8ycX/Rv8oGYmIF0M2dm5P1FmdqBms//DDtMbEhEeaHxrWNC/A91thma8wQEUS+Gxs83tubljUojHRO1VtDLat0iP2Y+z3PeqaGFpAbrne6EuGUrozmbk6K8LQaTTzHhxD6RWQdxwLW+wSK3vaddE8FxybkZ/3m7whsNI/7RG4oNKZN+VndMK2FYE+eudO5fKGxGKW3R6w63rujMRMcFI/qkbO/hEgTVgDjGJsi4IRjUDyqIsKQLpSk4JHQUf7sgPxlJ+b+GtmFstSVA0PK49cN0ljug+GhCbliLVEAM8ZB25Us/ro0ezzJDrsiLuW/c4oXxISKhab2M2IPDrokpzTrT3UXXiXC50H/khuDju7GaMGvFTm3ph/Hg/86bfOgvbnWeRiKDzcdVXdPld66+GgJw9XInNpjuzewHlQdfcIkUeOk6Jbok/jN84I6W39703quUuGJB2UP6e8ppo2MYtrIbcPpdemwFkmpoZklzqjOmdteXCUFYw0PgXPXes9GxJJVHhSGejSvZRCIH7NBBTZ31DsZexlCzckywIYxLbpdBa7dPwAwnpI6+haQhiOwyUQTSvm5JqP0/nyTrGU3C6d9hWiyj7OZ8QRWLtBI8MslgBMTyGXhnAMm6CQEbzwT0y5itZAt1KhJK6Xqltjm/VaCuSAknJloLUuCo7Dyl43lB4jdEp/+5TGNVDve5/okJEbMhiIv1x/Zoii3M6/apgHQ4Ta+1nM2UHkn2skbcu8AdXI+0ozVlxTKfZi8WNjEE6VBgfmlGZ2G5OxtemYYTGiNxq VcjtU3eF Na2lVO/7D5OWws8GAJmp5eHpkmrObR1pvljpz5TVi239ynjDAxxj3dEqwv3yLKgI+EQNZif2EyfUPFgqyd5Ndh1Jo0g== 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: From: Naoya Horiguchi Currently a large folio is considered as thp in the output of /proc/kpageflags because stable_page_flags() does not have resolution to distinguish thp and large folio. This is confusing and the readers of /proc/kpageflags need additional checks in userspace, which is inefficient. Check page order in stable_page_flags() to distinguish thp and large folio. Although thp (or other types of compound page) is a special form of folio, but the KPF_FOLIO means "folio" in narrower meaning (representing folios in page cache), so KPF_FOLIO is not set on thp or hugetlb pages. This is because thp and hugetlb (and other compound pages) have their own KPF_* flags, so those are already identifiable. Thp and folio use some struct page's field of the first tail pages for internal use. There's no point to parse and show flag info based on tail pages, so return immediately when finding thp/folio tail pages. The output below shows how this patch changes the output of page-types. Before patch: // anonymous thp voffset offset len flags ... 700000000 156c00 1 ___U_l_____Ma_bH______t_____________f_d_____1 700000001 156c01 1 L__U_______Ma___T_____t_____________f_______1 700000002 156c02 1fe ___________Ma___T_____t_____________f_______1 ^ this 't' means thp // file thp 700000000 15d600 1 __RUDl_____M__bH______t_____________f__I____1 700000001 15d601 1 L__U_______M____T_____t_____________f_______1 700000002 15d602 1fe ___________M____T_____t_____________f_______1 // large folio 700000000 154f84 1 __RU_l_____M___H______t________P____f_____F_1 700000001 154f85 1 ________W__M____T_____t_____________f_____F_1 700000002 154f86 2 ___________M____T_____t_____________f_____F_1 After patch: // anonymous thp 700000000 117000 1 ___U_l_____Ma_bH______t_____________f_d_____1 700000001 117001 1ff ________________T_____t_____________f_______1 // file thp 700000000 118400 1 __RUDl_____M__bH______t_____________f__I____1 700000001 118401 1ff ________________T_____t_____________f_______1 // large folio 700000000 148da4 1 __RU_l_____M___H___________f___P____f_____F_1 700000001 148da5 3 ________________T__________f________f_____F_1 ^ this 'f' means folio Signed-off-by: Naoya Horiguchi --- fs/proc/page.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/fs/proc/page.c b/fs/proc/page.c index 195b077c0fac..78f675f791c1 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -154,11 +154,24 @@ u64 stable_page_flags(struct page *page) else if (PageTransCompound(page)) { struct page *head = compound_head(page); - if (PageLRU(head) || PageAnon(head)) - u |= 1 << KPF_THP; - else if (is_huge_zero_page(head)) { + /* + * We need to check PageLRU/PageAnon to make sure a given page + * is a thp, not a huge zero page or a generic compound page + * (allocated by drivers with __GFP_COMP). + */ + if (PageLRU(head) || PageAnon(head)) { + if (compound_order(head) == HPAGE_PMD_ORDER) + u |= 1 << KPF_THP; + else + u |= 1 << KPF_FOLIO; + } else if (is_huge_zero_page(head)) u |= 1 << KPF_ZERO_PAGE; - u |= 1 << KPF_THP; + + if (PageHead(page)) + u |= 1 << KPF_COMPOUND_HEAD; + if (PageTail(page)) { + u |= 1 << KPF_COMPOUND_TAIL; + return u; } } else if (is_zero_pfn(page_to_pfn(page))) u |= 1 << KPF_ZERO_PAGE;