From patchwork Wed Feb 12 03:21:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 13971021 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 335A7C0219E for ; Wed, 12 Feb 2025 03:22:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 54B9A6B0089; Tue, 11 Feb 2025 22:22:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4AC226B008A; Tue, 11 Feb 2025 22:22:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3242F6B008C; Tue, 11 Feb 2025 22:22:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 14FA26B0089 for ; Tue, 11 Feb 2025 22:22:03 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BBBB31A164D for ; Wed, 12 Feb 2025 03:22:02 +0000 (UTC) X-FDA: 83109843684.19.6C16DEB Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf26.hostedemail.com (Postfix) with ESMTP id CA163140008 for ; Wed, 12 Feb 2025 03:22:00 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=EoGcpvn8; spf=pass (imf26.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.175 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=1739330520; 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=QF+XsAOZtoeX6mlWsDERSJyrasHSdBo5DRJV2HHqSDI=; b=nyPcdiGkA6lftkSXx9gqepSy1tjJsj8p6b96UrnVbwqEYg9VLO92WVcIA0sJLA3Pkg80vf zRgA4QPfcTI5TLL6cLHBcKHY6gcGx3XdDLOxKRC9EXhgdrEIeFtyOJDnLkMbSERw7dSgAP rbYbiesnRbYm1G6D2vyGeKWPrq91KUU= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=EoGcpvn8; spf=pass (imf26.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.175 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=1739330520; a=rsa-sha256; cv=none; b=zSskO6htx37yXl/3K1pq02I31w2hX5m4ocGKU+ePVnu/WiyQgOFs/ZvLIaAqNWWVe1Jrdb +WCE5GqmDSHwymSBn9buDvn/CNT9cYoxpwim92YPX7/T0aAhGWs9KOvI0XUOvSWguCl+09 h6CngnWhBlNMJlDOJPk+H9Zlev/NYfs= Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-21f8f3bd828so6432055ad.2 for ; Tue, 11 Feb 2025 19:22:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739330520; x=1739935320; 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=QF+XsAOZtoeX6mlWsDERSJyrasHSdBo5DRJV2HHqSDI=; b=EoGcpvn8MzDVFy6Z7/5io3Q9PxTLAS3wADrrqGcLEL9SLfe4Xq5d5/QxQgA0N/LlE9 1rW4QAqXaRUMD0QGGMSl0XvqAT+H0bk2v53iBY6lxo/+wbgqmd64db+KGqVxRnaClKb3 2b1x2nFMw/vnFEBAgDwne4iC8ohujuOfPODe4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739330520; x=1739935320; 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=QF+XsAOZtoeX6mlWsDERSJyrasHSdBo5DRJV2HHqSDI=; b=NHJtwvQvZCPf79nDqXfC7gEACgx78x7O45UrIyZHQregJ/EtIXe04sTjPIG3+4SEbz u58LvSuHeYDDQOWBULTX5SFL52ONDJdxatVaJpqQ3X2j23FpESsTnPxx5OeXnyr0L8Ce iTgNMcW4gLrjP1MJOFL/OAhfeQ0m3uMwv6HkqKeE8Bgs1cTfRXFJPCiDy91Hhc7gttgS DGBIYuScIZQDtqN+/ClKKnFIQc/M0KmROLpPr4/rNxbjmDQi4yUxbwmXui8AhXUFIX1t gTIQgLt4lmJnEylAKnm8zX1H0lqbIbbDlnF3Krhl4XKzbE+ljZCpcvol3Y65gMvIsf8R sSPw== X-Forwarded-Encrypted: i=1; AJvYcCXRnRNp1dmB1ePV4KoJnAoZiDhXKMJ7cMRBsEnDJHXqB3vWlxLSpmujlgdrYbe2zD0T84Sb0SZoXA==@kvack.org X-Gm-Message-State: AOJu0YznJQMlDwfEpSIngZX9Y5UJj2knsTEiMecrFAyNgoliVNkOUGqV f4oMSyquwEyEPGn4veyMsSJJu0QUk/PIsugkcK1jRndC5XQdi4uRmWfa5vIoKA== X-Gm-Gg: ASbGnct1v0q7ERefXC3TyKdh7WP8VynKeqVtIPgfyrLIS4jFZuNAKbJSZFqGjQR64xr oyZPddVWwgWU+R91UJ248Mb0lFoGwVWqRsp3gI1SQefjNiu1xQpgzp6IhiceXkxJ6MupSuIEuCQ T1wxrvTukwZxBWlMXPh0Hqw5WWFxDmp677UT+dYrff61o8cCmkOFV17CZOyFyxfoWNWw8UbH/kR skeCck7TKPdAyIdfa5HrFCN/IqclGMHVQR3Dg6Hk/Ew41aZubjClorx161HBKRwUkN3BGGQkRtR BBDPkfe/EbzPI9pnZBWB6YYfpmS600VTRUlayhu7baXDmR4nVw== X-Google-Smtp-Source: AGHT+IHHM7M1gkeTK0DkmrzJae9kr1fBnAHXJ9XN96tPbv9kYILCpzpkfCEUqgGotDXyfntPOksCow== X-Received: by 2002:a17:902:f68f:b0:21f:207:bd88 with SMTP id d9443c01a7336-220bbf0220fmr10761195ad.3.1739330519734; Tue, 11 Feb 2025 19:21:59 -0800 (PST) Received: from localhost (9.184.168.34.bc.googleusercontent.com. [34.168.184.9]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-21f3683db25sm102503155ad.134.2025.02.11.19.21.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 Feb 2025 19:21:59 -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 3/7] mseal, system mappings: enable x86-64 Date: Wed, 12 Feb 2025 03:21:51 +0000 Message-ID: <20250212032155.1276806-4-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-Rspam-User: X-Stat-Signature: fw94snnh5eom6kkiwtq4b8p71g16ffzi X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: CA163140008 X-HE-Tag: 1739330520-795101 X-HE-Meta: U2FsdGVkX1+FPv+f7IDNxsy1XY4ux+nwE/z+zYgdtn5fUNej+z/YdVibjH4Pho/UuuQed63OcKcDA4SzLvLs3upbabp9YBXuCt6cvNs0u0UfILWaH9WFjgJNy8Q8CaxrzK5Wvnvs3f5MI6AjeU4fmF8hks7po5k/N66gdD3MYUq2S0mO5NzvhL2l4ascDfTGqQptu5L+jUIsbisnPP2yMiYbwHsaKah7BSc02dZ/a+kZInGnJb1leFnpuczEOpINs/M/6A8LHxSLmxxkSgsMqFXBiT481azFjqqinYxg6lgzd6aOgRA8TXGYPHugU2Fers08T49AY8lNzlMy3lz4WfguC32hB4VOhkAYHv5wzRTR/tdTpQrDjJBsNONoKX/+0EcNFSjlQ4n06GVhIu34+8C3HfXU6G6UiYylk+HOFQCELaPLmYZnLKj09A9UEGh2ztjKhThdcFnxD6auaGakxqeIqFKRK2CVMpRlmMOEXEQadB5qop4WWW/jFtf0aTfKajiCBzZ5lLSg7kbPBYhgvCkhGrWaRY+4kRldm77Va1Qm7kFAq1Cw9UzpfccOvtOeBByX3nsfm3W4Ec1nuEv7SXV+OFCHZuZykR5qOZaF1PopVVcj4h7lIE7EeHXmUjqgZRPTxFCnlvIgBZk45z1dT3mo7mLZkjS1ZOj3FSE8WWfwhHumqwMjMOvcjVul47LSDSmVkCC2fmrGIPdNFDXBj6V8ehN4b5rFhuy3Y+7RJlB4OifYnZvDVmoWKePQDUB6+dUldfhPyu13DVspuToxpOGdPFOZk3x3l/Dd0yrO1MSAkj/LkYf7+8fRBI/QDvQ0aew1cEFyVnb6RMvZ6C4OMXp0OXlE1IpX/ju4rw8Y4kNE4z5DzI2RgqXe5LMoVFLBajLQJCFW9h1eD67onOwlACpE+VHlDonFtRRooaRazywulAxRkhO+PBh0hhm6Iftqin94eQQOke/TM2vH3Sx i4xBOFC3 tObq3GodcVKxVV/WiyS+MWomAUVIdX15AxUxr0/5Vo8IF+MziweQDqnlyfUUtCdJYwgSQh0swzyRlfXqRpSrczSxeGa5t1ADr/HHspLI8wnaMjVUj6mqvyAo1TQ+tzGSgYgj/NEvjF2BUWDH+/vovB5gTLEpZjmzlGleKCWQrU3vyQ0nHppbFBYR15OBh0nqUo16A37rrSwVGA9jFXTg7ZI6TUSNqqRzo6qBgRexLmD90zvhGMSFTK5m7IeQfl2aWZ5JwQWmJ9Soyo5IsWymM48/N9FB+WUgYshYRfGf2Amc9G01uarFsUCof3eoo+TWPuRtP6dS988Y7qOOanI127dtL07nInIVDWlt3tGVV22jIkGkztuQUbzHFLTr6LIyvHOwBszejC8L9JVQdT6scVsRkp8AQCTUCdCoX 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 x86-64, covering the vdso, vvar, vvar_vclock. Production release testing passes on Android and Chrome OS. Signed-off-by: Jeff Xu --- arch/x86/Kconfig | 1 + arch/x86/entry/vdso/vma.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 87198d957e2f..8fa17032ca46 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -26,6 +26,7 @@ config X86_64 depends on 64BIT # Options that are inherently 64-bit kernel only: select ARCH_HAS_GIGANTIC_PAGE + select ARCH_HAS_MSEAL_SYSTEM_MAPPINGS select ARCH_SUPPORTS_INT128 if CC_HAS_INT128 select ARCH_SUPPORTS_PER_VMA_LOCK select ARCH_SUPPORTS_HUGE_PFNMAP if TRANSPARENT_HUGEPAGE diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c index 39e6efc1a9ca..b5273dadd64a 100644 --- a/arch/x86/entry/vdso/vma.c +++ b/arch/x86/entry/vdso/vma.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -247,6 +248,7 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr) struct mm_struct *mm = current->mm; struct vm_area_struct *vma; unsigned long text_start; + unsigned long vm_flags; int ret = 0; if (mmap_write_lock_killable(mm)) @@ -264,11 +266,12 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr) /* * MAYWRITE to allow gdb to COW and set breakpoints */ + vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC; + vm_flags |= mseal_system_mappings(); vma = _install_special_mapping(mm, text_start, image->size, - VM_READ|VM_EXEC| - VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC, + vm_flags, &vdso_mapping); if (IS_ERR(vma)) { @@ -276,11 +279,12 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr) goto up_fail; } + vm_flags = VM_READ|VM_MAYREAD|VM_IO|VM_DONTDUMP|VM_PFNMAP; + vm_flags |= mseal_system_mappings(); vma = _install_special_mapping(mm, addr, (__VVAR_PAGES - VDSO_NR_VCLOCK_PAGES) * PAGE_SIZE, - VM_READ|VM_MAYREAD|VM_IO|VM_DONTDUMP| - VM_PFNMAP, + vm_flags, &vvar_mapping); if (IS_ERR(vma)) { @@ -289,11 +293,12 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr) goto up_fail; } + vm_flags = VM_READ|VM_MAYREAD|VM_IO|VM_DONTDUMP|VM_PFNMAP; + vm_flags |= mseal_system_mappings(); vma = _install_special_mapping(mm, addr + (__VVAR_PAGES - VDSO_NR_VCLOCK_PAGES) * PAGE_SIZE, VDSO_NR_VCLOCK_PAGES * PAGE_SIZE, - VM_READ|VM_MAYREAD|VM_IO|VM_DONTDUMP| - VM_PFNMAP, + vm_flags, &vvar_vclock_mapping); if (IS_ERR(vma)) {