lkml.org 
[lkml]   [2015]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 10/15] KVM: MTRR: sort variable MTRRs


    On 06/01/2015 05:27 PM, Paolo Bonzini wrote:
    >
    >
    > On 30/05/2015 12:59, Xiao Guangrong wrote:
    >> Sort all valid variable MTRRs based on its base address, it will help us to
    >> check a range to see if it's fully contained in variable MTRRs
    >>
    >> Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
    >> ---
    >> arch/x86/include/asm/kvm_host.h | 3 +++
    >> arch/x86/kvm/mtrr.c | 39 +++++++++++++++++++++++++++++++++++++++
    >> arch/x86/kvm/x86.c | 2 +-
    >> arch/x86/kvm/x86.h | 1 +
    >> 4 files changed, 44 insertions(+), 1 deletion(-)
    >>
    >> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
    >> index f3fc152..5be8f2e 100644
    >> --- a/arch/x86/include/asm/kvm_host.h
    >> +++ b/arch/x86/include/asm/kvm_host.h
    >> @@ -347,6 +347,7 @@ enum {
    >> struct kvm_mtrr_range {
    >> u64 base;
    >> u64 mask;
    >> + struct list_head node;
    >> };
    >>
    >> struct kvm_mtrr {
    >> @@ -362,6 +363,8 @@ struct kvm_mtrr {
    >> unsigned mtrr_enabled:1;
    >> };
    >> };
    >> +
    >> + struct list_head head;
    >> };
    >>
    >> struct kvm_vcpu_arch {
    >> diff --git a/arch/x86/kvm/mtrr.c b/arch/x86/kvm/mtrr.c
    >> index aeb9767..8e3b81a 100644
    >> --- a/arch/x86/kvm/mtrr.c
    >> +++ b/arch/x86/kvm/mtrr.c
    >> @@ -262,6 +262,38 @@ do_zap:
    >> kvm_zap_gfn_range(vcpu->kvm, gpa_to_gfn(start), gpa_to_gfn(end));
    >> }
    >>
    >> +static bool var_mtrr_range_is_valid(struct kvm_mtrr_range *range)
    >> +{
    >> + u64 start, end;
    >> +
    >> + if (!(range->mask & (1 << 11)))
    >> + return false;
    >> +
    >> + var_mtrr_range(range, &start, &end);
    >> + return end > start;
    >> +}
    >> +
    >> +static void set_var_mtrr_start(struct kvm_mtrr *mtrr_state, int index)
    >> +{
    >> + /* remove the entry if it's in the list. */
    >> + if (var_mtrr_range_is_valid(&mtrr_state->var_ranges[index]))
    >> + list_del(&mtrr_state->var_ranges[index].node);
    >> +}
    >> +
    >> +static void set_var_mtrr_end(struct kvm_mtrr *mtrr_state, int index)
    >> +{
    >> + struct kvm_mtrr_range *tmp, *cur = &mtrr_state->var_ranges[index];
    >> +
    >> + /* add it to the list if it's valid. */
    >> + if (var_mtrr_range_is_valid(&mtrr_state->var_ranges[index])) {
    >> + list_for_each_entry(tmp, &mtrr_state->head, node)
    >> + if (cur->base < tmp->base)
    >> + list_add_tail(&cur->node, &tmp->node);
    >> +
    >> + list_add_tail(&cur->node, &mtrr_state->head);
    >> + }
    >> +}
    >> +
    >> int kvm_mtrr_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data)
    >> {
    >> int index;
    >> @@ -281,10 +313,12 @@ int kvm_mtrr_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data)
    >>
    >> index = (msr - 0x200) / 2;
    >> is_mtrr_mask = msr - 0x200 - 2 * index;
    >> + set_var_mtrr_start(&vcpu->arch.mtrr_state, index);
    >> if (!is_mtrr_mask)
    >> vcpu->arch.mtrr_state.var_ranges[index].base = data;
    >> else
    >> vcpu->arch.mtrr_state.var_ranges[index].mask = data;
    >> + set_var_mtrr_end(&vcpu->arch.mtrr_state, index);
    >
    > Just move the whole code to a new kvm_set_var_mtrr function.

    Okay.

    >
    >> }
    >>
    >> update_mtrr(vcpu, msr);
    >> @@ -331,6 +365,11 @@ int kvm_mtrr_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
    >> return 0;
    >> }
    >>
    >> +void kvm_vcpu_mtrr_init(struct kvm_vcpu *vcpu)
    >> +{
    >> + INIT_LIST_HEAD(&vcpu->arch.mtrr_state.head);
    >> +}
    >> +
    >> u8 kvm_mtrr_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn)
    >> {
    >> struct kvm_mtrr *mtrr_state = &vcpu->arch.mtrr_state;
    >> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    >> index 64c2891..8084ac3 100644
    >> --- a/arch/x86/kvm/x86.c
    >> +++ b/arch/x86/kvm/x86.c
    >> @@ -6991,7 +6991,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
    >> kvm_vcpu_reset(vcpu, false);
    >> kvm_mmu_setup(vcpu);
    >> vcpu_put(vcpu);
    >> -
    >> + kvm_vcpu_mtrr_init(vcpu);
    >
    > Please move this call much earlier.

    Okay, will do these in v2.



    \
     
     \ /
      Last update: 2015-06-03 05:01    [W:8.073 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site