On Sat, Sep 03, 2022 at 01:09:01PM +0530, Gautam Menghani wrote:
> A TODO in xapic_state_test asks to use number of vCPUs instead of
> vcpu.id + 1 in test_icr(). This patch adds support to get the number
> of vCPUs from the VM created and use it.
>
> Signed-off-by: Gautam Menghani <gautammenghani201@xxxxxxxxx>
> ---
> .../selftests/kvm/x86_64/xapic_state_test.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/x86_64/xapic_state_test.c b/tools/testing/selftests/kvm/x86_64/xapic_state_test.c
> index 6f7a5ef66718..de934e8e5e41 100644
> --- a/tools/testing/selftests/kvm/x86_64/xapic_state_test.c
> +++ b/tools/testing/selftests/kvm/x86_64/xapic_state_test.c
> @@ -96,9 +96,8 @@ static void __test_icr(struct xapic_vcpu *x, uint64_t val)
> ____test_icr(x, val & ~(u64)APIC_ICR_BUSY);
> }
>
> -static void test_icr(struct xapic_vcpu *x)
> +static void test_icr(struct xapic_vcpu *x, int num_vcpus)
> {
> - struct kvm_vcpu *vcpu = x->vcpu;
> uint64_t icr, i, j;
>
> icr = APIC_DEST_SELF | APIC_INT_ASSERT | APIC_DM_FIXED;
> @@ -110,11 +109,11 @@ static void test_icr(struct xapic_vcpu *x)
> __test_icr(x, icr | i);
>
> /*
> - * Send all flavors of IPIs to non-existent vCPUs. TODO: use number of
> - * vCPUs, not vcpu.id + 1. Arbitrarily use vector 0xff.
> + * Send all flavors of IPIs to non-existent vCPUs. Arbitrarily use vector 0xff.
> */
> +
> icr = APIC_INT_ASSERT | 0xff;
> - for (i = vcpu->id + 1; i < 0xff; i++) {
> + for (i = num_vcpus; i < 0xff; i++) {
> for (j = 0; j < 8; j++)
> __test_icr(x, i << (32 + 24) | icr | (j << 8));
> }
> @@ -137,9 +136,13 @@ int main(int argc, char *argv[])
> .is_x2apic = true,
> };
> struct kvm_vm *vm;
> + struct list_head *iter;
> + int nr_vcpus_created = 0;
>
> vm = vm_create_with_one_vcpu(&x.vcpu, x2apic_guest_code);
> - test_icr(&x);
> + list_for_each(iter, &vm->vcpus)
> + nr_vcpus_created++;
> + test_icr(&x, nr_vcpus_created);
> kvm_vm_free(vm);
>
> /*
> @@ -153,6 +156,6 @@ int main(int argc, char *argv[])
> vcpu_clear_cpuid_feature(x.vcpu, X86_FEATURE_X2APIC);
>
> virt_pg_map(vm, APIC_DEFAULT_GPA, APIC_DEFAULT_GPA);
> - test_icr(&x);
> + test_icr(&x, nr_vcpus_created);
> kvm_vm_free(vm);
> }
> --
> 2.34.1
>
Hi,
Please review the above patch and let me know if any change is required.
Thanks,
Gautam
