From patchwork Mon Feb 24 22:52:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 13989024 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 27E2EC021B8 for ; Mon, 24 Feb 2025 22:52:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 33C7728000B; Mon, 24 Feb 2025 17:52:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2EEAB280001; Mon, 24 Feb 2025 17:52:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0153128000B; Mon, 24 Feb 2025 17:52:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D9CA4280001 for ; Mon, 24 Feb 2025 17:52:53 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 8B8761A02BA for ; Mon, 24 Feb 2025 22:52:53 +0000 (UTC) X-FDA: 83156339826.17.212C27D Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf10.hostedemail.com (Postfix) with ESMTP id A0858C0006 for ; Mon, 24 Feb 2025 22:52:51 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=STqW59cR; spf=pass (imf10.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.177 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=1740437571; a=rsa-sha256; cv=none; b=o2/cc1mxWpsMRDCCC4VytnNYNUOyW7hTP5nAKTsHHpz8b6rdcmylkehKxI4m+xj5NPqHKa kbju4enE75RKHfECwpdrq78Tis27At5rmAQkkVEOyEwTOlV5fFL0vO5p3iktY76Et4z9M5 Xrgz2dDsxuLaEGByEqE7zQ3/W2c3vEw= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=STqW59cR; spf=pass (imf10.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.177 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=1740437571; 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=HehPKH2HS0HzCH0hQSNM2QcWWpZkmDJGAEgO0vW2y+g=; b=1o89z5GjncBLQcPjoBpTEJM7rPMmGHwShypseIF6jyL1RjlWudSNmrOauxDvY8+6onXkys 585kNfo2cWmxYPSkAnDluuuZbmB444EqFMxIOUSgCwEnVAEfvURm2s9f4bOKSlbvsIzlTv CIUsg80UX0AN5LRiVPl8llc99lIzOKI= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-220d47b035fso11398535ad.1 for ; Mon, 24 Feb 2025 14:52:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740437570; x=1741042370; 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=HehPKH2HS0HzCH0hQSNM2QcWWpZkmDJGAEgO0vW2y+g=; b=STqW59cRolshSWtrU4m/TuMFMksvS7IehtJrTPPbA7pnprEP6qcONh6FyAvDWvj9GC 43mNnTd3G4aBDQN07F/FLpZuxg2a+gTbOwD9n0Iow126VMeQ7wmb5Ivj6+fDg9lxT0CV ev6vTf6B98dK7lhWZThZfva6IXmQsey8koJSI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740437570; x=1741042370; 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=HehPKH2HS0HzCH0hQSNM2QcWWpZkmDJGAEgO0vW2y+g=; b=J8EPc17ctCsjwSe0tKnf3pV2vTzIzsqzdI74eQTnDoR48wKT0o/g2H7VlK/MZWKMMP O0xHeDwZ4G+iVxVD8TBzfG86c4jmok8uK37n4tM0n2unsQZgweuHRz7z1C3VHMpjUCLB Z1tZVOtnEII2PBGS+bPzJ87Fe5IwHt1+rbsMAYWMFRcBUZDJ/gbg5wBXOy9rNPavms/Q O/BfZX0vvUxndIhuXVJxR7LpAj6jwypgJsjVGaxjd1oFDNYinFh6dJm+bR2DJU0ysu/I kECpyNsjUk0fItH5JJPBmpZJNfRQx7mIsbRZhP6xGuuWoTrhfCId59ZYLR3Q1Mh1Ckwc U0VA== X-Forwarded-Encrypted: i=1; AJvYcCU1EaHanQ5i+hVVDb83Idq+8KTM52+70cnS6lZVtCxzDNbGHw7Z9SL72dF5WdEv910qqKXpmYlemw==@kvack.org X-Gm-Message-State: AOJu0YwR6mIS/aTzQshD65pYwfNUgUsUh2VCiUwaIrAKcm6NUSNIUxBY 8ls1d9NBAlUE9HpISI/uFsZ0dNsvRrVKdkbGyiIiUCFE5IQv2tB/ZXenKw9NCA== X-Gm-Gg: ASbGncsLmjgrDNf+YO5jzl6+BsRM9sXPKyzSf8G8O6ZDOov1z7T3xwdwoMukXdBh5Cd 0sFwsuKJYQ9sg/yto2Y/eUjwpXGCiWH0NIjOhqdhoQ8CD+Lg2oQbslrZJLSy1xI9eTnxAC1wiqe kWJvRsECGSffa30iY9PXzS12NwEu/+lPoalob9+opEXb4FbJ7MQJvVxmQLSNlwiODkUZQsOA4Ut AbjRD44Vhg70cYhxJY4sEjmdVb/xCjFwfwUPYOtn9qFSe3q5GieyrTbLSLGeBDX+8rTeZG7UU+F LONe5rl+oKqM8Jd2UYA9GUTXnhif0nz4a363g2vX/DYnThc6AfQDpRUY0PGm X-Google-Smtp-Source: AGHT+IHvxyCpkXXkYjTLWWPzvLXpjBHCjYNwj83VFoOFzg3xddNwivdcqHIMBcGsWOCoYPcqKcpgHA== X-Received: by 2002:a17:902:e5d0:b0:215:9a73:6c4f with SMTP id d9443c01a7336-2219ff50d56mr94813075ad.6.1740437570374; Mon, 24 Feb 2025 14:52:50 -0800 (PST) Received: from localhost (201.59.83.34.bc.googleusercontent.com. [34.83.59.201]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-2230a0ae9acsm1300615ad.225.2025.02.24.14.52.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Feb 2025 14:52:49 -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 3/7] mseal, system mappings: enable x86-64 Date: Mon, 24 Feb 2025 22:52:42 +0000 Message-ID: <20250224225246.3712295-4-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-Stat-Signature: x48er15hq9hyzifqaayt5bw4haz5buy4 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: A0858C0006 X-Rspam-User: X-HE-Tag: 1740437571-557523 X-HE-Meta: U2FsdGVkX18CIu/RgTM5SpOnBiv51i7auiHGLkJ6BZT0Y77YQoshvq7cSjNEfV3WpPwN5u0vCsXRkbFuFxjSqcSwMXYntHqRvqum8wuCr5TPGlhYQm32zGIXmnalGkybk1FtsP2sZy1AH8IIH5LRvxoKxEoLsmeHiaAqWnGPF78KMvdPjtk38mfmnjAP1dZJFZ7sm38S5S/ZIFsNqBrbdibrTUPwxr6YMQ0T0gZOrjAyaPSs53pcJ4qrrGqc44JOpp3kOth240qKJElLwcKrN8rF3J4bp/VD/bJEhuyCklgPaw6rFL3O2iirAChcEsC71UMGJe+DvKcCs3ilLt2bFeP97Rhj6x+CZUi2kPZngiwOYY91K8ubz19lZWdKSMw/IzZ4xixK8hfBl3HcS0+ifWaiwlACwPLXmyCn4rpxiji9Gl9vN1Qy4Uk/VEHTSNLNhpYZ6rnxfgSisqjY9whWwNjUQHn90Fz9R10kdUzWhqXGJqfi0w3dxLwUkkm+tIPWsDJl8zyL7VWZEfLCJjuvuWi+HQlQwbeae4fGoayzVhgYE053kCrtxpWO1f9IyglyUwn5BCuuGZTcPnwueSAY7QbtF9XXQOM/ISj7jhqguDE3PyCzI8CGh37zrjzWDRvxwSmo3/KZc1yXSE73kuFdedWQIBQ0IdHKP35KKMgRvuRvPyb3cMEQHbXsc7iVEKu3Qk1VqbwdGZZ+7KkiUCcbh9zQFMCb0ae2HiNYhkGtw4DqQ0ey3FQjTemLZ/DVaCNuUiYY7qJaawb2O/US22Ftgqk+Q6lpB+YpG1vawSDlD/sgGDRLkHLK/sRn2hIPmOoFuw/v9e4e9ktlhk+Uxo/S9Nx4C6aZ1min/R2TFD6GGlZRrldzFRP8ySkcs4eXkSgaOU3Ra8Wm6wO9kID9jk9dva1yDYCD/s9zt1VluKlSK+X4efnhHKkjl1ZI4lmFAzMCM2K1JBa1gvagFAARuRl BMx8xjtB s4XlKM1gh2vLdKJUP5BKZrhoAvnZNA96mYch0Had1gvmg4g92Lz52myr4m1hMviP2zsTKrnrjCFCCiLJSnw3nG2vuRZbnt0ixOv4pG56A38KLnKCr6XXLe0GY3L3K47tt92u5A9E9dZifqVsdvce1IqFIcGBv8+LXkDBd7MT1/woVFz69MZgaQmVx2c7OMz/ybccePeWzarnooT7W3r/fjUXqMa0TJzB2NS5P6J5QZI1iYuCEybQtHK/WeRugN+50God2vyUcpsVIURAKaTSY9Q7+fgMCX5LET2Cz/uMmUAYQ39OxjXEvt6xFVn1rFFgFrB8TFakTCEmAVa9TbsgffaIoegRJuBUgV3W534465kJ+Zb28TvPAZ9cluw== 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 | 16 ++++++++++------ 2 files changed, 11 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..1b1c009f20a8 100644 --- a/arch/x86/entry/vdso/vma.c +++ b/arch/x86/entry/vdso/vma.c @@ -247,6 +247,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 +265,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 |= VM_SEALED_SYSMAP; 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 +278,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 |= VM_SEALED_SYSMAP; 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 +292,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 |= VM_SEALED_SYSMAP; 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)) {