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=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT 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 A890EC004C9 for ; Fri, 3 May 2019 08:46:10 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4D4712087F for ; Fri, 3 May 2019 08:46:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D4712087F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AEE526B0003; Fri, 3 May 2019 04:46:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A9E9E6B0005; Fri, 3 May 2019 04:46:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 98D3C6B0007; Fri, 3 May 2019 04:46:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by kanga.kvack.org (Postfix) with ESMTP id 4501B6B0003 for ; Fri, 3 May 2019 04:46:09 -0400 (EDT) Received: by mail-ed1-f69.google.com with SMTP id h12so3081307edl.23 for ; Fri, 03 May 2019 01:46:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:date:from:to :cc:subject:message-id:references:mime-version:content-disposition :in-reply-to:user-agent; bh=JoZMkUYu1UQairScnAhWAbiNKSOywbkzKnjZGaKAOwg=; b=YyQJ2C0xRG1jy5ecWtgEraBdrAW4XvskEXCeJThU+EFsXrJgfKfhvURcfMfa7GTxrQ oQw8xQm58nzfw3kfp6sVQfQq0l+NV3TiYiiLK7+v07PpJzmLsQNGXg48kLb/Ky2Ot6rA 1iWZJG7c1JLO9EK/cLpS81AzryH1ZBnKyuxPafB1voGaoPh+up6JXgIt3PpyPSYEi7T5 IfKhxCtjv+0cIJ+Vu6qk5EowzFjn2yxFOgefIQYS/+PxC4G4F06+QPF71+UCAT9z4Ssm BWn4XdIbj2vK6OzLXp9/8GOQCIrgo3h0nf0G87mfAvoJx7amP8lXsUHLR2uzAw/+bCJZ mWlw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador@suse.de designates 195.135.220.15 as permitted sender) smtp.mailfrom=osalvador@suse.de X-Gm-Message-State: APjAAAUZhvIil4Gwo7mBaxEwzqjnCHZ8v5TtM8R9c01E4DbvYerasQWS GhsSC2Nx1mKAo3wlXclU7tu3kh86F0eqIKq1ReigeHCWj5JPLh7bNSPZEjdWeLYQAn8BgoJ169P w9DWVWvOyu8fjzHk38m2k1h9DMtxwEGX4nEJEMUgWC/O5kuF/cV1bqMVBcj4rG+3Ikg== X-Received: by 2002:a17:906:4dd4:: with SMTP id f20mr5168240ejw.62.1556873168810; Fri, 03 May 2019 01:46:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqwrZTcRagDbEKgfigXMkZsIpFePhSYOCWFBzw4LAHlSWer37MVpYR7Vua3w9A6PM8S8GNKk X-Received: by 2002:a17:906:4dd4:: with SMTP id f20mr5168175ejw.62.1556873167624; Fri, 03 May 2019 01:46:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556873167; cv=none; d=google.com; s=arc-20160816; b=t+idjrpCmzk5BbPqJekXor0TMZ+go/+fVFUl+F7cl7X+Xiwgx1ststKWoym+4cl74c Yz4v8yGri6tT3CvcE49+y/qk8PF4XU1ycONtw+8h2Ps5XBJ+qO2m6OmZhscCmEtfFpxX wIxfwdllMe+spovtnfCQqwyTRx44keXMJdx+h6ZDNqmaF9q0+oaV671Qpz10aid3C++m ODZkRce1KuTx7xVmF5jx5PrydEC8WK2Dn7e47QjbnP2TalrC5HNLEQVY2LbXJQFbpOTQ 5db6wEBn3lVOFLWTlZ83u3WI4ZQH5VUhe8pBo3e6rIDTBsCAZC1m7zuAXTqw0SOUYeCP 9R/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date; bh=JoZMkUYu1UQairScnAhWAbiNKSOywbkzKnjZGaKAOwg=; b=P0T9ZaYCywHQHtYY7PHbdKNWlYyEDW/k4sH1FRDD1qBG03PpvYAyguzKphBTjG57O1 XAoFL59fu4wCJ42G8gJeaYVM4+6jZ9+pgs4dOKjK8yzxJNwSw0JLesY+bWlZTizhtitI ey4KKRp9CFy2WCVh1zOBrL1MNJQblCf9YLC48pmfzRfyY8zKAgTqKy85PLt2u8ajsy3q U5enWeMFdEHh8JuRPn1UCGljnfHt3omMiuozPFulprTdQhqCvkaEegKfNswtyYmxDdEt wgHZ4gaiWskaR/UYHhghRXbeugW6sB7WrMCHKHNNDiYquNraB7RGhrQWjppmCRDzba55 7QZQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of osalvador@suse.de designates 195.135.220.15 as permitted sender) smtp.mailfrom=osalvador@suse.de Received: from mx1.suse.de (mx2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id b22si1116922edd.378.2019.05.03.01.46.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 May 2019 01:46:07 -0700 (PDT) Received-SPF: pass (google.com: domain of osalvador@suse.de designates 195.135.220.15 as permitted sender) client-ip=195.135.220.15; Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador@suse.de designates 195.135.220.15 as permitted sender) smtp.mailfrom=osalvador@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 06A8CACAE; Fri, 3 May 2019 08:46:07 +0000 (UTC) Date: Fri, 3 May 2019 10:46:03 +0200 From: Oscar Salvador To: Dan Williams Cc: akpm@linux-foundation.org, Michal Hocko , David Hildenbrand , Logan Gunthorpe , linux-nvdimm@lists.01.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v7 05/12] mm/sparsemem: Convert kmalloc_section_memmap() to populate_section_memmap() Message-ID: <20190503084603.GE15740@linux> References: <155677652226.2336373.8700273400832001094.stgit@dwillia2-desk3.amr.corp.intel.com> <155677654842.2336373.17000900051843592636.stgit@dwillia2-desk3.amr.corp.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <155677654842.2336373.17000900051843592636.stgit@dwillia2-desk3.amr.corp.intel.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, May 01, 2019 at 10:55:48PM -0700, Dan Williams wrote: > Allow sub-section sized ranges to be added to the memmap. > populate_section_memmap() takes an explict pfn range rather than > assuming a full section, and those parameters are plumbed all the way > through to vmmemap_populate(). There should be no sub-section usage in > current deployments. New warnings are added to clarify which memmap > allocation paths are sub-section capable. > > Cc: Michal Hocko > Cc: David Hildenbrand > Cc: Logan Gunthorpe > Signed-off-by: Dan Williams > --- > arch/x86/mm/init_64.c | 4 ++- > include/linux/mm.h | 4 ++- > mm/sparse-vmemmap.c | 21 +++++++++++------ > mm/sparse.c | 61 +++++++++++++++++++++++++++++++------------------ > 4 files changed, 57 insertions(+), 33 deletions(-) > > diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c > index 20d14254b686..bb018d09d2dc 100644 > --- a/arch/x86/mm/init_64.c > +++ b/arch/x86/mm/init_64.c > @@ -1457,7 +1457,9 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, > { > int err; > > - if (boot_cpu_has(X86_FEATURE_PSE)) > + if (end - start < PAGES_PER_SECTION * sizeof(struct page)) maybe just: if (PHYS_PFN(end) - PHYS_PFN(start) < PAGES_PER_SECTION) ? > + err = vmemmap_populate_basepages(start, end, node); > + else if (boot_cpu_has(X86_FEATURE_PSE)) > err = vmemmap_populate_hugepages(start, end, node, altmap); > else if (altmap) { > pr_err_once("%s: no cpu support for altmap allocations\n", Although the following looks more clear to me: int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, struct vmem_altmap *altmap) { int err; bool partial_section = (PHYS_PFN(end) - PFN_PHYS(start)) < PAGES_PER_SECTION; if (partial_section || !boot_cpu_has(X86_FEATURE_PSE)) err = vmemmap_populate_basepages(start, end, node); else if (boot_cpu_has(X86_FEATURE_PSE)) err = vmemmap_populate_hugepages(start, end, node, altmap); else if (altmap) { pr_err_once("%s: no cpu support for altmap allocations\n", __func__); err = -ENOMEM; } if (!err) sync_global_pgds(start, end - 1); return err; } > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 0e8834ac32b7..5360a0e4051d 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2748,8 +2748,8 @@ const char * arch_vma_name(struct vm_area_struct *vma); > void print_vma_addr(char *prefix, unsigned long rip); > > void *sparse_buffer_alloc(unsigned long size); > -struct page *sparse_mem_map_populate(unsigned long pnum, int nid, > - struct vmem_altmap *altmap); > +struct page * __populate_section_memmap(unsigned long pfn, > + unsigned long nr_pages, int nid, struct vmem_altmap *altmap); > pgd_t *vmemmap_pgd_populate(unsigned long addr, int node); > p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node); > pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node); > diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c > index 7fec05796796..dcb023aa23d1 100644 > --- a/mm/sparse-vmemmap.c > +++ b/mm/sparse-vmemmap.c > @@ -245,19 +245,26 @@ int __meminit vmemmap_populate_basepages(unsigned long start, > return 0; > } > > -struct page * __meminit sparse_mem_map_populate(unsigned long pnum, int nid, > - struct vmem_altmap *altmap) > +struct page * __meminit __populate_section_memmap(unsigned long pfn, > + unsigned long nr_pages, int nid, struct vmem_altmap *altmap) > { > unsigned long start; > unsigned long end; > - struct page *map; > > - map = pfn_to_page(pnum * PAGES_PER_SECTION); > - start = (unsigned long)map; > - end = (unsigned long)(map + PAGES_PER_SECTION); > + /* > + * The minimum granularity of memmap extensions is > + * SECTION_ACTIVE_SIZE as allocations are tracked in the > + * 'map_active' bitmap of the section. > + */ > + end = ALIGN(pfn + nr_pages, PHYS_PFN(SECTION_ACTIVE_SIZE)); I would use PAGES_PER_SUB_SECTION directly: end = ALIGN(pfn + nr_pages, PAGES_PER_SUB_SECTION); > + pfn &= PHYS_PFN(SECTION_ACTIVE_MASK); pfn &= PAGE_SUB_SECTION_MASK ? [...] > -static struct page *__kmalloc_section_memmap(void) > +struct page *populate_section_memmap(unsigned long pfn, > + unsigned long nr_pages, int nid, struct vmem_altmap *altmap) > { > struct page *page, *ret; > unsigned long memmap_size = sizeof(struct page) * PAGES_PER_SECTION; > > + if ((pfn & ~PAGE_SECTION_MASK) || nr_pages != PAGES_PER_SECTION) { > + WARN(1, "%s: called with section unaligned parameters\n", > + __func__); > + return NULL; > + } Can this actually happen? We need CONFIG_SPARSEMEM_VMEMMAP in order to use nvdimm, right? But I guess it is fine to have a safety net just in case. > + > page = alloc_pages(GFP_KERNEL|__GFP_NOWARN, get_order(memmap_size)); > if (page) > goto got_map_page; > @@ -682,15 +692,17 @@ static struct page *__kmalloc_section_memmap(void) > return ret; > } > > -static inline struct page *kmalloc_section_memmap(unsigned long pnum, int nid, > +static void depopulate_section_memmap(unsigned long pfn, unsigned long nr_pages, > struct vmem_altmap *altmap) > { > - return __kmalloc_section_memmap(); > -} > + struct page *memmap = pfn_to_page(pfn); > + > + if ((pfn & ~PAGE_SECTION_MASK) || nr_pages != PAGES_PER_SECTION) { > + WARN(1, "%s: called with section unaligned parameters\n", > + __func__); > + return; > + } > > -static void __kfree_section_memmap(struct page *memmap, > - struct vmem_altmap *altmap) > -{ > if (is_vmalloc_addr(memmap)) > vfree(memmap); > else > @@ -761,12 +773,13 @@ int __meminit sparse_add_one_section(int nid, unsigned long start_pfn, > if (ret < 0 && ret != -EEXIST) > return ret; > ret = 0; > - memmap = kmalloc_section_memmap(section_nr, nid, altmap); > + memmap = populate_section_memmap(start_pfn, PAGES_PER_SECTION, nid, > + altmap); > if (!memmap) > return -ENOMEM; > usage = kzalloc(mem_section_usage_size(), GFP_KERNEL); > if (!usage) { > - __kfree_section_memmap(memmap, altmap); > + depopulate_section_memmap(start_pfn, PAGES_PER_SECTION, altmap); > return -ENOMEM; > } > > @@ -788,7 +801,7 @@ int __meminit sparse_add_one_section(int nid, unsigned long start_pfn, > out: > if (ret < 0) { > kfree(usage); > - __kfree_section_memmap(memmap, altmap); > + depopulate_section_memmap(start_pfn, PAGES_PER_SECTION, altmap); > } > return ret; > } > @@ -825,7 +838,8 @@ static inline void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) > #endif > > static void free_section_usage(struct page *memmap, > - struct mem_section_usage *usage, struct vmem_altmap *altmap) > + struct mem_section_usage *usage, unsigned long pfn, > + unsigned long nr_pages, struct vmem_altmap *altmap) > { > struct page *usage_page; > > @@ -839,7 +853,7 @@ static void free_section_usage(struct page *memmap, > if (PageSlab(usage_page) || PageCompound(usage_page)) { > kfree(usage); > if (memmap) > - __kfree_section_memmap(memmap, altmap); > + depopulate_section_memmap(pfn, nr_pages, altmap); > return; > } > > @@ -868,7 +882,8 @@ void sparse_remove_one_section(struct zone *zone, struct mem_section *ms, > > clear_hwpoisoned_pages(memmap + map_offset, > PAGES_PER_SECTION - map_offset); > - free_section_usage(memmap, usage, altmap); > + free_section_usage(memmap, usage, section_nr_to_pfn(__section_nr(ms)), > + PAGES_PER_SECTION, altmap); > } > #endif /* CONFIG_MEMORY_HOTREMOVE */ > #endif /* CONFIG_MEMORY_HOTPLUG */ > -- Oscar Salvador SUSE L3