From mboxrd@z Thu Jan 1 00:00:00 1970 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 AE4C3C83F17 for ; Tue, 15 Jul 2025 09:34:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 345B56B00AA; Tue, 15 Jul 2025 05:34:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 31D556B00AB; Tue, 15 Jul 2025 05:34:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 25C566B00AC; Tue, 15 Jul 2025 05:34:26 -0400 (EDT) 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 17E7C6B00AA for ; Tue, 15 Jul 2025 05:34:26 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D65CA1A0345 for ; Tue, 15 Jul 2025 09:34:25 +0000 (UTC) X-FDA: 83665988490.27.C830F5F Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf14.hostedemail.com (Postfix) with ESMTP id 2D74C100005 for ; Tue, 15 Jul 2025 09:34:22 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="ml/Bx9/j"; spf=pass (imf14.hostedemail.com: domain of 3nSB2aAUKCAIvcddciqqing.eqonkpwz-oomxcem.qti@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3nSB2aAUKCAIvcddciqqing.eqonkpwz-oomxcem.qti@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752572063; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=aEKOci68q/+1+5NvCmhg64dST16/3/kdZfJDTw54/Tw=; b=elYoVgzqhVFwwKwfS9/T+z/ts4crWXgg5h7ATdlbFEShdYjOorwJ31U7Sg460f0E1exyqA NasqA+tYflcS/Uvk8UurUOmoqOduOthqYk3mchX4T21rqDEyOrRzdax8qApfwTcOGHwDlD YEBphOW1N9kwmRYMU8w7HqITa00j3e4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752572063; a=rsa-sha256; cv=none; b=xNayH3yjA/6APuzOw/g0tOIOI4PSNeudB6vXS4URxxnNa6A5nbwlcZePkSbKM7osxkRaLD 3vvrDvQ5plsIbhxu9OSSGBdIPKhs2W0c02XBTdUSUI15m6GV0xUUmT+6BWTGFT/EP0jpUS OOW/4ulbIl8DfBVYqtxi/snUK+ns4jU= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="ml/Bx9/j"; spf=pass (imf14.hostedemail.com: domain of 3nSB2aAUKCAIvcddciqqing.eqonkpwz-oomxcem.qti@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3nSB2aAUKCAIvcddciqqing.eqonkpwz-oomxcem.qti@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-451d7de4ae3so33433695e9.2 for ; Tue, 15 Jul 2025 02:34:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752572062; x=1753176862; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=aEKOci68q/+1+5NvCmhg64dST16/3/kdZfJDTw54/Tw=; b=ml/Bx9/jAOKGLrDaaTzLJWT0Sj6GmsgzeB50enNxJUUFpzoD1bykAkQjaEDDKcmT+/ KTZ7j9j91LyHvh0oIJVDmNADugMCaM+uSyb+UStG0WvBOucb/QRk6jHpWGk7Oa0/79uy qfZUA7YSXps4bvdtZp7UnPOWTXD6mAZiOn79m3BY0KAegPF748MZbuqTNh/EDyNAhgkT IexC4ViEPOEE8bEHtC1MqNYXy3INpY51UxepIxl5pvsOK0dxlyIr1+4P0hgGA8yUp7p6 F+Q89hgWl7syUarw23gEgFsufQ3+nvsn+lQ6Bo8/WJwZWsLHnjmhx4q+Y/jL4uP/vPb7 Th6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752572062; x=1753176862; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aEKOci68q/+1+5NvCmhg64dST16/3/kdZfJDTw54/Tw=; b=TiTPkRMXl6oC63DFOrP8J7zM1Vv/ZaduWzJJI5jx1dXG1KJFlPH8UZuG7jvq69RWNo pLQ6DM78z8uGLUT+Z/kzilWD8rsAO/xscHNOQ9hLaFaplpNunuEmNOdGZrKTkblIn5th 0ljvX6fGBUIj3YdhcbXduogcD3EEmHDQzgLm/vL8wgz7WHTTllpwxS5bbMFqI0HCTuCP tIOKUdSQR7NYSrbS5wbB3Ppn5R5eUNX1PbT5EPsuBTLwXw6mrkq5e+8aDfPpxv9gCDdN ALvWGROcY+kkz8x1wD/tUD6NXtDt3GUtBAmqiCtXmHJHkWwypeD7sDouEDa3XAUjHDYb 5urw== X-Forwarded-Encrypted: i=1; AJvYcCV+Bgmb5+muvPB5541w/jPcHB5LHIvqmnW00URnj90Kc4ZwLT8y8ltsNyXu2FnXinelPFZLCuAk4g==@kvack.org X-Gm-Message-State: AOJu0Yx1IvnJ5VIa3bIpa7Mj1LFzcnVFODMvEJnVpumds1L0MOQ/wTgE lzD0S2TzZTNXiav6qa9AN3Kx95fSTwR5o24u6zr/A3zIpvUdS4izUZtGoa5+SzIkM7Uo5E659y3 hFQ== X-Google-Smtp-Source: AGHT+IEELjRi0u+U/t3ZPXir0+vn67lvZW5Zgk9WFpr/aFf+aU4MD6lHSrWdMucnDXEfgpQNrJqHgmlV3A== X-Received: from wmbji1.prod.google.com ([2002:a05:600c:a341:b0:456:be0:e1e3]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4695:b0:450:d4a6:799e with SMTP id 5b1f17b1804b1-454f4259c7cmr132508705e9.20.1752572061578; Tue, 15 Jul 2025 02:34:21 -0700 (PDT) Date: Tue, 15 Jul 2025 10:33:43 +0100 In-Reply-To: <20250715093350.2584932-1-tabba@google.com> Mime-Version: 1.0 References: <20250715093350.2584932-1-tabba@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250715093350.2584932-15-tabba@google.com> Subject: [PATCH v14 14/21] KVM: x86: Enable guest_memfd mmap for default VM type From: Fuad Tabba To: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org, kvmarm@lists.linux.dev Cc: pbonzini@redhat.com, chenhuacai@kernel.org, mpe@ellerman.id.au, anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, seanjc@google.com, viro@zeniv.linux.org.uk, brauner@kernel.org, willy@infradead.org, akpm@linux-foundation.org, xiaoyao.li@intel.com, yilun.xu@intel.com, chao.p.peng@linux.intel.com, jarkko@kernel.org, amoorthy@google.com, dmatlack@google.com, isaku.yamahata@intel.com, mic@digikod.net, vbabka@suse.cz, vannapurve@google.com, ackerleytng@google.com, mail@maciej.szmigiero.name, david@redhat.com, michael.roth@amd.com, wei.w.wang@intel.com, liam.merwick@oracle.com, isaku.yamahata@gmail.com, kirill.shutemov@linux.intel.com, suzuki.poulose@arm.com, steven.price@arm.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_tsoni@quicinc.com, quic_svaddagi@quicinc.com, quic_cvanscha@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, catalin.marinas@arm.com, james.morse@arm.com, yuzenghui@huawei.com, oliver.upton@linux.dev, maz@kernel.org, will@kernel.org, qperret@google.com, keirf@google.com, roypat@amazon.co.uk, shuah@kernel.org, hch@infradead.org, jgg@nvidia.com, rientjes@google.com, jhubbard@nvidia.com, fvdl@google.com, hughd@google.com, jthoughton@google.com, peterx@redhat.com, pankaj.gupta@amd.com, ira.weiny@intel.com, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 2D74C100005 X-Stat-Signature: cbjyxb6x7sz738p84pd5am3d56a574g4 X-Rspam-User: X-HE-Tag: 1752572062-731330 X-HE-Meta: U2FsdGVkX19fK8G4aDDY+nWnTwb68IGAbh0AAEVcFjIljc+AEqeLaTjHXxK6nfMOIVul/gqyXrAMv1Y4ks+szaWwDBdFzrbie6Vymkki2QNLH1svVjE5X7f4PAgCXGqiwMarFouyXNQrZMGY7+yyvMTUNrrRUyJpsmByu0oVjn5aujZ+lGKMO3Y1z8LVElSS7d34quZ+PhraKV7SVxSBNU9ANwCj7S5qojV4z2RPhX37q9dDBU8bhplp0a40V/2uI5OQT5s3Qrcka5SFbkVLsev/NM691I34O0dOt6bgBQsjA/ftXSFZQILK1XC7FjGgC2EaMR23q5zxb1BawIDF2WjZY4NFpdkI1dyrSHfsZhrmXDQPeXdfkv/XM/V98c+fpj/Jvh2Jwf+0OQI6C6t0hrsB0enmocxqIy7gRaqxSnTz5LTusnKGCK9MSENTi/gWcSwBdE2BQ2wm/dcEU88RDCRsVXAYoPb7rhTYYTuEVMSDKTOPS90j+w2roy3x9fs6pBf2mOk8yfIpYbLGW/esYwHToeO1DHyCUmfpfJN1uIv0kty61AzNAnxhvtMHHnu7ncdzL6XOZQ3T/rPG8XK0fQppiQzZzCQtseA8OC6XYIGCqU9UBuJr2Y4JQrLtpQua9A64sLIMSsWKbL1BWlKcv9QUvY/pScxPrWKy4k5M3wzWn3D7rHemOoJGH1/7pUFsmtu0qkl2NCTAWf68wTlrjl1dBqeB6blY2H2H8yflhHa25cAjCVrvYtkeAjI2KLgcBY6Xh7t7VhUi5Cq0aH5PGQI7yL6u+Uj701rx64LCfQTA1LsiDwb4gvCqXFYvOokrXBkL3cFk9FSyEjohBK9IriAGAvJpq58q/UhB8Vg1hxIVOWmpWBhFOtGhAwzD0tT6pJ68rArWRQnzt7kynaKsbAqmb59ydNqXlMtNU3WeINu2N3j0Z89TznLLRWDAhraJzytaCoK9coyVDP+568U aoFeiEA/ L7TBTFr0USkRSARIpx127cK/lFF9gN8MCrN77iTzDxK3e7lPxOXso3NWGMYLWFAfGQn6EIAjVFtAGJd4lx/tTJQa+z5xJJ0NY0u4AAYm+RyMIP776R9ObpVzL1cXpjokXcqfsrz2rRah3QjPFn6nW9WOl3T9vX2V0deXttFU8v0KW++k6zICSk9O44pAABVueEsUGm0CMtFFF3I+8ybm2SV7B/X7A8Tm4NAO5mujfSuTXUr8rHUzDSwPHRcaqhVnXddKVSatO0cAZuYqVkOEJDLE8HKbFV25y3Vonsf6NcHD9NN1pry30817plS8vOQqtw7cuYPO/YtAqoTWAa/5OF76QeCDtFfoNAbqsn5uoL/LV34s= 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: Enable host userspace mmap support for guest_memfd-backed memory when running KVM with the KVM_X86_DEFAULT_VM type: * Define kvm_arch_supports_gmem_mmap() for KVM_X86_DEFAULT_VM: Introduce the architecture-specific kvm_arch_supports_gmem_mmap() macro, specifically enabling mmap support for KVM_X86_DEFAULT_VM instances. This macro, gated by CONFIG_KVM_GMEM_SUPPORTS_MMAP, ensures that only the default VM type can leverage guest_memfd mmap functionality on x86. This explicit enablement prevents CoCo VMs, which use guest_memfd primarily for private memory and rely on hardware-enforced privacy, from accidentally exposing guest memory via host userspace mappings. * Select CONFIG_KVM_GMEM_SUPPORTS_MMAP in KVM_X86: Enable the CONFIG_KVM_GMEM_SUPPORTS_MMAP Kconfig option when KVM_X86 is selected. This ensures that the necessary code for guest_memfd mmap support (introduced earlier) is compiled into the kernel for x86. This Kconfig option acts as a system-wide gate for the guest_memfd mmap capability. It implicitly enables CONFIG_KVM_GMEM, making guest_memfd available, and then layers the mmap capability on top specifically for the default VM. These changes make guest_memfd a more versatile memory backing for standard KVM guests, allowing VMMs to use a unified guest_memfd model for both private (CoCo) and non-private (default) VMs. This is a prerequisite for use cases such as running Firecracker guests entirely backed by guest_memfd and implementing direct map removal for non-CoCo VMs. Co-developed-by: Ackerley Tng Signed-off-by: Ackerley Tng Signed-off-by: Fuad Tabba --- arch/x86/include/asm/kvm_host.h | 9 +++++++++ arch/x86/kvm/Kconfig | 1 + arch/x86/kvm/x86.c | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 543d09fd4bca..e1426adfa93e 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2279,9 +2279,18 @@ void kvm_configure_mmu(bool enable_tdp, int tdp_forced_root_level, #ifdef CONFIG_KVM_GMEM #define kvm_arch_has_private_mem(kvm) ((kvm)->arch.has_private_mem) #define kvm_arch_supports_gmem(kvm) ((kvm)->arch.supports_gmem) + +/* + * CoCo VMs with hardware support that use guest_memfd only for backing private + * memory, e.g., TDX, cannot use guest_memfd with userspace mapping enabled. + */ +#define kvm_arch_supports_gmem_mmap(kvm) \ + (IS_ENABLED(CONFIG_KVM_GMEM_SUPPORTS_MMAP) && \ + (kvm)->arch.vm_type == KVM_X86_DEFAULT_VM) #else #define kvm_arch_has_private_mem(kvm) false #define kvm_arch_supports_gmem(kvm) false +#define kvm_arch_supports_gmem_mmap(kvm) false #endif #define kvm_arch_has_readonly_mem(kvm) (!(kvm)->arch.has_protected_state) diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index df1fdbb4024b..1ba959b9eadc 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@ -47,6 +47,7 @@ config KVM_X86 select KVM_GENERIC_HARDWARE_ENABLING select KVM_GENERIC_PRE_FAULT_MEMORY select KVM_GENERIC_GMEM_POPULATE if KVM_SW_PROTECTED_VM + select KVM_GMEM_SUPPORTS_MMAP if X86_64 select KVM_WERROR if WERROR config KVM diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index adbdc2cc97d4..ca99187a566e 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12781,7 +12781,8 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) kvm->arch.vm_type = type; kvm->arch.has_private_mem = (type == KVM_X86_SW_PROTECTED_VM); - kvm->arch.supports_gmem = (type == KVM_X86_SW_PROTECTED_VM); + kvm->arch.supports_gmem = + type == KVM_X86_DEFAULT_VM || type == KVM_X86_SW_PROTECTED_VM; /* Decided by the vendor code for other VM types. */ kvm->arch.pre_fault_allowed = type == KVM_X86_DEFAULT_VM || type == KVM_X86_SW_PROTECTED_VM; -- 2.50.0.727.gbf7dc18ff4-goog