| Message ID | 20170216160449.13094-6-rkrcmar@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am 16.02.2017 um 17:04 schrieb Radim Krčmář: > Just to complete the encapsulation. > > Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> > --- Reviewed-by: David Hildenbrand <david@redhat.com>
On Thu, Feb 16, 2017 at 05:04:49PM +0100, Radim Krčmář wrote: ... > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index 2cc438685af8..563cf964dc5c 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -1101,6 +1101,11 @@ static inline int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args) > * should contain kvm_vcpu_kick(). > */ > > +static inline bool kvm_request_pending(struct kvm_vcpu *vcpu) > +{ > + return vcpu->requests; How about wrapping this with READ_ONCE for good measure? > +} > + > static inline void __kvm_request_set(unsigned req, struct kvm_vcpu *vcpu) > { > set_bit(req, &vcpu->requests); > -- > 2.11.1 > Thanks, drew
2017-02-17 10:51+0100, Andrew Jones: > On Thu, Feb 16, 2017 at 05:04:49PM +0100, Radim Krčmář wrote: > ... >> diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h >> index 2cc438685af8..563cf964dc5c 100644 >> --- a/include/linux/kvm_host.h >> +++ b/include/linux/kvm_host.h >> @@ -1101,6 +1101,11 @@ static inline int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args) >> * should contain kvm_vcpu_kick(). >> */ >> >> +static inline bool kvm_request_pending(struct kvm_vcpu *vcpu) >> +{ >> + return vcpu->requests; > > How about wrapping this with READ_ONCE for good measure? Sounds good; I don't think that callers would want stale values, thanks.
diff --git a/arch/mips/kvm/trap_emul.c b/arch/mips/kvm/trap_emul.c index 35068823cde6..59e121343170 100644 --- a/arch/mips/kvm/trap_emul.c +++ b/arch/mips/kvm/trap_emul.c @@ -1029,7 +1029,7 @@ static void kvm_trap_emul_check_requests(struct kvm_vcpu *vcpu, int cpu, struct mm_struct *mm; int i; - if (likely(!vcpu->requests)) + if (likely(!kvm_request_pending(vcpu))) return; if (kvm_request_test_and_clear(KVM_REQ_TLB_FLUSH, vcpu)) { diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index e9098af0ab2a..54d2d1cca514 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -682,7 +682,7 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu) kvmppc_core_check_exceptions(vcpu); - if (vcpu->requests) { + if (kvm_request_pending(vcpu)) { /* Exception delivery raised request; start over */ return 1; } diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index f570ca9cd8c6..f92d82382da3 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -52,7 +52,7 @@ EXPORT_SYMBOL_GPL(kvmppc_pr_ops); int kvm_arch_vcpu_runnable(struct kvm_vcpu *v) { return !!(v->arch.pending_exceptions) || - v->requests; + kvm_request_pending(v); } int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu) @@ -104,7 +104,7 @@ int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu) */ smp_mb(); - if (vcpu->requests) { + if (kvm_request_pending(vcpu)) { /* Make sure we process requests preemptable */ local_irq_enable(); trace_kvm_check_requests(vcpu); diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 0fa77e6fdfaf..f2625da20e38 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -2393,7 +2393,7 @@ static int kvm_s390_handle_requests(struct kvm_vcpu *vcpu) { retry: kvm_s390_vcpu_request_handled(vcpu); - if (!vcpu->requests) + if (!kvm_request_pending(vcpu)) return 0; /* * We use MMU_RELOAD just to re-arm the ipte notifier for the diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 6e8c62c29a5a..4f325b4eb2cd 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6723,7 +6723,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) bool req_immediate_exit = false; - if (vcpu->requests) { + if (kvm_request_pending(vcpu)) { if (kvm_request_test_and_clear(KVM_REQ_MMU_RELOAD, vcpu)) kvm_mmu_unload(vcpu); if (kvm_request_test_and_clear(KVM_REQ_MIGRATE_TIMER, vcpu)) @@ -6887,7 +6887,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) kvm_x86_ops->sync_pir_to_irr(vcpu); } - if (vcpu->mode == EXITING_GUEST_MODE || vcpu->requests + if (vcpu->mode == EXITING_GUEST_MODE || kvm_request_pending(vcpu) || need_resched() || signal_pending(current)) { vcpu->mode = OUTSIDE_GUEST_MODE; smp_wmb(); diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 2cc438685af8..563cf964dc5c 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1101,6 +1101,11 @@ static inline int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args) * should contain kvm_vcpu_kick(). */ +static inline bool kvm_request_pending(struct kvm_vcpu *vcpu) +{ + return vcpu->requests; +} + static inline void __kvm_request_set(unsigned req, struct kvm_vcpu *vcpu) { set_bit(req, &vcpu->requests);
Just to complete the encapsulation. Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> --- arch/mips/kvm/trap_emul.c | 2 +- arch/powerpc/kvm/booke.c | 2 +- arch/powerpc/kvm/powerpc.c | 4 ++-- arch/s390/kvm/kvm-s390.c | 2 +- arch/x86/kvm/x86.c | 4 ++-- include/linux/kvm_host.h | 5 +++++ 6 files changed, 12 insertions(+), 7 deletions(-)