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 X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 683ACC43215 for ; Thu, 28 Nov 2019 10:20:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 34E542053B for ; Thu, 28 Nov 2019 10:20:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 34E542053B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C68E36B0519; Thu, 28 Nov 2019 05:20:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C1AC26B051A; Thu, 28 Nov 2019 05:20:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B30F06B051B; Thu, 28 Nov 2019 05:20:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0080.hostedemail.com [216.40.44.80]) by kanga.kvack.org (Postfix) with ESMTP id 9FB5C6B0519 for ; Thu, 28 Nov 2019 05:20:54 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 5D7BA8249980 for ; Thu, 28 Nov 2019 10:20:54 +0000 (UTC) X-FDA: 76205292828.02.wash85_421260123b02b X-HE-Tag: wash85_421260123b02b X-Filterd-Recvd-Size: 5149 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Thu, 28 Nov 2019 10:20:53 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id i12so30475889wro.5 for ; Thu, 28 Nov 2019 02:20:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=caWmBHqOFCXoHvzB9Rg0Yov3N8s7t2SawQxPVgzqSw4=; b=jhCNzus98IBUMUfJjgKlufT6ogeoZs7J+mVXX3KwwQL7PvAz5rMBYEVnBxmRAPrUat f2S+8vF2+rTp7SgNfR345D1UJtMIvhCcoBcRRTqHtiTdsaMLIk0kkj3Gf8OSsRZgRm4d GgtXuvcm8Dy98GhZBpr7WQpN5HQTR2zJaFJHbFZJiPe5MTzBIIA+jjfTC67e7mDNeY4s BgY32yaUXfFErE2xlcHkgvaq+fH073NHmbds4Kn+/U5D0+zVO1JxUOFmiSPMhz2h4Wbt fflrFJW0IzX0WhdzJvBjyUJDWdsp/9dAOtAOJNcXS9T/pUPUXLRKllO7BLeSrBQkpAVR 43BQ== X-Gm-Message-State: APjAAAWdQiSbHBoIVr+d4VRMuEu+FYGEF1SsdmglYAadQaMQ9XpKuqRp KIzVMF3YflOY0eE3i7EtSC0= X-Google-Smtp-Source: APXvYqwGRZRnVs75F0orSXv2n5n1SyiQDtgNO1It2H0+sjNBdyZzegh5FzGkWXuN2ViBfGB8/E225g== X-Received: by 2002:a5d:6886:: with SMTP id h6mr29500317wru.154.1574936452924; Thu, 28 Nov 2019 02:20:52 -0800 (PST) Received: from localhost (prg-ext-pat.suse.com. [213.151.95.130]) by smtp.gmail.com with ESMTPSA id z6sm9672837wrw.36.2019.11.28.02.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2019 02:20:52 -0800 (PST) Date: Thu, 28 Nov 2019 11:20:51 +0100 From: Michal Hocko To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Greg Kroah-Hartman , "Rafael J. Wysocki" , Oscar Salvador , Andrew Morton Subject: Re: [PATCH v1] drivers/base/node.c: get rid of get_nid_for_pfn() Message-ID: <20191128102051.GI26807@dhcp22.suse.cz> References: <20191127174126.28064-1-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191127174126.28064-1-david@redhat.com> User-Agent: Mutt/1.10.1 (2018-07-13) 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 Wed 27-11-19 18:41:26, David Hildenbrand wrote: > Since commit d84f2f5a7552 ("drivers/base/node.c: simplify > unregister_memory_block_under_nodes()") we only have a single user of > get_nid_for_pfn(). Let's just inline that code and get rid of > get_nid_for_pfn(). > > Cc: Greg Kroah-Hartman > Cc: "Rafael J. Wysocki" > Cc: Michal Hocko > Cc: Oscar Salvador > Cc: Andrew Morton > Signed-off-by: David Hildenbrand I am not really sure this is an improvement. The code is ugly as hell and open coding it just makes register_mem_sect_under_node harder to read. If anything get_nid_for_pfn deserves a comment why CONFIG_DEFERRED_STRUCT_PAGE_INIT calls for special case as early_pfn_to_nid is not bound to that config (it is defined when CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID || CONFIG_HAVE_MEMBLOCK_NODE_MAP > --- > drivers/base/node.c | 23 +++++++---------------- > 1 file changed, 7 insertions(+), 16 deletions(-) > > diff --git a/drivers/base/node.c b/drivers/base/node.c > index 98a31bafc8a2..735073fd2926 100644 > --- a/drivers/base/node.c > +++ b/drivers/base/node.c > @@ -744,17 +744,6 @@ int unregister_cpu_under_node(unsigned int cpu, unsigned int nid) > } > > #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE > -static int __ref get_nid_for_pfn(unsigned long pfn) > -{ > - if (!pfn_valid_within(pfn)) > - return -1; > -#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT > - if (system_state < SYSTEM_RUNNING) > - return early_pfn_to_nid(pfn); > -#endif > - return pfn_to_nid(pfn); > -} > - > /* register memory section under specified node if it spans that node */ > static int register_mem_sect_under_node(struct memory_block *mem_blk, > void *arg) > @@ -766,8 +755,6 @@ static int register_mem_sect_under_node(struct memory_block *mem_blk, > unsigned long pfn; > > for (pfn = start_pfn; pfn <= end_pfn; pfn++) { > - int page_nid; > - > /* > * memory block could have several absent sections from start. > * skip pfn range from absent section > @@ -784,11 +771,15 @@ static int register_mem_sect_under_node(struct memory_block *mem_blk, > * block belong to the same node. > */ > if (system_state == SYSTEM_BOOTING) { > - page_nid = get_nid_for_pfn(pfn); > - if (page_nid < 0) > + if (!pfn_valid_within(pfn)) > continue; > - if (page_nid != nid) > +#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT > + if (early_pfn_to_nid(pfn) != nid) > continue; > +#else > + if (pfn_to_nid(pfn) != nid) > + continue; > +#endif > } > > /* > -- > 2.21.0 -- Michal Hocko SUSE Labs