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.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 5DAA7C433E0 for ; Mon, 15 Jun 2020 12:36:10 +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 28F7F206D7 for ; Mon, 15 Jun 2020 12:36:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hVJfiUQ6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 28F7F206D7 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]:58886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkoLR-0004sK-Fa for qemu-devel@archiver.kernel.org; Mon, 15 Jun 2020 08:36:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkoKr-0004Ma-UM for qemu-devel@nongnu.org; Mon, 15 Jun 2020 08:35:33 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:59024 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jkoKp-0003Hu-2C for qemu-devel@nongnu.org; Mon, 15 Jun 2020 08:35:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592224529; 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=m7MfCuOk/toxn5XgHfIlrrYOYm3Xjk/agti4gYah52U=; b=hVJfiUQ6yYK79NcZ1oUAu+5650lmT9ia41nSAtWYzDivfy3E+XltJOjAqFjn3cddg2XcrA VUyRKWNdgMbWQMa0Pw3R7oTxGykoVMwSDqldRwb37Xc+5SvggNqp5nyfVP3rEoetQ1jVAc fkQPZnb3BvNqfvwTd1IG1/wD2wbKX8Q= 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-170-dgNKU14mPT2rgKnUrZBZCw-1; Mon, 15 Jun 2020 08:35:27 -0400 X-MC-Unique: dgNKU14mPT2rgKnUrZBZCw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 317CF18585AF; Mon, 15 Jun 2020 12:35:26 +0000 (UTC) Received: from [10.36.114.197] (ovpn-114-197.ams2.redhat.com [10.36.114.197]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 642135C1C5; Mon, 15 Jun 2020 12:35:21 +0000 (UTC) Subject: Re: [PULL v2 20/58] bios-tables-test: Add Q35/TPM-TIS test To: Thomas Huth , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , "Michael S. Tsirkin" References: <20200612141917.9446-1-mst@redhat.com> <20200612141917.9446-21-mst@redhat.com> <8dbb3662-25b5-ba06-10fe-e3667bb62f6c@redhat.com> From: Auger Eric Message-ID: <84e25c05-1b06-9f9e-e0b3-1b777d56530c@redhat.com> Date: Mon, 15 Jun 2020 14:35:19 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <8dbb3662-25b5-ba06-10fe-e3667bb62f6c@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=205.139.110.61; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 01:12:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Laurent Vivier , Peter Maydell , Igor Mammedov , QEMU Developers , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Philippe, Thomas, On 6/15/20 12:22 PM, Thomas Huth wrote: > On 15/06/2020 12.02, Philippe Mathieu-Daudé wrote: >> On Fri, Jun 12, 2020 at 5:00 PM Michael S. Tsirkin wrote: >>> >>> From: Eric Auger >>> >>> Test tables specific to the TPM-TIS instantiation. >>> The TPM2 is added in the framework. Also the DSDT >>> is updated with the TPM. The new function should be >>> be usable for CRB as well, later one. >>> >>> Signed-off-by: Eric Auger >>> >>> Message-Id: <20200609125409.24179-5-eric.auger@redhat.com> >>> Reviewed-by: Michael S. Tsirkin >>> Signed-off-by: Michael S. Tsirkin >>> --- >>> tests/qtest/bios-tables-test.c | 58 ++++++++++++++++++++++++++++++++++ >>> tests/qtest/Makefile.include | 1 + >>> 2 files changed, 59 insertions(+) >>> >>> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c >>> index c9843829b3..53f104a9c5 100644 >>> --- a/tests/qtest/bios-tables-test.c >>> +++ b/tests/qtest/bios-tables-test.c >>> @@ -57,6 +57,9 @@ >>> #include "qemu/bitmap.h" >>> #include "acpi-utils.h" >>> #include "boot-sector.h" >>> +#include "tpm-emu.h" >>> +#include "hw/acpi/tpm.h" >>> + >>> >>> #define MACHINE_PC "pc" >>> #define MACHINE_Q35 "q35" >>> @@ -874,6 +877,60 @@ static void test_acpi_piix4_tcg_numamem(void) >>> free_test_data(&data); >>> } >>> >>> +uint64_t tpm_tis_base_addr; >>> + >>> +static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if, >>> + uint64_t base) >>> +{ >>> + gchar *tmp_dir_name = g_strdup_printf("qemu-test_acpi_%s_tcg_%s.XXXXXX", >>> + machine, tpm_if); >>> + char *tmp_path = g_dir_make_tmp(tmp_dir_name, NULL); >>> + TestState test; >>> + test_data data; >>> + GThread *thread; >>> + char *args, *variant = g_strdup_printf(".%s", tpm_if); >>> + >>> + tpm_tis_base_addr = base; >>> + >>> + module_call_init(MODULE_INIT_QOM); >>> + >>> + test.addr = g_new0(SocketAddress, 1); >>> + test.addr->type = SOCKET_ADDRESS_TYPE_UNIX; >>> + test.addr->u.q_unix.path = g_build_filename(tmp_path, "sock", NULL); >>> + g_mutex_init(&test.data_mutex); >>> + g_cond_init(&test.data_cond); >>> + test.data_cond_signal = false; >>> + >>> + thread = g_thread_new(NULL, tpm_emu_ctrl_thread, &test); >>> + tpm_emu_test_wait_cond(&test); >>> + >>> + memset(&data, 0, sizeof(data)); >>> + data.machine = machine; >>> + data.variant = variant; >>> + >>> + args = g_strdup_printf( >>> + " -chardev socket,id=chr,path=%s" >>> + " -tpmdev emulator,id=dev,chardev=chr" >> >> This test makes our CI fail: >> https://gitlab.com/qemu-project/qemu/-/jobs/593586369#L3466 > > Right. The problem seems to occur as soon as you run "configure" with > "--disable-tpm" ... I think you need some "#ifdef CONFIG_TPM" here? Thank you. I will respin asap. Eric > > Thomas > >