From patchwork Mon Oct 9 12:08:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13413502 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 1A369E95A8E for ; Mon, 9 Oct 2023 12:10:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B05FA8D005C; Mon, 9 Oct 2023 08:10:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AB66C8D0031; Mon, 9 Oct 2023 08:10:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 97E5F8D005C; Mon, 9 Oct 2023 08:10:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 894EA8D0031 for ; Mon, 9 Oct 2023 08:10:48 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 53F90140216 for ; Mon, 9 Oct 2023 12:10:48 +0000 (UTC) X-FDA: 81325806576.26.8C2B2FA Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf01.hostedemail.com (Postfix) with ESMTP id 8069B40015 for ; Mon, 9 Oct 2023 12:10:46 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Wvv+8fQi; spf=pass (imf01.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696853446; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=DbuZEnfEz8N4esDWlO+EFArbZ8jBkVnMQyeK4BYbEVk=; b=2dNqJzLWL4UnBL1VvPFbwPoR8XIeIz4VxJBEH/yd50QfYtVLUDPEQRXsCuUEqNW3X/fuSK ZL8BnHSpKC2hZjUHA7Q4nMPCVg85b/kZV8N5sXhHLRZkXsNIRVj7PhKHwlDjhJOw75LF0w SS2z//cjHj+BRTIu+pvVPEeZ6k3pLgw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696853446; a=rsa-sha256; cv=none; b=Yy/9I+LQVdXC1szd1rsFnFSBwoSMt2qaLl3vp03xv+T6X8z4R9GIKQlPpZ1bbk/OUPtlBn qlKjgJBqTDPnyfvj31UQfd1+zUX0oCEPiIVBQntXLJ8k1AocdZWw3hTDYah36Nt5qdTSh2 dPLgxA5JdZAGEDv3VbQpYb6I2lL3uvs= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Wvv+8fQi; spf=pass (imf01.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 89E0561077; Mon, 9 Oct 2023 12:10:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E26B1C43395; Mon, 9 Oct 2023 12:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696853445; bh=pFAvrTvTUMO0xGKH/cMXrv1R9nlyUOOKoHgSKri2XFo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Wvv+8fQiJLsDyPC0NnM1Q8ZyuLIaTwYxmV4/n6iYyTSFm2c3s/lXYiIujtfqegWR5 i+6r97yeEFEr4SuiSg43kWLmH09n7ZR/ZCXoWJasjIzJx+djDmQqsidBxXjLgKIpdW USEzih2i0SA+mKWoVY+bWCbYYsuCJH+HUplm5UojKv0lL6UF4DGA5SDT+CacuA1WA4 oSm8tkPSZp0qife0Ths/W9nGm12sWcn2q+T/WK1q5JrOai/DPDX9Umpa7nqzfrVypG J6NVP/nkQzGEuN9PqjtaHLmak3br43uZpGnq2WynrJw6MMDSVcTWuk4mRX6DuUaqiF +7pCIfTCF7+SA== From: Mark Brown Date: Mon, 09 Oct 2023 13:08:35 +0100 Subject: [PATCH v6 01/38] arm64/mm: Restructure arch_validate_flags() for extensibility MIME-Version: 1.0 Message-Id: <20231009-arm64-gcs-v6-1-78e55deaa4dd@kernel.org> References: <20231009-arm64-gcs-v6-0-78e55deaa4dd@kernel.org> In-Reply-To: <20231009-arm64-gcs-v6-0-78e55deaa4dd@kernel.org> To: Catalin Marinas , Will Deacon , Jonathan Corbet , Andrew Morton , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Arnd Bergmann , Oleg Nesterov , Eric Biederman , Kees Cook , Shuah Khan , "Rick P. Edgecombe" , Deepak Gupta , Ard Biesheuvel , Szabolcs Nagy Cc: "H.J. Lu" , Paul Walmsley , Palmer Dabbelt , Albert Ou , Florian Weimer , Christian Brauner , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Mark Brown X-Mailer: b4 0.13-dev-0438c X-Developer-Signature: v=1; a=openpgp-sha256; l=1303; i=broonie@kernel.org; h=from:subject:message-id; bh=pFAvrTvTUMO0xGKH/cMXrv1R9nlyUOOKoHgSKri2XFo=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBlI+2RRGngkj18F3uCpZZfRd1ocU0q8HRquWAvC/i8 MLyCK6+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZSPtkQAKCRAk1otyXVSH0IgWB/ 9nEEL548GJxcwR1LGdSjepOH5kHepxay1tzf82bn7l9zh6fQGxR6ix+aOPOcIC0mVUG3uBo/OqUafc JHsz6EEkKKkT+8LEz51beTFl4qVhh1Ow5Rk0OEWXlvnnu8ZQObqqFwMY0PNRfSmOtzpFrAOF+7cpg3 Sj0Yycn8U5ODSu3bIWtjprRbW0HeaYkWpU1J/rMGOVpT+VVlXY/Tac108UyzCQmmIro7sCHuaLNBpW UxSMVsEAelZ5K94QPG020QQcQvtmVVBOG1zhZOUIWPgeZ9WuB8xrR237xwNy7kMbaxY9AWSb7Jaazz bt/kuflV6ao5nlq/P4VKE/AulNOgZm X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Rspamd-Queue-Id: 8069B40015 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 4omk3osr1shefayawpnx9wpu4u943hqa X-HE-Tag: 1696853446-268587 X-HE-Meta: U2FsdGVkX180mCJH4OUZFmYh5R+GDgSC077UdgZuZGK1x4JFq2FSx871uagEqXBv0gceAzoV1dby0VF5330fjBLPzEqEu9/6uhTx0M31D1zntKX+oANNF+4e0V0OK+XNxCUFqOcI5Nrd9nBeRACfqo1pgWbjmzqJMMDcoqwV7hLmAESTL+VRWULGd5vLusMFG2ZuUFMRMWk5gZV1WbBQlg/UEv82FKBrzgKeJM8UHeabOMGBG4i++MVh5jaodHPY3VoulOQkjqylxvr+kXjCxsdiEl98+p4uuu/jUnGDETAha78fQ2dtXx6niEpeG2zKg+0h+8PiPskJmFKgyDNdhPVBuBNHgIqBMPuNIo1f5suryRT1crlysEPaIIYGJ+hZG/xKgWKgC/bIA5N5BO9KILz8aG04EHzRMFNrfM3Hbd4lRZ8DbZknVdJ6gaXInGB+ZVWKybonhlj4gCNB+niKRmP0fNvGzoOZckNnj7Jgw/LQfEDNOxuEOcPk81Y9Ee4rD4euQjNJ1JD5B5aKFbQxq/GIojOrp+a+Z99P4CpCYnMwgiYvDPXYsf2ngJUrfgPTYO6mNtaDr5Qbm1eKSuk1euhfWmKwdSpRbR7oQYYKIPgA5m/2LuanZ7jpPrKdG5CYQaGkAbyA6Eq7IkVDXdThbeiM7v+DeNn6jWykL2geLQFSFF33ROeK10ON61BWaRc2qJ/ysANOSSQi5nnZumLMTUY1Qa4nq4XIOsO9gBBzHtTcMEdbsjpGduq2HIaLu3UFjAeJX90jP9Y1BW7LKNvmH9fI7K1bWOEHH9R3KcYJbHhxXrPcbBAyz7Y2s9tNG8Ffewy3obN7WQITd9gOv9RMZ+LCsD7b6qetWO5JKNHVs4ycCG82nj9gEBkoMseVXzcqM9+UW1RhkyGIXlabiqbynsl/hrWA++5mGWfpPKyOgQyD54H62wypp6WPjXcTlSFxiy9oFR7HkLsKoVStfvZ 9VwlhKm/ yP9aCGsRveXqK0bHazF5PZb2QjKcr64KRi225S1fQKdHf3LKbzbuvulIU7ZJF/Q2gaE9/YlhE4O3xIpNDBYZYDUI0kTm/x+elAFU53nXteADHKrnN2bPHBviN/00On1SamOBDSMmQfzp8JuaK3wkkoYmRJT/Xuj8r3eQWGDuQHUoKNNqkxOXbWhjCTz2KaWm0WBZIBCyWcXud0wvZWJe/zatNMJq+eGfuv+EF56+tLtUTkRnraelt4LGaJvwhq4GTbDK4NE07QAZvgUZdgbyX3rMTBZS4j2L9QrdiBJANNQhljaRVQA1Xk1NJAiQJZiMw3QXNLhkgFVc6deyi+yN7yC+aHHbqq6OW97UmuKeY+HcPge3m2JtAaYnLmg== 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: Currently arch_validate_flags() is written in a very non-extensible fashion, returning immediately if MTE is not supported and writing the MTE check as a direct return. Since we will want to add more checks for GCS refactor the existing code to be more extensible, no functional change intended. Signed-off-by: Mark Brown --- arch/arm64/include/asm/mman.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/mman.h b/arch/arm64/include/asm/mman.h index 5966ee4a6154..c21849ffdd88 100644 --- a/arch/arm64/include/asm/mman.h +++ b/arch/arm64/include/asm/mman.h @@ -52,11 +52,17 @@ static inline bool arch_validate_prot(unsigned long prot, static inline bool arch_validate_flags(unsigned long vm_flags) { - if (!system_supports_mte()) - return true; + if (system_supports_mte()) { + /* + * only allow VM_MTE if VM_MTE_ALLOWED has been set + * previously + */ + if ((vm_flags & VM_MTE) && !(vm_flags & VM_MTE_ALLOWED)) + return false; + } + + return true; - /* only allow VM_MTE if VM_MTE_ALLOWED has been set previously */ - return !(vm_flags & VM_MTE) || (vm_flags & VM_MTE_ALLOWED); } #define arch_validate_flags(vm_flags) arch_validate_flags(vm_flags)