lkml.org 
[lkml]   [2017]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RFC 1/7] KVM: x86: rename HV_X64_MSR_APIC_ASSIST_PAGE to HV_X64_MSR_VP_ASSIST_PAGE
    Date
    From: Ladi Prosek <lprosek@redhat.com>

    The assist page has been used only for the paravirtual EOI so far, hence
    the "APIC" in the MSR name. Renaming to match the Hyper-V TLFS where it's
    called "Virtual VP Assist MSR".

    Signed-off-by: Ladi Prosek <lprosek@redhat.com>
    Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
    ---
    arch/x86/include/uapi/asm/hyperv.h | 10 +++++-----
    arch/x86/kvm/hyperv.c | 8 ++++----
    arch/x86/kvm/lapic.h | 2 +-
    arch/x86/kvm/x86.c | 2 +-
    4 files changed, 11 insertions(+), 11 deletions(-)

    diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h
    index 1a5bfead93b4..a742af3e8408 100644
    --- a/arch/x86/include/uapi/asm/hyperv.h
    +++ b/arch/x86/include/uapi/asm/hyperv.h
    @@ -186,7 +186,7 @@
    #define HV_X64_MSR_EOI 0x40000070
    #define HV_X64_MSR_ICR 0x40000071
    #define HV_X64_MSR_TPR 0x40000072
    -#define HV_X64_MSR_APIC_ASSIST_PAGE 0x40000073
    +#define HV_X64_MSR_VP_ASSIST_PAGE 0x40000073

    /* Define synthetic interrupt controller model specific registers. */
    #define HV_X64_MSR_SCONTROL 0x40000080
    @@ -248,10 +248,10 @@
    #define HVCALL_POST_MESSAGE 0x005c
    #define HVCALL_SIGNAL_EVENT 0x005d

    -#define HV_X64_MSR_APIC_ASSIST_PAGE_ENABLE 0x00000001
    -#define HV_X64_MSR_APIC_ASSIST_PAGE_ADDRESS_SHIFT 12
    -#define HV_X64_MSR_APIC_ASSIST_PAGE_ADDRESS_MASK \
    - (~((1ull << HV_X64_MSR_APIC_ASSIST_PAGE_ADDRESS_SHIFT) - 1))
    +#define HV_X64_MSR_VP_ASSIST_PAGE_ENABLE 0x00000001
    +#define HV_X64_MSR_VP_ASSIST_PAGE_ADDRESS_SHIFT 12
    +#define HV_X64_MSR_VP_ASSIST_PAGE_ADDRESS_MASK \
    + (~((1ull << HV_X64_MSR_VP_ASSIST_PAGE_ADDRESS_SHIFT) - 1))

    #define HV_X64_MSR_TSC_REFERENCE_ENABLE 0x00000001
    #define HV_X64_MSR_TSC_REFERENCE_ADDRESS_SHIFT 12
    diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
    index dc97f2544b6f..9fb0ed9b1670 100644
    --- a/arch/x86/kvm/hyperv.c
    +++ b/arch/x86/kvm/hyperv.c
    @@ -1009,17 +1009,17 @@ static int kvm_hv_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data, bool host)
    return 1;
    hv->vp_index = (u32)data;
    break;
    - case HV_X64_MSR_APIC_ASSIST_PAGE: {
    + case HV_X64_MSR_VP_ASSIST_PAGE: {
    u64 gfn;
    unsigned long addr;

    - if (!(data & HV_X64_MSR_APIC_ASSIST_PAGE_ENABLE)) {
    + if (!(data & HV_X64_MSR_VP_ASSIST_PAGE_ENABLE)) {
    hv->hv_vapic = data;
    if (kvm_lapic_enable_pv_eoi(vcpu, 0))
    return 1;
    break;
    }
    - gfn = data >> HV_X64_MSR_APIC_ASSIST_PAGE_ADDRESS_SHIFT;
    + gfn = data >> HV_X64_MSR_VP_ASSIST_PAGE_ADDRESS_SHIFT;
    addr = kvm_vcpu_gfn_to_hva(vcpu, gfn);
    if (kvm_is_error_hva(addr))
    return 1;
    @@ -1129,7 +1129,7 @@ static int kvm_hv_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
    return kvm_hv_vapic_msr_read(vcpu, APIC_ICR, pdata);
    case HV_X64_MSR_TPR:
    return kvm_hv_vapic_msr_read(vcpu, APIC_TASKPRI, pdata);
    - case HV_X64_MSR_APIC_ASSIST_PAGE:
    + case HV_X64_MSR_VP_ASSIST_PAGE:
    data = hv->hv_vapic;
    break;
    case HV_X64_MSR_VP_RUNTIME:
    diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
    index 4b9935a38347..f7ee56819add 100644
    --- a/arch/x86/kvm/lapic.h
    +++ b/arch/x86/kvm/lapic.h
    @@ -109,7 +109,7 @@ int kvm_hv_vapic_msr_read(struct kvm_vcpu *vcpu, u32 msr, u64 *data);

    static inline bool kvm_hv_vapic_assist_page_enabled(struct kvm_vcpu *vcpu)
    {
    - return vcpu->arch.hyperv.hv_vapic & HV_X64_MSR_APIC_ASSIST_PAGE_ENABLE;
    + return vcpu->arch.hyperv.hv_vapic & HV_X64_MSR_VP_ASSIST_PAGE_ENABLE;
    }

    int kvm_lapic_enable_pv_eoi(struct kvm_vcpu *vcpu, u64 data);
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index faf843c9b916..fc06af73128e 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -1026,7 +1026,7 @@ static u32 emulated_msrs[] = {
    HV_X64_MSR_VP_RUNTIME,
    HV_X64_MSR_SCONTROL,
    HV_X64_MSR_STIMER0_CONFIG,
    - HV_X64_MSR_APIC_ASSIST_PAGE, MSR_KVM_ASYNC_PF_EN, MSR_KVM_STEAL_TIME,
    + HV_X64_MSR_VP_ASSIST_PAGE, MSR_KVM_ASYNC_PF_EN, MSR_KVM_STEAL_TIME,
    MSR_KVM_PV_EOI_EN,

    MSR_IA32_TSC_ADJUST,
    --
    2.14.3
    \
     
     \ /
      Last update: 2017-12-18 18:21    [W:4.047 / U:0.416 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site