From nobody Sun Oct 5 21:42:49 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44B742874F1 for ; Tue, 29 Jul 2025 22:56:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753829769; cv=none; b=ecb6Sqtd5jbhX+K6nbKG1aqZcnO6OwIfgfeWczIZiPbOATw9Hqb7jMU979ZFfFUtIoNv6UD1ZP+k3eN3KkZExsr2+6XeWV9APxGAbVCZWOAmI2wZEG/I+OmKta/4ETin6+Aw2j/3xCyCR77UNjdRDwicqpa47oLc4UpoyEnhOdA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753829769; c=relaxed/simple; bh=vnri19yf9LfJXIcNv1qDJmMwl1WKLHs9dVfwzDC2NUk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=QIWAAcN7Mqk4UWIuO9NEjYh9vSxrRq4XbgNNKMUpW0EZsQzHaFfdhJFdOvIjRz2AE0zgbUo7F25rk3FZ/+Cqdl/K7+dSdxLgG3d9YemDMsGyYJpXxxSqjzpjlXvO2jwhyCmFGA2cDSgvAspJDDUl2rb+f7FxEtbSWR2/nN3Ve/Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=DCEyV34G; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="DCEyV34G" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-313c3915345so9489245a91.3 for ; Tue, 29 Jul 2025 15:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753829767; x=1754434567; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=CDh3a2mKi2563DqkffKvhXA2J/RouDXBIlWaKp9FKZM=; b=DCEyV34G5ju/CZ3lV4ft0R3RNuL0H4CgkfF4wiwsmBd2iN6rDFB7GeA91z7ddXn2ms FBTim/hnsHyzqcHQownhv6+WYrmcFhldxMgdPP6N65o5YLhBM/PgFZmuXG76LcPxYgEK EU/C1vk+llANqW1H0Ijub5QNV1lCicS/ohTuJrdw7HEkDfP5M52OO6PVSt9ENGQix0Lx +tQkFopdI/sT5kQRTKiTHXBGO/nT3YxUeoheK+xsgg2QaDnHgh8u/khoUiRndQjJ1kA5 sWGfJP9V++OPKQLLik9578GdLfM/R8Wfro2XAczoNEr6ezk+bytkKpsxdBOOjkeuRMWL PPsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753829767; x=1754434567; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CDh3a2mKi2563DqkffKvhXA2J/RouDXBIlWaKp9FKZM=; b=SDrRuybJMZOzZpLu15AtBLROtBSdt/ncyCDsaMU2MXJTGdCTPaS88THmWiKXCDhEXO gyWp6lnkc3gVRNryLhmzap7AXrW5Ry9YnnpPil1bkqgYnsQ/N4DNi1x4aCow8jFCpmA3 0nvwuYl3TgSJAt2Egqw3+pu9YVBveMBp7JGYhT80yCv6V/h1vFNrv2IWRQtzzdINIF9L +g08Frg8Ps0/0+6bBjdNPPq6WqElH4OD4A/36lWyDp9CQj3udrON6EOJf8A9poCMd14x 33QvlLbJ2IuQhdLaMsXgJuyetx2pxZa9xLCjh3O1ACXpud3wq2MK6KwUma6ildfKkLd1 YD7Q== X-Forwarded-Encrypted: i=1; AJvYcCXN1m6s8S2oZZQv9BMThm5Zy5vXi27ZDGxrS6aztWi6rLa6OexnX70MHM7XYav0OQ3R22dMrREESNbbQdA=@vger.kernel.org X-Gm-Message-State: AOJu0Ywb7P6GqPAwzc49d4eUMW+r5Z9dVT/fTD3zlberQIJ2wZcx2dcL lxEQETQHYGPeMoqDXbmtDCiam+k3/j6hb5nqJcXlz/9zqjW3EyFGpeTuOuj/MFPlRfX6Ji3RYDD 8VUFIWA== X-Google-Smtp-Source: AGHT+IHC3uJKuTdSzXOEtHPqlvC+coV4BnnQv6uc7mWxcOspxNE/dt4wFfxxPGUhBzxbDLgfuxcg7hNN5F0= X-Received: from pjg6.prod.google.com ([2002:a17:90b:3f46:b0:31c:bd1d:516]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4a81:b0:31f:210d:2e56 with SMTP id 98e67ed59e1d1-31f5de557femr1551448a91.28.1753829767333; Tue, 29 Jul 2025 15:56:07 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 29 Jul 2025 15:54:52 -0700 In-Reply-To: <20250729225455.670324-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250729225455.670324-1-seanjc@google.com> X-Mailer: git-send-email 2.50.1.552.g942d659e1b-goog Message-ID: <20250729225455.670324-22-seanjc@google.com> Subject: [PATCH v17 21/24] KVM: Allow and advertise support for host mmap() on guest_memfd files From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Sean Christopherson Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Ira Weiny , Gavin Shan , Shivank Garg , Vlastimil Babka , Xiaoyao Li , David Hildenbrand , Fuad Tabba , Ackerley Tng , Tao Chan , James Houghton Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Fuad Tabba Now that all the x86 and arm64 plumbing for mmap() on guest_memfd is in place, allow userspace to set GUEST_MEMFD_FLAG_MMAP and advertise support via a new capability, KVM_CAP_GUEST_MEMFD_MMAP. The availability of this capability is determined per architecture, and its enablement for a specific guest_memfd instance is controlled by the GUEST_MEMFD_FLAG_MMAP flag at creation time. Update the KVM API documentation to detail the KVM_CAP_GUEST_MEMFD_MMAP capability, the associated GUEST_MEMFD_FLAG_MMAP, and provide essential information regarding support for mmap in guest_memfd. Reviewed-by: David Hildenbrand Reviewed-by: Gavin Shan Reviewed-by: Shivank Garg Reviewed-by: Xiaoyao Li Signed-off-by: Fuad Tabba Signed-off-by: Sean Christopherson --- Documentation/virt/kvm/api.rst | 9 +++++++++ include/uapi/linux/kvm.h | 2 ++ virt/kvm/guest_memfd.c | 7 ++++++- virt/kvm/kvm_main.c | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index fcb783735dd1..1e0c4a68876d 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -6414,6 +6414,15 @@ most one mapping per page, i.e. binding multiple mem= ory regions to a single guest_memfd range is not allowed (any number of memory regions can be boun= d to a single guest_memfd file, but the bound ranges must not overlap). =20 +When the capability KVM_CAP_GUEST_MEMFD_MMAP is supported, the 'flags' fie= ld +supports GUEST_MEMFD_FLAG_MMAP. Setting this flag on guest_memfd creation +enables mmap() and faulting of guest_memfd memory to host userspace. + +When the KVM MMU performs a PFN lookup to service a guest fault and the ba= cking +guest_memfd has the GUEST_MEMFD_FLAG_MMAP set, then the fault will always = be +consumed from guest_memfd, regardless of whether it is a shared or a priva= te +fault. + See KVM_SET_USER_MEMORY_REGION2 for additional details. =20 4.143 KVM_PRE_FAULT_MEMORY diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index aeb2ca10b190..0d96d2ae6e5d 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -961,6 +961,7 @@ struct kvm_enable_cap { #define KVM_CAP_ARM_EL2 240 #define KVM_CAP_ARM_EL2_E2H0 241 #define KVM_CAP_RISCV_MP_STATE_RESET 242 +#define KVM_CAP_GUEST_MEMFD_MMAP 243 =20 struct kvm_irq_routing_irqchip { __u32 irqchip; @@ -1597,6 +1598,7 @@ struct kvm_memory_attributes { #define KVM_MEMORY_ATTRIBUTE_PRIVATE (1ULL << 3) =20 #define KVM_CREATE_GUEST_MEMFD _IOWR(KVMIO, 0xd4, struct kvm_create_guest= _memfd) +#define GUEST_MEMFD_FLAG_MMAP (1ULL << 0) =20 struct kvm_create_guest_memfd { __u64 size; diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index d5b445548af4..08a6bc7d25b6 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -314,7 +314,9 @@ static pgoff_t kvm_gmem_get_index(struct kvm_memory_slo= t *slot, gfn_t gfn) =20 static bool kvm_gmem_supports_mmap(struct inode *inode) { - return false; + const u64 flags =3D (u64)inode->i_private; + + return flags & GUEST_MEMFD_FLAG_MMAP; } =20 static vm_fault_t kvm_gmem_fault_user_mapping(struct vm_fault *vmf) @@ -522,6 +524,9 @@ int kvm_gmem_create(struct kvm *kvm, struct kvm_create_= guest_memfd *args) u64 flags =3D args->flags; u64 valid_flags =3D 0; =20 + if (kvm_arch_supports_gmem_mmap(kvm)) + valid_flags |=3D GUEST_MEMFD_FLAG_MMAP; + if (flags & ~valid_flags) return -EINVAL; =20 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 4f57cb92e109..18f29ef93543 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4918,6 +4918,8 @@ static int kvm_vm_ioctl_check_extension_generic(struc= t kvm *kvm, long arg) #ifdef CONFIG_KVM_GUEST_MEMFD case KVM_CAP_GUEST_MEMFD: return 1; + case KVM_CAP_GUEST_MEMFD_MMAP: + return !kvm || kvm_arch_supports_gmem_mmap(kvm); #endif default: break; --=20 2.50.1.552.g942d659e1b-goog