Skip to contentSkip to conversation

A couple of KVM dead functions

PATCH Applied [email protected] 2 participants 4 messages Oct 1, 2024 KVM

lore
Share & tools
lore
#0 lore raw

cover A couple of KVM dead functions

From: "Dr. David Alan Gilbert" <[email protected]>

Hi,
Just some deadcode removal; I split it
because the second one is mentioned in docs
that I don't know mean if it's still needed or
how to fix up.

Dave

Dr. David Alan Gilbert (2):
KVM: Remove unused kvm_vcpu_gfn_to_pfn
KVM: Remove unused kvm_vcpu_gfn_to_pfn_atomic

 include/linux/kvm_host.h |  2 --
 virt/kvm/kvm_main.c      | 12 ------------
 2 files changed, 14 deletions(-)
Signature · 1 line
2.46.2
#1 lore raw

PATCH 1/2 KVM: Remove unused kvm_vcpu_gfn_to_pfn

From: "Dr. David Alan Gilbert" <[email protected]>

The last use of kvm_vcpu_gfn_to_pfn was removed by commit b1624f99aa8f ("KVM: Remove kvm_vcpu_gfn_to_page() and kvm_vcpu_gpa_to_page()")

Remove it.

---
 include/linux/kvm_host.h | 1 -
 virt/kvm/kvm_main.c      | 6 ------
 2 files changed, 7 deletions(-)
include/linux/kvm_host.h +0 -1
index db567d26f7b9..b9b2e42e3fa7 100644
@@ -1314,7 +1314,6 @@ void mark_page_dirty(struct kvm *kvm, gfn_t gfn);
 struct kvm_memslots *kvm_vcpu_memslots(struct kvm_vcpu *vcpu);
 struct kvm_memory_slot *kvm_vcpu_gfn_to_memslot(struct kvm_vcpu *vcpu, gfn_t gfn);
 kvm_pfn_t kvm_vcpu_gfn_to_pfn_atomic(struct kvm_vcpu *vcpu, gfn_t gfn);
-kvm_pfn_t kvm_vcpu_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn);
 int kvm_vcpu_map(struct kvm_vcpu *vcpu, gpa_t gpa, struct kvm_host_map *map);
 void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map, bool dirty);
 unsigned long kvm_vcpu_gfn_to_hva(struct kvm_vcpu *vcpu, gfn_t gfn);
virt/kvm/kvm_main.c +0 -6
index 05cbb2548d99..f82131e7978b 100644
@@ -3047,12 +3047,6 @@ kvm_pfn_t gfn_to_pfn(struct kvm *kvm, gfn_t gfn)
 }
 EXPORT_SYMBOL_GPL(gfn_to_pfn);
 
-kvm_pfn_t kvm_vcpu_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn)
-{
-	return gfn_to_pfn_memslot(kvm_vcpu_gfn_to_memslot(vcpu, gfn), gfn);
-}
-EXPORT_SYMBOL_GPL(kvm_vcpu_gfn_to_pfn);
-
 int gfn_to_page_many_atomic(struct kvm_memory_slot *slot, gfn_t gfn,
 			    struct page **pages, int nr_pages)
 {
Signature · 1 line
2.46.2
#2 lore raw

PATCH 2/2 KVM: Remove unused kvm_vcpu_gfn_to_pfn_atomic

In reply to [email protected]

From: "Dr. David Alan Gilbert" <[email protected]>

The last use of kvm_vcpu_gfn_to_pfn_atomic was removed by commit 1bbc60d0c7e5 ("KVM: x86/mmu: Remove MMU auditing")

Remove it.

Note, I've not removed the example in,
Documentation/virt/kvm/locking.rst
which I guess needs reworking; or maybe it's a reason to hold onto this.

---
 include/linux/kvm_host.h | 1 -
 virt/kvm/kvm_main.c      | 6 ------
 2 files changed, 7 deletions(-)
include/linux/kvm_host.h +0 -1
index b9b2e42e3fa7..45be36e5285f 100644
@@ -1313,7 +1313,6 @@ void mark_page_dirty(struct kvm *kvm, gfn_t gfn);
 
 struct kvm_memslots *kvm_vcpu_memslots(struct kvm_vcpu *vcpu);
 struct kvm_memory_slot *kvm_vcpu_gfn_to_memslot(struct kvm_vcpu *vcpu, gfn_t gfn);
-kvm_pfn_t kvm_vcpu_gfn_to_pfn_atomic(struct kvm_vcpu *vcpu, gfn_t gfn);
 int kvm_vcpu_map(struct kvm_vcpu *vcpu, gpa_t gpa, struct kvm_host_map *map);
 void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map, bool dirty);
 unsigned long kvm_vcpu_gfn_to_hva(struct kvm_vcpu *vcpu, gfn_t gfn);
virt/kvm/kvm_main.c +0 -6
index f82131e7978b..141db5b79cd4 100644
@@ -3035,12 +3035,6 @@ kvm_pfn_t gfn_to_pfn_memslot_atomic(const struct kvm_memory_slot *slot, gfn_t gf
 }
 EXPORT_SYMBOL_GPL(gfn_to_pfn_memslot_atomic);
 
-kvm_pfn_t kvm_vcpu_gfn_to_pfn_atomic(struct kvm_vcpu *vcpu, gfn_t gfn)
-{
-	return gfn_to_pfn_memslot_atomic(kvm_vcpu_gfn_to_memslot(vcpu, gfn), gfn);
-}
-EXPORT_SYMBOL_GPL(kvm_vcpu_gfn_to_pfn_atomic);
-
 kvm_pfn_t gfn_to_pfn(struct kvm *kvm, gfn_t gfn)
 {
 	return gfn_to_pfn_memslot(gfn_to_memslot(kvm, gfn), gfn);
Signature · 1 line
2.46.2
maintainer Applied
#3 lore raw
In reply to [email protected]
Quoted 7 lines · On 10/1/24 16:13, [email protected] wrote:

From: "Dr. David Alan Gilbert" <[email protected]>

Hi,
Just some deadcode removal; I split it
because the second one is mentioned in docs
that I don't know mean if it's still needed or
how to fix up.

Let's change that to mention gfn_to_pfn_memslot instead - any *_to_pfn function will do, and the whole API is going away soon.

I queued the patches, thanks.

Paolo

Quoted 10 lines

Dave

Dr. David Alan Gilbert (2):
KVM: Remove unused kvm_vcpu_gfn_to_pfn
KVM: Remove unused kvm_vcpu_gfn_to_pfn_atomic

  include/linux/kvm_host.h |  2 --
  virt/kvm/kvm_main.c      | 12 ------------
  2 files changed, 14 deletions(-)