Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp4221316imm; Mon, 15 Oct 2018 11:01:25 -0700 (PDT) X-Google-Smtp-Source: ACcGV62HdBONs02s1eb6CzQODK9IC9KK9Wud3qDYOsA3VKKA30Mixnj/U8oDhN5HKribeioq8YPu X-Received: by 2002:a63:1c1b:: with SMTP id c27-v6mr17066587pgc.351.1539626485046; Mon, 15 Oct 2018 11:01:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539626485; cv=none; d=google.com; s=arc-20160816; b=Yu4KjDqt/ZWelFrQCb5M9zS7aBlNa0nE4pJCo33cR/H09KsSsGmxXvgaDPFDCoELGl epucsUh2QWDOKzr/NhTuki0Wu4/nn9jvVgUe0tJsMrUKBZDOW7qYIW8hAF2QvwlB6BNh z7cLzjyUmqZSbZulRwCpHFvu3KNbud6fVCojuMD4kHjWMKn5WwqmIDQlM0EM7gDNCkTE cm8q/m742W9KYES29TNlsGI3KiyP5KUw8H8sVqrR+bVXvrNZSNjH6GJsUv8rDq/Yei9z qVTivzKyzYwVji/liSWXi9GseFotOtEMG2KKjkNIKDW5flaoWwtktbqfU/hzaTCasJXY zGuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:subject:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:cc:to:from; bh=Q2/22PJP5KiW9SOBKPYV29chcTBnVKjNVxRDnLt6F18=; b=v3pVi1CZQlnFqHSgVnUFO5v/1sEhp7uoaYMoqczg6z+BpkNuoVaHgn06EIj6WCzAuY eCBpLjkptRNrZbCUbRF1BZGR62QaGOO0J38NPUBdIVVYSjrRtfPZj/kagfRjmlIlVatz Fluu6LqbJiHCSzAk+P9g5SLnmduIYP6uGzOvYcUflEJ+byGYxq4cst1twSdmULWcnzcl yLyr4YOQd6rU5u3lTZcgEdpzTIE4jBFUNWsZTmt/gJcE8qRvJXwBUmIsZdl6OiSUjG8B MeWnnGvgURhyAmkmiQKpCLSFxToW/KTewj5DFus9DPRmcWWhlLnYPdU/QNqynF13x6+W 5DMg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f1-v6si6129731pld.49.2018.10.15.11.01.09; Mon, 15 Oct 2018 11:01:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727528AbeJPBp0 (ORCPT + 99 others); Mon, 15 Oct 2018 21:45:26 -0400 Received: from ale.deltatee.com ([207.54.116.67]:54706 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727078AbeJPBnf (ORCPT ); Mon, 15 Oct 2018 21:43:35 -0400 Received: from cgy1-donard.priv.deltatee.com ([172.16.1.31]) by ale.deltatee.com with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gC77C-0002II-7K; Mon, 15 Oct 2018 11:57:16 -0600 Received: from gunthorp by cgy1-donard.priv.deltatee.com with local (Exim 4.89) (envelope-from ) id 1gC779-0002Ma-0e; Mon, 15 Oct 2018 11:57:11 -0600 From: Logan Gunthorpe To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org Cc: Stephen Bates , Palmer Dabbelt , Albert Ou , Christoph Hellwig , Andrew Morton , Arnd Bergmann , Logan Gunthorpe , Catalin Marinas , Will Deacon Date: Mon, 15 Oct 2018 11:56:57 -0600 Message-Id: <20181015175702.9036-2-logang@deltatee.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181015175702.9036-1-logang@deltatee.com> References: <20181015175702.9036-1-logang@deltatee.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, sbates@raithlin.com, palmer@sifive.com, aou@eecs.berkeley.edu, hch@lst.de, akpm@linux-foundation.org, arnd@arndb.de, logang@deltatee.com, catalin.marinas@arm.com, will.deacon@arm.com X-SA-Exim-Mail-From: gunthorp@deltatee.com X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on ale.deltatee.com X-Spam-Level: X-Spam-Status: No, score=-8.7 required=5.0 tests=ALL_TRUSTED,BAYES_00, GREYLIST_ISWHITE,MYRULES_NO_TEXT autolearn=ham autolearn_force=no version=3.4.1 Subject: [PATCH v2 1/6] mm: Introduce common STRUCT_PAGE_MAX_SHIFT define X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This define is used by arm64 to calculate the size of the vmemmap region. It is defined as the log2 of the upper bound on the size of a struct page. We move it into mm_types.h so it can be defined properly instead of set and checked with a build bug. This also allows us to use the same define for riscv. Signed-off-by: Logan Gunthorpe Cc: Catalin Marinas Cc: Will Deacon Cc: Arnd Bergmann Cc: Andrew Morton Cc: Christoph Hellwig --- arch/arm64/include/asm/memory.h | 9 --------- arch/arm64/mm/init.c | 8 -------- include/asm-generic/fixmap.h | 1 + include/linux/mm_types.h | 5 +++++ 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index b96442960aea..f0a5c9531e8b 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -34,15 +34,6 @@ */ #define PCI_IO_SIZE SZ_16M -/* - * Log2 of the upper bound of the size of a struct page. Used for sizing - * the vmemmap region only, does not affect actual memory footprint. - * We don't use sizeof(struct page) directly since taking its size here - * requires its definition to be available at this point in the inclusion - * chain, and it may not be a power of 2 in the first place. - */ -#define STRUCT_PAGE_MAX_SHIFT 6 - /* * VMEMMAP_SIZE - allows the whole linear region to be covered by * a struct page array diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 787e27964ab9..6a0b5c5a61af 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -615,14 +615,6 @@ void __init mem_init(void) BUILD_BUG_ON(TASK_SIZE_32 > TASK_SIZE_64); #endif -#ifdef CONFIG_SPARSEMEM_VMEMMAP - /* - * Make sure we chose the upper bound of sizeof(struct page) - * correctly when sizing the VMEMMAP array. - */ - BUILD_BUG_ON(sizeof(struct page) > (1 << STRUCT_PAGE_MAX_SHIFT)); -#endif - if (PAGE_SIZE >= 16384 && get_num_physpages() <= 128) { extern int sysctl_overcommit_memory; /* diff --git a/include/asm-generic/fixmap.h b/include/asm-generic/fixmap.h index 827e4d3bbc7a..8cc7b09c1bc7 100644 --- a/include/asm-generic/fixmap.h +++ b/include/asm-generic/fixmap.h @@ -16,6 +16,7 @@ #define __ASM_GENERIC_FIXMAP_H #include +#include #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 5ed8f6292a53..ec8c16d9396b 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -206,6 +206,11 @@ struct page { #endif } _struct_page_alignment; +/* + * Used for sizing the vmemmap region on some architectures + */ +#define STRUCT_PAGE_MAX_SHIFT ilog2(roundup_pow_of_two(sizeof(struct page))) + #define PAGE_FRAG_CACHE_MAX_SIZE __ALIGN_MASK(32768, ~PAGE_MASK) #define PAGE_FRAG_CACHE_MAX_ORDER get_order(PAGE_FRAG_CACHE_MAX_SIZE) -- 2.19.0