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.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 B8FFBC3F2CD for ; Tue, 3 Mar 2020 08:22:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 724B3208C3 for ; Tue, 3 Mar 2020 08:22:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SAq1OhIn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 724B3208C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1BF7E6B0005; Tue, 3 Mar 2020 03:22:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 171276B0006; Tue, 3 Mar 2020 03:22:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 038E26B0007; Tue, 3 Mar 2020 03:22:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0085.hostedemail.com [216.40.44.85]) by kanga.kvack.org (Postfix) with ESMTP id DCA7A6B0005 for ; Tue, 3 Mar 2020 03:22:15 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id BFBB58248047 for ; Tue, 3 Mar 2020 08:22:15 +0000 (UTC) X-FDA: 76553358630.26.suit79_6b05daab9a008 X-HE-Tag: suit79_6b05daab9a008 X-Filterd-Recvd-Size: 8687 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf44.hostedemail.com (Postfix) with ESMTP for ; Tue, 3 Mar 2020 08:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583223734; 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=mXAVwNbFK4zOSYaxMkWSKgD7XHHLmzjEY2OvgxPd9bg=; b=SAq1OhInvglfntDNgdvb9jREtFhDJX14zHlvkTtSgz5EKRxsVhZ6yvKq9g49vqrhz5D/SE /93OZCq2OIw8hbd9EFGc8h1FvcQWLKEMV68WKYWVMeaofKRyJoMe1HlF9/ooauJzGjz6vA aGqdPSpG7isb2oMXRaJzVQFnrhLa2Jo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-473-Ccue4YSPOFey6hFYtMA_9g-1; Tue, 03 Mar 2020 03:22:13 -0500 X-MC-Unique: Ccue4YSPOFey6hFYtMA_9g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3DE191005513; Tue, 3 Mar 2020 08:22:11 +0000 (UTC) Received: from localhost (ovpn-12-29.pek2.redhat.com [10.72.12.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7146087B1A; Tue, 3 Mar 2020 08:22:07 +0000 (UTC) Date: Tue, 3 Mar 2020 16:22:04 +0800 From: Baoquan He To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, richardw.yang@linux.intel.com, osalvador@suse.de, dan.j.williams@intel.com, mhocko@suse.com, rppt@linux.ibm.com, robin.murphy@arm.com Subject: Re: [PATCH v2 3/7] mm/sparse.c: introduce a new function clear_subsection_map() Message-ID: <20200303082204.GA4433@MiWiFi-R3L-srv> References: <20200220043316.19668-1-bhe@redhat.com> <20200220043316.19668-4-bhe@redhat.com> <20200301052028.GN24216@MiWiFi-R3L-srv> <1346f0c2-7b1f-6feb-5e9b-2854fd0022ba@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1346f0c2-7b1f-6feb-5e9b-2854fd0022ba@redhat.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 03/02/20 at 04:43pm, David Hildenbrand wrote: > On 01.03.20 06:20, Baoquan He wrote: > > On 02/28/20 at 03:36pm, David Hildenbrand wrote: > >> On 20.02.20 05:33, Baoquan He wrote: > >>> Wrap the codes which clear subsection map of one memory region from > >>> section_deactivate() into clear_subsection_map(). > >>> > >>> Signed-off-by: Baoquan He > >>> --- > >>> mm/sparse.c | 46 ++++++++++++++++++++++++++++++++++++++-------- > >>> 1 file changed, 38 insertions(+), 8 deletions(-) > >>> > >>> diff --git a/mm/sparse.c b/mm/sparse.c > >>> index 977b47acd38d..df857ee9330c 100644 > >>> --- a/mm/sparse.c > >>> +++ b/mm/sparse.c > >>> @@ -726,14 +726,25 @@ static void free_map_bootmem(struct page *memmap) > >>> } > >>> #endif /* CONFIG_SPARSEMEM_VMEMMAP */ > >>> > >>> -static void section_deactivate(unsigned long pfn, unsigned long nr_pages, > >>> - struct vmem_altmap *altmap) > >>> +/** > >>> + * clear_subsection_map - Clear subsection map of one memory region > >>> + * > >>> + * @pfn - start pfn of the memory range > >>> + * @nr_pages - number of pfns to add in the region > >>> + * > >>> + * This is only intended for hotplug, and clear the related subsection > >>> + * map inside one section. > >>> + * > >>> + * Return: > >>> + * * -EINVAL - Section already deactived. > >>> + * * 0 - Subsection map is emptied. > >>> + * * 1 - Subsection map is not empty. > >>> + */ > >> > >> Less verbose please (in my preference: none and simplify return handling) > >> > >>> +static int clear_subsection_map(unsigned long pfn, unsigned long nr_pages) > >>> { > >>> DECLARE_BITMAP(map, SUBSECTIONS_PER_SECTION) = { 0 }; > >>> DECLARE_BITMAP(tmp, SUBSECTIONS_PER_SECTION) = { 0 }; > >>> struct mem_section *ms = __pfn_to_section(pfn); > >>> - bool section_is_early = early_section(ms); > >>> - struct page *memmap = NULL; > >>> unsigned long *subsection_map = ms->usage > >>> ? &ms->usage->subsection_map[0] : NULL; > >>> > >>> @@ -744,8 +755,28 @@ static void section_deactivate(unsigned long pfn, unsigned long nr_pages, > >>> if (WARN(!subsection_map || !bitmap_equal(tmp, map, SUBSECTIONS_PER_SECTION), > >>> "section already deactivated (%#lx + %ld)\n", > >>> pfn, nr_pages)) > >>> - return; > >>> + return -EINVAL; > >>> + > >>> + bitmap_xor(subsection_map, map, subsection_map, SUBSECTIONS_PER_SECTION); > >>> > >>> + if (bitmap_empty(subsection_map, SUBSECTIONS_PER_SECTION)) > >>> + return 0; > >>> + > >> > >> Can we please just have a > >> > >> subsection_map_empty() instead and handle that in the caller? > >> (you can then always return true in the !VMEMMAP variant) > > > > I don't follow. Could you be more specific? or pseudo code please? > > > > The old code has to handle below case in which subsection_map has been > > cleared. And I introduce clear_subsection_map() to encapsulate all > > subsection map realted code so that !VMEMMAP won't have to see it any > > more. > > > > Something like this on top would be easier to understand IMHO > > > diff --git a/mm/sparse.c b/mm/sparse.c > index dc79b00ddaaa..be5c80e9cfee 100644 > --- a/mm/sparse.c > +++ b/mm/sparse.c > @@ -726,20 +726,6 @@ static void free_map_bootmem(struct page *memmap) > } > #endif /* CONFIG_SPARSEMEM_VMEMMAP */ > > -/** > - * clear_subsection_map - Clear subsection map of one memory region > - * > - * @pfn - start pfn of the memory range > - * @nr_pages - number of pfns to add in the region > - * > - * This is only intended for hotplug, and clear the related subsection > - * map inside one section. > - * > - * Return: > - * * -EINVAL - Section already deactived. > - * * 0 - Subsection map is emptied. > - * * 1 - Subsection map is not empty. > - */ > static int clear_subsection_map(unsigned long pfn, unsigned long nr_pages) > { > DECLARE_BITMAP(map, SUBSECTIONS_PER_SECTION) = { 0 }; > @@ -758,11 +744,12 @@ static int clear_subsection_map(unsigned long pfn, unsigned long nr_pages) > return -EINVAL; > > bitmap_xor(subsection_map, map, subsection_map, SUBSECTIONS_PER_SECTION); > + return 0; > +} > > - if (bitmap_empty(subsection_map, SUBSECTIONS_PER_SECTION)) > - return 0; > - > - return 1; > +static bool is_subsection_map_empty(unsigned long pfn, unsigned long nr_pages) > +{ > + return bitmap_empty(subsection_map, SUBSECTIONS_PER_SECTION); > } > > static void section_deactivate(unsigned long pfn, unsigned long nr_pages, > @@ -771,11 +758,8 @@ static void section_deactivate(unsigned long pfn, unsigned long nr_pages, > struct mem_section *ms = __pfn_to_section(pfn); > bool section_is_early = early_section(ms); > struct page *memmap = NULL; > - int rc; > - > > - rc = clear_subsection_map(pfn, nr_pages); > - if (IS_ERR_VALUE((unsigned long)rc)) > + if (unlikely(clear_subsection_map(pfn, nr_pages))) > return; > /* > * There are 3 cases to handle across two configurations > @@ -794,7 +778,7 @@ static void section_deactivate(unsigned long pfn, unsigned long nr_pages, > * > * For 2/ and 3/ the SPARSEMEM_VMEMMAP={y,n} cases are unified > */ > - if (!rc) { > + if (is_subsection_map_empty(pfn, nr_pages)) { > unsigned long section_nr = pfn_to_section_nr(pfn); Tried this way, it's not good in this patch. Since ms->usage might be freed in this place. if (!PageReserved(virt_to_page(ms->usage))) { kfree(ms->usage); ms->usage = NULL; } If have to introduce is_subsection_map_empty(), the code need be adjusted a little bit. It may need be done in another separate patch to adjust it. If you agree, I would like to keep this patch as is, later I can refactor this on top of this patchset, or if anyone else post patch to adjust it, I can help review. > > /* > @@ -816,7 +800,7 @@ static void section_deactivate(unsigned long pfn, unsigned long nr_pages, > else > depopulate_section_memmap(pfn, nr_pages, altmap); > > - if (!rc) > + if (is_subsection_map_empty(pfn, nr_pages)) > ms->section_mem_map = (unsigned long)NULL; > } > > > -- > Thanks, > > David / dhildenb