lkml.org 
[lkml]   [2020]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 81/99] kvm: x86: use macros to compute bank MSRs
    3.16.84-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Chen Yucong <slaoub@gmail.com>

    commit 81760dccf8d1fe5b128b58736fe3f56a566133cb upstream.

    Avoid open coded calculations for bank MSRs by using well-defined
    macros that hide the index of higher bank MSRs.

    No semantic changes.

    Signed-off-by: Chen Yucong <slaoub@gmail.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    [bwh: Backported to 3.16: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/x86/kvm/x86.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -1915,7 +1915,7 @@ static int set_msr_mce(struct kvm_vcpu *
    break;
    default:
    if (msr >= MSR_IA32_MC0_CTL &&
    - msr < MSR_IA32_MC0_CTL + 4 * bank_num) {
    + msr < MSR_IA32_MCx_CTL(bank_num)) {
    u32 offset = msr - MSR_IA32_MC0_CTL;
    /* only 0 or all 1s can be written to IA32_MCi_CTL
    * some Linux kernels though clear bit 10 in bank 4 to
    @@ -2276,7 +2276,7 @@ int kvm_set_msr_common(struct kvm_vcpu *

    case MSR_IA32_MCG_CTL:
    case MSR_IA32_MCG_STATUS:
    - case MSR_IA32_MC0_CTL ... MSR_IA32_MC0_CTL + 4 * KVM_MAX_MCE_BANKS - 1:
    + case MSR_IA32_MC0_CTL ... MSR_IA32_MCx_CTL(KVM_MAX_MCE_BANKS) - 1:
    return set_msr_mce(vcpu, msr, data);

    /* Performance counters are not protected by a CPUID bit,
    @@ -2442,7 +2442,7 @@ static int get_msr_mce(struct kvm_vcpu *
    break;
    default:
    if (msr >= MSR_IA32_MC0_CTL &&
    - msr < MSR_IA32_MC0_CTL + 4 * bank_num) {
    + msr < MSR_IA32_MCx_CTL(bank_num)) {
    u32 offset = msr - MSR_IA32_MC0_CTL;
    data = vcpu->arch.mce_banks[offset];
    break;
    @@ -2628,7 +2628,7 @@ int kvm_get_msr_common(struct kvm_vcpu *
    case MSR_IA32_MCG_CAP:
    case MSR_IA32_MCG_CTL:
    case MSR_IA32_MCG_STATUS:
    - case MSR_IA32_MC0_CTL ... MSR_IA32_MC0_CTL + 4 * KVM_MAX_MCE_BANKS - 1:
    + case MSR_IA32_MC0_CTL ... MSR_IA32_MCx_CTL(KVM_MAX_MCE_BANKS) - 1:
    return get_msr_mce(vcpu, msr_info->index, &msr_info->data);
    case MSR_K7_CLK_CTL:
    /*
    \
     
     \ /
      Last update: 2020-05-20 16:26    [W:4.089 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site