From patchwork Fri May 3 13:01:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 13652782 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3C28C10F16 for ; Fri, 3 May 2024 13:02:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 588DB6B0096; Fri, 3 May 2024 09:02:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 539206B0098; Fri, 3 May 2024 09:02:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 400AC6B0099; Fri, 3 May 2024 09:02:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 27C656B0096 for ; Fri, 3 May 2024 09:02:08 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B008F1C0F8A for ; Fri, 3 May 2024 13:02:07 +0000 (UTC) X-FDA: 82077097494.04.C4B92C8 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf07.hostedemail.com (Postfix) with ESMTP id 1875C4001A for ; Fri, 3 May 2024 13:02:05 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf07.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714741326; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ngGB0Bj2BuNTbRSE4L9TicbHMy2yLYIVIV+RC2ewmr0=; b=dt4w4qrLYpVTesI+JSv1qaZ1KM/MBbeCiGypCpgu9QI9OuHwlVi+leb6E9UNv17+2bNB1l SxIpCrOBotPpKIkvBWcO/QdhTxpc4+mFhIPFfHMs5PBNjj1lZqsbdDBkzbg5XB6mY++lHd b0FNiZC+h9bhtn6x/pQNr/wCNbyh6pI= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf07.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714741326; a=rsa-sha256; cv=none; b=S5JaIqV5LkCRls5pttxWANQMue++avrbaHPyh9eDvjhpJYKM/LXPaoF2ISMZUvoYupvAVW rFIAgR9XjPneNgTBfhWf6chEjm6Zy7+70C7qZeqEKWeYDO+hbIfZ7gZkyo/twlrmlyBtOb 9Uv7TSHOXaY52sTijkC678mEMBetVcM= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B60E31477; Fri, 3 May 2024 06:02:30 -0700 (PDT) Received: from e124191.cambridge.arm.com (e124191.cambridge.arm.com [10.1.197.45]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 650863F73F; Fri, 3 May 2024 06:02:02 -0700 (PDT) From: Joey Gouly To: linux-arm-kernel@lists.infradead.org Cc: akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.com, bp@alien8.de, broonie@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, hpa@zytor.com, joey.gouly@arm.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, maz@kernel.org, mingo@redhat.com, mpe@ellerman.id.au, naveen.n.rao@linux.ibm.com, npiggin@gmail.com, oliver.upton@linux.dev, shuah@kernel.org, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev Subject: [PATCH v4 03/29] mm: use ARCH_PKEY_BITS to define VM_PKEY_BITN Date: Fri, 3 May 2024 14:01:21 +0100 Message-Id: <20240503130147.1154804-4-joey.gouly@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240503130147.1154804-1-joey.gouly@arm.com> References: <20240503130147.1154804-1-joey.gouly@arm.com> MIME-Version: 1.0 X-Stat-Signature: 93y5cg6t5yyjcqtg5jsk4xy86se7qhps X-Rspamd-Queue-Id: 1875C4001A X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1714741325-76161 X-HE-Meta: U2FsdGVkX18NBkjwgAUjTY6dBlXZL02mTBq/Agc9kshCLp2fZiZIWkuJHKOAuqdjRt6XfW3NKk3UqkveVjjlDsxmclVEutbDkoLfXWhjaY7rbTkaXDRzdDuXAa61Uvr7wfECYBXz3142k4Ule7sXMS1mx/CVJkvOB7bWlv28gJPhQEjhUf5m68+Fjn31csrtGhE67NgV4BAEqNlJKAeWSPGpIFGNiay/2bpJNV7Yek+0QkX15MsKjQuNOQIpm31yh/uShjx6WSUfeMBEpQYxBvtNXUpasLMc1pGEiStYkRHBK/OgLQH2MifVKUT3zJUjuO8P3yuFCd8Vwdi/nLFc893+GH+1BqOQuXM8RU5bqGL/eb4dKlJXhNTVQtRrfmMTdPTuhnwGlP6VBziznR7y1Mh1ADnRqtOqhuMaseugeUIRlay7NehXZTP3O95+KrwYGpa/NgDjx6FINh8WOEDuyZ/0hDlcOHuDGkANXxKBdvaMISqjsGGytqRSajRoVDQpO6/x024DejuEyzPyk8IdV4WdEy4buoR0EVN9nRwxchBDZSvIph4PJZkMjm/v9CsN+ZR21k/MAAXBFks3ebyNXrOV8KKMt9P+weKIXNFdmCwt4sHBIzUncf+FXJkdP7LCwXeevHievAqedkV6faK0lzVgp/7XgUBcjlTywver5e0jeo3fdryPe/Y6yFvJ5mnHwFzH2XNrMGexJ0F1Ue/Mwq9g6W305dzH1MIl9Rghh/0PxcQpYuZh01srDKdAuF/O/k43P2Fqskt0MgNtacwThWbiZw6N3ZsisxenL1i1rCwOzXlW2QcIKO2HePiREiuUJo51U5kkkqu4EkWT+HQcB2Rd5Ab7Ot96VjEzCgRZg+PD6Tv5zuS6hKRooENGE5BMngaPTt1laqyikKLFPFGvTfm+7sLwSPX+iz04nh1airjNq9mjeFb5Op6Zysu8MMLL/HBl/C5+fFrjLi2BRNB YOQuXKX6 2mcpaiTq8S37V2O5yz1e5t+JbuZt/zfnfqj0aJTHn2bbcYORE066stsCoC7U/VlgolOQIu6YME3DIE3UvfJo0En4K1QdJUWQguqWZuv0OYxkGQshd29ii9/abohStjA16Z9qHOWfztzx7O5pcxvOW9aScBZHg2L3C9Erut07EJoP+KyhLb5xpMEvS5V9sH/Ph0Jan1lDkdwtRlIgZItCrQ1dyGQ+l4mye9lnDjaOv61t3mfFZPPEJnsMCi50bGvuAKPCcADkYdW1Bx6Mja84oxOTlRe1CL/JbzSYBAeaPE8NG2FOApSiwAZoNrauY/MQa/uPR8g5ZDUklBK0xeDuEMpfOAadG8ziZznedCpD3u4k4I16Xu2THtZQBXIx1AwygdEsR 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: List-Subscribe: List-Unsubscribe: Use the new CONFIG_ARCH_PKEY_BITS to simplify setting these bits for different architectures. Signed-off-by: Joey Gouly Cc: Andrew Morton Cc: linux-fsdevel@vger.kernel.org Cc: linux-mm@kvack.org Acked-by: Dave Hansen --- fs/proc/task_mmu.c | 2 ++ include/linux/mm.h | 16 ++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 23fbab954c20..0d152f460dcc 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -692,7 +692,9 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma) [ilog2(VM_PKEY_BIT0)] = "", [ilog2(VM_PKEY_BIT1)] = "", [ilog2(VM_PKEY_BIT2)] = "", +#if VM_PKEY_BIT3 [ilog2(VM_PKEY_BIT3)] = "", +#endif #if VM_PKEY_BIT4 [ilog2(VM_PKEY_BIT4)] = "", #endif diff --git a/include/linux/mm.h b/include/linux/mm.h index b6bdaa18b9e9..5605b938acce 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -329,12 +329,16 @@ extern unsigned int kobjsize(const void *objp); #endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */ #ifdef CONFIG_ARCH_HAS_PKEYS -# define VM_PKEY_SHIFT VM_HIGH_ARCH_BIT_0 -# define VM_PKEY_BIT0 VM_HIGH_ARCH_0 /* A protection key is a 4-bit value */ -# define VM_PKEY_BIT1 VM_HIGH_ARCH_1 /* on x86 and 5-bit value on ppc64 */ -# define VM_PKEY_BIT2 VM_HIGH_ARCH_2 -# define VM_PKEY_BIT3 VM_HIGH_ARCH_3 -#ifdef CONFIG_PPC +# define VM_PKEY_SHIFT VM_HIGH_ARCH_BIT_0 +# define VM_PKEY_BIT0 VM_HIGH_ARCH_0 +# define VM_PKEY_BIT1 VM_HIGH_ARCH_1 +# define VM_PKEY_BIT2 VM_HIGH_ARCH_2 +#if CONFIG_ARCH_PKEY_BITS > 3 +# define VM_PKEY_BIT3 VM_HIGH_ARCH_3 +#else +# define VM_PKEY_BIT3 0 +#endif +#if CONFIG_ARCH_PKEY_BITS > 4 # define VM_PKEY_BIT4 VM_HIGH_ARCH_4 #else # define VM_PKEY_BIT4 0