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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 B06E0C43603 for ; Tue, 10 Dec 2019 04:47:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 54CE6206E0 for ; Tue, 10 Dec 2019 04:47:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=axtens.net header.i=@axtens.net header.b="O5nCdYx2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 54CE6206E0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=axtens.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EF37F6B2A7C; Mon, 9 Dec 2019 23:47:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EC9756B2A7D; Mon, 9 Dec 2019 23:47:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D91026B2A7E; Mon, 9 Dec 2019 23:47:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0071.hostedemail.com [216.40.44.71]) by kanga.kvack.org (Postfix) with ESMTP id C46C86B2A7C for ; Mon, 9 Dec 2019 23:47:31 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id 8E0C94DC9 for ; Tue, 10 Dec 2019 04:47:31 +0000 (UTC) X-FDA: 76247998302.17.wood42_248499f59eb33 X-HE-Tag: wood42_248499f59eb33 X-Filterd-Recvd-Size: 11190 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Tue, 10 Dec 2019 04:47:30 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id w7so6751123plz.12 for ; Mon, 09 Dec 2019 20:47:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qz4EMw+QBJw2XWxTbQKVczK3wuv6III+QMaefXi4B1g=; b=O5nCdYx24XRHih+SobL+eWjqEusRBefcWBDsBAOpFVAMMe2QengfDnaGE/2eb0QLV2 8SvJ9eVwh2xDfgv4uBgb6H0ZItjFdyKZ+Miq75UP9ce2bzPevxnMdJ0+S6UXrQPHQNOt ILMzn3kwdJAJNWxoffMwxSm2RUfbtz0r2eGag= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Qz4EMw+QBJw2XWxTbQKVczK3wuv6III+QMaefXi4B1g=; b=UYVRQ4vRJnOU1c3qFd+FQ8UN/yPCsf+nrgphOWKpCLnb0EVE7xd5oN0FUblRR20GVL K6dUpUUG8UBWk5rslFEfsTZLnJXqI/EqesnEHflXNECOY841bY9fymc3q26HThBBpKF8 LOn69cF9s5HTpuyl+869XYJ1Sq/R//j5KpM6lOz20bKLjrMYPecWtrLhV0slNaOPFscF CKGhFPRZDuRWPPXWnsoroLIM7mmr2cpVpe5qU6clCY7gRYTeGvaQMCBwudixV12odH0Y CBmtJgeb4g1yI1+LIYsIcrGe/5qTPFaji2wJQckkp4stcoc6RBFler1aZad2lsssJ4kT atrA== X-Gm-Message-State: APjAAAXzw8M2gyrQabIFLbnTjG0dVYxPnNBEXbEokYfTSZ4lLr88K7Ql z0tOHJCUZtWn8eruKOnm0bLNYw== X-Google-Smtp-Source: APXvYqw7LnsjeT+HcbOOl/JAdXG9ZgiZpjPbgIlnkKCZPr9JzIqeMTG75gBMCWn5zm8HjDsTA4uL0A== X-Received: by 2002:a17:90a:374f:: with SMTP id u73mr3243246pjb.22.1575953249787; Mon, 09 Dec 2019 20:47:29 -0800 (PST) Received: from localhost (2001-44b8-1113-6700-e460-0b66-7007-c654.static.ipv6.internode.on.net. [2001:44b8:1113:6700:e460:b66:7007:c654]) by smtp.gmail.com with ESMTPSA id a14sm1176178pfn.22.2019.12.09.20.47.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 20:47:29 -0800 (PST) From: Daniel Axtens To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kasan-dev@googlegroups.com, christophe.leroy@c-s.fr, aneesh.kumar@linux.ibm.com, bsingharora@gmail.com Cc: Daniel Axtens Subject: [PATCH v2 1/4] mm: define MAX_PTRS_PER_{PTE,PMD,PUD} Date: Tue, 10 Dec 2019 15:47:11 +1100 Message-Id: <20191210044714.27265-2-dja@axtens.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210044714.27265-1-dja@axtens.net> References: <20191210044714.27265-1-dja@axtens.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: powerpc has boot-time configurable PTRS_PER_PTE, PMD and PUD. The values are selected based on the MMU under which the kernel is booted. This is much like how 4 vs 5-level paging on x86_64 leads to boot-time configurable PTRS_PER_P4D. So far, this hasn't leaked out of arch/powerpc. But with KASAN, we have static arrays based on PTRS_PER_*, so for powerpc support must provide constant upper bounds for generic code. Define MAX_PTRS_PER_{PTE,PMD,PUD} for this purpose. I have configured these constants: - in asm-generic headers - on arches that implement KASAN: x86, s390, arm64, xtensa and powerpc I haven't wired up any other arches just yet - there is no user of the constants outside of the KASAN code I add in the next patch, so missing the constants on arches that don't support KASAN shouldn't break anything. Suggested-by: Christophe Leroy Signed-off-by: Daniel Axtens --- arch/arm64/include/asm/pgtable-hwdef.h | 3 +++ arch/powerpc/include/asm/book3s/64/hash.h | 4 ++++ arch/powerpc/include/asm/book3s/64/pgtable.h | 7 +++++++ arch/powerpc/include/asm/book3s/64/radix.h | 5 +++++ arch/s390/include/asm/pgtable.h | 3 +++ arch/x86/include/asm/pgtable_types.h | 5 +++++ arch/xtensa/include/asm/pgtable.h | 1 + include/asm-generic/pgtable-nop4d-hack.h | 9 +++++---- include/asm-generic/pgtable-nopmd.h | 9 +++++---- include/asm-generic/pgtable-nopud.h | 9 +++++---- 10 files changed, 43 insertions(+), 12 deletions(-) diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/= asm/pgtable-hwdef.h index d9fbd433cc17..485e1f3c5c6f 100644 --- a/arch/arm64/include/asm/pgtable-hwdef.h +++ b/arch/arm64/include/asm/pgtable-hwdef.h @@ -41,6 +41,7 @@ #define ARM64_HW_PGTABLE_LEVEL_SHIFT(n) ((PAGE_SHIFT - 3) * (4 - (n)) + = 3) =20 #define PTRS_PER_PTE (1 << (PAGE_SHIFT - 3)) +#define MAX_PTRS_PER_PTE PTRS_PER_PTE =20 /* * PMD_SHIFT determines the size a level 2 page table entry can map. @@ -50,6 +51,7 @@ #define PMD_SIZE (_AC(1, UL) << PMD_SHIFT) #define PMD_MASK (~(PMD_SIZE-1)) #define PTRS_PER_PMD PTRS_PER_PTE +#define MAX_PTRS_PER_PMD PTRS_PER_PMD #endif =20 /* @@ -60,6 +62,7 @@ #define PUD_SIZE (_AC(1, UL) << PUD_SHIFT) #define PUD_MASK (~(PUD_SIZE-1)) #define PTRS_PER_PUD PTRS_PER_PTE +#define MAX_PTRS_PER_PUD PTRS_PER_PUD #endif =20 /* diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/inc= lude/asm/book3s/64/hash.h index 2781ebf6add4..fce329b8452e 100644 --- a/arch/powerpc/include/asm/book3s/64/hash.h +++ b/arch/powerpc/include/asm/book3s/64/hash.h @@ -18,6 +18,10 @@ #include #endif =20 +#define H_PTRS_PER_PTE (1 << H_PTE_INDEX_SIZE) +#define H_PTRS_PER_PMD (1 << H_PMD_INDEX_SIZE) +#define H_PTRS_PER_PUD (1 << H_PUD_INDEX_SIZE) + /* Bits to set in a PMD/PUD/PGD entry valid bit*/ #define HASH_PMD_VAL_BITS (0x8000000000000000UL) #define HASH_PUD_VAL_BITS (0x8000000000000000UL) diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/= include/asm/book3s/64/pgtable.h index b01624e5c467..209817235a44 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h @@ -231,6 +231,13 @@ extern unsigned long __pmd_frag_size_shift; #define PTRS_PER_PUD (1 << PUD_INDEX_SIZE) #define PTRS_PER_PGD (1 << PGD_INDEX_SIZE) =20 +#define MAX_PTRS_PER_PTE ((H_PTRS_PER_PTE > R_PTRS_PER_PTE) ? \ + H_PTRS_PER_PTE : R_PTRS_PER_PTE) +#define MAX_PTRS_PER_PMD ((H_PTRS_PER_PMD > R_PTRS_PER_PMD) ? \ + H_PTRS_PER_PMD : R_PTRS_PER_PMD) +#define MAX_PTRS_PER_PUD ((H_PTRS_PER_PUD > R_PTRS_PER_PUD) ? \ + H_PTRS_PER_PUD : R_PTRS_PER_PUD) + /* PMD_SHIFT determines what a second-level page table entry can map */ #define PMD_SHIFT (PAGE_SHIFT + PTE_INDEX_SIZE) #define PMD_SIZE (1UL << PMD_SHIFT) diff --git a/arch/powerpc/include/asm/book3s/64/radix.h b/arch/powerpc/in= clude/asm/book3s/64/radix.h index d97db3ad9aae..4f826259de71 100644 --- a/arch/powerpc/include/asm/book3s/64/radix.h +++ b/arch/powerpc/include/asm/book3s/64/radix.h @@ -35,6 +35,11 @@ #define RADIX_PMD_SHIFT (PAGE_SHIFT + RADIX_PTE_INDEX_SIZE) #define RADIX_PUD_SHIFT (RADIX_PMD_SHIFT + RADIX_PMD_INDEX_SIZE) #define RADIX_PGD_SHIFT (RADIX_PUD_SHIFT + RADIX_PUD_INDEX_SIZE) + +#define R_PTRS_PER_PTE (1 << RADIX_PTE_INDEX_SIZE) +#define R_PTRS_PER_PMD (1 << RADIX_PMD_INDEX_SIZE) +#define R_PTRS_PER_PUD (1 << RADIX_PUD_INDEX_SIZE) + /* * Size of EA range mapped by our pagetables. */ diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgta= ble.h index 7b03037a8475..3b491ce52ed2 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -342,6 +342,9 @@ static inline int is_module_addr(void *addr) #define PTRS_PER_PGD _CRST_ENTRIES =20 #define MAX_PTRS_PER_P4D PTRS_PER_P4D +#define MAX_PTRS_PER_PUD PTRS_PER_PUD +#define MAX_PTRS_PER_PMD PTRS_PER_PMD +#define MAX_PTRS_PER_PTE PTRS_PER_PTE =20 /* * Segment table and region3 table entry encoding diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/= pgtable_types.h index ea7400726d7a..82d523db133b 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -257,6 +257,11 @@ enum page_cache_mode { # include #endif =20 +/* There is no runtime switching of these sizes */ +#define MAX_PTRS_PER_PUD PTRS_PER_PUD +#define MAX_PTRS_PER_PMD PTRS_PER_PMD +#define MAX_PTRS_PER_PTE PTRS_PER_PTE + #ifndef __ASSEMBLY__ =20 #include diff --git a/arch/xtensa/include/asm/pgtable.h b/arch/xtensa/include/asm/= pgtable.h index 27ac17c9da09..5d6aa16ceae6 100644 --- a/arch/xtensa/include/asm/pgtable.h +++ b/arch/xtensa/include/asm/pgtable.h @@ -55,6 +55,7 @@ * we don't really have any PMD directory physically. */ #define PTRS_PER_PTE 1024 +#define MAX_PTRS_PER_PTE 1024 #define PTRS_PER_PTE_SHIFT 10 #define PTRS_PER_PGD 1024 #define PGD_ORDER 0 diff --git a/include/asm-generic/pgtable-nop4d-hack.h b/include/asm-gener= ic/pgtable-nop4d-hack.h index 829bdb0d6327..6faa23f9e0b4 100644 --- a/include/asm-generic/pgtable-nop4d-hack.h +++ b/include/asm-generic/pgtable-nop4d-hack.h @@ -14,10 +14,11 @@ */ typedef struct { pgd_t pgd; } pud_t; =20 -#define PUD_SHIFT PGDIR_SHIFT -#define PTRS_PER_PUD 1 -#define PUD_SIZE (1UL << PUD_SHIFT) -#define PUD_MASK (~(PUD_SIZE-1)) +#define PUD_SHIFT PGDIR_SHIFT +#define MAX_PTRS_PER_PUD 1 +#define PTRS_PER_PUD 1 +#define PUD_SIZE (1UL << PUD_SHIFT) +#define PUD_MASK (~(PUD_SIZE-1)) =20 /* * The "pgd_xxx()" functions here are trivial for a folded two-level diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pg= table-nopmd.h index 0d9b28cba16d..4a860f47f3e6 100644 --- a/include/asm-generic/pgtable-nopmd.h +++ b/include/asm-generic/pgtable-nopmd.h @@ -17,10 +17,11 @@ struct mm_struct; */ typedef struct { pud_t pud; } pmd_t; =20 -#define PMD_SHIFT PUD_SHIFT -#define PTRS_PER_PMD 1 -#define PMD_SIZE (1UL << PMD_SHIFT) -#define PMD_MASK (~(PMD_SIZE-1)) +#define PMD_SHIFT PUD_SHIFT +#define MAX_PTRS_PER_PMD 1 +#define PTRS_PER_PMD 1 +#define PMD_SIZE (1UL << PMD_SHIFT) +#define PMD_MASK (~(PMD_SIZE-1)) =20 /* * The "pud_xxx()" functions here are trivial for a folded two-level diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pg= table-nopud.h index d3776cb494c0..1aef1b18edbc 100644 --- a/include/asm-generic/pgtable-nopud.h +++ b/include/asm-generic/pgtable-nopud.h @@ -18,10 +18,11 @@ */ typedef struct { p4d_t p4d; } pud_t; =20 -#define PUD_SHIFT P4D_SHIFT -#define PTRS_PER_PUD 1 -#define PUD_SIZE (1UL << PUD_SHIFT) -#define PUD_MASK (~(PUD_SIZE-1)) +#define PUD_SHIFT P4D_SHIFT +#define MAX_PTRS_PER_PUD 1 +#define PTRS_PER_PUD 1 +#define PUD_SIZE (1UL << PUD_SHIFT) +#define PUD_MASK (~(PUD_SIZE-1)) =20 /* * The "p4d_xxx()" functions here are trivial for a folded two-level --=20 2.20.1