From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (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 03C653B0ACD for ; Fri, 31 Jul 2026 17:38:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.200 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785519534; cv=none; b=d2qYyK0bBKOqRSo504ilX9neEb3D8HiFJ+S5/z8nGBdqvjH4Elwk141G+MpwVIuAaeT4dlD/thPO+kAacwdbca/21QknjZfx9Dqik2xmrUY4ma74XdDX9yhZem8Z7uvfyxhJEBtxVnv1B9hrJcs6rA4dTbFbWWebrdXoCsCxL3c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785519534; c=relaxed/simple; bh=IYcC9lIapaYdJoAFtUXkm8OwJYJ5zsexH5lmUSeBS6I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=s29PiuUBRExE9o42PPEG3ixU+A/SiHMKBblrsynKK47Xsn1EnfTejilcNVVJIvk6RDd63PJJYlxl9pyic337HZrkmCaUCvWy1dPlZMYztpd7jW4G4SYpDPM5lgeHGE1qDMJsZRKRI9LitNuuass7mUwkoX7lTO61vnTaTtyR8Gc= 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=dSj7nIwq; arc=none smtp.client-ip=209.85.210.200 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="dSj7nIwq" Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-8485b7e18b4so2415903b3a.1 for ; Fri, 31 Jul 2026 10:38:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785519528; x=1786124328; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:reply-to:from:to:cc:subject:date:message-id :reply-to:content-type; bh=ZBZ4WEbR2BQ44y7jx9EAFSDGpgtjFTxL2JrU5WB2i+c=; b=dSj7nIwqGnTJBQxSYXBxauBqkaCyblUJ7F+UxoxRt38OltPuponYjAMB3gtHMYo0ak ea4/w/8P4yhEPV30OZQtxcdADa5lfnWlKCeRmKqVODQSOFeKRBJPpXRY+Y/WpfOB07o8 /Zz8sl0E/BXexnq9CtEF4WvmG/XqSuDfvS+2Dq3YEfV5xfzLxz08+9JJtz+iPBf25oAK C3IGx3O1Fh4MNCC5vo82W96RUIK0MXL02G/3+cSi8vmBHdAXWR+Ac1b4aVCTVSHKbfHf 0iUFs6Pd7TRa8tK1y39DyppsFAt9aClarnOFmqieSS6L3wen6/Twyk08JmCq5+O5ggaU DKuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785519528; x=1786124328; h=content-type: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:content-type; bh=ZBZ4WEbR2BQ44y7jx9EAFSDGpgtjFTxL2JrU5WB2i+c=; b=ZXNIhVhzYoD2YcapaXStW4uO37Et6lFjUw93HXxR32/fQtxkl6/n1s1OOUMHvD2RHG LAIWERA85S7fCQWJi5TBsd2ZyZ6Y11F0xS3oRlX36gmU0lanVmdNBAmhBlXiDYmCQCOJ rK9x4k1mdqFVTg30DZbYNjx9xnp6tbY9sMnUM0KJ5aXXIVGO4KSwykvwZmx8uW2ovbKg baRX9OvcTBb96Osm2wsM04QP9xbSHbMsqreeHYeH+Q8+GaAcZajofmrLPKqJRmoXwhC4 rFcir7hV+O3jfnnALotZTx6iZ5nCBVAx6FpvFHeGuB2cO3xSrH+MuJ0VceoxCZU3a7fU tZLQ== X-Forwarded-Encrypted: i=1; AHgh+RqDW6A0eo6pxdqXzBtVIRtBVN2ooO2jaDyS8LVwZxWcVTPpC/Nr8XmAH5AZJzMyZNzwPSg3SgmXMOb9XbE=@vger.kernel.org X-Gm-Message-State: AOJu0YxYWWGlgiwDBPpK+VoObORaPkuHujMEtAbm4cocGM1vq+zBt8E5 aMvt/BtX9UQqtDfY+dt5UULcjygtvg98ba0hN1M5YnS6sU86fWxsbvztQRtTzk4sr07d9/2cY8X W9CTm3A== X-Received: from pgce6.prod.google.com ([2002:a05:6a02:1c6:b0:c99:aff5:7092]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:180d:b0:848:2f84:f42e with SMTP id d2e1a72fcca58-84ee49c4d6bmr433113b3a.71.1785519528369; Fri, 31 Jul 2026 10:38:48 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 31 Jul 2026 10:38:39 -0700 In-Reply-To: <20260731173842.2649391-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: <20260731173842.2649391-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731173842.2649391-3-seanjc@google.com> Subject: [PATCH v2 2/5] KVM: guest_memfd: Move gmem function declarations to dedicated guest_memfd.h From: Sean Christopherson To: Paolo Bonzini , Sean Christopherson Cc: David Hildenbrand , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed , Ackerley Tng , Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Christian Borntraeger , Janosch Frank , Claudio Imbrenda Content-Type: text/plain; charset="UTF-8" Extract the gmem function declarations out of kvm_mm.h and into a dedicated header, guest_memfd.h. This will allow creating a MAINTAINERS entry for guest_memfd without having to rely on content pattern matching. Reviewed-by: Ackerley Tng Acked-by: David Hildenbrand (Arm) Signed-off-by: Sean Christopherson --- virt/kvm/guest_memfd.c | 1 + virt/kvm/guest_memfd.h | 34 ++++++++++++++++++++++++++++++++++ virt/kvm/kvm_main.c | 1 + virt/kvm/kvm_mm.h | 27 --------------------------- 4 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 virt/kvm/guest_memfd.h diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 86690683b2fe..de2585539b25 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -9,6 +9,7 @@ #include #include "kvm_mm.h" +#include "guest_memfd.h" static struct vfsmount *kvm_gmem_mnt; diff --git a/virt/kvm/guest_memfd.h b/virt/kvm/guest_memfd.h new file mode 100644 index 000000000000..0f9c6f840838 --- /dev/null +++ b/virt/kvm/guest_memfd.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __KVM_GUEST_MEMFD_H__ +#define __KVM_GUEST_MEMFD_H__ + +#include + +#ifdef CONFIG_KVM_GUEST_MEMFD +int kvm_gmem_init(struct module *module); +void kvm_gmem_exit(void); +int kvm_gmem_create(struct kvm *kvm, struct kvm_create_guest_memfd *args); +int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot, + unsigned int fd, uoff_t offset); +void kvm_gmem_unbind(struct kvm_memory_slot *slot); +#else +static inline int kvm_gmem_init(struct module *module) +{ + return 0; +} +static inline void kvm_gmem_exit(void) {}; +static inline int kvm_gmem_bind(struct kvm *kvm, + struct kvm_memory_slot *slot, + unsigned int fd, uoff_t offset) +{ + WARN_ON_ONCE(1); + return -EIO; +} + +static inline void kvm_gmem_unbind(struct kvm_memory_slot *slot) +{ + WARN_ON_ONCE(1); +} +#endif /* CONFIG_KVM_GUEST_MEMFD */ + +#endif /* __KVM_GUEST_MEMFD_H__ */ diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index e44c20c04961..a2f67623e60a 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -56,6 +56,7 @@ #include "coalesced_mmio.h" #include "async_pf.h" +#include "guest_memfd.h" #include "kvm_mm.h" #include "vfio.h" diff --git a/virt/kvm/kvm_mm.h b/virt/kvm/kvm_mm.h index 7510ca915dd1..c65cfdb14f1c 100644 --- a/virt/kvm/kvm_mm.h +++ b/virt/kvm/kvm_mm.h @@ -70,31 +70,4 @@ static inline void gfn_to_pfn_cache_invalidate_start(struct kvm *kvm, } #endif /* HAVE_KVM_PFNCACHE */ -#ifdef CONFIG_KVM_GUEST_MEMFD -int kvm_gmem_init(struct module *module); -void kvm_gmem_exit(void); -int kvm_gmem_create(struct kvm *kvm, struct kvm_create_guest_memfd *args); -int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot, - unsigned int fd, uoff_t offset); -void kvm_gmem_unbind(struct kvm_memory_slot *slot); -#else -static inline int kvm_gmem_init(struct module *module) -{ - return 0; -} -static inline void kvm_gmem_exit(void) {}; -static inline int kvm_gmem_bind(struct kvm *kvm, - struct kvm_memory_slot *slot, - unsigned int fd, uoff_t offset) -{ - WARN_ON_ONCE(1); - return -EIO; -} - -static inline void kvm_gmem_unbind(struct kvm_memory_slot *slot) -{ - WARN_ON_ONCE(1); -} -#endif /* CONFIG_KVM_GUEST_MEMFD */ - #endif /* __KVM_MM_H__ */ -- 2.55.0.508.g3f0d502094-goog