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/[email protected]/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 <[email protected]>
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));
| ^~
vim +186 drivers/base/memory.c
177
178 static int memory_block_online(struct memory_block *mem)
179 {
180 unsigned long start_pfn = section_nr_to_pfn(mem->start_section_nr);
181 unsigned long nr_pages = PAGES_PER_SECTION * sections_per_block;
182 unsigned long nr_vmemmap_pages = mem->nr_vmemmap_pages;
183 struct zone *zone;
184 int ret;
185
> 186 if (atomic_long_read(&mem->nr_hwpoison))
187 return -EHWPOISON;
188
189 zone = zone_for_pfn_range(mem->online_type, mem->nid, mem->group,
190 start_pfn, nr_pages);
191
192 /*
193 * Although vmemmap pages have a different lifecycle than the pages
194 * they describe (they remain until the memory is unplugged), doing
195 * their initialization and accounting at memory onlining/offlining
196 * stage helps to keep accounting easier to follow - e.g vmemmaps
197 * belong to the same zone as the memory they backed.
198 */
199 if (nr_vmemmap_pages) {
200 ret = mhp_init_memmap_on_memory(start_pfn, nr_vmemmap_pages, zone);
201 if (ret)
202 return ret;
203 }
204
205 ret = online_pages(start_pfn + nr_vmemmap_pages,
206 nr_pages - nr_vmemmap_pages, zone, mem->group);
207 if (ret) {
208 if (nr_vmemmap_pages)
209 mhp_deinit_memmap_on_memory(start_pfn, nr_vmemmap_pages);
210 return ret;
211 }
212
213 /*
214 * Account once onlining succeeded. If the zone was unpopulated, it is
215 * now already properly populated.
216 */
217 if (nr_vmemmap_pages)
218 adjust_present_page_count(pfn_to_page(start_pfn), mem->group,
219 nr_vmemmap_pages);
220
221 mem->zone = zone;
222 return ret;
223 }
224
--
0-DAY CI Kernel Test Service
https://01.org/lkp
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/[email protected]/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 <[email protected]>
>
> 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)