From patchwork Mon Feb 24 17:45:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 13988619 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 4FF87C021A4 for ; Mon, 24 Feb 2025 17:45:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 12A0028000F; Mon, 24 Feb 2025 12:45:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 03BF428000A; Mon, 24 Feb 2025 12:45:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D81EC28000F; Mon, 24 Feb 2025 12:45:22 -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 B65FB28000A for ; Mon, 24 Feb 2025 12:45:22 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 7B80A1C8CD5 for ; Mon, 24 Feb 2025 17:45:22 +0000 (UTC) X-FDA: 83155564884.06.341BC7B Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf23.hostedemail.com (Postfix) with ESMTP id 8F0D2140017 for ; Mon, 24 Feb 2025 17:45:20 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=l+44w9Tq; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf23.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.171 as permitted sender) smtp.mailfrom=jeffxu@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740419120; a=rsa-sha256; cv=none; b=0kcjnzbYkGic8rGOVJe/w5VwAw2czFhwhgIxDRvlV4reJH5gMDj5EgksAz/5+Q4uF0QR3C r4G9LtNPiSmFww/tjobeZznnqeH2vXJkKA/4hG7STx+k27AsE6R6jHL3fqRP/pLWmfEtJT hjJ0qnZKS+0GEAU2Ttcqwl9Xpq9OyeA= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=l+44w9Tq; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf23.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.171 as permitted sender) smtp.mailfrom=jeffxu@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740419120; 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=83PJNkO9JARY6UfrwtNSh9B3t1cYA+bhOuyhuOOAsAw=; b=0ScwX4nNFYVmUUB+//iSoEKMTAqTD3p2wmWpb0LScTEPLLovkk6IbZPGzBafOKY0RLisNO qYliFerUMoQwx5AMhm1h/EOJKW+RCcH1j1F8kIdBIIovSaNq/uHpE6w/B2qtjqtnAiESy2 2gjO+3U9jDYq2qO0lWIGFft9t2bdvGE= Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-220c3e25658so11171755ad.1 for ; Mon, 24 Feb 2025 09:45:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740419119; x=1741023919; 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=83PJNkO9JARY6UfrwtNSh9B3t1cYA+bhOuyhuOOAsAw=; b=l+44w9TqMgF8zhVVFBq6aeyS3gccR2SVf76+FWD33PxFo+03Wub+Uy+HlATx1624Gy pvTS/tx2l6q0OxElkmTorHkz8nkJTtS3frVqKkxjOvIMSErVphX2j9koEzi3038Ykt4z YdpwikMJVbze9vVWahjlXbmbumCCrjkUPHQgU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740419119; x=1741023919; 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=83PJNkO9JARY6UfrwtNSh9B3t1cYA+bhOuyhuOOAsAw=; b=a+LxMaycpljPkYbJ5ODZmfHuo9ie4hTxXs7xAYJVBznccJxzAfOO+jQX0sE9SLTyI+ AjG04xYt01KtR6AISVtMtTsSc+gRKqPSTbLVVUAmqbcxM5vFREE+mt2VlJpU6vxkAjSp rsrSMdqJngBIIgDxXY8frSe8I6ITEx09nvQarY76AjHMM9zuXO3hU6ICtnqe1KT3WxmW cgTkvRG9M0TyK6xqTZCsbw7OXxrtupp7eHKOa7BqlvvHiZKYHd0FBul9I/f01UoQQDAt 0zU6w16EciFY+xJeza4TUNg8FVtysul0i0aVlbMnd745HMP3ckjIAeHqWAWr/tsII3dV 4zqQ== X-Forwarded-Encrypted: i=1; AJvYcCU6Os/01LljJQMfeO99ezvwHa9zAwr4TO2Q8zYOzJu36fYj2lEpHHHwHNI2p0ZIh74ga+/ZSGeJYQ==@kvack.org X-Gm-Message-State: AOJu0Yx3tjRZmH/qmuP14m1WZ6Ii+7aI8m6A4vLuFkpjA60aZFUAdw1h upbl2oovUyoOAJK240uOGU0vHT4YYjE+K4omBakQAH9xnEwWF2FUKI0ilAKHKQ== X-Gm-Gg: ASbGncuWlu/dnZHfBiSabvIpNnuzPsS6DhlzQjkuvMWHQO4k4EHTRNBpcwECsMofioC c4khvuz3uHI6eotXHSB7zsPSLUajevYc/1xytm3bKV7gI0dAhDS3Caejg2od7nB+20yXRXpm+ie C9KB2xuDgAy2UWvAzL9WPS92kVTFm4RjeRR+oBo2H61J2IgbOxYYRxJR3bVB12Du/pc7JSG7mds Xu51rVbN/sBaa0jWSAmruFjqmdTsx2cZQmcedwcbJN+7msAltdQeuXfUA7F/0+DDhQS59MjFWmZ XgwXOdRCocdVJoukgLzAvu+My/VNLlaHb84SweDQ6HdTsJ8BsBqs9kGb9emi X-Google-Smtp-Source: AGHT+IENcuh0GalF98aZHKN5+tl8yLBoqJnSu897mR97ZSdm7iKR5lpyIJSzEx3gH73SJaU8KQn4bw== X-Received: by 2002:a17:903:22c6:b0:21f:f02:4154 with SMTP id d9443c01a7336-2219ffe0dbdmr89037615ad.11.1740419119262; Mon, 24 Feb 2025 09:45:19 -0800 (PST) Received: from localhost (201.59.83.34.bc.googleusercontent.com. [34.83.59.201]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d55850f5sm180508385ad.208.2025.02.24.09.45.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Feb 2025 09:45:18 -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 v6 4/7] mseal, system mappings: enable arm64 Date: Mon, 24 Feb 2025 17:45:10 +0000 Message-ID: <20250224174513.3600914-5-jeffxu@google.com> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog In-Reply-To: <20250224174513.3600914-1-jeffxu@google.com> References: <20250224174513.3600914-1-jeffxu@google.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 8F0D2140017 X-Rspamd-Server: rspam12 X-Stat-Signature: s8apang86gzn54tkqnsu5kw79zrpjmec X-HE-Tag: 1740419120-367742 X-HE-Meta: U2FsdGVkX194fHc/JVk0R8+LWoh3/uvhA7e1fnH6fT47JjNBZBeRkPZ/3DqjRpCd/qWJPDF76n0tAFlxIg6OHO80gVC0nYf5gwgWKvivVDL4+sewdOIkn95FEgv5CvLEECDLZtRorGTgpHT2EFhXtEstPSC/Ym+D/35b4mKYSHrVwE3D9ziPO+wBx1wd2MBYXwZx+/yUAZXhxIPXIyApiCa3csB96e2iPdXBiWTQYy2ZsDsYUkb8cyrB/gi2MJsCx0Wo+NejfX6K/vRa0YgiN2mBrfFtTti/JlWckH2Ffj17XZZEaOYkHR/HB24hpxi5Zfki0W9hXJaGU2VIpZEGbcgH5q/3Jn20Ms9lJSb6dESOC6hqYsffZGuFyjBItfW4t1jQrhELHH4WPOvH++09UZJfpff2MdS0el5dcMJn7ZvArWvDg81Mz+tVT9H9dqtNTvtIc9c9y/1AntCrg/COH+K9gYpniyWD8OTIxxU8fuyHjlHiF86n/WFmwxmiNa2ed8VdXtmiF8b2gcLe7dbu2IPfIMRTcuIJ7IgKdqlXvBFLjIw28tglBBs3vnNo9rgIsRpItWfd1xgwiqKDDVkSpv4u+Iw0hlQPDEuJ8c0kGQ9K7wR8w4qRfEProyFMzZMfHrUApA0LdcRwCu5ZqXes+DS64Z1050WeBS3Xneh91RtDx2Y02wEpe+vHI1TzDUmaowYk2eJZG8kTctzb/sQDCObWHqcvxK9CqTaCAGcb0zLhJ+gWjs3KcfcJeFLXb8C1cXccl0byoR8JPEHmryt+A3jLvHjHC0dYw8UfOa8ICBfibBGk4ziPAv6Yd3eaJCR8xaME0auguPDwunRTXZdsK3/EMWSFFb/mW1uiTczFzeZtgUt3LnDoPgzrJlLG5atk/h6bsc1rvUpcj5SS7u3oARTgj8qy6ewXbwPyTekm4gIiMnrxn42M8BHfk6WFxIbdYqLvbjznVlqOmwBMaN+ VeaKOtcd lFp0panUvNv4cmvPfiFjSw9oguZoiqyI3wQCfX/qL6yhtXbc9rKv52I8LIu3F2V5nDWToeu7uz5FiBv3BvvSmayhKEFFych3//jfc16Z0Fh4POd3WQZff7PCfLHTcrGsQ6R1BS9MsoFv3Yt9HyQPc7mjDOqhYVY4fTLT3P1P3GQwO2nrmQ/eGDGKdwq4HRNgL2kDL9pruFafxB7zh6o8Xl/TvNPTkfOj2rVffdBqXsua3PdUc9PnCRwHGr3CFgRbk0o7pspip1f8D3KtIEIQX+VGEaOauBmOqUQjPIJCrmjjc/M3EUJWWJTpHk3zFFn1A68NoLZ67en7k8nQnBOxvmCJNUUtb/qek6BEiA3WlPZC40RwB+U0LJEZRFg== 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..fa3b85b7ff01 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 |= MSEAL_SYSTEM_MAPPINGS_VM_FLAG; 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 |= MSEAL_SYSTEM_MAPPINGS_VM_FLAG; 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 |= MSEAL_SYSTEM_MAPPINGS_VM_FLAG; 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 |= MSEAL_SYSTEM_MAPPINGS_VM_FLAG; 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;