x86/hyperv: stash and use the configured max VP index
PATCH 1/1 x86/hyperv: stash and use the configured max VP index
The value returned from CPUID is the maximum number for virtual processors supported by Hyper-V. It could be larger than the maximum number of virtual processors configured.
Stash the configured number into a variable and use it in calculations.
--- xen/arch/x86/guest/hyperv/hyperv.c | 4 ++++ xen/arch/x86/guest/hyperv/private.h | 1 + xen/arch/x86/guest/hyperv/tlb.c | 2 +- xen/arch/x86/guest/hyperv/util.c | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-)
xen/arch/x86/guest/hyperv/hyperv.c +4 -0
@@ -33,6 +33,7 @@ DEFINE_PER_CPU_READ_MOSTLY(void *, hv_input_page); DEFINE_PER_CPU_READ_MOSTLY(void *, hv_vp_assist); DEFINE_PER_CPU_READ_MOSTLY(unsigned int, hv_vp_index); +unsigned int __read_mostly hv_max_vp_index;static bool __read_mostly hcall_page_ready;static uint64_t generate_guest_id (void )
@@ -143,6 +144,9 @@ static int setup_hypercall_pcpu_arg(void)rdmsrl (HV_X64_MSR_VP_INDEX , vp_index_msr);this_cpu (hv_vp_index) = vp_index_msr; +if ( vp_index_msr > hv_max_vp_index ) + hv_max_vp_index = vp_index_msr; +return 0 ; }
xen/arch/x86/guest/hyperv/private.h +1 -0
@@ -28,6 +28,7 @@ DECLARE_PER_CPU(void *, hv_input_page); DECLARE_PER_CPU(void *, hv_vp_assist); DECLARE_PER_CPU(unsigned int, hv_vp_index); +extern unsigned int hv_max_vp_index;static inline unsigned int hv_vp_index (unsigned int cpu) {
xen/arch/x86/guest/hyperv/tlb.c +1 -1
@@ -166,7 +166,7 @@ int hyperv_flush_tlb(const cpumask_t *mask, const void *va, {unsigned int vpid =hv_vp_index (cpu); -if ( vpid >= ms_hyperv.max_vp_index ) +if ( vpid >= hv_max_vp_index ) {local_irq_restore (irq_flags);return -ENXIO ;
xen/arch/x86/guest/hyperv/util.c +1 -1
@@ -33,7 +33,7 @@ int cpumask_to_vpset(struct hv_vpset *vpset, {int nr =1 ;unsigned int cpu, vcpu_bank, vcpu_offset; -unsigned int max_banks = ms_hyperv.max_vp_index /64 ; +unsigned int max_banks = hv_max_vp_index /64 ;/* Up to 64 banks can be represented by valid_bank_mask */ if ( max_banks >64 )
Signature · 1 line
2.20.1
Quoted 53 lines · Wei Liu
The value returned from CPUID is the maximum number for virtual processors supported by Hyper-V. It could be larger than the maximum number of virtual processors configured.
Stash the configured number into a variable and use it in calculations.
Signed-off-by Wei Liu <[email protected]>--- xen/arch/x86/guest/hyperv/hyperv.c | 4 ++++ xen/arch/x86/guest/hyperv/private.h | 1 + xen/arch/x86/guest/hyperv/tlb.c | 2 +- xen/arch/x86/guest/hyperv/util.c | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-)xen/arch/x86/guest/hyperv/hyperv.c +4
-0@@ -33,6 +33,7 @@ DEFINE_PER_CPU_READ_MOSTLY(void *, hv_input_page); DEFINE_PER_CPU_READ_MOSTLY(void *, hv_vp_assist); DEFINE_PER_CPU_READ_MOSTLY(unsigned int, hv_vp_index); +unsigned int __read_mostly hv_max_vp_index;static bool __read_mostly hcall_page_ready;static uint64_t generate_guest_id (void )@@ -143,6 +144,9 @@ static int setup_hypercall_pcpu_arg(void)rdmsrl (HV_X64_MSR_VP_INDEX , vp_index_msr);this_cpu (hv_vp_index) = vp_index_msr; +if ( vp_index_msr > hv_max_vp_index ) + hv_max_vp_index = vp_index_msr; +return 0 ; }xen/arch/x86/guest/hyperv/private.h +1
-0@@ -28,6 +28,7 @@ DECLARE_PER_CPU(void *, hv_input_page); DECLARE_PER_CPU(void *, hv_vp_assist); DECLARE_PER_CPU(unsigned int, hv_vp_index); +extern unsigned int hv_max_vp_index;static inline unsigned int hv_vp_index (unsigned int cpu) {xen/arch/x86/guest/hyperv/tlb.c +0
-0
xen/arch/x86/guest/hyperv/tlb.c int hyperv_flush_tlb(const cpumask_t *mask, const void *va, · line 169
Quoted 5 lines
xen/arch/x86/guest/hyperv/tlb.c +1
-1@@ -166,7 +166,7 @@ int hyperv_flush_tlb(const cpumask_t *mask, const void *va, {unsigned int vpid =hv_vp_index (cpu); -if ( vpid >= ms_hyperv.max_vp_index ) +if ( vpid >= hv_max_vp_index )
I think the >= should be changed to > here.
Wei.
Quoted 19 lines
xen/arch/x86/guest/hyperv/tlb.c +0
-0{local_irq_restore (irq_flags);return -ENXIO ;xen/arch/x86/guest/hyperv/util.c +1
-1@@ -33,7 +33,7 @@ int cpumask_to_vpset(struct hv_vpset *vpset, {int nr =1 ;unsigned int cpu, vcpu_bank, vcpu_offset; -unsigned int max_banks = ms_hyperv.max_vp_index /64 ; +unsigned int max_banks = hv_max_vp_index /64 ;/* Up to 64 banks can be represented by valid_bank_mask */ if ( max_banks >64 )Signature · 1 line
2.20.1
Roger Pau Monné
Reviewed-byQuoted 57 lines · Wei Liu
Quoted 56 lines · Wei Liu
The value returned from CPUID is the maximum number for virtual processors supported by Hyper-V. It could be larger than the maximum number of virtual processors configured.
Stash the configured number into a variable and use it in calculations.
Signed-off-by Wei Liu <[email protected]>--- xen/arch/x86/guest/hyperv/hyperv.c | 4 ++++ xen/arch/x86/guest/hyperv/private.h | 1 + xen/arch/x86/guest/hyperv/tlb.c | 2 +- xen/arch/x86/guest/hyperv/util.c | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-)xen/arch/x86/guest/hyperv/hyperv.c +4
-0@@ -33,6 +33,7 @@ DEFINE_PER_CPU_READ_MOSTLY(void *, hv_input_page); DEFINE_PER_CPU_READ_MOSTLY(void *, hv_vp_assist); DEFINE_PER_CPU_READ_MOSTLY(unsigned int, hv_vp_index); +unsigned int __read_mostly hv_max_vp_index;static bool __read_mostly hcall_page_ready;static uint64_t generate_guest_id (void )@@ -143,6 +144,9 @@ static int setup_hypercall_pcpu_arg(void)rdmsrl (HV_X64_MSR_VP_INDEX , vp_index_msr);this_cpu (hv_vp_index) = vp_index_msr; +if ( vp_index_msr > hv_max_vp_index ) + hv_max_vp_index = vp_index_msr; +return 0 ; }xen/arch/x86/guest/hyperv/private.h +1
-0@@ -28,6 +28,7 @@ DECLARE_PER_CPU(void *, hv_input_page); DECLARE_PER_CPU(void *, hv_vp_assist); DECLARE_PER_CPU(unsigned int, hv_vp_index); +extern unsigned int hv_max_vp_index;static inline unsigned int hv_vp_index (unsigned int cpu) {xen/arch/x86/guest/hyperv/tlb.c +0
-0@@ -166,7 +166,7 @@ int hyperv_flush_tlb(const cpumask_t *mask, const void *va, {unsigned int vpid =hv_vp_index (cpu);
Quoted 4 lines
xen/arch/x86/guest/hyperv/tlb.c int hyperv_flush_tlb(const cpumask_t *mask, const void *va, · line 169
Quoted 2 lines
xen/arch/x86/guest/hyperv/tlb.c +1
-1-if ( vpid >= ms_hyperv.max_vp_index ) +if ( vpid >= hv_max_vp_index )I think the >= should be changed to > here.
I agree. With this fixed:
Thanks!
Quoted 58 lines · Roger Pau Monné
Quoted 57 lines · Wei Liu
Quoted 56 lines · Wei Liu
The value returned from CPUID is the maximum number for virtual processors supported by Hyper-V. It could be larger than the maximum number of virtual processors configured.
Stash the configured number into a variable and use it in calculations.
Signed-off-by Wei Liu <[email protected]>--- xen/arch/x86/guest/hyperv/hyperv.c | 4 ++++ xen/arch/x86/guest/hyperv/private.h | 1 + xen/arch/x86/guest/hyperv/tlb.c | 2 +- xen/arch/x86/guest/hyperv/util.c | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-)xen/arch/x86/guest/hyperv/hyperv.c +4
-0@@ -33,6 +33,7 @@ DEFINE_PER_CPU_READ_MOSTLY(void *, hv_input_page); DEFINE_PER_CPU_READ_MOSTLY(void *, hv_vp_assist); DEFINE_PER_CPU_READ_MOSTLY(unsigned int, hv_vp_index); +unsigned int __read_mostly hv_max_vp_index;static bool __read_mostly hcall_page_ready;static uint64_t generate_guest_id (void )@@ -143,6 +144,9 @@ static int setup_hypercall_pcpu_arg(void)rdmsrl (HV_X64_MSR_VP_INDEX , vp_index_msr);this_cpu (hv_vp_index) = vp_index_msr; +if ( vp_index_msr > hv_max_vp_index ) + hv_max_vp_index = vp_index_msr; +return 0 ; }xen/arch/x86/guest/hyperv/private.h +1
-0@@ -28,6 +28,7 @@ DECLARE_PER_CPU(void *, hv_input_page); DECLARE_PER_CPU(void *, hv_vp_assist); DECLARE_PER_CPU(unsigned int, hv_vp_index); +extern unsigned int hv_max_vp_index;static inline unsigned int hv_vp_index (unsigned int cpu) {xen/arch/x86/guest/hyperv/tlb.c +0
-0@@ -166,7 +166,7 @@ int hyperv_flush_tlb(const cpumask_t *mask, const void *va, {unsigned int vpid =hv_vp_index (cpu);
Quoted 8 lines
Quoted 4 lines
xen/arch/x86/guest/hyperv/tlb.c int hyperv_flush_tlb(const cpumask_t *mask, const void *va, · line 169
Quoted 2 lines
xen/arch/x86/guest/hyperv/tlb.c +1
-1-if ( vpid >= ms_hyperv.max_vp_index ) +if ( vpid >= hv_max_vp_index )I think the >= should be changed to > here.
I agree. With this fixed:
Reviewed-by Roger Pau Monné <[email protected]>
FWIW, I think it should also be nice to add an ASSERT_UNREACHABLE in the if body, as now it shouldn't be possible for vpid to be greater than hv_max_vp_index unless something has gone really wrong?
Roger.
Quoted 64 lines · Roger Pau Monné
Quoted 63 lines · Roger Pau Monné
Quoted 61 lines · Wei Liu
Quoted 53 lines · Wei Liu
The value returned from CPUID is the maximum number for virtual processors supported by Hyper-V. It could be larger than the maximum number of virtual processors configured.
Stash the configured number into a variable and use it in calculations.
Signed-off-by Wei Liu <[email protected]>--- xen/arch/x86/guest/hyperv/hyperv.c | 4 ++++ xen/arch/x86/guest/hyperv/private.h | 1 + xen/arch/x86/guest/hyperv/tlb.c | 2 +- xen/arch/x86/guest/hyperv/util.c | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-)xen/arch/x86/guest/hyperv/hyperv.c +4
-0@@ -33,6 +33,7 @@ DEFINE_PER_CPU_READ_MOSTLY(void *, hv_input_page); DEFINE_PER_CPU_READ_MOSTLY(void *, hv_vp_assist); DEFINE_PER_CPU_READ_MOSTLY(unsigned int, hv_vp_index); +unsigned int __read_mostly hv_max_vp_index;static bool __read_mostly hcall_page_ready;static uint64_t generate_guest_id (void )@@ -143,6 +144,9 @@ static int setup_hypercall_pcpu_arg(void)rdmsrl (HV_X64_MSR_VP_INDEX , vp_index_msr);this_cpu (hv_vp_index) = vp_index_msr; +if ( vp_index_msr > hv_max_vp_index ) + hv_max_vp_index = vp_index_msr; +return 0 ; }xen/arch/x86/guest/hyperv/private.h +1
-0@@ -28,6 +28,7 @@ DECLARE_PER_CPU(void *, hv_input_page); DECLARE_PER_CPU(void *, hv_vp_assist); DECLARE_PER_CPU(unsigned int, hv_vp_index); +extern unsigned int hv_max_vp_index;static inline unsigned int hv_vp_index (unsigned int cpu) {xen/arch/x86/guest/hyperv/tlb.c +0
-0xen/arch/x86/guest/hyperv/tlb.c int hyperv_flush_tlb(const cpumask_t *mask, const void *va, · line 169
Quoted 5 lines
xen/arch/x86/guest/hyperv/tlb.c +1
-1@@ -166,7 +166,7 @@ int hyperv_flush_tlb(const cpumask_t *mask, const void *va, {unsigned int vpid =hv_vp_index (cpu); -if ( vpid >= ms_hyperv.max_vp_index ) +if ( vpid >= hv_max_vp_index )I think the >= should be changed to > here.
Quoted 7 lines
Quoted 3 lines
I agree. With this fixed:
Reviewed-by Roger Pau Monné <[email protected]>FWIW, I think it should also be nice to add an
ASSERT_UNREACHABLEin the if body, as now it shouldn't be possible for vpid to be greater thanhv_max_vp_indexunless something has gone really wrong?
At some point I will initialise vpid to (uint32_t)-1 so it could go over hv_max_vp_index if there is a bug in code.
Wei.
Quoted 2 lines
Roger.