Re: [PATCH v4 5/6] KVM: arm64: selftests: Add test for nASSGIcap attribute

[Eric Auger <eauger@redhat.com>]

Hi,

On 7/9/25 11:14 PM, Oliver Upton wrote:
> From: Raghavendra Rao Ananta <rananta@google.com>
> 
> Extend vgic_init to test the nASSGIcap attribute, asserting that it is
> configurable (within reason) prior to initializing the VGIC.
> Additionally, check that userspace cannot set the attribute after the
> VGIC has been initialized.
> 
> Signed-off-by: Raghavendra Rao Ananta <rananta@google.com>
> Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Thanks

Eric
> ---
>  tools/testing/selftests/kvm/arm64/vgic_init.c | 42 ++++++++++++++++++-
>  1 file changed, 40 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/kvm/arm64/vgic_init.c b/tools/testing/selftests/kvm/arm64/vgic_init.c
> index b3b5fb0ff0a9..743351aa998e 100644
> --- a/tools/testing/selftests/kvm/arm64/vgic_init.c
> +++ b/tools/testing/selftests/kvm/arm64/vgic_init.c
> @@ -13,13 +13,12 @@
>  #include "kvm_util.h"
>  #include "processor.h"
>  #include "vgic.h"
> +#include "gic_v3.h"
>  
>  #define NR_VCPUS		4
>  
>  #define REG_OFFSET(vcpu, offset) (((uint64_t)vcpu << 32) | offset)
>  
> -#define GICR_TYPER 0x8
> -
>  #define VGIC_DEV_IS_V2(_d) ((_d) == KVM_DEV_TYPE_ARM_VGIC_V2)
>  #define VGIC_DEV_IS_V3(_d) ((_d) == KVM_DEV_TYPE_ARM_VGIC_V3)
>  
> @@ -675,6 +674,44 @@ static void test_v3_its_region(void)
>  	vm_gic_destroy(&v);
>  }
>  
> +static void test_v3_nassgicap(void)
> +{
> +	struct kvm_vcpu *vcpus[NR_VCPUS];
> +	bool has_nassgicap;
> +	struct vm_gic vm;
> +	u32 typer2;
> +	int ret;
> +
> +	vm = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS, vcpus);
> +	kvm_device_attr_get(vm.gic_fd, KVM_DEV_ARM_VGIC_GRP_DIST_REGS,
> +			    GICD_TYPER2, &typer2);
> +	has_nassgicap = typer2 & GICD_TYPER2_nASSGIcap;
> +
> +	typer2 |= GICD_TYPER2_nASSGIcap;
> +	ret = __kvm_device_attr_set(vm.gic_fd, KVM_DEV_ARM_VGIC_GRP_DIST_REGS,
> +				    GICD_TYPER2, &typer2);
> +	if (has_nassgicap)
> +		TEST_ASSERT(!ret, KVM_IOCTL_ERROR(KVM_DEVICE_ATTR_SET, ret));
> +	else
> +		TEST_ASSERT(ret && errno == EINVAL,
> +			    "Enabled nASSGIcap even though it's unavailable");
> +
> +	typer2 &= ~GICD_TYPER2_nASSGIcap;
> +	kvm_device_attr_set(vm.gic_fd, KVM_DEV_ARM_VGIC_GRP_DIST_REGS,
> +			    GICD_TYPER2, &typer2);
> +
> +	kvm_device_attr_set(vm.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
> +			    KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);
> +
> +	typer2 ^= GICD_TYPER2_nASSGIcap;
> +	ret = __kvm_device_attr_set(vm.gic_fd, KVM_DEV_ARM_VGIC_GRP_DIST_REGS,
> +				    GICD_TYPER2, &typer2);
> +	TEST_ASSERT(ret && errno == EBUSY,
> +		    "Changed nASSGIcap after initializing the VGIC");
> +
> +	vm_gic_destroy(&vm);
> +}
> +
>  /*
>   * Returns 0 if it's possible to create GIC device of a given type (V2 or V3).
>   */
> @@ -730,6 +767,7 @@ void run_tests(uint32_t gic_dev_type)
>  		test_v3_last_bit_single_rdist();
>  		test_v3_redist_ipa_range_check_at_vcpu_run();
>  		test_v3_its_region();
> +		test_v3_nassgicap();
>  	}
>  }
>