From patchwork Tue Aug 22 13:56:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13360851 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 B31B4EE4993 for ; Tue, 22 Aug 2023 14:03:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EFEE0900012; Tue, 22 Aug 2023 10:03:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EAEF3900011; Tue, 22 Aug 2023 10:03:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D2BB5900012; Tue, 22 Aug 2023 10:03:10 -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 C38E3900011 for ; Tue, 22 Aug 2023 10:03:10 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 8F15EA02FB for ; Tue, 22 Aug 2023 14:03:10 +0000 (UTC) X-FDA: 81151907340.30.76B24C5 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf06.hostedemail.com (Postfix) with ESMTP id A09E8180036 for ; Tue, 22 Aug 2023 14:03:08 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qTm9XTGv; spf=pass (imf06.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=1692712988; 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=k6CCWpUbYDAcwc74o2L9unChfsueGo1erxFbjWWTN6pMIetdFCbwJAGfOMCqKAAniwzei4 gfHxjTmmXKaS3TsNnXxLwKY/HXg+dizUHe8UKEDthCk3ha3nnEkcWRi/gjuyBTemNBGlt2 b7nXwsaPgUowB6Cn4xmr4LHrhsT2Axw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692712988; a=rsa-sha256; cv=none; b=tY6Cg4g0Jhxvep7abwtJZwL7hdB6S6faOf+1CyliHgw/vAEUyxd6zFOCd02BWn6e/Q9ABr OD2mHVJbIUbLkpYVk4YvykLs+N+2MRfslZKpWnXQ+G/I6CtRIIGqCGaQXwpZH7gpsv/Yn7 HWGW63Eydrphwa4rwIrlpBBPbnGOm+g= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qTm9XTGv; spf=pass (imf06.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 (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B1EF765764; Tue, 22 Aug 2023 14:03:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9638EC433CC; Tue, 22 Aug 2023 14:03:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692712987; bh=pFAvrTvTUMO0xGKH/cMXrv1R9nlyUOOKoHgSKri2XFo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qTm9XTGvcYh+Br8eJUAeGbO/I6+6TObGxYTwfAxErZq7Ntyj+r+ZjZ36mVjjS7fby MGJHkozGMXiQgElJ1L/hdHWK5jS6K1IdwfgG9KFB0cPquHiAoreyGmmIaE94d5auZT rjpYop2VCduatHJPECR0bjHwBO9GubtNMy0N/6iGoLAWZEN1/T1a/pZ56+uoTSGifm wnKHoGJpjPpQVFEbG7W8LrY+Y/HsoFR9s1p6c//axRtaZ4h28qBqfFbSfM57TLqGYm bBjhEAgEE4xe1eR1F9baQN7ZtJmG9EQIaDzevsFHbvH7o4lc5g6GpvtWWOhLpiaI8I 5jsTDl5jo/oGQ== From: Mark Brown Date: Tue, 22 Aug 2023 14:56:34 +0100 Subject: [PATCH v5 01/37] arm64/mm: Restructure arch_validate_flags() for extensibility MIME-Version: 1.0 Message-Id: <20230822-arm64-gcs-v5-1-9ef181dd6324@kernel.org> References: <20230822-arm64-gcs-v5-0-9ef181dd6324@kernel.org> In-Reply-To: <20230822-arm64-gcs-v5-0-9ef181dd6324@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 , 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-034f2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1303; i=broonie@kernel.org; h=from:subject:message-id; bh=pFAvrTvTUMO0xGKH/cMXrv1R9nlyUOOKoHgSKri2XFo=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBk5L/wf8ItiVhhsjU1U1pKaopo/uh7rIWP4I7WMtBO inLmxduJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZOS/8AAKCRAk1otyXVSH0AV6B/ 9NgV9lhw6oHPGtixcm5V3lAr7z+o9fWsFcBTBXWxSurUlb0XFjc+t7fDH7SvXhVDsM3caWcvDpNysc rUzR8kRdWUsc2c9LvqoaTcUMfW7SZ4LidddLAhjU+PCa1JGQoP92n9jN6TStbJ85YIH9l9KVVshmVZ XiPc6ANN4NmBzgKj9JGYlITGz4YnTicnXsOeD1e2p0e45JZx9f0hBIkU/lKRzsyIRzwpsY90K00Qz9 YGG3gusgb5P00L14xVRHrVAbuNMepnYq7a4rPyLGjenQCUiv8inCi9K4DWKE0JohN+V9sSbORNNply wIdHzUINXrAPZmj+TfHarlSM6uY9B7 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Stat-Signature: sy6n5ei7zpfurscjok1mo7zo9yu9knom X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: A09E8180036 X-Rspam-User: X-HE-Tag: 1692712988-270835 X-HE-Meta: U2FsdGVkX1+hGpOsoAImAYFMLlpvNAghNXw9AKJa9fXQbMvOfaLYbl6NVxx7NnXyovvS91X9TodeaOlZA9B1aMu5kFa5Kq6Kjf281B07Ptf3/B7hyTm+H4YkQgARDmhKJfFBXIKp7pb6C6X9w/r9H+VpzaLSXrU3eeW6t77Oz+cM9dfXGF+9eWc84w3lPyyp2MeB8WL0xW3JucxXULRcIP7OHyBhJtnvVCCXG5pb8eyYz7xrEhsz1EJ4jky+CQfgvltlil6vcHdk1/YnYGOBTdpkm+3WVKC3V+Tkm3thCkM63Ex6HUnz2OS2ojm2kv1pUv6vNQB0H4MQ4SYYakQ/Nfjj0OTsFBB6aYBibBqYHoK+b3OQzAWKW8yPW6Bnh9wMIPq17P1Ro1h1papCzMyL+EZzDRkGZnvGVOVTWpGwEtCRykU0l8OfezTLx/CnWEC8Ji+owr5tLVW46wCnnmPeyMdx+LPLlGb6rGJMxjhU46cfTZdtJmfDX2mA7YE+QFUFDB8c+/hCfkEEOg3+cKQ1rabnAJjrK1i0tmcx2msq4sFOLZBgcJDnGeHNvG1/VLyfPrkOHZn3OwNuC985NL3dxgE6XG4sMJdkMrq6dePFjRJzE1JimzSOy+gpwqm418K1NWFpFWeZNNcbVePE6U74BnYH064ZTVmB9v84JHU524hewQKJaBApHV821GG8FLzgRsIYIxLmbSpyb3HMMDq6dXhOS2nGXtiwXhJ0y9LJcjzFG71NE+gKic1dmuag0lCwm7yY3A2z8Jzlg9kKM6Xz8e0l7LdozxKQVkmbmqq0QUZHxvg+RmGDEx5oTwjYQqEZxZsaJI/aDUiIzUFf1XWQwYpZtoRSmQqdxGgetwSMKwCpqTAwmkH7M2rTuFbENvb8OZJUnXI66Hd/WE1ElT9B7d9ZYfNnNYWXgwRToaWBzBnB+Udet8ExZ2XYrQvvedhu3gqVNBB+vZL+qG1Z99U Cr5CnGIo 6I82LWSsLVUfuS149tNg/C6NDQbc+JM5HgcrHRv3NKINvIbXh1gSyYLsFm6OnYapKOV79ECkUgORZKTe+FJPhpnNkGnp8oUqUmHHlTcTI1PHBSx3cai9u3VXYCu8rVFuAiACaAYUrK7aDuROrZ2lEKrn+CmSWjAIwL+vei6gwNrtSBqSVaHN7Li6NvEqIfgZBm5Bnc3s55qzFnwmjb4upvxgD/cKjowBPvH/dbHveqiqcvkKeyBFwWmZk0bzLzQEON3Rbb/irQk0uUy5GAs7i4zJdtwkpMVBlFg35D1uioDUoyram2GHAFEWTrsNN/wvPZVQLNQBQZJMSd2CXyJ/JQVfIPx5en9t+bfM37SLjryJ9xHYb/CQu7WCtQPyBDmFSPKMc7CvQckAaMKRspbL2BQDmN7NLg1hDmqEyz4nJz6KCI2NzLaiMKkMXyFdcTs/SoU2sVKVCvKRC9mUiipi1KNEODA== 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)