Received-SPF: pass (google.com: domain of linux-kernel+bounces-109236-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Svetly Todorov <svetly.todorov@memverge.com>
Date: Wed, 20 Mar 2024 10:28:09 -0700
Subject: [PATCH v3] kpageflags: respect folio head-page flag placement
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240320-kpageflags-svetly-v3-1-b6725843bfa7@memverge.com>
To: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org, gregory.price@memverge.com, 
 willy@infradead.org, wangkefeng.wang@huawei.com, akpm@linux-foundation.org, 
 david@redhat.com, vbabka@suse.cz, naoya.horiguchi@linux.dev, 
 Svetly Todorov <svetly.todorov@memverge.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?ODBybE9nTXROaUh3ZnZNTmQxamVGOTlQN2FkdkVZL0F1VkRNdjNaalRLLzk5?=
 =?utf-8?B?OFMxdHdpRW5ucDVwUmJud1BvMnZSWFVWTFdWU3oyS2lpNyttV25lS1FrRS9O?=
 =?utf-8?B?VldSTWFkTS9IdEpSbUViSVZ0SjRUdVd1d3IyMjB3Smc0dnpnWXFJQWcwcSto?=
 =?utf-8?B?bEdKQ3hZOURPY1d6M29TWWwvWVA5cGIyVFRXVGlSak5tZzN2aDZkSUVLbEpN?=
 =?utf-8?B?dnM2ZEhxZEJqS0tjZ3BZbHNOTFJlczhybGlsNzZ0cXA2ZzQ5Y3VpNm4rL0ZW?=
 =?utf-8?B?RmVzMGJvLy9JVWtmU2xjR29pN09KNFo3VWF4bEZWUmY3WDlrN1FnTEpKWERD?=
 =?utf-8?B?WnFZNjQrK3F5eWRRUkFJbW12cGRIMDNmd1BHMXZ2TEJHWDk2dWQyaXgyWUsv?=
 =?utf-8?B?eEVyb1lGajd2ZEIvK2lrZk43MWxnVHBwVmtLLzVLRzlLNmQ4Wm1TUVJBcWps?=
 =?utf-8?B?SnNnSXZIVUlOVVVVOFA3SklCeTdzYkVWU2tWZE9PK3JiaFBhb0xwZktBbDgx?=
 =?utf-8?B?RjdKK1BzRld4ZVl6aVI1ajlhdXhNYU9Oem5kVW1sSCtLR0xNTzllcGtrMFhT?=
 =?utf-8?B?aFlhL2RYa0NWT0xYZFJoemdlK2U2MG1zVWJDdlgxNWlCY205ZmM2TmZydlJr?=
 =?utf-8?B?UHV6UVZJUlB6WEpBS0hTSDYyQnlDZG8rem9LUzd0WHZsZlVPVHBNeHVsT2Qx?=
 =?utf-8?B?SDRSWm5ualczL1A0dHhybkd4SlBza3kvSGNGbmxlT21vcXZaRy96dEhOSnVk?=
 =?utf-8?B?cnh4dTZJQ3ExYWRnWU5IYzhBMG1Zb3IrbkVJYmlCREtXdi9yVVZ1UHpGeWhP?=
 =?utf-8?B?Vit0WG12UktQRnRIcnp3OTYrd3FWbFFtYUMyS1FhOUdyb04ydTJaa1pZUHN1?=
 =?utf-8?B?c3djbHA2S2FUMDl5eWFtT3pZTHRESnoxMi9pa0pTVEpLQThjdWcwYVhHNVVu?=
 =?utf-8?B?bldvTzBNOGQ5NTc5YlBWbDhHdEM1bWhSbWwrZFNiSUtCRFBVdDRDbDlWekFT?=
 =?utf-8?B?bWtvUEhLQTdnMmJNekJKMGVzN3B4cXQrNFhYcmZSUUJ2ZmlQYXRvdVZQNk51?=
 =?utf-8?B?aXZyNEwvbnN6V2hjQmVtTWFSWU9obElaUlRqbUE1YjFiNW1WZm1uQWNYMmZT?=
 =?utf-8?B?VTJXb2FEY2lKNmxZZGc4NmUyWkp0WlArNENvR0x3WDlsTzFkb2VUVHU0NGVw?=
 =?utf-8?B?Yi85enArTU5YdmNTNjFFVGVzRHFkUXJYSElDcUQyTzFEdHJJYklBa3E1YVRm?=
 =?utf-8?B?RlAwN001YUFuQWpsWVh5VWk5Q3ZYTlBpaFZZZW9vdzRNRk9Jb1NiTU9VL2Vo?=
 =?utf-8?B?cWg1V055bU5lalhRVStsMVNjOXVVRmNqZEhEQVRHSm9rcEd0YVRGZCtQNFNL?=
 =?utf-8?B?WXB6Yml4eDBTSVlBU214aUl4YjI0UDB0RytIVm9NOEhXRW9kMi9qMlpVSlZW?=
 =?utf-8?B?M1Vpc2pjNEQzYVFsSytkUXlLRTRlUnBnWXRVYlRRR1Y5Y0poUGk0MVBVR2Rh?=
 =?utf-8?B?N1pXZnV1TkthbGhPbkx4VGVhdlBVL0tQQUVpOG5oK2RCQTQ0aGNUeHRZRkN0?=
 =?utf-8?B?aDg2dmN2Y3U4emdsUGx2Tm14ZXZFcmRPeHFwUGNaTkhrUlZ3RmJGS1RKU3kz?=
 =?utf-8?B?dzZodWtHdFFHYVM4OTNrek9kV0gwMmZ5QTduQkFZY1ZqbUM4elh2Y2YwVU93?=
 =?utf-8?B?U01udWFFSmVzYlZPbG00bDd4RThTUGkxL0RVV0JLZDVHR3FzREZuWmxwTzdQ?=
 =?utf-8?B?MjNBbGdyempLL083SHhXZHR4ai9hR3V4RklXSkp0cmloYkZTYnBYdG5McXNv?=
 =?utf-8?B?SVRnRHVOdC9GYU4zZUZXN095WHdKbFllSC81TWw4NmlmcEtqWi9CUGpDM2oz?=
 =?utf-8?B?eXRVUTdQRVJtZzRMK0R2T3IwN0JUbHdmRFRUNjBuU2lEMkt6QkYweWFpbXZM?=
 =?utf-8?B?aThLdnZjMDlkenZpZW5HaUZDQTh4Zmpic3c1bGZMTGtGZFFOUGIzdjVqUk1X?=
 =?utf-8?B?cXg5b1I4MEFPOUNpU21kVnRqOVI4MkpiRVZBcW1OenZWb1dMWVZFYjdxYmdX?=
 =?utf-8?B?SVk5SnYxZlZSQVN0b2QzN2J0Wm1QSDd3TWxZZUR2VUpESDJLMWtGSE5nT2pi?=
 =?utf-8?B?S2ZSNFFVTUhZN2dvcXhyZnRtS1ZwZnBNcmg2alAxTEp3aHVWRlNHNEJkU3E0?=
 =?utf-8?B?Umc9PQ==?=
X-OriginatorOrg: memverge.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 48fd7873-244e-49e6-708d-08dc49031da1
X-MS-Exchange-CrossTenant-AuthSource: IA0PR17MB6347.namprd17.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2024 17:28:11.1307
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 5c90cb59-37e7-4c81-9c07-00473d5fb682
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oULiqfVkNBBmFLaNFEfg/uPcnvU9/WvL421ekRKKDZuovLFSF1gPgPbbtz1Z9oSvIMjvp7XV084Ro9EpuSYdUJNb10FiyxSWqd0ZZtjEbi0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR17MB7109


---
Page flags are now stored per-folio. Change kpageflags to report these
per-folio flags where appropriate.

Most folio flags are set on the head page, i.e. *folio_flag(page, 0).

Only three are set on the second page -- PG_has_hwpoisoned, PG_large_rmappable,
and PG_hugetlb. kpageflags doesn't report the first two, and the PG_hugetlb
check is handled by calls to PageHuge/PageTransCompound(), so no code changes
are required for these flags.

mm/memory-failure.c applies PG_HWPoison via SetPageHWPoison(page).
This call falls through to the SetPage##uname macro in
include/linux/page-flags.h, which sets the corresponding PG_##lname bit
on the given page struct. Therefore KPF_HWPOISON must come from page->flags.

arch/xtensa/mm/cache.c tests and sets the PG_arch1 bit in both
folio->flags and page->flags. So both sources are OR'd into KPF_ARCH.

As for arch2 and arch3, Kefeng Wang reported that they appear only as
arm64-specific aliases: namely, PG_mte_tagged and PG_mte_lock. 
Both are applied to page->flags via set_bit() in arch/arm64/include/asm/mte.h.
So those must come from page->flags, too.

Signed-off-by: Svetly Todorov <svetly.todorov@memverge.com>
Suggested-by: Matthew Wilcox <willy@infradead.org>
Suggested-by: Gregory Price <gregory.price@memverge.com>
Suggested-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Link: https://lore.kernel.org/all/20231030180005.2046-1-gregory.price@memverge.com/
Link: https://80x24.org/lore/linux-mm/20231110033324.2455523-4-wangkefeng.wang@huawei.com/
Link: https://80x24.org/lore/linux-mm/438ba640-c205-4034-886e-6a7231f3d210@huawei.com/
---
 fs/proc/page.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/fs/proc/page.c b/fs/proc/page.c
index 195b077c0fac..290470819fa2 100644
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -110,6 +110,7 @@ static inline u64 kpf_copy_bit(u64 kflags, int ubit, int kbit)
 u64 stable_page_flags(struct page *page)
 {
 	u64 k;
+	u64 p;
 	u64 u;
 
 	/*
@@ -119,7 +120,8 @@ u64 stable_page_flags(struct page *page)
 	if (!page)
 		return 1 << KPF_NOPAGE;
 
-	k = page->flags;
+	k = *folio_flags(page, 0);
+	p = page->flags;
 	u = 0;
 
 	/*
@@ -205,7 +207,7 @@ u64 stable_page_flags(struct page *page)
 	u |= kpf_copy_bit(k, KPF_MLOCKED,	PG_mlocked);
 
 #ifdef CONFIG_MEMORY_FAILURE
-	u |= kpf_copy_bit(k, KPF_HWPOISON,	PG_hwpoison);
+	u |= kpf_copy_bit(p, KPF_HWPOISON,	PG_hwpoison);
 #endif
 
 #ifdef CONFIG_ARCH_USES_PG_UNCACHED
@@ -216,11 +218,14 @@ u64 stable_page_flags(struct page *page)
 	u |= kpf_copy_bit(k, KPF_MAPPEDTODISK,	PG_mappedtodisk);
 	u |= kpf_copy_bit(k, KPF_PRIVATE,	PG_private);
 	u |= kpf_copy_bit(k, KPF_PRIVATE_2,	PG_private_2);
+	u |= kpf_copy_bit(p, KPF_PRIVATE,	PG_private);
+	u |= kpf_copy_bit(p, KPF_PRIVATE_2,	PG_private_2);
 	u |= kpf_copy_bit(k, KPF_OWNER_PRIVATE,	PG_owner_priv_1);
 	u |= kpf_copy_bit(k, KPF_ARCH,		PG_arch_1);
+	u |= kpf_copy_bit(p, KPF_ARCH,		PG_arch_1);
 #ifdef CONFIG_ARCH_USES_PG_ARCH_X
-	u |= kpf_copy_bit(k, KPF_ARCH_2,	PG_arch_2);
-	u |= kpf_copy_bit(k, KPF_ARCH_3,	PG_arch_3);
+	u |= kpf_copy_bit(p, KPF_ARCH_2,	PG_arch_2);
+	u |= kpf_copy_bit(p, KPF_ARCH_3,	PG_arch_3);
 #endif
 
 	return u;

---
base-commit: e8f897f4afef0031fe618a8e94127a0934896aba
change-id: 20240319-kpageflags-svetly-9faa11b17022

Best regards,
-- 
Svetly Todorov <svetly.todorov@memverge.com>