Skip to content

Commit 93b7da4

Browse files
sean-jcbonzini
authored andcommitted
KVM: Drop APIs that manipulate "struct page" via pfns
Remove all kvm_{release,set}_pfn_*() APIs now that all users are gone. No functional change intended. Reviewed-by: Alex Bennée <[email protected]> Tested-by: Alex Bennée <[email protected]> Signed-off-by: Sean Christopherson <[email protected]> Tested-by: Dmitry Osipenko <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]> Message-ID: <[email protected]>
1 parent 2362506 commit 93b7da4

File tree

2 files changed

+0
-60
lines changed

2 files changed

+0
-60
lines changed

include/linux/kvm_host.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,11 +1274,6 @@ static inline kvm_pfn_t kvm_faultin_pfn(struct kvm_vcpu *vcpu, gfn_t gfn,
12741274
write ? FOLL_WRITE : 0, writable, refcounted_page);
12751275
}
12761276

1277-
void kvm_release_pfn_clean(kvm_pfn_t pfn);
1278-
void kvm_release_pfn_dirty(kvm_pfn_t pfn);
1279-
void kvm_set_pfn_dirty(kvm_pfn_t pfn);
1280-
void kvm_set_pfn_accessed(kvm_pfn_t pfn);
1281-
12821277
int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset,
12831278
int len);
12841279
int kvm_read_guest(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len);

virt/kvm/kvm_main.c

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3164,61 +3164,6 @@ void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map)
31643164
}
31653165
EXPORT_SYMBOL_GPL(kvm_vcpu_unmap);
31663166

3167-
void kvm_release_pfn_clean(kvm_pfn_t pfn)
3168-
{
3169-
struct page *page;
3170-
3171-
if (is_error_noslot_pfn(pfn))
3172-
return;
3173-
3174-
page = kvm_pfn_to_refcounted_page(pfn);
3175-
if (!page)
3176-
return;
3177-
3178-
kvm_release_page_clean(page);
3179-
}
3180-
EXPORT_SYMBOL_GPL(kvm_release_pfn_clean);
3181-
3182-
void kvm_release_pfn_dirty(kvm_pfn_t pfn)
3183-
{
3184-
struct page *page;
3185-
3186-
if (is_error_noslot_pfn(pfn))
3187-
return;
3188-
3189-
page = kvm_pfn_to_refcounted_page(pfn);
3190-
if (!page)
3191-
return;
3192-
3193-
kvm_release_page_dirty(page);
3194-
}
3195-
EXPORT_SYMBOL_GPL(kvm_release_pfn_dirty);
3196-
3197-
/*
3198-
* Note, checking for an error/noslot pfn is the caller's responsibility when
3199-
* directly marking a page dirty/accessed. Unlike the "release" helpers, the
3200-
* "set" helpers are not to be used when the pfn might point at garbage.
3201-
*/
3202-
void kvm_set_pfn_dirty(kvm_pfn_t pfn)
3203-
{
3204-
if (WARN_ON(is_error_noslot_pfn(pfn)))
3205-
return;
3206-
3207-
if (pfn_valid(pfn))
3208-
kvm_set_page_dirty(pfn_to_page(pfn));
3209-
}
3210-
EXPORT_SYMBOL_GPL(kvm_set_pfn_dirty);
3211-
3212-
void kvm_set_pfn_accessed(kvm_pfn_t pfn)
3213-
{
3214-
if (WARN_ON(is_error_noslot_pfn(pfn)))
3215-
return;
3216-
3217-
if (pfn_valid(pfn))
3218-
kvm_set_page_accessed(pfn_to_page(pfn));
3219-
}
3220-
EXPORT_SYMBOL_GPL(kvm_set_pfn_accessed);
3221-
32223167
static int next_segment(unsigned long len, int offset)
32233168
{
32243169
if (len > PAGE_SIZE - offset)

0 commit comments

Comments
 (0)