Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp119404pxb; Wed, 20 Jan 2021 02:46:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJzy52VwR/HjRYyB8mPffZ6gwvNBgpHFzNnG4SZqFRE2chXTzIfNesYR4VcU2hqfB6IgsIm0 X-Received: by 2002:a17:906:b0c2:: with SMTP id bk2mr5954041ejb.223.1611139618808; Wed, 20 Jan 2021 02:46:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611139618; cv=none; d=google.com; s=arc-20160816; b=YvN0YefZdFQ13URrAKHstTdqYps2neCYC27XqWpIaOQpXYligU6LhXOxU5xR2RjlET bU8+fOAM0NScBeAFABY+P8NDw6TRzyRm70G9EDFdrusNxu5JfovQ1YELxYXLPAaSbILv 1VIfrZFEsuExFuR2a1M+74UtCejp4gX2/J0Bhy2kOB5fdV5qpYiqVkHRaxpbJtIN/yhb SMmQyTQW3tvsV5bTwEALUo3hjhafD3Da2yPgdJg8Gv32CDy+FJjRRiGnE7PhIXKOXg3j cmMVndKJdmaYGGvM7rwaIOsfz3ioFLiDGRlp8xbncxfdf0OdsFen09uFaxny7OldEMtq 7Feg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=f85nyV30dGUYyT4OSwZQuD/tNzi1TVhqdVBME5I7U34=; b=foh29Bg1TFd9RS7QViaD/2ltdj59BbL4fCAXnfSTSp/ylZAZNdFXR2hYuKS4+40fHd BbAUjHSi4ugde90hv0nvfLDGv/7clSZ1nQnj3vQgsRXus6rk3klBJYCv5fSmziRCFxa+ sktB/k/AsXCrWQFCW+M/yn9ro5HPnP52jlVmutmNixiCBbwTbTE9LntfW/jne4s6gvcf jZtmT5eIBFmwcQDSE4rDvM4u/mO08CHXHToyN0ziofxmAOBuL6hL8pMHg9+YIEOzUFqP P+MMBosw1wv0IGzCXw+UODBeKZs7MSHW63NGt1lg6cKdo7kEcMQYNRA6ylwcFZBZU2MZ G1Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=Tqtkk73B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hr32si520823ejc.128.2021.01.20.02.46.08; Wed, 20 Jan 2021 02:46:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=Tqtkk73B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732939AbhATKUa (ORCPT + 99 others); Wed, 20 Jan 2021 05:20:30 -0500 Received: from mx2.suse.de ([195.135.220.15]:46144 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730352AbhATKMA (ORCPT ); Wed, 20 Jan 2021 05:12:00 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1611137473; h=from:from:reply-to: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=f85nyV30dGUYyT4OSwZQuD/tNzi1TVhqdVBME5I7U34=; b=Tqtkk73BVvR1GyvLqKN8ezpgmILoSEhpUbnhuP+3EYhk+CP5v9bOCWEbAYqu7lzOemwRDX Y4lmzrHaj6x3fJ6JJrwa92jIVJWUqquupWpWBxfWJ4kEZcUuWCL+wHAKVU0cMlyQwdVDRJ FQANm4sJYUPgLnNrgjrxdQNSlQcFIao= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 1D056AC8F; Wed, 20 Jan 2021 10:11:13 +0000 (UTC) Date: Wed, 20 Jan 2021 11:11:12 +0100 From: Michal Hocko To: Dan Williams Cc: akpm@linux-foundation.org, David Hildenbrand , Oscar Salvador , linux-mm@kvack.org, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 1/5] mm: Move pfn_to_online_page() out of line Message-ID: <20210120101112.GF9371@dhcp22.suse.cz> References: <161058499000.1840162.702316708443239771.stgit@dwillia2-desk3.amr.corp.intel.com> <161058499608.1840162.10165648147615238793.stgit@dwillia2-desk3.amr.corp.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <161058499608.1840162.10165648147615238793.stgit@dwillia2-desk3.amr.corp.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed 13-01-21 16:43:16, Dan Williams wrote: > pfn_to_online_page() is already too large to be a macro or an inline > function. In anticipation of further logic changes / growth, move it out > of line. > > No functional change, just code movement. > > Reported-by: Michal Hocko I am not sure what r-b refers to. I suspect it is the overal problem rather than this particular patch. Not that I care much but it might get confusing because I do not remember ever complaining about pfn_to_online_page to be too large. > Reviewed-by: David Hildenbrand > Reviewed-by: Oscar Salvador > Signed-off-by: Dan Williams I do not remember any hot path which depends on pfn walk and a function call would be clearly visible. If this ever turn out to be a problem we can make it inline and push the heavy lifting out of line. Acked-by: Michal Hocko Thanks! > --- > include/linux/memory_hotplug.h | 17 +---------------- > mm/memory_hotplug.c | 16 ++++++++++++++++ > 2 files changed, 17 insertions(+), 16 deletions(-) > > diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h > index 15acce5ab106..3d99de0db2dd 100644 > --- a/include/linux/memory_hotplug.h > +++ b/include/linux/memory_hotplug.h > @@ -16,22 +16,7 @@ struct resource; > struct vmem_altmap; > > #ifdef CONFIG_MEMORY_HOTPLUG > -/* > - * Return page for the valid pfn only if the page is online. All pfn > - * walkers which rely on the fully initialized page->flags and others > - * should use this rather than pfn_valid && pfn_to_page > - */ > -#define pfn_to_online_page(pfn) \ > -({ \ > - struct page *___page = NULL; \ > - unsigned long ___pfn = pfn; \ > - unsigned long ___nr = pfn_to_section_nr(___pfn); \ > - \ > - if (___nr < NR_MEM_SECTIONS && online_section_nr(___nr) && \ > - pfn_valid_within(___pfn)) \ > - ___page = pfn_to_page(___pfn); \ > - ___page; \ > -}) > +struct page *pfn_to_online_page(unsigned long pfn); > > /* > * Types for free bootmem stored in page->lru.next. These have to be in > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index f9d57b9be8c7..55a69d4396e7 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -300,6 +300,22 @@ static int check_hotplug_memory_addressable(unsigned long pfn, > return 0; > } > > +/* > + * Return page for the valid pfn only if the page is online. All pfn > + * walkers which rely on the fully initialized page->flags and others > + * should use this rather than pfn_valid && pfn_to_page > + */ > +struct page *pfn_to_online_page(unsigned long pfn) > +{ > + unsigned long nr = pfn_to_section_nr(pfn); > + > + if (nr < NR_MEM_SECTIONS && online_section_nr(nr) && > + pfn_valid_within(pfn)) > + return pfn_to_page(pfn); > + return NULL; > +} > +EXPORT_SYMBOL_GPL(pfn_to_online_page); > + > /* > * Reasonably generic function for adding memory. It is > * expected that archs that support memory hotplug will -- Michal Hocko SUSE Labs