On 06/06/19 00:54, Liran Alon wrote:
> Make all code consistent with kvm_deliver_exception_payload() by using
> appropriate symbolic constant instead of hard-coded number.
>
> Reviewed-by: Nikita Leshenko <nikita.leshchenko@xxxxxxxxxx>
> Reviewed-by: Krish Sadhukhan <krish.sadhukhan@xxxxxxxxxx>
> Signed-off-by: Liran Alon <liran.alon@xxxxxxxxxx>
> ---
> arch/x86/kvm/emulate.c | 2 +-
> arch/x86/kvm/vmx/vmx.c | 4 ++--
> arch/x86/kvm/x86.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
> index d0d5dd44b4f4..199cd2cf7254 100644
> --- a/arch/x86/kvm/emulate.c
> +++ b/arch/x86/kvm/emulate.c
> @@ -4260,7 +4260,7 @@ static int check_dr_read(struct x86_emulate_ctxt *ctxt)
> ulong dr6;
>
> ctxt->ops->get_dr(ctxt, 6, &dr6);
> - dr6 &= ~15;
> + dr6 &= ~DR_TRAP_BITS;
> dr6 |= DR6_BD | DR6_RTM;
> ctxt->ops->set_dr(ctxt, 6, dr6);
> return emulate_db(ctxt);
> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> index b93e36ddee5e..f64bcbb03906 100644
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@ -4521,7 +4521,7 @@ static int handle_exception(struct kvm_vcpu *vcpu)
> dr6 = vmcs_readl(EXIT_QUALIFICATION);
> if (!(vcpu->guest_debug &
> (KVM_GUESTDBG_SINGLESTEP | KVM_GUESTDBG_USE_HW_BP))) {
> - vcpu->arch.dr6 &= ~15;
> + vcpu->arch.dr6 &= ~DR_TRAP_BITS;
> vcpu->arch.dr6 |= dr6 | DR6_RTM;
> if (is_icebp(intr_info))
> skip_emulated_instruction(vcpu);
> @@ -4766,7 +4766,7 @@ static int handle_dr(struct kvm_vcpu *vcpu)
> vcpu->run->exit_reason = KVM_EXIT_DEBUG;
> return 0;
> } else {
> - vcpu->arch.dr6 &= ~15;
> + vcpu->arch.dr6 &= ~DR_TRAP_BITS;
> vcpu->arch.dr6 |= DR6_BD | DR6_RTM;
> kvm_queue_exception(vcpu, DB_VECTOR);
> return 1;
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 83aefd759846..db9dc011965b 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -6381,7 +6381,7 @@ static bool kvm_vcpu_check_breakpoint(struct kvm_vcpu *vcpu, int *r)
> vcpu->arch.db);
>
> if (dr6 != 0) {
> - vcpu->arch.dr6 &= ~15;
> + vcpu->arch.dr6 &= ~DR_TRAP_BITS;
> vcpu->arch.dr6 |= dr6 | DR6_RTM;
> kvm_queue_exception(vcpu, DB_VECTOR);
> *r = EMULATE_DONE;
>
Queued, thanks.
Paolo
