From patchwork Mon Feb 24 22:52:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 13989025 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 D8E95C021B6 for ; Mon, 24 Feb 2025 22:53:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2A13128000D; Mon, 24 Feb 2025 17:52:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2553B280001; Mon, 24 Feb 2025 17:52:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ED3FD28000D; Mon, 24 Feb 2025 17:52:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CEC63280001 for ; Mon, 24 Feb 2025 17:52:54 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 87C7F802EB for ; Mon, 24 Feb 2025 22:52:54 +0000 (UTC) X-FDA: 83156339868.24.6FA7F24 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf22.hostedemail.com (Postfix) with ESMTP id 9DCB8C0010 for ; Mon, 24 Feb 2025 22:52:52 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=B+iGgnNu; spf=pass (imf22.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.174 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=1740437572; 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=mnbYZdR9Dsd6yNbIvKX9KQDi82tgjieU0sfh+fobVnA=; b=TbVELK0a769fvwhRqfEUrzRS8Pv3W2cinvpj/Y4NK5PXILuMJJd8CBl2A+A5WPJIujThgi 9P2PgTotlXdzWpcAe1SmlHH+5VstjtQzZGxvB9uEu3xtz4DaELqzw00aDsVEEG+OB7OAfT 8eLutysRvc93b9K9HHzZbAxXSWZILXs= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=B+iGgnNu; spf=pass (imf22.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.174 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=1740437572; a=rsa-sha256; cv=none; b=xdvQM/zLV0gfbiocZ2XBLFGDAoJvM5xAciJddkTABN0njsQUBrp+CtehrXw6e67iNuAEZG OCn6IlYdHl1WETa3+9XxEmD1VgPu7vaF9StLIsX2G1piD0CFkxG8JrDSVuctloZ0th3P76 BTayRjHpwbJh5vKcF3QKi5VQhbGGpDY= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21f8f3bd828so10884175ad.2 for ; Mon, 24 Feb 2025 14:52:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740437571; x=1741042371; 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=mnbYZdR9Dsd6yNbIvKX9KQDi82tgjieU0sfh+fobVnA=; b=B+iGgnNuu1OzI1cJsgjWODJXF7sR6iC1lUXz3OjVGAHdnRLz6NmlsLnTPSa/kRzms7 T4RWDelQ86UXSt6D9KqNhqgDAOzHBnzFSabE7kOgUzAHtp/PC/6OMVrinLU6K6gQC91s lGu//CVNnUqtSjkWv3s8L+q8/CBILow9diE8s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740437571; x=1741042371; 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=mnbYZdR9Dsd6yNbIvKX9KQDi82tgjieU0sfh+fobVnA=; b=audb7gjNh2addHzMnvGpl6Q+cDQxCizlzxog76PYQ8HifBRLEKlHUUg0Zq0MKhvBRS 912bGN1o/k7ECjCAdSRLOcQucn1qXW0nc3i+djaITxCQeRm8ZOwpyuO2H/WaJpBFUqAR dNmEkS1/cw1a0YQIsqy9t8BdUW8pj/h7b5Rrn9kcCEYPExVSVmbdAhtPN7n9KB/F/4Pi yv1gXMJODrQVAnQTZEuBiZS8vU1Ehfzhxx07tpG9W38QZeGYktGTu720AT+sYcv8e2x/ /OlVOL+ipJfsL/FSEUaH2+3fGe608KL+zLFA/vK8/7oi+99u2yz3PiGrqrwHixy49AIK F/lA== X-Forwarded-Encrypted: i=1; AJvYcCUoiTM/d12PZrQ/frG8FlpyYW96JDGfBWLLDjWc5cSLuDUDWKFaRWUukIaKYFGActAfzWy+8VV6Ew==@kvack.org X-Gm-Message-State: AOJu0Ywr0/nGKnZVmM7EnpKhGjUeaADIGTpnbLB8q7kYGSVCiFVPs5sH eVJW3w6qUatelby2YNUZjCAIcdjTUNWwyAGnl2xJ9hGqaVJRj0cmkjauLRWN8g== X-Gm-Gg: ASbGncsbwo7d6hmQpATx4KvDqLCKjVCnknBmO09EZAJQeZfoDO4aAmqc65mnHnK12Ua Z22xv/TT82QdU2KO0gLE/AZEcwqDOvPl2KRi034G+FFeaHZtkT83qajxqzWlxrEx3N5tjKnhFZ8 r4BeH7af2+k7erGJECG0vREL8eD1y3SwqIVNbcpqIglgybDhpuMPc+8e2PXemWSZnRLX59r5ykr JwsEnHkmOscMBGfI3tMAgGad4zk0K5YomIa7wrNBVv9c5ZOPKgnGdS494mH1tOEAHgkuchUHRf4 xW5elxUA3rC24t0keDjS8vBYY03MG5lnI7pPDU9cNk3W9uKtKpZvpGkM4uAS X-Google-Smtp-Source: AGHT+IEhSKFRCZXsG2Zy3hOdxapBXQNVpwEKFfeiuGKe7NPaKl+bBQmXHsBtgSBl5DplToMs80po9g== X-Received: by 2002:a17:902:cec6:b0:215:aa88:e142 with SMTP id d9443c01a7336-2219ff6e82amr92327965ad.7.1740437571460; Mon, 24 Feb 2025 14:52:51 -0800 (PST) Received: from localhost (201.59.83.34.bc.googleusercontent.com. [34.83.59.201]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-2230a000536sm1358685ad.45.2025.02.24.14.52.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Feb 2025 14:52:50 -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, 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 v7 4/7] mseal, system mappings: enable arm64 Date: Mon, 24 Feb 2025 22:52:43 +0000 Message-ID: <20250224225246.3712295-5-jeffxu@google.com> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog In-Reply-To: <20250224225246.3712295-1-jeffxu@google.com> References: <20250224225246.3712295-1-jeffxu@google.com> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 9DCB8C0010 X-Stat-Signature: 6ctx9yks3fo6cj6p1smhuhdanexnjhqr X-Rspam-User: X-HE-Tag: 1740437572-186655 X-HE-Meta: U2FsdGVkX1+SXLqgStXSNiswgm1omlrtRCzuGmVLhGpONryMg59fdjBRh9KARjjpJ0ePyvTIYZ0oagROJXdLjZtQClVADBeUZuNcUjASxCeMjpq5beGCOjkYDTNvnYUWka3WjNz8VWWcC3RgSBI5v5ZNwqfz9e/2UaRD1wR/OcvGf7nFkLpavDWys9dKwlBQZLPpFSHIX29NADAwVb37ct9bWzgkzer8HgUByJ1+uGfLISq3r7+qocD8GG/TK60r50qUmXPhpvVHoPC3X41zZBgky2gIO8zGYLpMLl1JH5h1z98eL6cN4LjA+FpmjdQi+XhAetni4Tso/pf5bfcoIZ9vnyFLlVJTJYI/puX8dK6zzCpWX44d/N1HUGFnUszJDarvmEpZA20X7R2aaaIIA3N8akr/3UvGKmXgkYml2Xeq8Vl2wb1Nn/Np9YX0XhuLZnFPYLfKxOim9E0+jF0GrNff5cTLbVLLvZt91Z0TBkLDrJKfBoQjfiBaYl/duFG6JK+nTFQ/egq9a7k3+Q6GNPwa3DhP8PFhMg4OR0m4Sm/HG5iRexiL1UXViJmJPoYnMz2apH37eVZjExa3mS3h+F+npt1uCs201AS26U11WTY4SSaIRUjdHQYrHEluJU1LoII0v6tjHtQjE+xL3sdEBp1zLkFmZX/+H9+p2k6ZRQB+2FlxQgru/it4WFo8AIXdP0zUssyLp8BmWFPxD4Kuj3xLz/IyM5YlCmLyHQVcvgjY8lmim1tm0uXP6X4mzApLMzfB/kmLWw3dx58kYv8BmGAG61SGJs9DY4Kv+/18qilKQo/P19Rro5BIGk8Qljik4Lw18ZCzu5l+XuvACW7WC/MaRGwoKS7mw0g+yJrZrai2rwFWiiYCvBiiApgjnd4p9L7UBANb78BxvfUIdGIU9gSfUxzT/5lTsGkZ5G5wres6mE0kUPTxtlsNfCG5n+wM8CJHAXELhSbbEGWhGn8 kujJdkBT /w+26q/20rADywqCl6Idralv8E0Sx4ahuhpbv2iBENJDlapS2+YB7vk2MEAyqbJUdrjp1o8t915Uv0gcUyCasuqVE++ZocFkoIF+iNAusT9CsFhYbYeC1AXx/uCGN0XOThsd8zeOliSKhaQv5MomQoYH78FWm9VoRinNNVAN6pWlsOhAN7uXf2UduAHLPBV79oUGWiH701xD0LkTtS8Awj9XvTa4bijpEvc3ELBjtes2NVMVoJatg/fbezy4ct0HIl+S6NJ0lbrvHOHplFRJVX/n5rh5vjJLakAsSGbxNWYsewnG/RdQeFYRrXi3xKN9pyjGaiw5L3XzV5BonQzIWquLnOb+1CWpSv3r46Jw+aJUrchkMm8urNePQVg== 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 --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/vdso.c | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index fcdd0ed3eca8..39202aa9a5af 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_HAS_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..12e6ab396018 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -183,6 +183,7 @@ static int __setup_additional_pages(enum vdso_abi abi, { unsigned long vdso_base, vdso_text_len, vdso_mapping_len; unsigned long gp_flags = 0; + unsigned long vm_flags; void *ret; BUILD_BUG_ON(VVAR_NR_PAGES != __VVAR_PAGES); @@ -197,8 +198,10 @@ static int __setup_additional_pages(enum vdso_abi abi, goto up_fail; } + vm_flags = VM_READ|VM_MAYREAD|VM_PFNMAP; + vm_flags |= VM_SEALED_SYSMAP; ret = _install_special_mapping(mm, vdso_base, VVAR_NR_PAGES * PAGE_SIZE, - VM_READ|VM_MAYREAD|VM_PFNMAP, + vm_flags, &vvar_map); if (IS_ERR(ret)) goto up_fail; @@ -208,9 +211,10 @@ static int __setup_additional_pages(enum vdso_abi abi, vdso_base += VVAR_NR_PAGES * PAGE_SIZE; mm->context.vdso = (void *)vdso_base; + vm_flags = VM_READ|VM_EXEC|gp_flags|VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC; + vm_flags |= VM_SEALED_SYSMAP; ret = _install_special_mapping(mm, vdso_base, vdso_text_len, - VM_READ|VM_EXEC|gp_flags| - VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC, + vm_flags, vdso_info[abi].cm); if (IS_ERR(ret)) goto up_fail; @@ -326,6 +330,7 @@ arch_initcall(aarch32_alloc_vdso_pages); static int aarch32_kuser_helpers_setup(struct mm_struct *mm) { void *ret; + unsigned long vm_flags; if (!IS_ENABLED(CONFIG_KUSER_HELPERS)) return 0; @@ -334,9 +339,10 @@ static int aarch32_kuser_helpers_setup(struct mm_struct *mm) * Avoid VM_MAYWRITE for compatibility with arch/arm/, where it's * not safe to CoW the page containing the CPU exception vectors. */ + vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC; + vm_flags |= VM_SEALED_SYSMAP; ret = _install_special_mapping(mm, AARCH32_VECTORS_BASE, PAGE_SIZE, - VM_READ | VM_EXEC | - VM_MAYREAD | VM_MAYEXEC, + vm_flags, &aarch32_vdso_maps[AA32_MAP_VECTORS]); return PTR_ERR_OR_ZERO(ret); @@ -345,6 +351,7 @@ static int aarch32_kuser_helpers_setup(struct mm_struct *mm) static int aarch32_sigreturn_setup(struct mm_struct *mm) { unsigned long addr; + unsigned long vm_flags; void *ret; addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0); @@ -357,9 +364,10 @@ static int aarch32_sigreturn_setup(struct mm_struct *mm) * VM_MAYWRITE is required to allow gdb to Copy-on-Write and * set breakpoints. */ + vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC; + vm_flags |= VM_SEALED_SYSMAP; ret = _install_special_mapping(mm, addr, PAGE_SIZE, - VM_READ | VM_EXEC | VM_MAYREAD | - VM_MAYWRITE | VM_MAYEXEC, + vm_flags, &aarch32_vdso_maps[AA32_MAP_SIGPAGE]); if (IS_ERR(ret)) goto out;