From: Shivank Garg <shivankg@amd.com>
To: <seanjc@google.com>, <david@redhat.com>, <vbabka@suse.cz>,
<willy@infradead.org>, <akpm@linux-foundation.org>,
<shuah@kernel.org>, <pbonzini@redhat.com>
Cc: <ackerleytng@google.com>, <paul@paul-moore.com>,
<jmorris@namei.org>, <serge@hallyn.com>, <pvorel@suse.cz>,
<bfoster@redhat.com>, <tabba@google.com>, <vannapurve@google.com>,
<chao.gao@intel.com>, <bharata@amd.com>, <nikunj@amd.com>,
<michael.day@amd.com>, <yan.y.zhao@intel.com>,
<Neeraj.Upadhyay@amd.com>, <thomas.lendacky@amd.com>,
<michael.roth@amd.com>, <aik@amd.com>, <jgg@nvidia.com>,
<kalyazin@amazon.com>, <peterx@redhat.com>, <shivankg@amd.com>,
<linux-fsdevel@vger.kernel.org>, <linux-mm@kvack.org>,
<linux-kernel@vger.kernel.org>,
<linux-security-module@vger.kernel.org>, <kvm@vger.kernel.org>,
<linux-kselftest@vger.kernel.org>, <linux-coco@lists.linux.dev>
Subject: [PATCH RFC v7 4/8] KVM: Add kvm_gmem_exit() cleanup function
Date: Tue, 8 Apr 2025 11:23:58 +0000 [thread overview]
Message-ID: <20250408112402.181574-5-shivankg@amd.com> (raw)
In-Reply-To: <20250408112402.181574-1-shivankg@amd.com>
Add empty kvm_gmem_exit() function for proper cleanup of guest memory
resources. Call it from both kvm_init() error path and kvm_exit().
This is preparatory change for upcoming work that involves KVM guest_memfd
using inodes to store metadata for backing memory.
Signed-off-by: Shivank Garg <shivankg@amd.com>
---
virt/kvm/guest_memfd.c | 5 +++++
virt/kvm/kvm_main.c | 2 ++
virt/kvm/kvm_mm.h | 6 ++++++
3 files changed, 13 insertions(+)
diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c
index b2aa6bf24d3a..88453b040926 100644
--- a/virt/kvm/guest_memfd.c
+++ b/virt/kvm/guest_memfd.c
@@ -323,6 +323,11 @@ void kvm_gmem_init(struct module *module)
kvm_gmem_fops.owner = module;
}
+void kvm_gmem_exit(void)
+{
+
+}
+
static int kvm_gmem_migrate_folio(struct address_space *mapping,
struct folio *dst, struct folio *src,
enum migrate_mode mode)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index e85b33a92624..39580f79908a 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -6441,6 +6441,7 @@ int kvm_init(unsigned vcpu_size, unsigned vcpu_align, struct module *module)
err_register:
kvm_uninit_virtualization();
err_virt:
+ kvm_gmem_exit();
kvm_vfio_ops_exit();
err_vfio:
kvm_async_pf_deinit();
@@ -6471,6 +6472,7 @@ void kvm_exit(void)
debugfs_remove_recursive(kvm_debugfs_dir);
for_each_possible_cpu(cpu)
free_cpumask_var(per_cpu(cpu_kick_mask, cpu));
+ kvm_gmem_exit();
kmem_cache_destroy(kvm_vcpu_cache);
kvm_vfio_ops_exit();
kvm_async_pf_deinit();
diff --git a/virt/kvm/kvm_mm.h b/virt/kvm/kvm_mm.h
index acef3f5c582a..8070956b1a43 100644
--- a/virt/kvm/kvm_mm.h
+++ b/virt/kvm/kvm_mm.h
@@ -69,6 +69,7 @@ static inline void gfn_to_pfn_cache_invalidate_start(struct kvm *kvm,
#ifdef CONFIG_KVM_PRIVATE_MEM
void 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, loff_t offset);
@@ -79,6 +80,11 @@ static inline void kvm_gmem_init(struct module *module)
}
+static inline void kvm_gmem_exit(void)
+{
+
+}
+
static inline int kvm_gmem_bind(struct kvm *kvm,
struct kvm_memory_slot *slot,
unsigned int fd, loff_t offset)
--
2.34.1
next prev parent reply other threads:[~2025-04-08 11:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-08 11:23 [PATCH RFC v7 0/8] Add NUMA mempolicy support for KVM guest-memfd Shivank Garg
2025-04-08 11:23 ` [PATCH RFC v7 1/8] mm/filemap: Add mempolicy support to the filemap layer Shivank Garg
2025-04-08 11:23 ` [PATCH RFC v7 2/8] mm/mempolicy: Export memory policy symbols Shivank Garg
2025-04-08 11:23 ` [PATCH RFC v7 3/8] security: Export security_inode_init_security_anon for KVM guest_memfd Shivank Garg
2025-04-09 20:19 ` Paul Moore
2025-04-11 6:07 ` Shivank Garg
2025-04-22 16:49 ` David Hildenbrand
2025-04-10 8:41 ` Christoph Hellwig
2025-04-11 6:51 ` Shivank Garg
2025-04-22 17:25 ` David Hildenbrand
2025-05-08 6:37 ` Shivank Garg
2025-04-08 11:23 ` Shivank Garg [this message]
2025-04-08 11:23 ` [PATCH RFC v7 5/8] KVM: guest_memfd: Make guest mem use guest mem inodes instead of anonymous inodes Shivank Garg
2025-04-10 8:42 ` Christoph Hellwig
2025-04-10 13:53 ` Ackerley Tng
2025-04-10 14:23 ` Christoph Hellwig
2025-04-08 11:24 ` [PATCH RFC v7 6/8] KVM: guest_memfd: Add slab-allocated inode cache Shivank Garg
2025-04-08 11:24 ` [PATCH RFC v7 7/8] KVM: guest_memfd: Enforce NUMA mempolicy using shared policy Shivank Garg
2025-04-10 13:40 ` Ackerley Tng
2025-04-11 6:42 ` Shivank Garg
2025-04-08 11:24 ` [PATCH RFC v7 8/8] KVM: guest_memfd: selftests: Add tests for mmap and NUMA policy support Shivank Garg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250408112402.181574-5-shivankg@amd.com \
--to=shivankg@amd.com \
--cc=Neeraj.Upadhyay@amd.com \
--cc=ackerleytng@google.com \
--cc=aik@amd.com \
--cc=akpm@linux-foundation.org \
--cc=bfoster@redhat.com \
--cc=bharata@amd.com \
--cc=chao.gao@intel.com \
--cc=david@redhat.com \
--cc=jgg@nvidia.com \
--cc=jmorris@namei.org \
--cc=kalyazin@amazon.com \
--cc=kvm@vger.kernel.org \
--cc=linux-coco@lists.linux.dev \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-security-module@vger.kernel.org \
--cc=michael.day@amd.com \
--cc=michael.roth@amd.com \
--cc=nikunj@amd.com \
--cc=paul@paul-moore.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=pvorel@suse.cz \
--cc=seanjc@google.com \
--cc=serge@hallyn.com \
--cc=shuah@kernel.org \
--cc=tabba@google.com \
--cc=thomas.lendacky@amd.com \
--cc=vannapurve@google.com \
--cc=vbabka@suse.cz \
--cc=willy@infradead.org \
--cc=yan.y.zhao@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox