On Fri, May 26, 2023, Yu Zhao wrote:
> diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
> index 0e571e973bc2..374262545f96 100644
> --- a/include/linux/kvm_host.h
> +++ b/include/linux/kvm_host.h
> @@ -258,6 +258,7 @@ int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu);
> #ifdef KVM_ARCH_WANT_MMU_NOTIFIER
> struct kvm_gfn_range {
> struct kvm_memory_slot *slot;
> + void *args;
There's no reason to make this "void *", just declare "struct test_clear_young_args"
in the header. Arch code won't be able to use it regardless. And I vote for
something more like "test_clear_young_metadata", as there's far more information
in there than just function arguments.
And to stave off the argument that "void *" would allow reuse, take this opportunity
to unionize the test_clear_young field with the change_pte field, e.g.
/* comment about these fields being callback specific. */
union {
struct test_clear_young_metadata *metadata;
pte_t pte;
unsigned long callback_arg; /* needs a better name */
};
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index 51e4882d0873..31ee58754b19 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -541,6 +541,7 @@ typedef void (*on_lock_fn_t)(struct kvm *kvm, unsigned long start,
> typedef void (*on_unlock_fn_t)(struct kvm *kvm);
>
> struct kvm_hva_range {
> + void *args;
Same feedback as kvm_gfn_range.
> unsigned long start;
> unsigned long end;
> pte_t pte;
> @@ -549,6 +550,7 @@ struct kvm_hva_range {
> on_unlock_fn_t on_unlock;
> bool flush_on_ret;
> bool may_block;
> + bool lockless;
> };
>
> /*
> @@ -602,6 +604,8 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm,
> hva_end = min(range->end, slot->userspace_addr +
> (slot->npages << PAGE_SHIFT));
>
> + gfn_range.args = range->args;
And this goes away because the generic callback_arg is what gets propagated.
> +
> /*
> * To optimize for the likely case where the address
> * range is covered by zero or one memslots, don't
> @@ -619,7 +623,7 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm,
> gfn_range.end = hva_to_gfn_memslot(hva_end + PAGE_SIZE - 1, slot);
> gfn_range.slot = slot;
>
> - if (!locked) {
> + if (!range->lockless && !locked) {
> locked = true;
> KVM_MMU_LOCK(kvm);
> if (!IS_KVM_NULL_FN(range->on_lock))
> @@ -628,6 +632,9 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm,
> break;
> }
> ret |= range->handler(kvm, &gfn_range);
> +
> + if (range->lockless && ret)
I don't like overloading "lockless" to also mean "stop on ret". Just add another
flag, there's literally no cost for most callbacks as everything is constant at
compile time and gets optimized away.
> + range.args = &args;
> + range.lockless = true;
The lockless and stop_on_ret behavior needs comments.
> + range.handler = kvm_arch_test_clear_young;
> +
> + if (!__kvm_handle_hva_range(kvm, &range))
> + return args.young ? MMU_NOTIFIER_RANGE_LOCKLESS : 0;
> + }
> +
> + if (bitmap)
> + return 0;
> +
> + range.args = NULL;
> + range.lockless = false;
No need to manually clear these, they'll be zeroed by the initialization code.
E.g. all in all, something like so
---
include/linux/kvm_host.h | 9 +++++++--
virt/kvm/kvm_main.c | 29 +++++++++++++++++------------
2 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 7a0922cbc36f..e04605061f5e 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -256,12 +256,17 @@ int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu);
#endif
#ifdef KVM_ARCH_WANT_MMU_NOTIFIER
+struct test_clear_young_metadata;
+
struct kvm_gfn_range {
struct kvm_memory_slot *slot;
- void *args;
gfn_t start;
gfn_t end;
- pte_t pte;
+ union {
+ struct test_clear_young_metadata *metadata;
+ pte_t pte;
+ unsigned long callback_arg;
+ };
bool may_block;
};
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index ac83cfb30771..8cf4fee9cd8b 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -536,16 +536,20 @@ typedef void (*on_lock_fn_t)(struct kvm *kvm, unsigned long start,
typedef void (*on_unlock_fn_t)(struct kvm *kvm);
struct kvm_hva_range {
- void *args;
unsigned long start;
unsigned long end;
- pte_t pte;
hva_handler_t handler;
+ union {
+ struct test_clear_young_metadata *metadata;
+ pte_t pte;
+ unsigned long callback_arg;
+ };
on_lock_fn_t on_lock;
on_unlock_fn_t on_unlock;
bool flush_on_ret;
bool may_block;
bool lockless;
+ bool stop_on_ret;
};
/*
@@ -576,6 +580,9 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm,
struct kvm_memslots *slots;
int i, idx;
+ BUILD_BUG_ON(sizeof(gfn_range.callback_arg) != sizeof(gfn_range.pte) ||
+ sizeof(gfn_range.callback_arg) != sizeof(gfn_range.metadata));
+
if (WARN_ON_ONCE(range->end <= range->start))
return 0;
@@ -599,16 +606,14 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm,
hva_end = min(range->end, slot->userspace_addr +
(slot->npages << PAGE_SHIFT));
- gfn_range.args = range->args;
-
/*
* To optimize for the likely case where the address
* range is covered by zero or one memslots, don't
* bother making these conditional (to avoid writes on
* the second or later invocation of the handler).
*/
- gfn_range.pte = range->pte;
gfn_range.may_block = range->may_block;
+ gfn_range.callback_arg = range->callback_arg;
/*
* {gfn(page) | page intersects with [hva_start, hva_end)} =
@@ -628,7 +633,8 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm,
}
ret |= range->handler(kvm, &gfn_range);
- if (range->lockless && ret)
+ /* comment goes here. */
+ if (range->stop_on_ret && ret)
break;
}
}
@@ -830,7 +836,7 @@ static int kvm_mmu_notifier_clear_flush_young(struct mmu_notifier *mn,
return kvm_handle_hva_range(mn, start, end, __pte(0), kvm_age_gfn);
}
-struct test_clear_young_args {
+struct test_clear_young_metadata {
unsigned long *bitmap;
unsigned long end;
bool clear;
@@ -839,7 +845,7 @@ struct test_clear_young_args {
bool kvm_should_clear_young(struct kvm_gfn_range *range, gfn_t gfn)
{
- struct test_clear_young_args *args = range->args;
+ struct test_clear_young_metadata *args = range->metadata;
VM_WARN_ON_ONCE(gfn < range->start || gfn >= range->end);
@@ -880,14 +886,15 @@ static int kvm_mmu_notifier_test_clear_young(struct mmu_notifier *mn, struct mm_
trace_kvm_age_hva(start, end);
if (kvm_test_clear_young) {
- struct test_clear_young_args args = {
+ struct test_clear_young_metadata args = {
.bitmap = bitmap,
.end = end,
.clear = clear,
};
- range.args = &args;
range.lockless = true;
+ range.stop_on_ret = true;
+ range.metadata = &args;
range.handler = kvm_test_clear_young;
if (!__kvm_handle_hva_range(kvm, &range))
@@ -897,8 +904,6 @@ static int kvm_mmu_notifier_test_clear_young(struct mmu_notifier *mn, struct mm_
if (bitmap)
return 0;
- range.args = NULL;
- range.lockless = false;
range.handler = clear ? kvm_age_gfn : kvm_test_age_gfn;
return __kvm_handle_hva_range(kvm, &range) ? MMU_NOTIFIER_RANGE_YOUNG : 0;
base-commit: 7a5d8be2c18415b73b9380741095f439d6983a40
--
