On Mon, 7 Sep 2026 17:42:11 +0200 "David Hildenbrand (Arm)" <[email protected]> wrote:
> On 9/3/26 07:35, Kaitao Cheng wrote: > > From: Kaitao Cheng <[email protected]> > > > > Page flag helpers for configuration-dependent flags provide false or no-op > > variants so that their users can be independent of the configuration. > > > > The HWPoison helpers do not fully follow this pattern. When > > CONFIG_MEMORY_FAILURE is enabled, PAGEFLAG() and TESTSCFLAG() provide the > > regular, test-and-set, and test-and-clear operations. When it is disabled, > > only PAGEFLAG_FALSE() is instantiated, leaving TestSetPageHWPoison() and > > TestClearPageHWPoison() undefined. > > > > Use TESTSCFLAG_FALSE() to provide the missing accessors when memory failure > > handling is disabled. Both accessors return false, which is consistent with > > HWPoison state being unavailable, and makes the accessor interface > > consistent across configurations. > > > > Signed-off-by: Kaitao Cheng <[email protected]> > > --- > > include/linux/page-flags.h | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h > > index 7a863572adce..a2315ab1dd3a 100644 > > --- a/include/linux/page-flags.h > > +++ b/include/linux/page-flags.h > > @@ -656,6 +656,7 @@ TESTSCFLAG(HWPoison, hwpoison, PF_ANY) > > #define __PG_HWPOISON (1UL << PG_hwpoison) > > #else > > PAGEFLAG_FALSE(HWPoison, hwpoison) > > +TESTSCFLAG_FALSE(HWPoison, hwpoison) > > #define __PG_HWPOISON 0 > > #endif > > > > Can we just squash this patch into #2 please? I did that. From: Kaitao Cheng <[email protected]> Subject: mm/page-flags: define HWPoison test-and-change helpers unconditionally Date: Thu, 3 Sep 2026 13:35:34 +0800 Page flag helpers for configuration-dependent flags provide false or no-op variants so that their users can be independent of the configuration. The HWPoison helpers do not fully follow this pattern. When CONFIG_MEMORY_FAILURE is enabled, PAGEFLAG() and TESTSCFLAG() provide the regular, test-and-set, and test-and-clear operations. When it is disabled, only PAGEFLAG_FALSE() is instantiated, leaving TestSetPageHWPoison() and TestClearPageHWPoison() undefined. Use TESTSCFLAG_FALSE() to provide the missing accessors when memory failure handling is disabled. Both accessors return false, which is consistent with HWPoison state being unavailable, and makes the accessor interface consistent across configurations. Also remove now-unneeded test_and_clear_pmem_poison() from nvdimm/pmem. Link: https://lore.kernel.org/[email protected] Link: https://lore.kernel.org/[email protected] Link: https://lore.kernel.org/[email protected] Signed-off-by: Kaitao Cheng <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Acked-by: Muchun Song <[email protected]> Acked-by: David Hildenbrand (Arm) <[email protected]> Reviewed-by: Oscar Salvador <[email protected]> Cc: Alison Schofield <[email protected]> Cc: Dave Jiang <[email protected]> Cc: Liam R. Howlett <[email protected]> Cc: Lorenzo Stoakes <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Suren Baghdasaryan <[email protected]> Cc: Vishal Verma <[email protected]> Cc: Vlastimil Babka <[email protected]> Cc: Ira Weiny <[email protected]> --- drivers/nvdimm/pmem.c | 2 +- drivers/nvdimm/pmem.h | 12 ------------ include/linux/page-flags.h | 1 + 3 files changed, 2 insertions(+), 13 deletions(-) --- a/include/linux/page-flags.h~mm-page-flags-define-hwpoison-test-and-change-helpers-unconditionally +++ a/include/linux/page-flags.h @@ -655,6 +655,7 @@ TESTSCFLAG(HWPoison, hwpoison, PF_ANY) #define __PG_HWPOISON (1UL << PG_hwpoison) #else PAGEFLAG_FALSE(HWPoison, hwpoison) +TESTSCFLAG_FALSE(HWPoison, hwpoison) #define __PG_HWPOISON 0 #endif --- a/drivers/nvdimm/pmem.c~mm-page-flags-define-hwpoison-test-and-change-helpers-unconditionally +++ a/drivers/nvdimm/pmem.c @@ -80,7 +80,7 @@ static void pmem_mkpage_present(struct p * here since we're in the driver I/O path and * outstanding I/O requests pin the dev_pagemap. */ - if (test_and_clear_pmem_poison(page)) + if (TestClearPageHWPoison(page)) clear_mce_nospec(pfn); } } --- a/drivers/nvdimm/pmem.h~mm-page-flags-define-hwpoison-test-and-change-helpers-unconditionally +++ a/drivers/nvdimm/pmem.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef __NVDIMM_PMEM_H__ #define __NVDIMM_PMEM_H__ -#include <linux/page-flags.h> #include <linux/badblocks.h> #include <linux/memremap.h> #include <linux/types.h> @@ -31,15 +30,4 @@ long __pmem_direct_access(struct pmem_de long nr_pages, enum dax_access_mode mode, void **kaddr, unsigned long *pfn); -#ifdef CONFIG_MEMORY_FAILURE -static inline bool test_and_clear_pmem_poison(struct page *page) -{ - return TestClearPageHWPoison(page); -} -#else -static inline bool test_and_clear_pmem_poison(struct page *page) -{ - return false; -} -#endif #endif /* __NVDIMM_PMEM_H__ */ _
