lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 15/18] KVM: selftests/vgic_init: vcpu related code consolidation
    Date
    Remove the unnecessary definition of the *vcpu[] array and reuse the one
    from kvm_vm. Simplify the related function interface by removeing the
    *vcpu[].

    Signed-off-by: Wei Wang <wei.w.wang@intel.com>
    ---
    .../testing/selftests/kvm/aarch64/vgic_init.c | 35 +++++++++----------
    1 file changed, 17 insertions(+), 18 deletions(-)

    diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c
    index 9c131d977a1b..e24130a49581 100644
    --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c
    +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c
    @@ -74,13 +74,12 @@ static int run_vcpu(struct kvm_vcpu *vcpu)
    }

    static struct vm_gic vm_gic_create_with_vcpus(uint32_t gic_dev_type,
    - uint32_t nr_vcpus,
    - struct kvm_vcpu *vcpus[])
    + uint32_t nr_vcpus)
    {
    struct vm_gic v;

    v.gic_dev_type = gic_dev_type;
    - v.vm = vm_create_with_vcpus(nr_vcpus, guest_code, vcpus);
    + v.vm = vm_create_with_vcpus(nr_vcpus, guest_code, NULL);
    v.gic_fd = kvm_create_device(v.vm, gic_dev_type);

    return v;
    @@ -324,14 +323,15 @@ static void subtest_v3_redist_regions(struct vm_gic *v)
    */
    static void test_vgic_then_vcpus(uint32_t gic_dev_type)
    {
    - struct kvm_vcpu *vcpus[NR_VCPUS];
    + struct kvm_vcpu **vcpus;
    struct vm_gic v;
    int ret, i;

    - v = vm_gic_create_with_vcpus(gic_dev_type, 1, vcpus);
    + v = vm_gic_create_with_vcpus(gic_dev_type, 1);

    subtest_dist_rdist(&v);

    + vcpus = v.vm->vcpus;
    /* Add the rest of the VCPUs */
    for (i = 1; i < NR_VCPUS; ++i)
    vcpus[i] = vm_vcpu_add(v.vm, i, guest_code);
    @@ -345,15 +345,14 @@ static void test_vgic_then_vcpus(uint32_t gic_dev_type)
    /* All the VCPUs are created before the VGIC KVM device gets initialized */
    static void test_vcpus_then_vgic(uint32_t gic_dev_type)
    {
    - struct kvm_vcpu *vcpus[NR_VCPUS];
    struct vm_gic v;
    int ret;

    - v = vm_gic_create_with_vcpus(gic_dev_type, NR_VCPUS, vcpus);
    + v = vm_gic_create_with_vcpus(gic_dev_type, NR_VCPUS);

    subtest_dist_rdist(&v);

    - ret = run_vcpu(vcpus[3]);
    + ret = run_vcpu(v.vm->vcpus[3]);
    TEST_ASSERT(ret == -EINVAL, "dist/rdist overlap detected on 1st vcpu run");

    vm_gic_destroy(&v);
    @@ -361,24 +360,25 @@ static void test_vcpus_then_vgic(uint32_t gic_dev_type)

    static void test_v3_new_redist_regions(void)
    {
    - struct kvm_vcpu *vcpus[NR_VCPUS];
    + struct kvm_vcpu **vcpus;
    void *dummy = NULL;
    struct vm_gic v;
    uint64_t addr;
    int ret;

    - v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS, vcpus);
    + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS);
    subtest_v3_redist_regions(&v);
    kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
    KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);

    + vcpus = v.vm->vcpus;
    ret = run_vcpu(vcpus[3]);
    TEST_ASSERT(ret == -ENXIO, "running without sufficient number of rdists");
    vm_gic_destroy(&v);

    /* step2 */

    - v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS, vcpus);
    + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS);
    subtest_v3_redist_regions(&v);

    addr = REDIST_REGION_ATTR_ADDR(1, 0x280000, 0, 2);
    @@ -392,7 +392,7 @@ static void test_v3_new_redist_regions(void)

    /* step 3 */

    - v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS, vcpus);
    + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS);
    subtest_v3_redist_regions(&v);

    ret = __kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
    @@ -559,12 +559,12 @@ static void test_v3_last_bit_single_rdist(void)
    /* Uses the legacy REDIST region API. */
    static void test_v3_redist_ipa_range_check_at_vcpu_run(void)
    {
    - struct kvm_vcpu *vcpus[NR_VCPUS];
    + struct kvm_vcpu **vcpus;
    struct vm_gic v;
    int ret, i;
    uint64_t addr;

    - v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, 1, vcpus);
    + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, 1);

    /* Set space for 3 redists, we have 1 vcpu, so this succeeds. */
    addr = max_phys_size - (3 * 2 * 0x10000);
    @@ -575,6 +575,7 @@ static void test_v3_redist_ipa_range_check_at_vcpu_run(void)
    kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
    KVM_VGIC_V3_ADDR_TYPE_DIST, &addr);

    + vcpus = v.vm->vcpus;
    /* Add the rest of the VCPUs */
    for (i = 1; i < NR_VCPUS; ++i)
    vcpus[i] = vm_vcpu_add(v.vm, i, guest_code);
    @@ -592,12 +593,11 @@ static void test_v3_redist_ipa_range_check_at_vcpu_run(void)

    static void test_v3_its_region(void)
    {
    - struct kvm_vcpu *vcpus[NR_VCPUS];
    struct vm_gic v;
    uint64_t addr;
    int its_fd, ret;

    - v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS, vcpus);
    + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS);
    its_fd = kvm_create_device(v.vm, KVM_DEV_TYPE_ARM_VGIC_ITS);

    addr = 0x401000;
    @@ -637,12 +637,11 @@ static void test_v3_its_region(void)
    */
    int test_kvm_device(uint32_t gic_dev_type)
    {
    - struct kvm_vcpu *vcpus[NR_VCPUS];
    struct vm_gic v;
    uint32_t other;
    int ret;

    - v.vm = vm_create_with_vcpus(NR_VCPUS, guest_code, vcpus);
    + v.vm = vm_create_with_vcpus(NR_VCPUS, guest_code, NULL);

    /* try to create a non existing KVM device */
    ret = __kvm_test_create_device(v.vm, 0);
    --
    2.27.0
    \
     
     \ /
      Last update: 2022-10-24 13:42    [W:4.193 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site