From patchwork Mon Mar 3 05:09:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 13998192 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 32F39C282C5 for ; Mon, 3 Mar 2025 05:09:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 35E61280011; Mon, 3 Mar 2025 00:09:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 29A1B280007; Mon, 3 Mar 2025 00:09:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 09E2E280011; Mon, 3 Mar 2025 00:09:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D92F6280007 for ; Mon, 3 Mar 2025 00:09:40 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6A882B1E79 for ; Mon, 3 Mar 2025 05:09:40 +0000 (UTC) X-FDA: 83179062120.15.6530A3D Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by imf09.hostedemail.com (Postfix) with ESMTP id 8339814000B for ; Mon, 3 Mar 2025 05:09:38 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=QiuIeyqx; spf=pass (imf09.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.208.52 as permitted sender) smtp.mailfrom=jeffxu@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740978578; 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:dkim-signature; bh=RAoQrXrn6YJEh9Pobcge+uaEegOFqqBxGl0PnC+cOhU=; b=JBUpCEBCynjQ+ho8VFqVY9Uj4P1MpxqlBRqFtMZ8s58dS6f3UCi1HMkoRxwoDTzCvSIXN1 ftJt1ss2BvZv4d6lYMIrMiamXN3vFiQgMlayrYUPIxuKX9VrQgDkPHMXBYNnMGHz6/SvhL Ub5fdOdIy6lXrNBPvLMRvZHWE87LXwM= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=QiuIeyqx; spf=pass (imf09.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.208.52 as permitted sender) smtp.mailfrom=jeffxu@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740978578; a=rsa-sha256; cv=none; b=trvkqr50+8UYJ7No+rOCYGMPpNc3tQDA4VFWrHKYlQjU3EJSxp8bVwt/qJdsnlpBVA4fKP iOWB5I3GmR4dIQy7C73eVObcA/18Xs8M+DIzA2Kh6d5OLi+9T3p3JwDGHrnjC23ENuoPw3 UXvGJYeFmj+8OEhkllQFmNrvBECSncY= Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5dc191ca8baso774633a12.1 for ; Sun, 02 Mar 2025 21:09:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740978577; x=1741583377; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RAoQrXrn6YJEh9Pobcge+uaEegOFqqBxGl0PnC+cOhU=; b=QiuIeyqxcYencnI71RIhKrXGRiKt+9ANYuNNx8b6JHSsbZyjpn+aPQVqVuLGuToBvl KjJ63I5Ai1kaMuAxXiFXMOinfcR0gqrYViL9FYnjZP7f1AOmVZAy9qJxmn/GEdoExKPR TbG8iVKrS88DQAdQ+oxsJm+yzlxLSecl4AWRU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740978577; x=1741583377; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RAoQrXrn6YJEh9Pobcge+uaEegOFqqBxGl0PnC+cOhU=; b=h2vLotUayahP8bkPk3w8IqLl0jpWPSKjYAyO3+jghrL9AUy2vkGSaCBxdYIq10Zy4y aiYZNtH90Okwr5OYMXVDOo+IX5ElLJZoLCzzetJ6ehwxchyHh0hYNHSvRrjtDTrKY1tB aIQi8gl6zlR4BtG8HQosgeyykJc+Xr2qN5GDegKGvNX2Kp1pvPo29UczCwS0R3I54ptR lkAZprqZvzNjE5onEeJN1Wy5dVEtlc0usJfblnfs14KQ066CfTtaGLdzVdgW+0+LKVy1 ElAk4fhnuY3P82Hf78QUvDuLQjXjs5TIe5lG51P7uU5fbyHMuCpJqezY7jAQazIZg64Y 3U2w== X-Forwarded-Encrypted: i=1; AJvYcCWD2UMqEzu8pL5pdIXkqXgstTSddXqdy5UjtS2zxX7l0cS9o3w4QRygXPO6SQIqouaLMxN5Hhvq6Q==@kvack.org X-Gm-Message-State: AOJu0YziCMBdhhq5WgN+krpA67AFVU52cdfeRkGuN2uMMk90lSWAlSg6 kZ2GMyPyClcYTAuz55RKQ4QNHJTvv+hoeQYWpTwfGJu2UIAXgSWM3wVdNPKUJw== X-Gm-Gg: ASbGnct5BnY1P7ck1QLDo6JyaPhZLz9X8VQlA7sbyq8NdqTB/vvL/OcgG+wjCKmQeTv PaEB4k5rMg4QutjMNbmTaZi3H989tV821o4XuFDlbejTvk5qvVeX4VrIyXX/qIh4fLwZ3FVDOxs 5jYtTMRxwEGEnj08Pn/rZ9bJZ2jT/pk5htR0HUP6GdclYmpUfO52iWnI2tE3ksXIiYDsCt0mHTy DZ+2JQN+TkqkSdnqOTomEbZNLQQSKVx4Ho8xlKX3I+VfkL4zaU/u7kRAtDfXD+jsrLyfw4v3txc 3cGttI4SXT+mFiBbn9BpkwiJP33d0ih2QVmxbSnKPvCldVRByNtU6QTbxGujnCqrv3yw8SjA3AL 0 X-Google-Smtp-Source: AGHT+IFFf+CduNG846GcfkCLdAht/QDxEug4xx+ZimxDfLRqsASOv0BOjbMGqDHYYZSfdkiJ8c/g8Q== X-Received: by 2002:a05:6402:35d2:b0:5e0:7ffd:a6ef with SMTP id 4fb4d7f45d1cf-5e4d6b42c58mr5147613a12.5.1740978577006; Sun, 02 Mar 2025 21:09:37 -0800 (PST) Received: from cfish.c.googlers.com.com (40.162.204.35.bc.googleusercontent.com. [35.204.162.40]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e4c3fb6067sm6248635a12.50.2025.03.02.21.09.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Mar 2025 21:09:35 -0800 (PST) From: jeffxu@chromium.org To: akpm@linux-foundation.org, keescook@chromium.org, jannh@google.com, torvalds@linux-foundation.org, vbabka@suse.cz, lorenzo.stoakes@oracle.com, Liam.Howlett@Oracle.com, adhemerval.zanella@linaro.org, oleg@redhat.com, avagin@gmail.com, benjamin@sipsolutions.net Cc: linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, jorgelo@chromium.org, sroettger@google.com, hch@lst.de, ojeda@kernel.org, thomas.weissschuh@linutronix.de, adobriyan@gmail.com, johannes@sipsolutions.net, pedro.falcato@gmail.com, hca@linux.ibm.com, willy@infradead.org, anna-maria@linutronix.de, mark.rutland@arm.com, linus.walleij@linaro.org, Jason@zx2c4.com, deller@gmx.de, rdunlap@infradead.org, davem@davemloft.net, peterx@redhat.com, f.fainelli@gmail.com, gerg@kernel.org, dave.hansen@linux.intel.com, mingo@kernel.org, ardb@kernel.org, mhocko@suse.com, 42.hyeyoo@gmail.com, peterz@infradead.org, ardb@google.com, enh@google.com, rientjes@google.com, groeck@chromium.org, mpe@ellerman.id.au, aleksandr.mikhalitsyn@canonical.com, mike.rapoport@gmail.com, Jeff Xu Subject: [PATCH v8 4/7] mseal sysmap: enable arm64 Date: Mon, 3 Mar 2025 05:09:18 +0000 Message-ID: <20250303050921.3033083-5-jeffxu@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog In-Reply-To: <20250303050921.3033083-1-jeffxu@google.com> References: <20250303050921.3033083-1-jeffxu@google.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: 3k5wx1nu6je88d8ktj5nyjrtb8pzcm7w X-Rspamd-Queue-Id: 8339814000B X-Rspamd-Server: rspam07 X-HE-Tag: 1740978578-250195 X-HE-Meta: U2FsdGVkX1+TMOxzk82+pB/slD5Src241HQxgYzVs162zmNZcrIuHyjwWPPHXD2puOAMy/wnRtWPIR6TvJfXQRbEq98SIAa/VNHcZTSVojYGtZTP/DLy1Oc30vgKmuPH6X88jtocfgbRij+Ols+3WeSqLjno2CnnTR42APu10vpaZNhlQLT8kdI4jQ1aIujr1F4WCoCTZjlgc6CY70bxTQxa/yp6QoT1fesj24SQ0Db0Uj5qbGBHy6jA9ZBnNZmcSdqgdrwduTFjS7IU+v+6QGX1L1QeOpsgyL5NrGFowoD2BvOGxiSVLzrEwGbScCgpn0Sh7zz/vCCHcvo/STTmOLLguiJQk6tM312kVvOAOd3WCtpaSzxXyQGj1r3tSGHEEO5e1SzQsxHBiYoMJLc1Ejp3EmgSz8neA7b/2pN+yWqSjr/qQejr7aXPHwptGykSUVP+63EmxcneO1ZTC5944pLlc/HuQNItOTn4jYH95oGtTI5ZCLfIGwFFZaRfCVmHdiaqeF6ffqY5EAUwXY3O5cprztKEYlBtJSU0hn0rY2y4q/TZv5fzsFihR/r3x8HQd6zdUKKIeBrIyGRynmlbLgwHZ7C0qAF2vdPFiTzlmFdc7dgl+T9N5ARs2phod5KEZSHFiBnAtybmCAxqGoPsLCOxu7s1/SZ+piiGPtQKTJYQhPVPhv7aQFq/wikB+qHMVceYEBAdAkGha4tAFw5iN/9dnR9YtnI0P16bRLdzRqwiYIXYUWhD8/rSdgn99QomFQ3W01VnHVZ2Uan7No5MqWlSg2GIdxQzz485roJD0rmYZLWJ9Zpwl2BjOeSlxm0M99P2ITEc6uf5+FszVw+ZXbcloKnfPvBY+FSZKtEDOj0TcLj3P2CXjGfQw/15XhXYxOBYoaJOdX9Dk+kiWnql6c3cVQOkItR8OBU2aQ3+aSUKdzH9I/jadNTSpx3XW0b0uOX/fyx0sqnUFJP59tN KxujFHx6 zYqq7EIo7zYhsGTZT7neM0jH388gpGN/VdqsE6zhlNSkpkFZYLaBeEcD7GLqGoN4wot/CwsJiFoOBjxkO7Mmv/Y0xkiKu5rCG3XPzO7MVui86kouFVD18NoV2dCjovRsj+7m94bHEUXjfPlJ/AYiCyR65MFFvlRbmATt2fkIVuMGlUFbECmQkLVlKC1a552OVLHy/dZEtWq4KlXpU8HaxrVSBAvGEM8j5b83oTfut7yiHpxUAWi2apMcadCjORFv7BCBWROHqR9YWGkJcFjkQYyMrnqTX3+gXBc28l7kLjjgrjXP+8pEe85sZyOIrz3b2arb0eM/t9T0Z52geKbcMtx74zAteeQlk8GEMXiJT9Zx5zigr/4nUun5lJA== 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: From: Jeff Xu Provide support for CONFIG_MSEAL_SYSTEM_MAPPINGS on arm64, covering the vdso, vvar, and compat-mode vectors and sigpage mappings. Production release testing passes on Android and Chrome OS. Signed-off-by: Jeff Xu Reviewed-by: Lorenzo Stoakes Reviewed-by: Liam R. Howlett Reviewed-by: Kees Cook --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/vdso.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 940343beb3d4..282d6cb13cfb 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -38,6 +38,7 @@ config ARM64 select ARCH_HAS_KEEPINITRD select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_MEM_ENCRYPT + select ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE select ARCH_HAS_NONLEAF_PMD_YOUNG if ARM64_HAFT diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index e8ed8e5b713b..69d2b5ceb092 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -198,7 +198,8 @@ static int __setup_additional_pages(enum vdso_abi abi, } ret = _install_special_mapping(mm, vdso_base, VVAR_NR_PAGES * PAGE_SIZE, - VM_READ|VM_MAYREAD|VM_PFNMAP, + VM_READ|VM_MAYREAD|VM_PFNMAP| + VM_SEALED_SYSMAP, &vvar_map); if (IS_ERR(ret)) goto up_fail; @@ -210,7 +211,8 @@ static int __setup_additional_pages(enum vdso_abi abi, mm->context.vdso = (void *)vdso_base; ret = _install_special_mapping(mm, vdso_base, vdso_text_len, VM_READ|VM_EXEC|gp_flags| - VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC, + VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC| + VM_SEALED_SYSMAP, vdso_info[abi].cm); if (IS_ERR(ret)) goto up_fail; @@ -336,7 +338,8 @@ static int aarch32_kuser_helpers_setup(struct mm_struct *mm) */ ret = _install_special_mapping(mm, AARCH32_VECTORS_BASE, PAGE_SIZE, VM_READ | VM_EXEC | - VM_MAYREAD | VM_MAYEXEC, + VM_MAYREAD | VM_MAYEXEC | + VM_SEALED_SYSMAP, &aarch32_vdso_maps[AA32_MAP_VECTORS]); return PTR_ERR_OR_ZERO(ret); @@ -359,7 +362,8 @@ static int aarch32_sigreturn_setup(struct mm_struct *mm) */ ret = _install_special_mapping(mm, addr, PAGE_SIZE, VM_READ | VM_EXEC | VM_MAYREAD | - VM_MAYWRITE | VM_MAYEXEC, + VM_MAYWRITE | VM_MAYEXEC | + VM_SEALED_SYSMAP, &aarch32_vdso_maps[AA32_MAP_SIGPAGE]); if (IS_ERR(ret)) goto out;