lkml.org 
[lkml]   [2022]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [ammarfaizi2-block:akpm/mm/mm-unstable 480/484] drivers/base/memory.c:186:34: error: 'struct memory_block' has no member named 'nr_hwpoison'
On Fri, Sep 23, 2022 at 12:00:13PM +0800, kernel test robot wrote:
> tree: https://github.com/ammarfaizi2/linux-block akpm/mm/mm-unstable
> head: 1dee68cfead9a3a85e244a274b4e85620abd5331
> commit: 69b496f03bb46c7ce743aff0d976c078d753d6d6 [480/484] mm/hwpoison: introduce per-memory_block hwpoison counter
> config: x86_64-randconfig-a015 (https://download.01.org/0day-ci/archive/20220923/202209231134.tnhKHRfg-lkp@intel.com/config)
> compiler: gcc-11 (Debian 11.3.0-5) 11.3.0
> reproduce (this is a W=1 build):
> # https://github.com/ammarfaizi2/linux-block/commit/69b496f03bb46c7ce743aff0d976c078d753d6d6
> git remote add ammarfaizi2-block https://github.com/ammarfaizi2/linux-block
> git fetch --no-tags ammarfaizi2-block akpm/mm/mm-unstable
> git checkout 69b496f03bb46c7ce743aff0d976c078d753d6d6
> # save the config file
> mkdir build_dir && cp config build_dir/.config
> make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash
>
> If you fix the issue, kindly add following tag where applicable
> | Reported-by: kernel test robot <lkp@intel.com>
>
> All errors (new ones prefixed by >>):
>
> drivers/base/memory.c: In function 'memory_block_online':
> >> drivers/base/memory.c:186:34: error: 'struct memory_block' has no member named 'nr_hwpoison'
> 186 | if (atomic_long_read(&mem->nr_hwpoison))
> | ^~
> drivers/base/memory.c: In function 'remove_memory_block_devices':
> drivers/base/memory.c:870:61: error: 'struct memory_block' has no member named 'nr_hwpoison'
> 870 | clear_hwpoisoned_pages(atomic_long_read(&mem->nr_hwpoison));
> | ^~
>

Thanks for the report, I should've used the accessor memblk_nr_poison()
to acccess to ->nr_hwpoison. The following diff should fix this.

Thanks,
Naoya Horiguchi
---
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index c9bde4c4ffdf..f470bbfc68d0 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -183,7 +183,7 @@ static int memory_block_online(struct memory_block *mem)
struct zone *zone;
int ret;

- if (atomic_long_read(&mem->nr_hwpoison))
+ if (memblk_nr_poison(start_pfn))
return -EHWPOISON;

zone = zone_for_pfn_range(mem->online_type, mem->nid, mem->group,
@@ -867,7 +867,7 @@ void remove_memory_block_devices(unsigned long start, unsigned long size)
mem = find_memory_block_by_id(block_id);
if (WARN_ON_ONCE(!mem))
continue;
- clear_hwpoisoned_pages(atomic_long_read(&mem->nr_hwpoison));
+ clear_hwpoisoned_pages(memblk_nr_poison(start));
unregister_memory_block_under_nodes(mem);
remove_memory_block(mem);
}
@@ -1199,4 +1199,9 @@ unsigned long memblk_nr_poison(unsigned long pfn)
return 0;
}

+#else
+unsigned long memblk_nr_poison(unsigned long pfn)
+{
+ return 0;
+}
#endif
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 2fe42bb9a517..5445943bbb4b 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -3282,7 +3282,6 @@ extern int __get_huge_page_for_hwpoison(unsigned long pfn, int flags);
extern void num_poisoned_pages_inc(unsigned long pfn);
extern void memblk_nr_poison_inc(unsigned long pfn);
extern void memblk_nr_poison_sub(unsigned long pfn, long i);
-extern unsigned long memblk_nr_poison(unsigned long pfn);
extern void clear_hwpoisoned_pages(long nr_poison);
#else
static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags)
@@ -3298,6 +3297,7 @@ static inline void clear_hwpoisoned_pages(long nr_poison)
{
}
#endif
+extern unsigned long memblk_nr_poison(unsigned long pfn);

#ifndef arch_memory_failure
static inline int arch_memory_failure(unsigned long pfn, int flags)
\
 
 \ /
  Last update: 2022-09-23 10:19    [W:0.263 / U:0.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site