From patchwork Tue Oct 6 11:19:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 271974 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 5C5BDC4363D for ; Tue, 6 Oct 2020 11:21:04 +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 D4AC420760 for ; Tue, 6 Oct 2020 11:21:03 +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="XcoH7fy2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4AC420760 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]:53300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPl1i-0003RM-PR for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 07:21:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPl07-0002MM-TO for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:19:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPl04-00068Y-TU for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:19:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601983160; 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=ic2vxCTWvaa5xCA7uWFI0HhSc9dX39cw8PJZy9niXhw=; b=XcoH7fy27+vkjbymhdeIEXNiJtJiPUExj1Rb1zS8xf7fN/OXfU3yIKCAf/WL5a8rc5wtXE 1eLoz6FdiNMrqDoTct3loL/szobG08rle6JbQjg1bSeQB+efH6KJAOjhN8kG98DbV+vg2p MDlSjYqYdrVE/eUzmrPIVSk8oH0uGYU= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-566-MTGTToghNRib6PNZf9UZow-1; Tue, 06 Oct 2020 07:19:17 -0400 X-MC-Unique: MTGTToghNRib6PNZf9UZow-1 Received: by mail-wm1-f69.google.com with SMTP id d76so985920wmd.8 for ; Tue, 06 Oct 2020 04:19:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ic2vxCTWvaa5xCA7uWFI0HhSc9dX39cw8PJZy9niXhw=; b=DHOZwDRzcWB30evAUOLt1+pjeSA76j2Y+sV0BqqhVNZt4bam7CBQf1qjc3N7qMUMOB IGYeWl9miVlbe0sqH5/i2FDMzFoAk22KPaD6u4gB91Ef8BSTALnI9lQprGXtURvWewdk SgeJtSOPK0tmVCOlgs+l7zcNP+gOHAavNY/ISM9gS9ziGlcVxyJ9u+FVZKH2PQTV2v6q fM8jkUNzgDOtA35+RRqff0gWWY0sL4m1pkVLh8rzIdjU0EDQn9aPOlrPnyQsVbKsmmeH ZKQ3q5a4S2aiW2gumtsysQgWL6W3VeQSU2QGBevikRSbQ3ZNsUfR9TfXbBWSyijBJR/D YqvQ== X-Gm-Message-State: AOAM531HVOXmNS9man/fTFQXAtRW3NH0u0E1CwAffFAasJaTuqf2zuVa Wz7I/GRJUA61JegvFxxM781KuHAryxw1OH+9S9eKhtboCtmZb4u4pdFoF2WoWugbU2t67hycGqb +JjoAI/omziGqPIk= X-Received: by 2002:a5d:6290:: with SMTP id k16mr4600221wru.357.1601983156561; Tue, 06 Oct 2020 04:19:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyb6VpDed4QzyS4twvG46bTF33W5KIwJmq24y+kYdWhg91CLqv1OLrnkDI4TAMNPedoxIIpsg== X-Received: by 2002:a5d:6290:: with SMTP id k16mr4600192wru.357.1601983156341; Tue, 06 Oct 2020 04:19:16 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id i6sm4228136wra.1.2020.10.06.04.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:19:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: "Daniel P . Berrange" , Kevin Wolf , qemu-devel@nongnu.org Subject: [PATCH v2 1/1] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE Date: Tue, 6 Oct 2020 13:19:09 +0200 Message-Id: <20201006111909.2302081-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111909.2302081-1-philmd@redhat.com> References: <20201006111909.2302081-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 01:55:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, 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_H5=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: Paolo Bonzini , Laszlo Ersek , Gerd Hoffmann , qemu-block@nongnu.org, =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" While the FW_CFG_DATA_GENERATOR_INTERFACE is only consumed by a device only available using system-mode (fw_cfg), it is implemented by a crypto component (tls-cipher-suites) which is always available when crypto is used. Commit 69699f3055 introduced the following error in the qemu-storage-daemon binary: $ echo -e \ '{"execute": "qmp_capabilities"}\r\n{"execute": "qom-list-types"}\r\n{"execute": "quit"}\r\n' \ | storage-daemon/qemu-storage-daemon --chardev stdio,id=qmp0 --monitor qmp0 {"QMP": {"version": {"qemu": {"micro": 50, "minor": 1, "major": 5}, "package": ""}, "capabilities": ["oob"]}} {"return": {}} missing interface 'fw_cfg-data-generator' for object 'tls-creds' Aborted (core dumped) Since QOM dependencies are resolved at runtime, this issue could not be triggered at linktime, and we don't have test running the qemu-storage-daemon binary. Fix by always registering the QOM interface. Reported-by: Kevin Wolf Fixes: 69699f3055 ("crypto/tls-cipher-suites: Produce fw_cfg consumable blob") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Paolo Bonzini Reviewed-by: Laszlo Ersek --- hw/nvram/fw_cfg-interface.c | 15 +++++++++++++++ hw/nvram/fw_cfg.c | 7 ------- MAINTAINERS | 2 +- hw/nvram/meson.build | 3 +++ 4 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 hw/nvram/fw_cfg-interface.c diff --git a/hw/nvram/fw_cfg-interface.c b/hw/nvram/fw_cfg-interface.c new file mode 100644 index 0000000000..2b19502ffe --- /dev/null +++ b/hw/nvram/fw_cfg-interface.c @@ -0,0 +1,15 @@ +#include "qemu/osdep.h" +#include "hw/nvram/fw_cfg.h" + +static const TypeInfo fw_cfg_data_generator_interface_info = { + .parent = TYPE_INTERFACE, + .name = TYPE_FW_CFG_DATA_GENERATOR_INTERFACE, + .class_size = sizeof(FWCfgDataGeneratorClass), +}; + +static void fw_cfg_register_types(void) +{ + type_register_static(&fw_cfg_data_generator_interface_info); +} + +type_init(fw_cfg_register_types) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 0e95d057fd..08539a1aab 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1360,18 +1360,11 @@ static const TypeInfo fw_cfg_mem_info = { .class_init = fw_cfg_mem_class_init, }; -static const TypeInfo fw_cfg_data_generator_interface_info = { - .parent = TYPE_INTERFACE, - .name = TYPE_FW_CFG_DATA_GENERATOR_INTERFACE, - .class_size = sizeof(FWCfgDataGeneratorClass), -}; - static void fw_cfg_register_types(void) { type_register_static(&fw_cfg_info); type_register_static(&fw_cfg_io_info); type_register_static(&fw_cfg_mem_info); - type_register_static(&fw_cfg_data_generator_interface_info); } type_init(fw_cfg_register_types) diff --git a/MAINTAINERS b/MAINTAINERS index b76fb31861..a45d908ebd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2054,7 +2054,7 @@ R: Laszlo Ersek R: Gerd Hoffmann S: Supported F: docs/specs/fw_cfg.txt -F: hw/nvram/fw_cfg.c +F: hw/nvram/fw_cfg*.c F: stubs/fw_cfg.c F: include/hw/nvram/fw_cfg.h F: include/standard-headers/linux/qemu_fw_cfg.h diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build index 1f2ed013b2..fd2951a860 100644 --- a/hw/nvram/meson.build +++ b/hw/nvram/meson.build @@ -1,3 +1,6 @@ +# QOM interfaces must be available anytime QOM is used. +qom_ss.add(files('fw_cfg-interface.c')) + softmmu_ss.add(files('fw_cfg.c')) softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c')) softmmu_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c'))