diff for duplicates of <YVOT3gj1ulBTNSw3@google.com> diff --git a/a/1.txt b/N1/1.txt index b2746c0..8c5da36 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,10 +27,10 @@ Reviewed-by: David Matlack <dmatlack@google.com> > +++ b/arch/x86/kvm/x86.c > @@ -9893,7 +9893,10 @@ static inline int vcpu_block(struct kvm *kvm, struct kvm_vcpu *vcpu) > if (!kvm_arch_vcpu_runnable(vcpu) && -> (!kvm_x86_ops.pre_block || static_call(kvm_x86_pre_block)(vcpu) = 0)) { +> (!kvm_x86_ops.pre_block || static_call(kvm_x86_pre_block)(vcpu) == 0)) { > srcu_read_unlock(&kvm->srcu, vcpu->srcu_idx); > - kvm_vcpu_halt(vcpu); -> + if (vcpu->arch.mp_state = KVM_MP_STATE_HALTED) +> + if (vcpu->arch.mp_state == KVM_MP_STATE_HALTED) > + kvm_vcpu_halt(vcpu); > + else > + kvm_vcpu_block(vcpu); @@ -39,4 +39,8 @@ Reviewed-by: David Matlack <dmatlack@google.com> > if (kvm_x86_ops.post_block) > -- > 2.33.0.685.g46640cef36-goog -> +> +_______________________________________________ +kvmarm mailing list +kvmarm@lists.cs.columbia.edu +https://lists.cs.columbia.edu/mailman/listinfo/kvmarm diff --git a/a/content_digest b/N1/content_digest index 9c8d093..bea1650 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,30 +4,26 @@ "Subject\0Re: [PATCH 14/14] KVM: x86: Invoke kvm_vcpu_block() directly for non-HALTED wait states\0" "Date\0Tue, 28 Sep 2021 22:14:54 +0000\0" "To\0Sean Christopherson <seanjc@google.com>\0" - "Cc\0Marc Zyngier <maz@kernel.org>" - Huacai Chen <chenhuacai@kernel.org> - Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> - Paul Mackerras <paulus@ozlabs.org> - Christian Borntraeger <borntraeger@de.ibm.com> - Janosch Frank <frankja@linux.ibm.com> - Paolo Bonzini <pbonzini@redhat.com> - James Morse <james.morse@arm.com> - Alexandru Elisei <alexandru.elisei@arm.com> - Suzuki K Poulose <suzuki.poulose@arm.com> + "Cc\0Wanpeng Li <wanpengli@tencent.com>" + kvm@vger.kernel.org David Hildenbrand <david@redhat.com> - Cornelia Huck <cohuck@redhat.com> + linux-kernel@vger.kernel.org + Paul Mackerras <paulus@ozlabs.org> Claudio Imbrenda <imbrenda@linux.ibm.com> - Vitaly Kuznetsov <vkuznets@redhat.com> - Wanpeng Li <wanpengli@tencent.com> - Jim Mattson <jmattson@google.com> + kvmarm@lists.cs.columbia.edu + Janosch Frank <frankja@linux.ibm.com> + Marc Zyngier <maz@kernel.org> Joerg Roedel <joro@8bytes.org> + Huacai Chen <chenhuacai@kernel.org> + Christian Borntraeger <borntraeger@de.ibm.com> + Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> + kvm-ppc@vger.kernel.org linux-arm-kernel@lists.infradead.org - kvmarm@lists.cs.columbia.edu + Jim Mattson <jmattson@google.com> + Cornelia Huck <cohuck@redhat.com> linux-mips@vger.kernel.org - kvm@vger.kernel.org - kvm-ppc@vger.kernel.org - linux-kernel@vger.kernel.org - " Jing Zhang <jingzhangos@google.com>\0" + Paolo Bonzini <pbonzini@redhat.com> + " Vitaly Kuznetsov <vkuznets@redhat.com>\0" "\00:1\0" "b\0" "On Fri, Sep 24, 2021 at 05:55:28PM -0700, Sean Christopherson wrote:\n" @@ -59,10 +55,10 @@ "> +++ b/arch/x86/kvm/x86.c\n" "> @@ -9893,7 +9893,10 @@ static inline int vcpu_block(struct kvm *kvm, struct kvm_vcpu *vcpu)\n" "> \tif (!kvm_arch_vcpu_runnable(vcpu) &&\n" - "> \t (!kvm_x86_ops.pre_block || static_call(kvm_x86_pre_block)(vcpu) = 0)) {\n" + "> \t (!kvm_x86_ops.pre_block || static_call(kvm_x86_pre_block)(vcpu) == 0)) {\n" "> \t\tsrcu_read_unlock(&kvm->srcu, vcpu->srcu_idx);\n" "> -\t\tkvm_vcpu_halt(vcpu);\n" - "> +\t\tif (vcpu->arch.mp_state = KVM_MP_STATE_HALTED)\n" + "> +\t\tif (vcpu->arch.mp_state == KVM_MP_STATE_HALTED)\n" "> +\t\t\tkvm_vcpu_halt(vcpu);\n" "> +\t\telse\n" "> +\t\t\tkvm_vcpu_block(vcpu);\n" @@ -71,6 +67,10 @@ "> \t\tif (kvm_x86_ops.post_block)\n" "> -- \n" "> 2.33.0.685.g46640cef36-goog\n" - > + "> \n" + "_______________________________________________\n" + "kvmarm mailing list\n" + "kvmarm@lists.cs.columbia.edu\n" + https://lists.cs.columbia.edu/mailman/listinfo/kvmarm -4d2aec639a9cc0f0e494b10d80965d3af8bdad38fd417064b93b2caafe86d612 +04973c02975abd6b51e0c4df76d45b369e45af4118c619e6dd1ba54fab5598a1
diff --git a/a/1.txt b/N2/1.txt index b2746c0..9d87b88 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -27,10 +27,10 @@ Reviewed-by: David Matlack <dmatlack@google.com> > +++ b/arch/x86/kvm/x86.c > @@ -9893,7 +9893,10 @@ static inline int vcpu_block(struct kvm *kvm, struct kvm_vcpu *vcpu) > if (!kvm_arch_vcpu_runnable(vcpu) && -> (!kvm_x86_ops.pre_block || static_call(kvm_x86_pre_block)(vcpu) = 0)) { +> (!kvm_x86_ops.pre_block || static_call(kvm_x86_pre_block)(vcpu) == 0)) { > srcu_read_unlock(&kvm->srcu, vcpu->srcu_idx); > - kvm_vcpu_halt(vcpu); -> + if (vcpu->arch.mp_state = KVM_MP_STATE_HALTED) +> + if (vcpu->arch.mp_state == KVM_MP_STATE_HALTED) > + kvm_vcpu_halt(vcpu); > + else > + kvm_vcpu_block(vcpu); diff --git a/a/content_digest b/N2/content_digest index 9c8d093..d8f6536 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -59,10 +59,10 @@ "> +++ b/arch/x86/kvm/x86.c\n" "> @@ -9893,7 +9893,10 @@ static inline int vcpu_block(struct kvm *kvm, struct kvm_vcpu *vcpu)\n" "> \tif (!kvm_arch_vcpu_runnable(vcpu) &&\n" - "> \t (!kvm_x86_ops.pre_block || static_call(kvm_x86_pre_block)(vcpu) = 0)) {\n" + "> \t (!kvm_x86_ops.pre_block || static_call(kvm_x86_pre_block)(vcpu) == 0)) {\n" "> \t\tsrcu_read_unlock(&kvm->srcu, vcpu->srcu_idx);\n" "> -\t\tkvm_vcpu_halt(vcpu);\n" - "> +\t\tif (vcpu->arch.mp_state = KVM_MP_STATE_HALTED)\n" + "> +\t\tif (vcpu->arch.mp_state == KVM_MP_STATE_HALTED)\n" "> +\t\t\tkvm_vcpu_halt(vcpu);\n" "> +\t\telse\n" "> +\t\t\tkvm_vcpu_block(vcpu);\n" @@ -73,4 +73,4 @@ "> 2.33.0.685.g46640cef36-goog\n" > -4d2aec639a9cc0f0e494b10d80965d3af8bdad38fd417064b93b2caafe86d612 +2d516d053cd34fa32361ea7b4c27cfb16688eac0ce7a3c584d898b87b591a9f9
diff --git a/a/1.txt b/N3/1.txt index b2746c0..a86bc6c 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -27,10 +27,10 @@ Reviewed-by: David Matlack <dmatlack@google.com> > +++ b/arch/x86/kvm/x86.c > @@ -9893,7 +9893,10 @@ static inline int vcpu_block(struct kvm *kvm, struct kvm_vcpu *vcpu) > if (!kvm_arch_vcpu_runnable(vcpu) && -> (!kvm_x86_ops.pre_block || static_call(kvm_x86_pre_block)(vcpu) = 0)) { +> (!kvm_x86_ops.pre_block || static_call(kvm_x86_pre_block)(vcpu) == 0)) { > srcu_read_unlock(&kvm->srcu, vcpu->srcu_idx); > - kvm_vcpu_halt(vcpu); -> + if (vcpu->arch.mp_state = KVM_MP_STATE_HALTED) +> + if (vcpu->arch.mp_state == KVM_MP_STATE_HALTED) > + kvm_vcpu_halt(vcpu); > + else > + kvm_vcpu_block(vcpu); @@ -39,4 +39,9 @@ Reviewed-by: David Matlack <dmatlack@google.com> > if (kvm_x86_ops.post_block) > -- > 2.33.0.685.g46640cef36-goog -> +> + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N3/content_digest index 9c8d093..012e6ac 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -59,10 +59,10 @@ "> +++ b/arch/x86/kvm/x86.c\n" "> @@ -9893,7 +9893,10 @@ static inline int vcpu_block(struct kvm *kvm, struct kvm_vcpu *vcpu)\n" "> \tif (!kvm_arch_vcpu_runnable(vcpu) &&\n" - "> \t (!kvm_x86_ops.pre_block || static_call(kvm_x86_pre_block)(vcpu) = 0)) {\n" + "> \t (!kvm_x86_ops.pre_block || static_call(kvm_x86_pre_block)(vcpu) == 0)) {\n" "> \t\tsrcu_read_unlock(&kvm->srcu, vcpu->srcu_idx);\n" "> -\t\tkvm_vcpu_halt(vcpu);\n" - "> +\t\tif (vcpu->arch.mp_state = KVM_MP_STATE_HALTED)\n" + "> +\t\tif (vcpu->arch.mp_state == KVM_MP_STATE_HALTED)\n" "> +\t\t\tkvm_vcpu_halt(vcpu);\n" "> +\t\telse\n" "> +\t\t\tkvm_vcpu_block(vcpu);\n" @@ -71,6 +71,11 @@ "> \t\tif (kvm_x86_ops.post_block)\n" "> -- \n" "> 2.33.0.685.g46640cef36-goog\n" - > + "> \n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -4d2aec639a9cc0f0e494b10d80965d3af8bdad38fd417064b93b2caafe86d612 +ef08c272fbab13d3ad535e60ae83e87e3ba3f5f8e3e1ad4cacd6a8d178f23dbb
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.