From patchwork Mon Feb 24 17:45:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 13988618 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 8BA8DC021A4 for ; Mon, 24 Feb 2025 17:45:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E716A28000E; Mon, 24 Feb 2025 12:45:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DF72928000A; Mon, 24 Feb 2025 12:45:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C266428000E; Mon, 24 Feb 2025 12:45:21 -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 9B71728000A for ; Mon, 24 Feb 2025 12:45:21 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 402001619B2 for ; Mon, 24 Feb 2025 17:45:21 +0000 (UTC) X-FDA: 83155564842.04.DB7DBE0 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf20.hostedemail.com (Postfix) with ESMTP id 502B51C0006 for ; Mon, 24 Feb 2025 17:45:19 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=hrCVAA09; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf20.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.177 as permitted sender) smtp.mailfrom=jeffxu@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740419119; a=rsa-sha256; cv=none; b=ynvj39NYr+9J7NzY8jJ3hZvY59XmvBIYQY9oGNwMpgU+ZFttsmXlrj0DhPrf3kWhi2bnb5 Vm/N+4uCs5vzK/X5OohQUHbgr+tyYdEj6opxgfI8f3NesHyTJlpSw19WE2EwdPYDKQQaKr +6o3ROUX8yhzoXrjTaYgB3NFsqdVYwE= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=hrCVAA09; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf20.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.177 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=1740419119; 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=X21CnZpPkRdzfQTLm/xqoLd+RlCmfK8svSgo70Yr8/I=; b=W8gt7QGNJBAtIAW7Dh+LRH9XDcZma+8vi85uztUUxvPQAO2+Dt5+ko+9Qohe/Tbt9XacGJ z66msT1+DfdHxSJnWc/VzN9A+EtOjepjprc4/uiwuubg4BkJ3PUUPon9GU7o+xz/y1lKx0 K/fbmn+flAH0v7xniDmY/QIMOWMtbRI= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-222def4189aso2676005ad.0 for ; Mon, 24 Feb 2025 09:45:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740419118; x=1741023918; 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=X21CnZpPkRdzfQTLm/xqoLd+RlCmfK8svSgo70Yr8/I=; b=hrCVAA09IUtFLnwBPY2cmFRG6199DaNR0iHq8WEWCaCsC0AlVJ/0sMmnz5T2OBolNL CxOVNS920bw3ak+GeTGQbumzS+NsJagHHMnWxNZEvl0a4pilWeN0kCsZkp4kxOpPGrvL 321G0jdsa93vQkDx9Fz/fDgq7ojc5w//Oei6Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740419118; x=1741023918; 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=X21CnZpPkRdzfQTLm/xqoLd+RlCmfK8svSgo70Yr8/I=; b=kAdWh3XYHvCxSI3mQOIFbCm+P0F9d7gGB5eKVrAmYcRCn0c22biytCLRKzVfpSH3+y fjzfoJASr8lWdjV1APYl/VCXPhMLxwfq8T6der7t48LQEmON62kOeYjBENawqh7M894C zFt5ZtDz5IsM1+DO7LUEM/Hhm9XEnjIRVTWfihCu92/scY4XdWnukfkPvMnEqKFaeLC0 HdV+kV3JYMIB1L64RSXZpe9vBvyLVs+AsMeYnDcImCG78DH6cKERWNw4kDvMmcmSv0UZ 2UTX+a4qJ/uAJH8T5Tgei/JQWu3QVX5Dd61SSA1poUEtF4+O7sSgfQLH9XlrN9fpJAX0 lQvg== X-Forwarded-Encrypted: i=1; AJvYcCX5aGWzIDNF/rdQAr+hdRONrbqxLA0S3KIpo3yqHABXnrh+efIVz0Ep0aNC7EJQXs7bwDM8G7JPcA==@kvack.org X-Gm-Message-State: AOJu0Yzp/Q+S/xaJHT5QvwHmkfmCupsrfkKAsniEGn13lNk9dNcMJ5qW X/y8RjzWFG/r+meNUeXeVv1QO2bAPDpCchHIdGVbsqGfn8aM9g64h+cp3itDeQ== X-Gm-Gg: ASbGncu9sw6Yl6AGPT9CHAZcHo0rQhH2QVNNbvtl6Gm0sn+4ZzU1ghYPstIdTBv6oeG FG+fSUsquJ2Ve+uwnUtNcEbpySIMghJ77MonideLTuswPZEmn95fRz1GiX18cQk6eHsr6L/OoBG LgoBQ1KINZZ3ug2b8CbmyHya/lsWGv4LpQ0lrN1vf/QlVazMozcJTU5S+xl/ldlPMVelj2yXfvf a8yT+wcXqPhUVwmaeOoD6DOpvyIY+qh8J/gVTMA+eBYK2Q8CgOPTV6DC1Em1cV80ZTqk1Kp2vKM L6SGsLqf/6MXF82H11+ZrrwdIThffCpy5nzI8LC/mIazmTPx4hp0bUR5pC6o X-Google-Smtp-Source: AGHT+IEIEwr4JLc08uaTem+ZJWi2exsrefWwA9KhDKMeXGKBmCEayibfQPpqr5pLiU9niDft6DfzOQ== X-Received: by 2002:a05:6a21:999f:b0:1ee:e16a:cfa0 with SMTP id adf61e73a8af0-1eef3dd0ddemr9610048637.9.1740419118151; Mon, 24 Feb 2025 09:45:18 -0800 (PST) Received: from localhost (201.59.83.34.bc.googleusercontent.com. [34.83.59.201]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-adb5a92c6d8sm19248497a12.65.2025.02.24.09.45.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Feb 2025 09:45:17 -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 3/7] mseal, system mappings: enable x86-64 Date: Mon, 24 Feb 2025 17:45:09 +0000 Message-ID: <20250224174513.3600914-4-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-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 502B51C0006 X-Stat-Signature: 6yw9fnqhoreuugteranp6999cnd4m7cn X-Rspam-User: X-HE-Tag: 1740419119-606666 X-HE-Meta: U2FsdGVkX19Gd+ervabIyPmPZPy7S3USDVzoP3d59Bgsr6MfDuYizddY+PKm73Xg7DgFezC/A6NxAthzokARHrjSIVpGBII5lL5ODwpjYCYUcMigi5BoLvvtWwqNG8HBUM6aFW0TLKM44BdI2pCN8IIiAV8PJ6Bd8ZMtKffGDjoDmjltv26zpuVFgw+3YSudcxLSUlK8nEWZOr89DGf8lrJENYM2MWVnILxCz+mxkD+EwER+SAI92H7jHvqztLgrFJC92IvoeB32JzVis6AHDXvIVJUYWY14AAeNN/DubwaXvDItQaSaLHMDe43jertzZchO/a7qXIvKbSgOql10/UyC8UK9fMfJRmJCN17A/3NKsUg/bozNDIJsnRPbo3SjJO7AUB5mhUo97RzM4e/2ut9GBoJVm4sZ9RHfxbybcLLe3XyPXQ276P9eH+2lJp7UMZ9UB28nGmrsVv6WEmf/h+dfi7fPBmEa+VPkIX8NJ7Wy5PAvfdyGDPn1X4CnAvWGtTtcZmSRpLWuTOTkOjrbI9QBV4J3o4ItHBuJ0InxrwBZupo3FH+rBsMBLrhn81U0Y8YmruvtDWMOHX5swDi+JG/lcRERO8LG+mjqEib/uQa+GgaOs97uIxH+rp8k4aD8kJHBia59kXgUckbguvQXH+zzXxQ7fBTh/udyvFmyn1bh8bOdKKS+wvlsaCvgGp6/+6tdeMEipsV6+DjIB3d/CbB/qDnrMeozoZb9vSEkcdD3l100UZIWyj4i4xJ4mhHlpXsodRDWSFjgCKjNKwABOCVj3KowF55j5gkL++xN3yWr3MZ7P1nQ3BTHhaqomr1oz3PqEM3J/0Rcej2NgEVThfv7suzCuiM4u3TkIbrWsEu7S+B4skt3hq5I40Y9vSLN9vqT2U8AgscCeMoQY1GuBJaQagy+VClYZQKWrKRnuqhWld8hv2eW8K/LVHAbfGUN+ct+/T2eITQF3E4K7l8 4zdzNNPj EFLgtDgRckJCzJSiesjwOqWBlj0NFO+LUMRt3Ow6MB2MuGEHR5xTmaMEvyQY4RPoE+kpPp5WKIxwShl4DtBkggqbTrgohT88zu59tFwNnAaD1mXaE5B3h2F9Dcwqkc7y9mvFsgI6JRQtR8Nq+WeNEdsBfh6LDLSY4/FEYstMQ62OpN29+Mn0ED+tEAyhbEVB/4cvEJuT5u+c8x6Q/v+S+jwbNG7erTB+kwajMUuYr46Jpu1nl+dT9cyPI9VeEDgeUCrXoazsX7HXvaHl3mly2hzFys4JYGwCkbVtWS/JOta2ezwhs2HCxCtyuk+yNWZ0SUmQolwpD8U6iQtyzAKjKPtrue/53Og1A/7nPFY4ycX8mHw9zkoFoYCIOgQ== 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..54677964d0b5 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 |= MSEAL_SYSTEM_MAPPINGS_VM_FLAG; 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 |= MSEAL_SYSTEM_MAPPINGS_VM_FLAG; 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 |= MSEAL_SYSTEM_MAPPINGS_VM_FLAG; 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)) {