From patchwork Fri May 3 13:01:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 13652792 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 96035C4345F for ; Fri, 3 May 2024 13:02:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2564E6B0099; Fri, 3 May 2024 09:02:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1DEA86B00A7; Fri, 3 May 2024 09:02:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 07EE66B00A8; Fri, 3 May 2024 09:02:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D8C8B6B0099 for ; Fri, 3 May 2024 09:02:44 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 59C3F1210CC for ; Fri, 3 May 2024 13:02:41 +0000 (UTC) X-FDA: 82077098922.05.34843E6 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf22.hostedemail.com (Postfix) with ESMTP id 35FBCC0017 for ; Fri, 3 May 2024 13:02:39 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf22.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=1714741359; 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=jC9SquTn4hL8Q9MxX9qSv/R/1kmB2MKiuuZuTQW/vfk=; b=oD9RXawVRjt95Ia4H4Wf3gtSeBNcvb7XIBZjijHQsDQ1lL2vQQf5WlPXuifBiLaQobKLwp INLjtEHzLgaio4lBPXTwd5z+Yp/hSjl40aerADjv+8jRgWm18wFbiJL17ufbHAmgMEKcmg 5ztNYYI65hoUQaYkDAH6oDd/VASHhkc= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf22.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=1714741359; a=rsa-sha256; cv=none; b=JjZCUE7GOUVGxpPoZnYi0THstf5A5pL7rTfiEvRZ9TysWtuk58/utnwTaDW/iJsoLDMcYE ywF6qI0uqgP32Zi81cWl50/SsfRaA7tDUaW5EZIoCT8hUGAtnL3X8xQ1RJFkVsR+POxPf/ +0pqiQ+uQlKmjK/+yYLiwmwywTebrms= 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 CAB99169C; Fri, 3 May 2024 06:03:03 -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 797533F73F; Fri, 3 May 2024 06:02:35 -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 13/29] arm64: convert protection key into vm_flags and pgprot values Date: Fri, 3 May 2024 14:01:31 +0100 Message-Id: <20240503130147.1154804-14-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-Rspamd-Server: rspam01 X-Stat-Signature: b44hpzc3st3utwnr7z8pub4m9edci4wz X-Rspam-User: X-Rspamd-Queue-Id: 35FBCC0017 X-HE-Tag: 1714741359-855480 X-HE-Meta: U2FsdGVkX18JXpiokuFrhNyhMt/qnVM/zUFpwTO0A6JTvB/AAV1EoW/j00QSHbVHCXA2PpDcnVGfp3AVJBe9Q5qvyDSEAnZMa6mBnZfGCi/NNd7bOTh63LCeP4NF/hPcFx3Y8ZSA2aPLw/johyTBET6l5P6MtfaEAv88RLdxYszqGGqJlLE2qqZXmz0Y71d07qsRy8hHoXIxlVZ+SVJyR7nqMsiP4+VBe7FIBrWkrP3egFzCuPMvt/Rr5ktqeZaH9mrlnFuCCo9mrVAba6p2JLnUuOk3p36I2xlrmeN9U5k6J0+IdINhSOGylKbjfXmlbNONAMOGh041Q68PELd77PuKlBvuClrY7iFyg8RnE1iiKuuCt1LD53MrrgFwnwcXlcayN7oC5C83WFtkRSdcdvsT2F2wghKrwpOJSmrPWxh09auP+E+GC6eND9+qEVpGt9M2btLYAacj3UHraQDZmPE4320D/IpPrSxKjckrdwyjc9f80XgoDxlj1F+0gufX0QpLKCqaUlAfBwKtt1V0pVCIHx6Savc0ejlWIsx5VLSGCMuczBEnfToom5r9UR7NVlEF5SynsgkcHGA0q+w9BDJQlb7aFbhZZKoR9Qj2WXjHwA6d6NMjep5k6+pcZBpBGMOO4/a8huar37Ll5qErwbsMo/EMS1KCSx637/MjIeIR6gLZNhgxEiX940D3TiQJP9Qe2oTC4uNh/+TTBNF7yTF75otXSfbfP30aTD2oAxFV5DQyqCJA5KCg21O+UZdwkHgZi1Lg6d/xS3Aj+U9QLM8sEndzZvvx8BX2M2Aoiwdyzvx9SQ+JeMW5MtC8NwjQsA/8bJ2EPPVDxKZx7AYCncHg5ZiBvWcwhgCjf9pdS/lAwzE7g1N5rbwnIRYWWizNP3t93B1vu6cAjBTETDViJRgBq24LOW1Yv/fGx36gYXB0RLToa8GWcQphpGQqsnFzT8mZScklH6QEO2TM2bG jEXV8Bkf 0fUnF6cWdkTstq/M96LLOkNLIH/2wUv71nP8qd0vT3amgUk2HmV7FKcO3EA7u6ktIxkfX07yS3M98Xiiyx/hMZbMkzG1B6HOndpI4+Ghvsb//5ixZYCLvfH6FIcrSuD+8gRfJO1OzEXQNUyil0Fi44RhDAHuIfz3wx+zMQ5zSejZk7/6kr4bbRbkyTaS+KK8tY4NiedbZO1etbclygZ1gXaMa1mwniak5tgDe9fRCpLyWq3jccNkB9JN5MK+fFxWeDTKoCCwabpJfA08= 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: Modify arch_calc_vm_prot_bits() and vm_get_page_prot() such that the pkey value is set in the vm_flags and then into the pgprot value. Signed-off-by: Joey Gouly Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/include/asm/mman.h | 8 +++++++- arch/arm64/mm/mmap.c | 9 +++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/mman.h b/arch/arm64/include/asm/mman.h index 5966ee4a6154..ecb2d18dc4d7 100644 --- a/arch/arm64/include/asm/mman.h +++ b/arch/arm64/include/asm/mman.h @@ -7,7 +7,7 @@ #include static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, - unsigned long pkey __always_unused) + unsigned long pkey) { unsigned long ret = 0; @@ -17,6 +17,12 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, if (system_supports_mte() && (prot & PROT_MTE)) ret |= VM_MTE; +#if defined(CONFIG_ARCH_HAS_PKEYS) + ret |= pkey & 0x1 ? VM_PKEY_BIT0 : 0; + ret |= pkey & 0x2 ? VM_PKEY_BIT1 : 0; + ret |= pkey & 0x4 ? VM_PKEY_BIT2 : 0; +#endif + return ret; } #define arch_calc_vm_prot_bits(prot, pkey) arch_calc_vm_prot_bits(prot, pkey) diff --git a/arch/arm64/mm/mmap.c b/arch/arm64/mm/mmap.c index 642bdf908b22..86eda6bc7893 100644 --- a/arch/arm64/mm/mmap.c +++ b/arch/arm64/mm/mmap.c @@ -102,6 +102,15 @@ pgprot_t vm_get_page_prot(unsigned long vm_flags) if (vm_flags & VM_MTE) prot |= PTE_ATTRINDX(MT_NORMAL_TAGGED); +#ifdef CONFIG_ARCH_HAS_PKEYS + if (vm_flags & VM_PKEY_BIT0) + prot |= PTE_PO_IDX_0; + if (vm_flags & VM_PKEY_BIT1) + prot |= PTE_PO_IDX_1; + if (vm_flags & VM_PKEY_BIT2) + prot |= PTE_PO_IDX_2; +#endif + return __pgprot(prot); } EXPORT_SYMBOL(vm_get_page_prot);