From patchwork Mon Mar 3 05:09:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 13998191 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 157F8C282C5 for ; Mon, 3 Mar 2025 05:09:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A3F2928000F; Mon, 3 Mar 2025 00:09:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9EC06280007; Mon, 3 Mar 2025 00:09:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 83EC728000F; Mon, 3 Mar 2025 00:09:38 -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 6398F280007 for ; Mon, 3 Mar 2025 00:09:38 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 15BD4140C84 for ; Mon, 3 Mar 2025 05:09:38 +0000 (UTC) X-FDA: 83179062036.02.794DAF2 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by imf10.hostedemail.com (Postfix) with ESMTP id 11EDAC0010 for ; Mon, 3 Mar 2025 05:09:35 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=TUP3YvIk; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf10.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.208.44 as permitted sender) smtp.mailfrom=jeffxu@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740978576; a=rsa-sha256; cv=none; b=6PgJbSqtPZLqfkzHku+DqfAelao+SWFB1ptUuYFGVbvzLbEFxVoXfnGdw8e2wbR9lRcF+M aBR3QF1ylpYBNdD71E2XzwzzfQol8dba2QRFK0Zw0g6zOmPiJYVDwrnmw4ID0kLnohcKx0 df5llw/Kca/9DSLgC3iO22HBTLOpbf4= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=TUP3YvIk; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf10.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.208.44 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=1740978576; 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=0NM3JxIxfGoSiAwP/bRvuWu/M48PsDVjGGpFsNsimuo=; b=t496PzRQCIjsQptponO4xf+5OjxtOESFzpyy8TR222eA0yRiOJWZspo45WK8eGSDwa5SiX pAIv3Q1qIvz5jZhkL8MBZLXngm5ea9VA0d33Adr6qD+fvylsKmQPalk+uaodL3xMeKNXmo OQbq+lbf4vp6gOuSUE5jOGGVjE3vvmc= Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5e4cbbb37ccso386173a12.1 for ; Sun, 02 Mar 2025 21:09:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740978575; x=1741583375; 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=0NM3JxIxfGoSiAwP/bRvuWu/M48PsDVjGGpFsNsimuo=; b=TUP3YvIkiKEp2+/hj2JQuNsK8x4/iViLEEJO0m5sI7xSKgUZoADv92hC8ps1y5KIhH Q3ysYDZS3YtaCAbenYcrMjll7c9syDNaLAqMMBVb0JhpMB/3IgDn2f1yUMHrW/z4TMA1 jZ9ZhxyjjM9gy253Tx6AZk+r2JulELlQxHiLE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740978575; x=1741583375; 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=0NM3JxIxfGoSiAwP/bRvuWu/M48PsDVjGGpFsNsimuo=; b=Afbn/stjAHFuNi89DLRLMsheDed5w1izy1Z0WGBTB/nXbRnygATYPrqoQuFc+ldxNn 0DkNmJxJNqGgIJWhvCqOXlBpvbiKjkI3ipK5L1KDLsY//baydkWBqBZWC6Y0xPE2bBQG UbrqaKTT5wuNFgCsOBFDhnrxkTQHzymnuVKeqZWhEDAf0qspUNU7UbbE51Zjp+wal2dZ NyCind5tlKlVube52D5NJPQYHYrtEqD0Oikb3Nc8dcpIfHDUzFFTS52oyJN4QW+ac5ZF +QSzeML7n97WMlO69Z/SslZxVRu/LVgfw035Psw74KLtRwykWWSI8Y1j8dVL401QtJCe bAag== X-Forwarded-Encrypted: i=1; AJvYcCVo48kcMwGAYzG9lZwBqZ4jbcRi1L3pgpxIrj4DkqE6N9oVxEDQHiD7T2wrPhOKyHYmawofGu4g1w==@kvack.org X-Gm-Message-State: AOJu0Yzi57P4r+2hJbYKlb9vvVnqrsuQfdFNRgHsqOTeU/5PcAl3EQ6z DUiu9Ya70kahq4JshgcDr0obbBIXoJTsFuDCJfTWBpbL/N/qQ5lxnlgjvLAscg== X-Gm-Gg: ASbGncs699exBFyOijfUzYWajCOgzgfpKvNQC9/KWpy0vj9rDGkoNZyyMS3eT4+7S1L a7qnwWK7o1eCVbOvtPEPzlMOYl/+WWlReRG+og4WOiCnYdIuWVhTrMTV8QZ3cxFfVZzx5FKmExQ p0oJ4vL3MrFZUr40n7wz5hMo2F9cNQGGAqzxNXRiXSkPSKI2blSU5p/J0304uvjv5FckAoJ3meB RUmrgi421a/PShF3SLyh8rmOjb92An+DEk8tcJ3vEvZXTgrsYu4RQdpYuTqm5Ma0ie4qYW2qWZT zkCbpJdR3Xv+bHzznqhaQvYc/jhMds67RT8dnMMyTDcj56Qm6g4e9ja0lWgZK4O61f/o/ONneRq C X-Google-Smtp-Source: AGHT+IEIzK5DVcy7xN31p85/klW2sNO6ixXa92Wud+ZOTOl0uHG/MytYEvsvME3kstnNOTe7tQRsOQ== X-Received: by 2002:a05:6402:4406:b0:5e0:e845:c825 with SMTP id 4fb4d7f45d1cf-5e4d6b98391mr4616303a12.10.1740978574644; Sun, 02 Mar 2025 21:09:34 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Mar 2025 21:09:33 -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 3/7] mseal sysmap: enable x86-64 Date: Mon, 3 Mar 2025 05:09:17 +0000 Message-ID: <20250303050921.3033083-4-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-Rspamd-Queue-Id: 11EDAC0010 X-Stat-Signature: u3iesome1kw33twt37xn63rohgyrqncq X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1740978575-797922 X-HE-Meta: U2FsdGVkX1+f0SKN+COKXX5HBMppDVQkP+xjKk0yDhheoJRzWlNE3uOl2Fa8at+R8J5OmCVH1zt5rBxCXergOuimxHHA0uwqJ9yLnacGmyiokvIem17B97I8VwpqdxdoGqSrIiMx9FRpGql9ApecuxTNHK9CkMZc6oBntD+7zt6kD9m4lQuJFmvmt2kbfJ1xXuTcqDu5fJQBF2dha99ZHny1v6rTbxawFvHFrtwVeiLrVax7j1kvi2SH1lPnb5GRL1wefZ9F6Xq3mLaxI3xDLiB9OrpoOX+vpkKo6QO1IMcKHsWACFqBvkpZlE+ByzmioRQhiLi+8PCNgPqtjmH0RG76y9VTQ2eHyDJiX+IXM2puEflyAAV7KNg5MaH2EShz+Gq5codsykZT1l+ppvDu9dHhnxflsuoMN3g03ZnxFVOWCf3nfa4d+RtrrDJ8L4snlfOzQjqF/hqMdOinB6bwPEOevlXv2DU7as9PDFr+dTpxGhz/ipNgT3FN0NztyKLszwfppbCXsLBHlI8wWaSqkQ0DxYyT3FugjXnrqp3EqPOTO+qoEcSnyA/i5Ge5fO3THyXe+RdtMWNIwY90p9ACoD5QxLK3lHz7ARdoDxbwa24W4XfT2kh/KCxMqczg7wl2Yk2IxrPoS7HJvXH4tiygt/u+14DmwfESslTs4pvO9K+zyd3CNm0jEfhzajrJP3bImXMKlN+ZhDe5CRztLe3IkB34uHp0d3JqPpYuoUKnQenXWk+Bd0s4rmblg+kB3m1AVgD9DeiNnogR/GzCTPkqkt6yU/uize1RTa2t6EyJmM2rIGmw9RcYA3gAk63bUMIrB8BfAAlUerTHMivayECT/Ms7SKJ3g516mtx1dG7K1Tw+aSDc69ecLfXnKu250MtnwQHg+h1whOd5pLZqYQllmxOsovnzu/KbhU+s3M1DLIO8em7v/A2BtN6gjIhRppkavxY8am9kQWtbXJBmsKl uOIpVZp5 lzC5kkeEKHOckS04FowRPOQycJ6w+NbycM9mkh+YLRJ3Ta2RyvdSW1Jt78tMOLSiYXafEzFxNxi2V+uChkAu/19GOaFrANhc+8innWpXfHLWbwD7R2Gzj9tJRd38YFFlKwRCYceCYslOU87lelFCtov5KPATB8e34dk1xVhI7XR14kRmvu9JNSNYewgisINuDjE7iLJ9iM3mn5jVnQA/cqfwsTQpiw/Aw3G29m8V7Be8dZ1WTLbonpu9EtO207etWwbsCypPysK7mVDosBHJBXcBNRQcv9sc2+eFKyWlpYmdxhMt71MSOe14YXQManCFIfswFnShRRkUO7Dsdew5ZgmBHgonTBXby+ufCW8Hz/o+GOso= 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 Reviewed-by: Lorenzo Stoakes Reviewed-by: Liam R. Howlett Reviewed-by: Kees Cook --- arch/x86/Kconfig | 1 + arch/x86/entry/vdso/vma.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index be2c311f5118..c6f9ebcbe009 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_SUPPORTS_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..a4f312495de1 100644 --- a/arch/x86/entry/vdso/vma.c +++ b/arch/x86/entry/vdso/vma.c @@ -268,7 +268,8 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr) text_start, image->size, VM_READ|VM_EXEC| - VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC, + VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC| + VM_SEALED_SYSMAP, &vdso_mapping); if (IS_ERR(vma)) { @@ -280,7 +281,7 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr) addr, (__VVAR_PAGES - VDSO_NR_VCLOCK_PAGES) * PAGE_SIZE, VM_READ|VM_MAYREAD|VM_IO|VM_DONTDUMP| - VM_PFNMAP, + VM_PFNMAP|VM_SEALED_SYSMAP, &vvar_mapping); if (IS_ERR(vma)) { @@ -293,7 +294,7 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr) 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_PFNMAP|VM_SEALED_SYSMAP, &vvar_vclock_mapping); if (IS_ERR(vma)) {