From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57F22C28CF5 for ; Wed, 26 Jan 2022 14:52:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id CD11C40BE6; Wed, 26 Jan 2022 09:52:55 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@kernel.org Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P7RBihrEAbxb; Wed, 26 Jan 2022 09:52:54 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 8573440E25; Wed, 26 Jan 2022 09:52:54 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 0249D408F4 for ; Wed, 26 Jan 2022 09:52:53 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fCDLy6kaT2UP for ; Wed, 26 Jan 2022 09:52:51 -0500 (EST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id D0F9540B41 for ; Wed, 26 Jan 2022 09:52:51 -0500 (EST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F26F9617CC; Wed, 26 Jan 2022 14:52:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58EBBC340E3; Wed, 26 Jan 2022 14:52:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643208770; bh=jm4UyXrKg8K/tVEMOvInmlJVENOimmSLeYrRFZ3iAhE=; h=From:To:Cc:Subject:Date:From; b=Ct7qB/ZAGMxyNqXRG5A9kCT09NEZ3jSt5gRRvrD5WPAeCAP7Ht1/9Kb4YXZ0ioABC 1mUvtkpMZ5F+ErEYve2etOfyiQCtPRTgKobkRgRm0CsXyfwO6mTKReroCii81W28WE DCPfcwYlFdillSzeKUpo/AnjSBxQVGHKok6SGuwImxnDl+baMWEtdZJ2UJPNSjiBuw F7n/gZySkP9wPLElD9Bx1JWgsUOAsYVDvSC2BfvtTXlZyqtoi2dDXHMIo2neBtQ7Gl 9yuIT2DLTB+/pjuzde2hJwpwQTJq1jZubLm5pMcFKguOjarfsPY7g6q9QcOqBsMR9J zp2y2+L/0dWDQ== From: Mark Brown To: Marc Zyngier , Shuah Khan Subject: [PATCH v3] kselftest: kvm/arm64: Skip tests if we can't create a vgic-v3 Date: Wed, 26 Jan 2022 14:52:42 +0000 Message-Id: <20220126145242.3473836-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3473; h=from:subject; bh=jm4UyXrKg8K/tVEMOvInmlJVENOimmSLeYrRFZ3iAhE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBh8V/S6QVgi5cZ6m4uINQ0R+IA6o/Pp0GxJxgH2V3E xbqPOk+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYfFf0gAKCRAk1otyXVSH0Ae2B/ 0cD5U10nc39f3kDDOT/XI0PcJ6n6+O+Wc+lW1Mvs8Pj+qd4x7AbZPV4WZ1YL+x2l6I9FsJpEcMLnz1 rrkOnaCc1SJMDQ15wqRrLXVEXAgIW2w88TjGfTBnpgHxVX4CVmuxkpZUrXK/kD2xJORtfO8gae5ilD eX4+iMqFnu+VIirw5oCuwQPpkQR6CNYkJE7rQ8rosa2RZvZjWcQ3s59GxVayil+06kOM7urphERRuI bjIJ0f7QRkGebZ7gsvWKCIbU+zXqtQNu3ifb9ZEVU7Rje9XUr9hoeFzv7aYgKJlQ1gp1HzSIlLPo/9 N8Tu08HBMIvpai5MVPE6zE92vTnuDN X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: Mark Brown , linux-kselftest@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu The arch_timer and vgic_irq kselftests assume that they can create a vgic-v3, using the library function vgic_v3_setup() which aborts with a test failure if it is not possible to do so. Since vgic-v3 can only be instantiated on systems where the host has GICv3 this leads to false positives on older systems where that is not the case. Fix this by changing vgic_v3_setup() to return an error if the vgic can't be instantiated and have the callers skip if this happens. We could also exit flagging a skip in vgic_v3_setup() but this would prevent future test cases conditionally deciding which GIC to use or generally doing more complex output. Signed-off-by: Mark Brown --- v3: - Use custom print_skip() helper. - Use internal version of _kvm_create_device. v2: - The test for being able to create the GIC doesn't actually instantiate it, add a call doing so in that case. tools/testing/selftests/kvm/aarch64/arch_timer.c | 7 ++++++- tools/testing/selftests/kvm/aarch64/vgic_irq.c | 4 ++++ tools/testing/selftests/kvm/lib/aarch64/vgic.c | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c index 9ad38bd360a4..b08d30bf71c5 100644 --- a/tools/testing/selftests/kvm/aarch64/arch_timer.c +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c @@ -366,6 +366,7 @@ static struct kvm_vm *test_vm_create(void) { struct kvm_vm *vm; unsigned int i; + int ret; int nr_vcpus = test_args.nr_vcpus; vm = vm_create_default_with_vcpus(nr_vcpus, 0, 0, guest_code, NULL); @@ -382,7 +383,11 @@ static struct kvm_vm *test_vm_create(void) ucall_init(vm, NULL); test_init_timer_irq(vm); - vgic_v3_setup(vm, nr_vcpus, 64, GICD_BASE_GPA, GICR_BASE_GPA); + ret = vgic_v3_setup(vm, nr_vcpus, 64, GICD_BASE_GPA, GICR_BASE_GPA); + if (ret < 0) { + print_skip("Failed to create vgic-v3"); + exit(KSFT_SKIP); + } /* Make all the test's cmdline args visible to the guest */ sync_global_to_guest(vm, test_args); diff --git a/tools/testing/selftests/kvm/aarch64/vgic_irq.c b/tools/testing/selftests/kvm/aarch64/vgic_irq.c index e6c7d7f8fbd1..7eca97799917 100644 --- a/tools/testing/selftests/kvm/aarch64/vgic_irq.c +++ b/tools/testing/selftests/kvm/aarch64/vgic_irq.c @@ -761,6 +761,10 @@ static void test_vgic(uint32_t nr_irqs, bool level_sensitive, bool eoi_split) gic_fd = vgic_v3_setup(vm, 1, nr_irqs, GICD_BASE_GPA, GICR_BASE_GPA); + if (gic_fd < 0) { + print_skip("Failed to create vgic-v3, skipping"); + exit(KSFT_SKIP); + } vm_install_exception_handler(vm, VECTOR_IRQ_CURRENT, guest_irq_handlers[args.eoi_split][args.level_sensitive]); diff --git a/tools/testing/selftests/kvm/lib/aarch64/vgic.c b/tools/testing/selftests/kvm/lib/aarch64/vgic.c index b3a0fca0d780..f5cd0c536d85 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/vgic.c +++ b/tools/testing/selftests/kvm/lib/aarch64/vgic.c @@ -52,7 +52,9 @@ int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs, nr_vcpus, nr_vcpus_created); /* Distributor setup */ - gic_fd = kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3, false); + if (_kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3, + false, &gic_fd) != 0) + return -1; kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS, 0, &nr_irqs, true); -- 2.30.2 _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28313C2BA4C for ; Wed, 26 Jan 2022 14:52:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235646AbiAZOwv (ORCPT ); Wed, 26 Jan 2022 09:52:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235644AbiAZOwv (ORCPT ); Wed, 26 Jan 2022 09:52:51 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62061C06161C for ; Wed, 26 Jan 2022 06:52:51 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F2BD66162C for ; Wed, 26 Jan 2022 14:52:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58EBBC340E3; Wed, 26 Jan 2022 14:52:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643208770; bh=jm4UyXrKg8K/tVEMOvInmlJVENOimmSLeYrRFZ3iAhE=; h=From:To:Cc:Subject:Date:From; b=Ct7qB/ZAGMxyNqXRG5A9kCT09NEZ3jSt5gRRvrD5WPAeCAP7Ht1/9Kb4YXZ0ioABC 1mUvtkpMZ5F+ErEYve2etOfyiQCtPRTgKobkRgRm0CsXyfwO6mTKReroCii81W28WE DCPfcwYlFdillSzeKUpo/AnjSBxQVGHKok6SGuwImxnDl+baMWEtdZJ2UJPNSjiBuw F7n/gZySkP9wPLElD9Bx1JWgsUOAsYVDvSC2BfvtTXlZyqtoi2dDXHMIo2neBtQ7Gl 9yuIT2DLTB+/pjuzde2hJwpwQTJq1jZubLm5pMcFKguOjarfsPY7g6q9QcOqBsMR9J zp2y2+L/0dWDQ== From: Mark Brown To: Marc Zyngier , Shuah Khan Cc: James Morse , Alexandru Elisei , Suzuki K Poulose , kvmarm@lists.cs.columbia.edu, linux-kselftest@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v3] kselftest: kvm/arm64: Skip tests if we can't create a vgic-v3 Date: Wed, 26 Jan 2022 14:52:42 +0000 Message-Id: <20220126145242.3473836-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3473; h=from:subject; bh=jm4UyXrKg8K/tVEMOvInmlJVENOimmSLeYrRFZ3iAhE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBh8V/S6QVgi5cZ6m4uINQ0R+IA6o/Pp0GxJxgH2V3E xbqPOk+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYfFf0gAKCRAk1otyXVSH0Ae2B/ 0cD5U10nc39f3kDDOT/XI0PcJ6n6+O+Wc+lW1Mvs8Pj+qd4x7AbZPV4WZ1YL+x2l6I9FsJpEcMLnz1 rrkOnaCc1SJMDQ15wqRrLXVEXAgIW2w88TjGfTBnpgHxVX4CVmuxkpZUrXK/kD2xJORtfO8gae5ilD eX4+iMqFnu+VIirw5oCuwQPpkQR6CNYkJE7rQ8rosa2RZvZjWcQ3s59GxVayil+06kOM7urphERRuI bjIJ0f7QRkGebZ7gsvWKCIbU+zXqtQNu3ifb9ZEVU7Rje9XUr9hoeFzv7aYgKJlQ1gp1HzSIlLPo/9 N8Tu08HBMIvpai5MVPE6zE92vTnuDN X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org The arch_timer and vgic_irq kselftests assume that they can create a vgic-v3, using the library function vgic_v3_setup() which aborts with a test failure if it is not possible to do so. Since vgic-v3 can only be instantiated on systems where the host has GICv3 this leads to false positives on older systems where that is not the case. Fix this by changing vgic_v3_setup() to return an error if the vgic can't be instantiated and have the callers skip if this happens. We could also exit flagging a skip in vgic_v3_setup() but this would prevent future test cases conditionally deciding which GIC to use or generally doing more complex output. Signed-off-by: Mark Brown --- v3: - Use custom print_skip() helper. - Use internal version of _kvm_create_device. v2: - The test for being able to create the GIC doesn't actually instantiate it, add a call doing so in that case. tools/testing/selftests/kvm/aarch64/arch_timer.c | 7 ++++++- tools/testing/selftests/kvm/aarch64/vgic_irq.c | 4 ++++ tools/testing/selftests/kvm/lib/aarch64/vgic.c | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c index 9ad38bd360a4..b08d30bf71c5 100644 --- a/tools/testing/selftests/kvm/aarch64/arch_timer.c +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c @@ -366,6 +366,7 @@ static struct kvm_vm *test_vm_create(void) { struct kvm_vm *vm; unsigned int i; + int ret; int nr_vcpus = test_args.nr_vcpus; vm = vm_create_default_with_vcpus(nr_vcpus, 0, 0, guest_code, NULL); @@ -382,7 +383,11 @@ static struct kvm_vm *test_vm_create(void) ucall_init(vm, NULL); test_init_timer_irq(vm); - vgic_v3_setup(vm, nr_vcpus, 64, GICD_BASE_GPA, GICR_BASE_GPA); + ret = vgic_v3_setup(vm, nr_vcpus, 64, GICD_BASE_GPA, GICR_BASE_GPA); + if (ret < 0) { + print_skip("Failed to create vgic-v3"); + exit(KSFT_SKIP); + } /* Make all the test's cmdline args visible to the guest */ sync_global_to_guest(vm, test_args); diff --git a/tools/testing/selftests/kvm/aarch64/vgic_irq.c b/tools/testing/selftests/kvm/aarch64/vgic_irq.c index e6c7d7f8fbd1..7eca97799917 100644 --- a/tools/testing/selftests/kvm/aarch64/vgic_irq.c +++ b/tools/testing/selftests/kvm/aarch64/vgic_irq.c @@ -761,6 +761,10 @@ static void test_vgic(uint32_t nr_irqs, bool level_sensitive, bool eoi_split) gic_fd = vgic_v3_setup(vm, 1, nr_irqs, GICD_BASE_GPA, GICR_BASE_GPA); + if (gic_fd < 0) { + print_skip("Failed to create vgic-v3, skipping"); + exit(KSFT_SKIP); + } vm_install_exception_handler(vm, VECTOR_IRQ_CURRENT, guest_irq_handlers[args.eoi_split][args.level_sensitive]); diff --git a/tools/testing/selftests/kvm/lib/aarch64/vgic.c b/tools/testing/selftests/kvm/lib/aarch64/vgic.c index b3a0fca0d780..f5cd0c536d85 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/vgic.c +++ b/tools/testing/selftests/kvm/lib/aarch64/vgic.c @@ -52,7 +52,9 @@ int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs, nr_vcpus, nr_vcpus_created); /* Distributor setup */ - gic_fd = kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3, false); + if (_kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3, + false, &gic_fd) != 0) + return -1; kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS, 0, &nr_irqs, true); -- 2.30.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2F24EC28CF5 for ; Wed, 26 Jan 2022 14:54:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=rhxN9I2hckxucLKSNokXdhTIZRJtpJbvfejACoejLsE=; b=H+pntKbOv0Amwy OdAp/mFnc95VRTxZ+9ngmA6RDgQykcP/52SC6z3Mo8TH3CtJt7xdvuyr3CKMli8eIaOOg40ZbQZSo 26i3Vk+KtypIdTxXS13qWb6IusHKnsrD+YD0GKnEFUp9218pQ0nhoFEXhrTOgq46VW70TJUQb8GWK tkBUeP7Tt2KUm9bvC56n8ECSGrZeBtXzK1GzFfeD1eajATYk9Qk3UBC94EMFkPV5c/LYLUPombcmM 2zQYiSn9qA5mscY3hrYn3kaFpum9ZEdYjEjAS0R/fP/WjiP/4dI/dWydKrgakoQ6N0qfQnJB6TRoC 5gTaxgWyGqqj4kLX3E2g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCjfK-00C2E9-F3; Wed, 26 Jan 2022 14:52:54 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCjfH-00C2DV-EP for linux-arm-kernel@lists.infradead.org; Wed, 26 Jan 2022 14:52:52 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F26F9617CC; Wed, 26 Jan 2022 14:52:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58EBBC340E3; Wed, 26 Jan 2022 14:52:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643208770; bh=jm4UyXrKg8K/tVEMOvInmlJVENOimmSLeYrRFZ3iAhE=; h=From:To:Cc:Subject:Date:From; b=Ct7qB/ZAGMxyNqXRG5A9kCT09NEZ3jSt5gRRvrD5WPAeCAP7Ht1/9Kb4YXZ0ioABC 1mUvtkpMZ5F+ErEYve2etOfyiQCtPRTgKobkRgRm0CsXyfwO6mTKReroCii81W28WE DCPfcwYlFdillSzeKUpo/AnjSBxQVGHKok6SGuwImxnDl+baMWEtdZJ2UJPNSjiBuw F7n/gZySkP9wPLElD9Bx1JWgsUOAsYVDvSC2BfvtTXlZyqtoi2dDXHMIo2neBtQ7Gl 9yuIT2DLTB+/pjuzde2hJwpwQTJq1jZubLm5pMcFKguOjarfsPY7g6q9QcOqBsMR9J zp2y2+L/0dWDQ== From: Mark Brown To: Marc Zyngier , Shuah Khan Cc: James Morse , Alexandru Elisei , Suzuki K Poulose , kvmarm@lists.cs.columbia.edu, linux-kselftest@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v3] kselftest: kvm/arm64: Skip tests if we can't create a vgic-v3 Date: Wed, 26 Jan 2022 14:52:42 +0000 Message-Id: <20220126145242.3473836-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3473; h=from:subject; bh=jm4UyXrKg8K/tVEMOvInmlJVENOimmSLeYrRFZ3iAhE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBh8V/S6QVgi5cZ6m4uINQ0R+IA6o/Pp0GxJxgH2V3E xbqPOk+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYfFf0gAKCRAk1otyXVSH0Ae2B/ 0cD5U10nc39f3kDDOT/XI0PcJ6n6+O+Wc+lW1Mvs8Pj+qd4x7AbZPV4WZ1YL+x2l6I9FsJpEcMLnz1 rrkOnaCc1SJMDQ15wqRrLXVEXAgIW2w88TjGfTBnpgHxVX4CVmuxkpZUrXK/kD2xJORtfO8gae5ilD eX4+iMqFnu+VIirw5oCuwQPpkQR6CNYkJE7rQ8rosa2RZvZjWcQ3s59GxVayil+06kOM7urphERRuI bjIJ0f7QRkGebZ7gsvWKCIbU+zXqtQNu3ifb9ZEVU7Rje9XUr9hoeFzv7aYgKJlQ1gp1HzSIlLPo/9 N8Tu08HBMIvpai5MVPE6zE92vTnuDN X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220126_065251_584845_A8DCD7AE X-CRM114-Status: GOOD ( 20.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The arch_timer and vgic_irq kselftests assume that they can create a vgic-v3, using the library function vgic_v3_setup() which aborts with a test failure if it is not possible to do so. Since vgic-v3 can only be instantiated on systems where the host has GICv3 this leads to false positives on older systems where that is not the case. Fix this by changing vgic_v3_setup() to return an error if the vgic can't be instantiated and have the callers skip if this happens. We could also exit flagging a skip in vgic_v3_setup() but this would prevent future test cases conditionally deciding which GIC to use or generally doing more complex output. Signed-off-by: Mark Brown --- v3: - Use custom print_skip() helper. - Use internal version of _kvm_create_device. v2: - The test for being able to create the GIC doesn't actually instantiate it, add a call doing so in that case. tools/testing/selftests/kvm/aarch64/arch_timer.c | 7 ++++++- tools/testing/selftests/kvm/aarch64/vgic_irq.c | 4 ++++ tools/testing/selftests/kvm/lib/aarch64/vgic.c | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c index 9ad38bd360a4..b08d30bf71c5 100644 --- a/tools/testing/selftests/kvm/aarch64/arch_timer.c +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c @@ -366,6 +366,7 @@ static struct kvm_vm *test_vm_create(void) { struct kvm_vm *vm; unsigned int i; + int ret; int nr_vcpus = test_args.nr_vcpus; vm = vm_create_default_with_vcpus(nr_vcpus, 0, 0, guest_code, NULL); @@ -382,7 +383,11 @@ static struct kvm_vm *test_vm_create(void) ucall_init(vm, NULL); test_init_timer_irq(vm); - vgic_v3_setup(vm, nr_vcpus, 64, GICD_BASE_GPA, GICR_BASE_GPA); + ret = vgic_v3_setup(vm, nr_vcpus, 64, GICD_BASE_GPA, GICR_BASE_GPA); + if (ret < 0) { + print_skip("Failed to create vgic-v3"); + exit(KSFT_SKIP); + } /* Make all the test's cmdline args visible to the guest */ sync_global_to_guest(vm, test_args); diff --git a/tools/testing/selftests/kvm/aarch64/vgic_irq.c b/tools/testing/selftests/kvm/aarch64/vgic_irq.c index e6c7d7f8fbd1..7eca97799917 100644 --- a/tools/testing/selftests/kvm/aarch64/vgic_irq.c +++ b/tools/testing/selftests/kvm/aarch64/vgic_irq.c @@ -761,6 +761,10 @@ static void test_vgic(uint32_t nr_irqs, bool level_sensitive, bool eoi_split) gic_fd = vgic_v3_setup(vm, 1, nr_irqs, GICD_BASE_GPA, GICR_BASE_GPA); + if (gic_fd < 0) { + print_skip("Failed to create vgic-v3, skipping"); + exit(KSFT_SKIP); + } vm_install_exception_handler(vm, VECTOR_IRQ_CURRENT, guest_irq_handlers[args.eoi_split][args.level_sensitive]); diff --git a/tools/testing/selftests/kvm/lib/aarch64/vgic.c b/tools/testing/selftests/kvm/lib/aarch64/vgic.c index b3a0fca0d780..f5cd0c536d85 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/vgic.c +++ b/tools/testing/selftests/kvm/lib/aarch64/vgic.c @@ -52,7 +52,9 @@ int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs, nr_vcpus, nr_vcpus_created); /* Distributor setup */ - gic_fd = kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3, false); + if (_kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3, + false, &gic_fd) != 0) + return -1; kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS, 0, &nr_irqs, true); -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel