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 X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3EF1C433B4 for ; Mon, 3 May 2021 16:10:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B1F7C61183 for ; Mon, 3 May 2021 16:09:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1F7C61183 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldb8w-0000k9-O4 for qemu-devel@archiver.kernel.org; Mon, 03 May 2021 12:09:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldb3d-00057z-Ix for qemu-devel@nongnu.org; Mon, 03 May 2021 12:04:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53271) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldb3a-0005VQ-8O for qemu-devel@nongnu.org; Mon, 03 May 2021 12:04:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620057863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LC7f0IJ0ysrAgGOUOV+g+qtxMO7n06gTtG7aUIqS9Co=; b=LPH3aPp+btNUP6Y/Y4kkFuq3nfEmkQw6s87hJkTopH7DxSRyqW40/VlujkdFitqEpxukVB p1wLUafnGAxU4m+gRr+uRvlB/3RIYTSYcrVvBod4ENnt457rNfISR1tT4OjfDlMcZ6WvDF 4sJD23PsC2BUhEmEWMFD80gpJxj3aYY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-308-T3wnBsJ3PI2rix9lNunA7w-1; Mon, 03 May 2021 12:04:22 -0400 X-MC-Unique: T3wnBsJ3PI2rix9lNunA7w-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1D8C58189C5; Mon, 3 May 2021 16:04:21 +0000 (UTC) Received: from localhost (unknown [10.40.208.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93F2F369A; Mon, 3 May 2021 16:04:17 +0000 (UTC) Date: Mon, 3 May 2021 18:04:15 +0200 From: Igor Mammedov To: Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Subject: Re: [PATCH v5 08/10] qtest/bios-tables-test: Make test build-independent from accelerator Message-ID: <20210503180415.3c798f64@redhat.com> In-Reply-To: References: <20210501223638.510712-1-philmd@redhat.com> <20210501223638.510712-9-philmd@redhat.com> <20210503143639.57e7c52c@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=170.10.133.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.698, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Juan Quintela , Richard Henderson , Andrew Jones , Markus Armbruster , qemu-arm@nongnu.org, Claudio Fontana , Paolo Bonzini , Alex =?UTF-8?B?QmVubsOp?= =?UTF-8?B?ZQ==?= , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 3 May 2021 14:44:32 +0200 Philippe Mathieu-Daud=C3=A9 wrote: > Hi Igor, >=20 > On 5/3/21 2:36 PM, Igor Mammedov wrote: > > On Sun, 2 May 2021 00:36:36 +0200 > > Philippe Mathieu-Daud=C3=A9 wrote: > > =20 > >> Now than we can probe if the TCG accelerator is available > >> at runtime with a QMP command, do it once at the beginning > >> and only register the tests we can run. > >> We can then replace the #ifdef'ry by an assertion. > >> > >> Reviewed-by: Eric Blake > >> Reviewed-by: Alex Benn=C3=A9e > >> Signed-off-by: Philippe Mathieu-Daud=C3=A9 > >> --- > >> tests/qtest/bios-tables-test.c | 99 ++++++++++++++++++---------------= - > >> 1 file changed, 52 insertions(+), 47 deletions(-) > >> > >> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-= test.c > >> index 156d4174aa3..a4c7bddf6f3 100644 > >> --- a/tests/qtest/bios-tables-test.c > >> +++ b/tests/qtest/bios-tables-test.c > >> @@ -97,6 +97,7 @@ typedef struct { > >> QTestState *qts; > >> } test_data; > >> =20 > >> +static bool tcg_accel_available; > >> static char disk[] =3D "tests/acpi-test-disk-XXXXXX"; > >> static const char *data_dir =3D "tests/data/acpi"; > >> #ifdef CONFIG_IASL > >> @@ -718,15 +719,11 @@ static void test_acpi_one(const char *params, te= st_data *data) > >> char *args; > >> bool use_uefi =3D data->uefi_fl1 && data->uefi_fl2; > >> =20 > >> -#ifndef CONFIG_TCG > >> - if (data->tcg_only) { > >> - g_test_skip("TCG disabled, skipping ACPI tcg_only test"); > >> - return; > >> - } > >> -#endif /* CONFIG_TCG */ > >> + assert(!data->tcg_only || tcg_accel_available); > >> =20 > >> args =3D test_acpi_create_args(data, params, use_uefi); > >> data->qts =3D qtest_init(args); > >> + =20 > > stray new line? =20 >=20 > Oops. >=20 > > =20 > >> test_acpi_load_tables(data, use_uefi); > >> =20 > >> if (getenv(ACPI_REBUILD_EXPECTED_AML)) { > >> @@ -1504,6 +1501,8 @@ int main(int argc, char *argv[]) > >> const char *arch =3D qtest_get_arch(); > >> int ret; > >> =20 > >> + tcg_accel_available =3D qtest_has_accel("tcg"); > >> + > >> g_test_init(&argc, &argv, NULL); > >> =20 > >> if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D= =3D 0) { > >> @@ -1512,56 +1511,62 @@ int main(int argc, char *argv[]) > >> return ret; > >> } > >> qtest_add_func("acpi/q35/oem-fields", test_acpi_oem_fields_q3= 5); > >> - qtest_add_func("acpi/q35/tpm-tis", test_acpi_q35_tcg_tpm_tis)= ; > >> - qtest_add_func("acpi/piix4", test_acpi_piix4_tcg); > >> qtest_add_func("acpi/oem-fields", test_acpi_oem_fields_pc); > >> - qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridg= e); > >> + qtest_add_func("acpi/microvm/oem-fields", test_acpi_oem_field= s_microvm); > >> qtest_add_func("acpi/piix4/pci-hotplug/no_root_hotplug", > >> test_acpi_piix4_no_root_hotplug); > >> qtest_add_func("acpi/piix4/pci-hotplug/no_bridge_hotplug", > >> test_acpi_piix4_no_bridge_hotplug); > >> qtest_add_func("acpi/piix4/pci-hotplug/off", > >> test_acpi_piix4_no_acpi_pci_hotplug); > >> - qtest_add_func("acpi/q35", test_acpi_q35_tcg); > >> - qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge); > >> - qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio64); > >> - qtest_add_func("acpi/piix4/ipmi", test_acpi_piix4_tcg_ipmi); > >> - qtest_add_func("acpi/q35/ipmi", test_acpi_q35_tcg_ipmi); > >> - qtest_add_func("acpi/piix4/cpuhp", test_acpi_piix4_tcg_cphp); > >> - qtest_add_func("acpi/q35/cpuhp", test_acpi_q35_tcg_cphp); > >> - qtest_add_func("acpi/piix4/memhp", test_acpi_piix4_tcg_memhp)= ; > >> - qtest_add_func("acpi/q35/memhp", test_acpi_q35_tcg_memhp); > >> - qtest_add_func("acpi/piix4/numamem", test_acpi_piix4_tcg_numa= mem); > >> - qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem)= ; > >> - qtest_add_func("acpi/piix4/nosmm", test_acpi_piix4_tcg_nosmm)= ; > >> - qtest_add_func("acpi/piix4/smm-compat", > >> - test_acpi_piix4_tcg_smm_compat); > >> - qtest_add_func("acpi/piix4/smm-compat-nosmm", > >> - test_acpi_piix4_tcg_smm_compat_nosmm); > >> - qtest_add_func("acpi/piix4/nohpet", test_acpi_piix4_tcg_nohpe= t); > >> - qtest_add_func("acpi/q35/nosmm", test_acpi_q35_tcg_nosmm); > >> - qtest_add_func("acpi/q35/smm-compat", > >> - test_acpi_q35_tcg_smm_compat); > >> - qtest_add_func("acpi/q35/smm-compat-nosmm", > >> - test_acpi_q35_tcg_smm_compat_nosmm); > >> - qtest_add_func("acpi/q35/nohpet", test_acpi_q35_tcg_nohpet); > >> - qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm= _pxm); > >> - qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm= ); > >> - qtest_add_func("acpi/piix4/acpihmat", test_acpi_piix4_tcg_acp= i_hmat); > >> - qtest_add_func("acpi/q35/acpihmat", test_acpi_q35_tcg_acpi_hm= at); > >> - qtest_add_func("acpi/microvm", test_acpi_microvm_tcg); > >> - qtest_add_func("acpi/microvm/usb", test_acpi_microvm_usb_tcg)= ; > >> - qtest_add_func("acpi/microvm/rtc", test_acpi_microvm_rtc_tcg)= ; > >> - qtest_add_func("acpi/microvm/ioapic2", test_acpi_microvm_ioap= ic2_tcg); > >> - qtest_add_func("acpi/microvm/oem-fields", test_acpi_oem_field= s_microvm); > >> - if (strcmp(arch, "x86_64") =3D=3D 0) { > >> - qtest_add_func("acpi/microvm/pcie", test_acpi_microvm_pci= e_tcg); > >> + if (tcg_accel_available) { =20 > >=20 > > most of this can run without TCG if KVM is available, so why are you li= miting it to TCG only > > or am I missing something? =20 >=20 > This patch is a simple API change, these tests are already restricted by > the 'g_test_skip("TCG disabled, skipping ACPI tcg_only test");' call. >=20 with current code, assume we have TCG compiled out: - test_acpi_one() will execute any test that is not marked as tcg_only with this patch if tcg_accel_available =3D=3D False, it will not even register any test under "if (tcg_accel_available) {" branc= h and in this patch that includes a bunch of _non_ tcg_only tests. So tests won't be executed on KVM only build, where previously they were ex= ecuted just fine. > If someone is willing to send a patch to have them run without TCG, I'm > fine to rebase my series on top. Else it can also be done on top of my > series. Whichever you prefer, but I'd rather not delay Claudio's work > too long... >=20 > > =20 > >> + qtest_add_func("acpi/q35/tpm-tis", test_acpi_q35_tcg_tpm_= tis); > >> + qtest_add_func("acpi/piix4", test_acpi_piix4_tcg); > >> + qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_b= ridge); > >> + qtest_add_func("acpi/q35", test_acpi_q35_tcg); > >> + qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridg= e); > >> + qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio6= 4); > >> + qtest_add_func("acpi/piix4/ipmi", test_acpi_piix4_tcg_ipm= i); > >> + qtest_add_func("acpi/q35/ipmi", test_acpi_q35_tcg_ipmi); > >> + qtest_add_func("acpi/piix4/cpuhp", test_acpi_piix4_tcg_cp= hp); > >> + qtest_add_func("acpi/q35/cpuhp", test_acpi_q35_tcg_cphp); > >> + qtest_add_func("acpi/piix4/memhp", test_acpi_piix4_tcg_me= mhp); > >> + qtest_add_func("acpi/q35/memhp", test_acpi_q35_tcg_memhp)= ; > >> + qtest_add_func("acpi/piix4/numamem", test_acpi_piix4_tcg_= numamem); > >> + qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numa= mem); > >> + qtest_add_func("acpi/piix4/nosmm", test_acpi_piix4_tcg_no= smm); > >> + qtest_add_func("acpi/piix4/smm-compat", > >> + test_acpi_piix4_tcg_smm_compat); > >> + qtest_add_func("acpi/piix4/smm-compat-nosmm", > >> + test_acpi_piix4_tcg_smm_compat_nosmm); > >> + qtest_add_func("acpi/piix4/nohpet", test_acpi_piix4_tcg_n= ohpet); > >> + qtest_add_func("acpi/q35/nosmm", test_acpi_q35_tcg_nosmm)= ; > >> + qtest_add_func("acpi/q35/smm-compat", > >> + test_acpi_q35_tcg_smm_compat); > >> + qtest_add_func("acpi/q35/smm-compat-nosmm", > >> + test_acpi_q35_tcg_smm_compat_nosmm); > >> + qtest_add_func("acpi/q35/nohpet", test_acpi_q35_tcg_nohpe= t); > >> + qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_= dimm_pxm); > >> + qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm= _pxm); > >> + qtest_add_func("acpi/piix4/acpihmat", > >> + test_acpi_piix4_tcg_acpi_hmat); > >> + qtest_add_func("acpi/q35/acpihmat", test_acpi_q35_tcg_acp= i_hmat); > >> + qtest_add_func("acpi/microvm", test_acpi_microvm_tcg); > >> + qtest_add_func("acpi/microvm/usb", test_acpi_microvm_usb_= tcg); > >> + qtest_add_func("acpi/microvm/rtc", test_acpi_microvm_rtc_= tcg); > >> + qtest_add_func("acpi/microvm/ioapic2", > >> + test_acpi_microvm_ioapic2_tcg); > >> + if (strcmp(arch, "x86_64") =3D=3D 0) { > >> + qtest_add_func("acpi/microvm/pcie", test_acpi_microvm= _pcie_tcg); > >> + } > >> } > >> } else if (strcmp(arch, "aarch64") =3D=3D 0) { > >> - qtest_add_func("acpi/virt", test_acpi_virt_tcg); > >> - qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numame= m); > >> - qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp); > >> - qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb); > >> + if (tcg_accel_available) { > >> + qtest_add_func("acpi/virt", test_acpi_virt_tcg); > >> + qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_nu= mamem); > >> + qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memh= p); > >> + qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb); > >> + } > >> qtest_add_func("acpi/virt/oem-fields", test_acpi_oem_fields_v= irt); > >> } > >> ret =3D g_test_run(); =20 > > =20 >=20 >=20