From mboxrd@z Thu Jan 1 00:00:00 1970 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 40C95C6FA82 for ; Fri, 23 Sep 2022 08:18:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C84C80008; Fri, 23 Sep 2022 04:18:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 777CD80007; Fri, 23 Sep 2022 04:18:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6172D80008; Fri, 23 Sep 2022 04:18:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 5019280007 for ; Fri, 23 Sep 2022 04:18:37 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2FF451A0F2D for ; Fri, 23 Sep 2022 08:18:37 +0000 (UTC) X-FDA: 79942648674.01.836E94D Received: from out0.migadu.com (out0.migadu.com [94.23.1.103]) by imf05.hostedemail.com (Postfix) with ESMTP id 70668100003 for ; Fri, 23 Sep 2022 08:18:36 +0000 (UTC) Date: Fri, 23 Sep 2022 17:18:27 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1663921114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6upSXBJLMhKZpE2evjezlcBk7TD7ZtUUvTObEbiXTq0=; b=IvTGKCHp/Gmb+0q8QNzcoO8KC28UH5zIu01DT706O+l2+l1pI81tnqpRItUUUqgVwhBMPz vdedmjWA8MQf1eoG4/EdFA3IXBqR5WgXRy43cRwsOnzgFfy24OX/iNGt7ZZqqEEuhiWZqI g0fpcL7uy3kzJ4cAXZgVCGKBtkaT754= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Naoya Horiguchi To: kernel test robot Cc: Naoya Horiguchi , kbuild-all@lists.01.org, Ammar Faizi , GNU/Weeb Mailing List , linux-kernel@vger.kernel.org, Andrew Morton , Linux Memory Management List Subject: Re: [ammarfaizi2-block:akpm/mm/mm-unstable 480/484] drivers/base/memory.c:186:34: error: 'struct memory_block' has no member named 'nr_hwpoison' Message-ID: <20220923081827.GA1357512@ik1-406-35019.vs.sakura.ne.jp> References: <202209231134.tnhKHRfg-lkp@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <202209231134.tnhKHRfg-lkp@intel.com> X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663921116; a=rsa-sha256; cv=none; b=VP2UVhN0q+qJ355pqkmxkvO0rMOGl3MUN4LTaxnZClx4T7l8s+X4S5Rh2uiF+aCwXjMFej pwWdHAp/4Zv3XDmpJf55SxUrJ391IfFnHcYpYSRZWKZJuX++ScKrIfRS/f+Bu/w04+8lT9 Kz1WORE+jUV4D62dCJuwPxNKYEJTL/Y= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=IvTGKCHp; spf=pass (imf05.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 94.23.1.103 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=1663921116; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=6upSXBJLMhKZpE2evjezlcBk7TD7ZtUUvTObEbiXTq0=; b=Ll8PFVElT2CXjghWl/q0lJGpaeK31wnf7qpEcEcVeW93V0P41eOG7tnNRuYG5k0hmiIriC QzUWH410ab0rLXwqRhKpQM57KP8NUlu6sxpr4dppvRq7FwMHSDPaRDyv37JX9d43U6kW6e 7pp+moq7IZ2Tt/5sNzy7PywKpQAIY54= X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 70668100003 Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=IvTGKCHp; spf=pass (imf05.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 94.23.1.103 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Rspam-User: X-Stat-Signature: 4ajqf6s68bxbcs93zu66mcxajf4iw8ek X-HE-Tag: 1663921116-156992 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: 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 > > 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)