From: Ricardo Koller <ricarkol@google.com>
To: Marc Zyngier <maz@kernel.org>
Cc: kvm@vger.kernel.org, Oliver Upton <oliver.upton@linux.dev>,
kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] KVM: arm64: selftests: Add support for GICv2 on v3
Date: Thu, 14 Jul 2022 11:30:17 -0700 [thread overview]
Message-ID: <YtBgueWEevIcS3EO@google.com> (raw)
In-Reply-To: <20220714154108.3531213-1-maz@kernel.org>
Hi Marc,
On Thu, Jul 14, 2022 at 04:41:08PM +0100, Marc Zyngier wrote:
> The current vgic_init test wrongly assumes that the host cannot
> multiple versions of the GIC architecture, while v2 emulation
> on v3 has almost always been supported (it was supported before
> the standalone v3 emulation).
Thanks for the fix. This was my mistake (also I was taking too long to
send the fix).
>
> Tweak the test to support multiple GIC incarnations.
>
Nit. You could add a fixes tag:
Fixes: 3f4db37e203b ("KVM: arm64: selftests: Make vgic_init gic version agnostic")
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> ---
> tools/testing/selftests/kvm/aarch64/vgic_init.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c
> index 34379c98d2f4..21ba4002fc18 100644
> --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c
> +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c
> @@ -670,7 +670,7 @@ int test_kvm_device(uint32_t gic_dev_type)
>
> if (!_kvm_create_device(v.vm, other, true, &fd)) {
> ret = _kvm_create_device(v.vm, other, false, &fd);
> - TEST_ASSERT(ret && errno == EINVAL,
> + TEST_ASSERT(ret && (errno == EINVAL || errno == EEXIST),
> "create GIC device while other version exists");
> }
>
> @@ -698,6 +698,7 @@ int main(int ac, char **av)
> {
> int ret;
> int pa_bits;
> + int cnt_impl = 0;
>
> pa_bits = vm_guest_mode_params[VM_MODE_DEFAULT].pa_bits;
> max_phys_size = 1ULL << pa_bits;
> @@ -706,17 +707,19 @@ int main(int ac, char **av)
> if (!ret) {
> pr_info("Running GIC_v3 tests.\n");
> run_tests(KVM_DEV_TYPE_ARM_VGIC_V3);
> - return 0;
> + cnt_impl++;
> }
>
> ret = test_kvm_device(KVM_DEV_TYPE_ARM_VGIC_V2);
> if (!ret) {
> pr_info("Running GIC_v2 tests.\n");
> run_tests(KVM_DEV_TYPE_ARM_VGIC_V2);
> - return 0;
> + cnt_impl++;
> }
>
> - print_skip("No GICv2 nor GICv3 support");
> - exit(KSFT_SKIP);
> + if (!cnt_impl) {
> + print_skip("No GICv2 nor GICv3 support");
> + exit(KSFT_SKIP);
> + }
> return 0;
> }
> --
> 2.34.1
>
Reviewed-by: Ricardo Koller <ricarkol@google.com>
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
WARNING: multiple messages have this Message-ID (diff)
From: Ricardo Koller <ricarkol@google.com>
To: Marc Zyngier <maz@kernel.org>
Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
Oliver Upton <oliver.upton@linux.dev>
Subject: Re: [PATCH] KVM: arm64: selftests: Add support for GICv2 on v3
Date: Thu, 14 Jul 2022 11:30:17 -0700 [thread overview]
Message-ID: <YtBgueWEevIcS3EO@google.com> (raw)
In-Reply-To: <20220714154108.3531213-1-maz@kernel.org>
Hi Marc,
On Thu, Jul 14, 2022 at 04:41:08PM +0100, Marc Zyngier wrote:
> The current vgic_init test wrongly assumes that the host cannot
> multiple versions of the GIC architecture, while v2 emulation
> on v3 has almost always been supported (it was supported before
> the standalone v3 emulation).
Thanks for the fix. This was my mistake (also I was taking too long to
send the fix).
>
> Tweak the test to support multiple GIC incarnations.
>
Nit. You could add a fixes tag:
Fixes: 3f4db37e203b ("KVM: arm64: selftests: Make vgic_init gic version agnostic")
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> ---
> tools/testing/selftests/kvm/aarch64/vgic_init.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c
> index 34379c98d2f4..21ba4002fc18 100644
> --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c
> +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c
> @@ -670,7 +670,7 @@ int test_kvm_device(uint32_t gic_dev_type)
>
> if (!_kvm_create_device(v.vm, other, true, &fd)) {
> ret = _kvm_create_device(v.vm, other, false, &fd);
> - TEST_ASSERT(ret && errno == EINVAL,
> + TEST_ASSERT(ret && (errno == EINVAL || errno == EEXIST),
> "create GIC device while other version exists");
> }
>
> @@ -698,6 +698,7 @@ int main(int ac, char **av)
> {
> int ret;
> int pa_bits;
> + int cnt_impl = 0;
>
> pa_bits = vm_guest_mode_params[VM_MODE_DEFAULT].pa_bits;
> max_phys_size = 1ULL << pa_bits;
> @@ -706,17 +707,19 @@ int main(int ac, char **av)
> if (!ret) {
> pr_info("Running GIC_v3 tests.\n");
> run_tests(KVM_DEV_TYPE_ARM_VGIC_V3);
> - return 0;
> + cnt_impl++;
> }
>
> ret = test_kvm_device(KVM_DEV_TYPE_ARM_VGIC_V2);
> if (!ret) {
> pr_info("Running GIC_v2 tests.\n");
> run_tests(KVM_DEV_TYPE_ARM_VGIC_V2);
> - return 0;
> + cnt_impl++;
> }
>
> - print_skip("No GICv2 nor GICv3 support");
> - exit(KSFT_SKIP);
> + if (!cnt_impl) {
> + print_skip("No GICv2 nor GICv3 support");
> + exit(KSFT_SKIP);
> + }
> return 0;
> }
> --
> 2.34.1
>
Reviewed-by: Ricardo Koller <ricarkol@google.com>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Ricardo Koller <ricarkol@google.com>
To: Marc Zyngier <maz@kernel.org>
Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
Oliver Upton <oliver.upton@linux.dev>
Subject: Re: [PATCH] KVM: arm64: selftests: Add support for GICv2 on v3
Date: Thu, 14 Jul 2022 11:30:17 -0700 [thread overview]
Message-ID: <YtBgueWEevIcS3EO@google.com> (raw)
In-Reply-To: <20220714154108.3531213-1-maz@kernel.org>
Hi Marc,
On Thu, Jul 14, 2022 at 04:41:08PM +0100, Marc Zyngier wrote:
> The current vgic_init test wrongly assumes that the host cannot
> multiple versions of the GIC architecture, while v2 emulation
> on v3 has almost always been supported (it was supported before
> the standalone v3 emulation).
Thanks for the fix. This was my mistake (also I was taking too long to
send the fix).
>
> Tweak the test to support multiple GIC incarnations.
>
Nit. You could add a fixes tag:
Fixes: 3f4db37e203b ("KVM: arm64: selftests: Make vgic_init gic version agnostic")
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> ---
> tools/testing/selftests/kvm/aarch64/vgic_init.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c
> index 34379c98d2f4..21ba4002fc18 100644
> --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c
> +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c
> @@ -670,7 +670,7 @@ int test_kvm_device(uint32_t gic_dev_type)
>
> if (!_kvm_create_device(v.vm, other, true, &fd)) {
> ret = _kvm_create_device(v.vm, other, false, &fd);
> - TEST_ASSERT(ret && errno == EINVAL,
> + TEST_ASSERT(ret && (errno == EINVAL || errno == EEXIST),
> "create GIC device while other version exists");
> }
>
> @@ -698,6 +698,7 @@ int main(int ac, char **av)
> {
> int ret;
> int pa_bits;
> + int cnt_impl = 0;
>
> pa_bits = vm_guest_mode_params[VM_MODE_DEFAULT].pa_bits;
> max_phys_size = 1ULL << pa_bits;
> @@ -706,17 +707,19 @@ int main(int ac, char **av)
> if (!ret) {
> pr_info("Running GIC_v3 tests.\n");
> run_tests(KVM_DEV_TYPE_ARM_VGIC_V3);
> - return 0;
> + cnt_impl++;
> }
>
> ret = test_kvm_device(KVM_DEV_TYPE_ARM_VGIC_V2);
> if (!ret) {
> pr_info("Running GIC_v2 tests.\n");
> run_tests(KVM_DEV_TYPE_ARM_VGIC_V2);
> - return 0;
> + cnt_impl++;
> }
>
> - print_skip("No GICv2 nor GICv3 support");
> - exit(KSFT_SKIP);
> + if (!cnt_impl) {
> + print_skip("No GICv2 nor GICv3 support");
> + exit(KSFT_SKIP);
> + }
> return 0;
> }
> --
> 2.34.1
>
Reviewed-by: Ricardo Koller <ricarkol@google.com>
next prev parent reply other threads:[~2022-07-14 18:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-14 15:41 [PATCH] KVM: arm64: selftests: Add support for GICv2 on v3 Marc Zyngier
2022-07-14 15:41 ` Marc Zyngier
2022-07-14 15:41 ` Marc Zyngier
2022-07-14 18:30 ` Ricardo Koller [this message]
2022-07-14 18:30 ` Ricardo Koller
2022-07-14 18:30 ` Ricardo Koller
2022-07-15 10:06 ` Marc Zyngier
2022-07-15 10:06 ` Marc Zyngier
2022-07-15 10:06 ` Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YtBgueWEevIcS3EO@google.com \
--to=ricarkol@google.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.