Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp4313295pxb; Tue, 31 Aug 2021 01:57:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEIH/Xt8e2RkZ0mWn/OQmjRQzfKoM3ZTBIW62Wo743CBAWgibYj59wP9cLRITQ6rW717N2 X-Received: by 2002:a05:6e02:134e:: with SMTP id k14mr20529208ilr.31.1630400223264; Tue, 31 Aug 2021 01:57:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630400223; cv=none; d=google.com; s=arc-20160816; b=y3iCOhjyYkUzXqy6s3NToJLxVq6TlkkrelnG47Zlo+eyJARzxiQmNkxVqxlLU/0uoV 8Z/Z9fzEeoeXXV6eH1IDwxzRkW+RdXU45Yo4joLDM/4PpT7kau4l+lmaqeWqNNizffp5 Lr+67sdET3xDEbG+S/uO1156Qsah6UNhq2ZmTOw82vzQOK9DgwYojF+erP3/ouoGnAqA 3yJz2NiNIgFmT4qJXgBleecFJx6BQpTNWD7M6NLLmovk6cVrZ01uwUffcjT0HX9nUfNy 9zqIy6E55XwRvkmDK/kMi3IdceaxFSxr/Vr1xGNglaF4zPvnnMqCigepaGIwKYWjd9xS RPag== 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=dJC0DB+B+B7Wikvb6Z+feGIpQFGPuWnbUn28xKIxWn0=; b=0vmuRC7hNXh+BK0oJh2BDSuJlsrjHX9L9UFnzsIoL06Nn21j8oFdSSomxCEAEMb6yl nGrri41fxGnhvLX1/7/rqSTn7idJqZzBk2LQNovnatryRj7TQHvVBQNdntMCeKo/8+fC 7X51uV67n2rSU6j4YbgYVKfpYLqFnIXsq45cpXhg6U73MI5FF/PqqlMOd1quFcvjRZeM MD7GYxDDLi8/5Da4s+2tsxos7SooCO/SI788ZzqxwtghDVU1ZObZmkq+Z4DUpLdWPDJV lRNcrPkFekfyW6YSDzcHiI7Ss6PIozR6KjbQDtlfiPSpiQX0mF9QaD0YHO9WlvqcBu5K Mh2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Y5ZK7tKO; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a2si17209595ilp.123.2021.08.31.01.56.52; Tue, 31 Aug 2021 01:57:03 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=Y5ZK7tKO; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240497AbhHaI4g (ORCPT + 99 others); Tue, 31 Aug 2021 04:56:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:39712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240493AbhHaI4f (ORCPT ); Tue, 31 Aug 2021 04:56:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F216E61008; Tue, 31 Aug 2021 08:55:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630400140; bh=bnuyHXDUsJj9o5rgMuonmJZYVMQ+ewGrcJK0XOQKYeo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Y5ZK7tKOpyfAuCyeblR4eHlrsNnVjT1nbN07J8NTAJhkl3cZvgiVK4BIy5f0fE7Mp Y2Yzu404o/elq8xE1AA0fDyiTkJkUi2oUrs1VsLgwqCEiFqxKMkrScjf3ACl055ZeG JsGfJEptohZZUZzk8Ek3gTvzMF523cXcbgOfN+nK//iQfl3XMKCLjD1u7B/XJ1aRmO Ju+/absN6LGHRL/qD69o3FPamMa4YGfkrgJEfpN68YbiNKUlEE27J1uGIwB/+lXDJZ +xLXh4xLJkuRzw1fWCdJI1K3AQncIQnrQmCuy0Bw5Hkm11VLdwQfqqk4NGzRVWESZe g23EwBM35lmgA== Date: Tue, 31 Aug 2021 11:55:33 +0300 From: Mike Rapoport To: Rick Edgecombe Cc: dave.hansen@intel.com, luto@kernel.org, peterz@infradead.org, x86@kernel.org, akpm@linux-foundation.org, keescook@chromium.org, shakeelb@google.com, vbabka@suse.cz, linux-mm@kvack.org, linux-hardening@vger.kernel.org, kernel-hardening@lists.openwall.com, ira.weiny@intel.com, dan.j.williams@intel.com, linux-kernel@vger.kernel.org Subject: Re: [RFC PATCH v2 11/19] mm/sparsemem: Use alloc_table() for table allocations Message-ID: References: <20210830235927.6443-1-rick.p.edgecombe@intel.com> <20210830235927.6443-12-rick.p.edgecombe@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210830235927.6443-12-rick.p.edgecombe@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Aug 30, 2021 at 04:59:19PM -0700, Rick Edgecombe wrote: > In order to support allocating PKS protected page tables for vmememap, > create a new variant of alloc_table(), alloc_table_node() that allows for > allocation of tables from a specific node. Use it when possible for > allocating vmemmap tables. > > vmemmap_alloc_block_zero() is currently only used to allocate page > tables, so fold it into a new function, vmemem_alloc_table() that can > be free to call alloc_table_node(). Since it is today only called with > PAGE_SIZE size, drop the size argument. > > Signed-off-by: Rick Edgecombe > --- > arch/x86/mm/pgtable.c | 10 +++++++--- > include/asm-generic/pgalloc.h | 2 ++ > include/linux/mm.h | 5 +++++ > mm/sparse-vmemmap.c | 22 +++++++++++++++------- > 4 files changed, 29 insertions(+), 10 deletions(-) > > diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c > index e65d69ad6e0c..006dc4f81f6d 100644 > --- a/arch/x86/mm/pgtable.c > +++ b/arch/x86/mm/pgtable.c > @@ -41,7 +41,7 @@ static struct grouped_page_cache gpc_pks; > static bool __ro_after_init pks_tables_inited_val; > > > -struct page *alloc_table(gfp_t gfp) > +struct page *alloc_table_node(gfp_t gfp, int node) > { > struct page *table; > > @@ -53,9 +53,9 @@ struct page *alloc_table(gfp_t gfp) > } > > if (gfp & GFP_ATOMIC) > - table = get_grouped_page_atomic(numa_node_id(), &gpc_pks); > + table = get_grouped_page_atomic(node, &gpc_pks); > else > - table = get_grouped_page(numa_node_id(), &gpc_pks); > + table = get_grouped_page(node, &gpc_pks); > if (!table) > return NULL; > __SetPageTable(table); > @@ -72,6 +72,10 @@ struct page *alloc_table(gfp_t gfp) > > return table; > } > +struct page *alloc_table(gfp_t gfp) > +{ > + return alloc_table_node(gfp, numa_node_id()); > +} > > void free_table(struct page *table_page) > { > diff --git a/include/asm-generic/pgalloc.h b/include/asm-generic/pgalloc.h > index e576c19abc8c..eb08371db211 100644 > --- a/include/asm-generic/pgalloc.h > +++ b/include/asm-generic/pgalloc.h > @@ -14,8 +14,10 @@ static inline struct page *alloc_table(gfp_t gfp) > { > return alloc_page(gfp); > } > +/* alloc_table_node() stub defined in mm.h */ > #else /* __HAVE_ARCH_ALLOC_TABLE */ > extern struct page *alloc_table(gfp_t gfp); > +extern struct page *alloc_table_node(gfp_t gfp, int node); > #endif /* __HAVE_ARCH_ALLOC_TABLE */ > > #ifdef __HAVE_ARCH_FREE_TABLE > diff --git a/include/linux/mm.h b/include/linux/mm.h > index ab63d5a201cb..fdb33bc6bba8 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2332,6 +2332,11 @@ static inline void free_table(struct page *table_page) > { > __free_pages(table_page, 0); > } > + > +static inline struct page *alloc_table_node(gfp_t gfp, int node) > +{ > + return alloc_pages_node(node, gfp, 0); > +} > #endif /* CONFIG_PKS_PG_TABLES */ > > static inline void pgtable_init(void) > diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c > index bdce883f9286..4f479c75cc8d 100644 > --- a/mm/sparse-vmemmap.c > +++ b/mm/sparse-vmemmap.c > @@ -511,13 +511,21 @@ pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, > return pte; > } > > -static void * __meminit vmemmap_alloc_block_zero(unsigned long size, int node) > +static void * __meminit vmemmap_alloc_table(int node) > { > - void *p = vmemmap_alloc_block(size, node); > + void *p; > + if (slab_is_available()) { > + struct page *page = alloc_table_node(GFP_KERNEL | __GFP_ZERO, node); This change removes __GFP_RETRY_MAYFAIL|__GFP_NOWARN from the original gfp vmemmap_alloc_block() used. Not sure __GFP_RETRY_MAYFAIL is really needed in vmemmap_alloc_block_zero() at the first place, though. More broadly, maybe it makes sense to split boot time and memory hotplug paths and use pxd_alloc() for the latter. > + > + if (!page) > + return NULL; > + return page_address(page); > + } > > + p = __earlyonly_bootmem_alloc(node, PAGE_SIZE, PAGE_SIZE, __pa(MAX_DMA_ADDRESS)); Opportunistically rename to __earlyonly_memblock_alloc()? ;-) > if (!p) > return NULL; > - memset(p, 0, size); > + memset(p, 0, PAGE_SIZE); > > return p; > } > @@ -526,7 +534,7 @@ pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node) > { > pmd_t *pmd = pmd_offset(pud, addr); > if (pmd_none(*pmd)) { > - void *p = vmemmap_alloc_block_zero(PAGE_SIZE, node); > + void *p = vmemmap_alloc_table(node); > if (!p) > return NULL; > pmd_populate_kernel(&init_mm, pmd, p); > @@ -538,7 +546,7 @@ pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node) > { > pud_t *pud = pud_offset(p4d, addr); > if (pud_none(*pud)) { > - void *p = vmemmap_alloc_block_zero(PAGE_SIZE, node); > + void *p = vmemmap_alloc_table(node); > if (!p) > return NULL; > pud_populate(&init_mm, pud, p); > @@ -550,7 +558,7 @@ p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node) > { > p4d_t *p4d = p4d_offset(pgd, addr); > if (p4d_none(*p4d)) { > - void *p = vmemmap_alloc_block_zero(PAGE_SIZE, node); > + void *p = vmemmap_alloc_table(node); > if (!p) > return NULL; > p4d_populate(&init_mm, p4d, p); > @@ -562,7 +570,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node) > { > pgd_t *pgd = pgd_offset_k(addr); > if (pgd_none(*pgd)) { > - void *p = vmemmap_alloc_block_zero(PAGE_SIZE, node); > + void *p = vmemmap_alloc_table(node); > if (!p) > return NULL; > pgd_populate(&init_mm, pgd, p); > -- > 2.17.1 > -- Sincerely yours, Mike.