From patchwork Wed Feb 12 03:21:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 13971022 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 A8F8BC021A2 for ; Wed, 12 Feb 2025 03:22:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 599556B008A; Tue, 11 Feb 2025 22:22:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D29D6B008C; Tue, 11 Feb 2025 22:22:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3269D6B0092; Tue, 11 Feb 2025 22:22:04 -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 117E46B008A for ; Tue, 11 Feb 2025 22:22:04 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BC3701A1657 for ; Wed, 12 Feb 2025 03:22:03 +0000 (UTC) X-FDA: 83109843726.10.D870310 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by imf14.hostedemail.com (Postfix) with ESMTP id D3F92100008 for ; Wed, 12 Feb 2025 03:22:01 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=dA0d+Vhc; spf=pass (imf14.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.216.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=1739330521; 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=l7pPl+80co4+z7JP7yvzolDYDYVYpoOhsDUrxcZkGCI=; b=zIWbRGInTor45Ag/O4uS7X3lBLKlWmcV3Lsw1V3Oot+oHYNuL183i96ggdIle5b6+OHMPG E+GgR/PzXuq/qqySofFgCQGNhe6cwUsh2zp9MDcTjFvi0H2lr/6+rDpJElMCeD8L1ZFJKA 0y32DNPRh0M7xvHSG8ZrvZdOay910F8= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=dA0d+Vhc; spf=pass (imf14.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.216.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=1739330521; a=rsa-sha256; cv=none; b=Ra7q+BUp5BSQnHnJBeUiawCHvASvaZYBK5oATyCACqxBoUiistUwnr1LhKTDa0UCLPgW0W YnfK5zy9p2iOqvsif3z6SVaGMtu2HVE9dWxiaTcMkOiNqyTw9yHoAeiEa7LjvybeDv2dSx LRutmO16T+VgSQfHvTMHBxIWKm9Hdck= Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2fa1a428f6aso1403304a91.1 for ; Tue, 11 Feb 2025 19:22:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739330521; x=1739935321; 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=l7pPl+80co4+z7JP7yvzolDYDYVYpoOhsDUrxcZkGCI=; b=dA0d+VhcEoCoh8/X4UPEVEk89n46nqetA3O82PU48oxZgOAcUH05jc59G/iZd+4dur UU10mY05Nz90dngpOVhd5bXkNk/3aVHafNrOLUYYIdiXvXEa1yD2lyKC+UsW2TSZ/U91 D8agevWqLch/lhN65BkPRpXQ9CUV0xkQBwc4U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739330521; x=1739935321; 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=l7pPl+80co4+z7JP7yvzolDYDYVYpoOhsDUrxcZkGCI=; b=GvzCi4ZA/DUQp7o/6z4EvVc/DrefK3q3H95UX5I83t85Jp5gJWwoEAPqpzj3GJtasI 9Q/nPum8WAosffg2uRky3LkdWr072nP/rKXoCHTjAOn9yV3lwDSu151DE+HoZlQt3oV4 dPdGXX3VNHoOhl9cgpLwk1IzAn/lq1gGkLNzYPp3dlpm4fS0Y9Ko2sAgz61NhphaT3I1 GdL9GGQw3fH20ZFXdqLVXWr3aYg+4FyhfQDxxxGmkfx+ZN8+R9VMvBf1IpYDr/mgPufy 5PH43gNizCTKefqdCk775GuLrV+413fKfpKHKUtmyv3wdX95KFzx1rMirAXwvMTVqCtV JdLQ== X-Forwarded-Encrypted: i=1; AJvYcCWyRUbbWGbsFKXCltfmF/IrKVGYqHwnk2msWfEi3XCRB+Q99WBhkD3yUKJRnwqqtjqtk5BguDuw4w==@kvack.org X-Gm-Message-State: AOJu0YyNQxwualVdl4xfcGGujNxcxqu+CUgjjUku3x1u94V6zHWIU3OH WNrgajfIFPj8Pc99Xf2RcEO8ddQDHbWFH2TuuJ5zYiD8xDzPEnVGEqbsVxEy+w== X-Gm-Gg: ASbGncvt+2iMRnNjNZ73KYvyP2cs3KK9CBN4eCwTK4huHGE7uRkOGEcoWOL1rix7DIy P3Qh9YucF1WhO/RBp39YFP3ZQuKJ0x93s1rugFhi9i6VJSU+1HxY1b/mAn4CiVpwRlEYYwx9hPX UP413bgT4Fyp9BeBRvR++gL7kCKyGo7gD++mapIqXN5yYMC3+25mdBdvX74IifEf0YTDNGd8ZP6 zzGHHkasP4m8UsKrbQqGNqubG0LjoqdUQNPUKzRNNw4ucbA7I6s76/Bak6idD4qEXNxRGXxYWol gxRd+Iuyte5lxsAUd0tVojGZG52xfUas8a2N/r1VOF40hiX0bw== X-Google-Smtp-Source: AGHT+IEQjI3mXwIsERllpCdgEEkG55fGZ2UKV6IZsw6M1hblfR3OjmOt9QtTdXsaFePhUPJi1BBTqA== X-Received: by 2002:a05:6a00:ac06:b0:725:46cc:719a with SMTP id d2e1a72fcca58-7322c3780fdmr864380b3a.1.1739330520652; Tue, 11 Feb 2025 19:22:00 -0800 (PST) Received: from localhost (9.184.168.34.bc.googleusercontent.com. [34.168.184.9]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-7309569d6efsm4018014b3a.92.2025.02.11.19.22.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 Feb 2025 19:22:00 -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: [RFC PATCH v5 4/7] mseal, system mappings: enable arm64 Date: Wed, 12 Feb 2025 03:21:52 +0000 Message-ID: <20250212032155.1276806-5-jeffxu@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog In-Reply-To: <20250212032155.1276806-1-jeffxu@google.com> References: <20250212032155.1276806-1-jeffxu@google.com> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: D3F92100008 X-Stat-Signature: 9bdt8gg5da68fqx7h3azfze3xcy3rrci X-Rspam-User: X-HE-Tag: 1739330521-625662 X-HE-Meta: U2FsdGVkX1+1/JqqSkeGKNQO8Y9I6LivOJifDaoCjRNVJ1skNeW6V7jZAJmaH5cGmJCgGoZkYYYHQW4UZ9IF1H5K1FCwQzRzvR2uA4E1CzpxHRnR5oH1Ss3lQSUKrcvxe/knGhkGnsUkSVB9khFHXBlvhB0pLZRn+xlVLQ2ZgFq5VYmiespoZp1ge4wr2urNDwj1IhnzqYxsgbUH6wBU2JX7kzd+sothMIwncJsPC6iCqtjy9A5NV8BX5hltXPEDcHuHg1A5skNhKS8UjVZ4cnOxEgHfLqLBAQAF7p21/sfmlrm3S32h0rzmZzR4i/ig0nWG9rhTNww4lGpn1d61p4McswNvovo0wf9E/yZnSWAlQkc+SOUXnruB8b9/l+jyLqLGTg36IfniFVWJll0zISY8G7hNbwuj0dGmUV/q5e8fqrFo7DoDZJvdC1KAzGRu7Y8B/jc4fp/FlR2Z2M65SzqeKlHv3tFijpR0iTugIkMmT4bKkQHJAaGpX6HNwS1GSYhJmacd3wbfmY/pfqCxYt4MnSnj67hyxwOOCwp+XtotukXUssO0PH8yw1jUJBrAKn1VJDWKY79nG3aBz8sHUMLDeFpeLXdlfZiGbOSTNQOufw0cWiGjbqhfGbc0SXxB689wyvM3dT/nX2ZDcnCP5qS+q5o/kb0YPB38A7O+DURb146C3FYcOwx4wuUmxBboYAZAC+Syxss2sqy0JWYzn3yXOJlwXnVLphFxCSRJSImMwpMR4caPg116cBJrCj4vgrlPL6h/iwPpE+Ov0GI+Qp8DKjaCBSC2EtYstGFb+7SaqjPVkhsX+KVsZnEAQPieok50dXKDs3WoasOeeIQj+D03pdactsrvSmJV/Q/F3FP2FWRO0RKjShBT8LYxy8R5qx7X/A3dgENB9ZsswkNGzartd+CYCKzpv63AyBeJdqVOOHr6HJoB5+JOMgOFiS8W/FcS1xABGjBdR8kvbJ7 iGpLPZDJ VeqqfH+fM5kcoYHUtH4ljPPspCs45L9ik04VUsYIdPscRR2zS7JfjxWwyVxqVA2/hcdGUGd8a4p4nzJ1cC+SOHDLzkFxberWFWSBiWBXoEkTIqE5yPj/FjoMzFiw0AIlCAUREP6FDKqS6HgpIPSnUPp66GuXPu41sdib0jWcsrKvk1977wheYVl8T17HE/Re8qpGdTSrMg41BSMl2ie0HmKfh19rPPhDwQPyVeoM9riyIT3d4D5aH5owub5PiArupqV4ciH0/PEkj6I93jI6gOuL9/H6K9pVNFne722R+VuHjFuomqXbqLQpYkRag74MIgtQOiGxHSsTD88l6UNQW5TR9tKb4WY4t4JwLbt4k2ZqxOF72zdBWCVzb4f6fk7lW9wep1yw1eZTSwy1NhYFG6GuTFJXpRjb4AeAx 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 | 23 ++++++++++++++++------- 2 files changed, 17 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..cfe2f5b344c4 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -183,6 +184,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 +199,10 @@ static int __setup_additional_pages(enum vdso_abi abi, goto up_fail; } + vm_flags = VM_READ|VM_MAYREAD|VM_PFNMAP; + vm_flags |= mseal_system_mappings(); 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 +212,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 |= mseal_system_mappings(); 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 +331,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 +340,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 |= mseal_system_mappings(); 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 +352,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 +365,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 |= mseal_system_mappings(); 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;