From nobody Thu Nov 20 12:26:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763468547; cv=none; d=zohomail.com; s=zohoarc; b=cgD+/x8bfh4aRxfrTqGOVVUrLE0jDXJikLPV4iA8COUOum5fcg09goTbJgCD4CC1043ekUU3+FGTkNu9XRerrJO0lWe0S3J98NrYcVV5VqPfzFyRIY6FiwS2nl0RF7DSd+RYssQ0Ff8RIIGK+nxfqeGZfao04Ore2IivDmzQ/+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763468547; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ucK12I488dUYw8mNfYHMEcUYym2/DVuiuzBjV/gWqAk=; b=KuNZPr3dE60+nd9e6PNg4BUkh1OKh5cC5LxgNRIouCZEL+8ie3a/By+lSbq5bkKRXKsgrBhGHj3Z4rZU98XycHPiSJAqKKgejbHHzuKfxYkcsuWZsvEluWQav0uKegiCf631A7aqBHR+2hqT976NeWxqwNbjYa1gSlp+ecBF95I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763468547031472.9737019869518; Tue, 18 Nov 2025 04:22:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLKiQ-0004qJ-As; Tue, 18 Nov 2025 07:21:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLKiO-0004nm-Vu for qemu-devel@nongnu.org; Tue, 18 Nov 2025 07:21:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLKiN-0005GJ-9l for qemu-devel@nongnu.org; Tue, 18 Nov 2025 07:21:44 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-78-Tm33k3t2PyurEAk3I_ZMuw-1; Tue, 18 Nov 2025 07:21:38 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 14F0918AB303; Tue, 18 Nov 2025 12:21:37 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.167]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BF9293003754; Tue, 18 Nov 2025 12:21:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 60794182C025; Tue, 18 Nov 2025 13:21:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763468502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ucK12I488dUYw8mNfYHMEcUYym2/DVuiuzBjV/gWqAk=; b=T2PvdPDrx1QyHix4H1c5hXHR1mfw/1EV1X7mHn8/8bOZc0dWce1pfsfwXlojXLEGlRj5ze iP8iu/E01fXtCDvFTXhT6sg9tH9/L4/mwj9iYOV/cN8a9nlptl2dPCVs4qZEyKwbyKYEfW WKAKUZnG4YTa3PAAF4C8Wqbc6Sh0z7M= X-MC-Unique: Tm33k3t2PyurEAk3I_ZMuw-1 X-Mimecast-MFC-AGG-ID: Tm33k3t2PyurEAk3I_ZMuw_1763468497 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Eduardo Habkost , Ani Sinha , Paolo Bonzini , Marcel Apfelbaum , Richard Henderson , Stefano Garzarella , Luigi Leonardi , Oliver Steffen , "Michael S. Tsirkin" Subject: [PATCH 1/4] igvm: make igvm-cfg object resetable Date: Tue, 18 Nov 2025 13:21:29 +0100 Message-ID: <20251118122133.1695767-2-kraxel@redhat.com> In-Reply-To: <20251118122133.1695767-1-kraxel@redhat.com> References: <20251118122133.1695767-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763468547470158500 Content-Type: text/plain; charset="utf-8" Add TYPE_RESETTABLE_INTERFACE to interfaces. Register callbacks for the reset phases. Add trace points for logging and debugging. No functional change, that will come in followup patches. Signed-off-by: Gerd Hoffmann --- include/system/igvm-cfg.h | 2 ++ backends/igvm-cfg.c | 36 +++++++++++++++++++++++++++++++++++- backends/trace-events | 5 +++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/include/system/igvm-cfg.h b/include/system/igvm-cfg.h index 944f23a814dd..312f77c092b0 100644 --- a/include/system/igvm-cfg.h +++ b/include/system/igvm-cfg.h @@ -13,6 +13,7 @@ #define QEMU_IGVM_CFG_H =20 #include "qom/object.h" +#include "hw/resettable.h" =20 typedef struct IgvmCfg { ObjectClass parent_class; @@ -23,6 +24,7 @@ typedef struct IgvmCfg { * format. */ char *filename; + ResettableState reset_state; } IgvmCfg; =20 typedef struct IgvmCfgClass { diff --git a/backends/igvm-cfg.c b/backends/igvm-cfg.c index d00acf351249..4e3ef88ffc27 100644 --- a/backends/igvm-cfg.c +++ b/backends/igvm-cfg.c @@ -13,8 +13,11 @@ =20 #include "system/igvm-cfg.h" #include "system/igvm.h" +#include "system/reset.h" #include "qom/object_interfaces.h" =20 +#include "trace.h" + static char *get_igvm(Object *obj, Error **errp) { IgvmCfg *igvm =3D IGVM_CFG(obj); @@ -28,24 +31,55 @@ static void set_igvm(Object *obj, const char *value, Er= ror **errp) igvm->filename =3D g_strdup(value); } =20 +static ResettableState *igvm_reset_state(Object *obj) +{ + IgvmCfg *igvm =3D IGVM_CFG(obj); + return &igvm->reset_state; +} + +static void igvm_reset_enter(Object *obj, ResetType type) +{ + trace_igvm_reset_enter(type); +} + +static void igvm_reset_hold(Object *obj, ResetType type) +{ + trace_igvm_reset_hold(type); +} + +static void igvm_reset_exit(Object *obj, ResetType type) +{ + trace_igvm_reset_exit(type); +} + OBJECT_DEFINE_TYPE_WITH_INTERFACES(IgvmCfg, igvm_cfg, IGVM_CFG, OBJECT, - { TYPE_USER_CREATABLE }, { NULL }) + { TYPE_USER_CREATABLE }, + { TYPE_RESETTABLE_INTERFACE }, + { NULL }) =20 static void igvm_cfg_class_init(ObjectClass *oc, const void *data) { IgvmCfgClass *igvmc =3D IGVM_CFG_CLASS(oc); + ResettableClass *rc =3D RESETTABLE_CLASS(oc); =20 object_class_property_add_str(oc, "file", get_igvm, set_igvm); object_class_property_set_description(oc, "file", "Set the IGVM filename to use"); =20 igvmc->process =3D qigvm_process_file; + + rc->get_state =3D igvm_reset_state; + rc->phases.enter =3D igvm_reset_enter; + rc->phases.hold =3D igvm_reset_hold; + rc->phases.exit =3D igvm_reset_exit; } =20 static void igvm_cfg_init(Object *obj) { + qemu_register_resettable(obj); } =20 static void igvm_cfg_finalize(Object *obj) { + qemu_unregister_resettable(obj); } diff --git a/backends/trace-events b/backends/trace-events index 56132d3fd22b..45ac46dc2454 100644 --- a/backends/trace-events +++ b/backends/trace-events @@ -21,3 +21,8 @@ iommufd_backend_free_id(int iommufd, uint32_t id, int ret= ) " iommufd=3D%d id=3D%d (% iommufd_backend_set_dirty(int iommufd, uint32_t hwpt_id, bool start, int r= et) " iommufd=3D%d hwpt=3D%u enable=3D%d (%d)" iommufd_backend_get_dirty_bitmap(int iommufd, uint32_t hwpt_id, uint64_t i= ova, uint64_t size, uint64_t page_size, int ret) " iommufd=3D%d hwpt=3D%u i= ova=3D0x%"PRIx64" size=3D0x%"PRIx64" page_size=3D0x%"PRIx64" (%d)" iommufd_backend_invalidate_cache(int iommufd, uint32_t id, uint32_t data_t= ype, uint32_t entry_len, uint32_t entry_num, uint32_t done_num, uint64_t da= ta_ptr, int ret) " iommufd=3D%d id=3D%u data_type=3D%u entry_len=3D%u entry= _num=3D%u done_num=3D%u data_ptr=3D0x%"PRIx64" (%d)" + +# igvm-cfg.c +igvm_reset_enter(int type) "type=3D%u" +igvm_reset_hold(int type) "type=3D%u" +igvm_reset_exit(int type) "type=3D%u" --=20 2.51.1 From nobody Thu Nov 20 12:26:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763468540; cv=none; d=zohomail.com; s=zohoarc; b=CPBLSwiejkw5O07J/w3hSBVIy7uSj+tqAJOiA4qC1g1TgCla8KuBxGQtIARyHBBzmR7wVqw0YV/g1tXPXCfiZgBKe7R17jdthuzkWAs65a/+hS/uRt7iIUz8yFxL5PUZKlS2mocFMYZJY8qGLcxwXHNrTEaBxxXb8603ngajpYY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763468540; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=R+q4FqU/Ou5+SNOeFkEvfBlC9qK8d7rE4gamtvT02qs=; b=Gv4VwFuJOlAMMVgVAPbuAM6cX2ERy9wWwGSaepyWlxzYmDpuSMEDbSwXHZci+tM2sgrNgHzqiS9skGRvYDIG7kezrFdQV03i+oa36bbH5tsyZyIb6ZO89XRwgvcx/T9FjlZ5McwS8ohSm+IMX/DDtAlx66n3yz5ZU2gYTX1eWbA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763468540787164.44261784915773; Tue, 18 Nov 2025 04:22:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLKiS-0004sc-OR; Tue, 18 Nov 2025 07:21:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLKiQ-0004qE-5R for qemu-devel@nongnu.org; Tue, 18 Nov 2025 07:21:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLKiN-0005GQ-Jl for qemu-devel@nongnu.org; Tue, 18 Nov 2025 07:21:45 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-551-QWx1JxzCN3GIGU5dr0mODA-1; Tue, 18 Nov 2025 07:21:41 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 495BA1800452; Tue, 18 Nov 2025 12:21:40 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.167]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8D846195419F; Tue, 18 Nov 2025 12:21:39 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 781C6182C026; Tue, 18 Nov 2025 13:21:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763468502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R+q4FqU/Ou5+SNOeFkEvfBlC9qK8d7rE4gamtvT02qs=; b=dRTagY81y6qNwmVd6xljlsHaaj7+AnK1A+4PMtcLaI33LiyVLcJhdt+xWFLpRmGVZYF4F8 RCWuow5znyYr0kB2Dm3fE0kGDnxqZCrY1uE85N3w09aLlROvhmej9dXYSZSoYJki1grwST Ep1BChKoudsAPSIn+q/IltMlTAepZuc= X-MC-Unique: QWx1JxzCN3GIGU5dr0mODA-1 X-Mimecast-MFC-AGG-ID: QWx1JxzCN3GIGU5dr0mODA_1763468500 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Eduardo Habkost , Ani Sinha , Paolo Bonzini , Marcel Apfelbaum , Richard Henderson , Stefano Garzarella , Luigi Leonardi , Oliver Steffen , "Michael S. Tsirkin" Subject: [PATCH 2/4] igvm: move file load to complete callback Date: Tue, 18 Nov 2025 13:21:30 +0100 Message-ID: <20251118122133.1695767-3-kraxel@redhat.com> In-Reply-To: <20251118122133.1695767-1-kraxel@redhat.com> References: <20251118122133.1695767-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763468543546158500 Content-Type: text/plain; charset="utf-8" Add UserCreatableClass->complete callback function for igvm-cfg object. Move file loading and parsing of the igvm file from the process function to the to the new complete callback function. Keep the igvm file loaded instead of releasing it after processing, so we parse it only once. Signed-off-by: Gerd Hoffmann --- include/system/igvm-cfg.h | 3 +++ include/system/igvm.h | 1 + backends/igvm-cfg.c | 10 ++++++++++ backends/igvm.c | 9 ++++----- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/include/system/igvm-cfg.h b/include/system/igvm-cfg.h index 312f77c092b0..7dc48677fd99 100644 --- a/include/system/igvm-cfg.h +++ b/include/system/igvm-cfg.h @@ -15,6 +15,8 @@ #include "qom/object.h" #include "hw/resettable.h" =20 +#include + typedef struct IgvmCfg { ObjectClass parent_class; =20 @@ -24,6 +26,7 @@ typedef struct IgvmCfg { * format. */ char *filename; + IgvmHandle file; ResettableState reset_state; } IgvmCfg; =20 diff --git a/include/system/igvm.h b/include/system/igvm.h index 48ce20604259..ec2538daa0e1 100644 --- a/include/system/igvm.h +++ b/include/system/igvm.h @@ -16,6 +16,7 @@ #include "system/igvm-cfg.h" #include "qapi/error.h" =20 +IgvmHandle qigvm_file_init(char *filename, Error **errp); int qigvm_process_file(IgvmCfg *igvm, ConfidentialGuestSupport *cgs, bool onlyVpContext, Error **errp); =20 diff --git a/backends/igvm-cfg.c b/backends/igvm-cfg.c index 4e3ef88ffc27..08501a67e58e 100644 --- a/backends/igvm-cfg.c +++ b/backends/igvm-cfg.c @@ -52,6 +52,13 @@ static void igvm_reset_exit(Object *obj, ResetType type) trace_igvm_reset_exit(type); } =20 +static void igvm_complete(UserCreatable *uc, Error **errp) +{ + IgvmCfg *igvm =3D IGVM_CFG(uc); + + igvm->file =3D qigvm_file_init(igvm->filename, errp); +} + OBJECT_DEFINE_TYPE_WITH_INTERFACES(IgvmCfg, igvm_cfg, IGVM_CFG, OBJECT, { TYPE_USER_CREATABLE }, { TYPE_RESETTABLE_INTERFACE }, @@ -61,6 +68,7 @@ static void igvm_cfg_class_init(ObjectClass *oc, const vo= id *data) { IgvmCfgClass *igvmc =3D IGVM_CFG_CLASS(oc); ResettableClass *rc =3D RESETTABLE_CLASS(oc); + UserCreatableClass *uc =3D USER_CREATABLE_CLASS(oc); =20 object_class_property_add_str(oc, "file", get_igvm, set_igvm); object_class_property_set_description(oc, "file", @@ -72,6 +80,8 @@ static void igvm_cfg_class_init(ObjectClass *oc, const vo= id *data) rc->phases.enter =3D igvm_reset_enter; rc->phases.hold =3D igvm_reset_hold; rc->phases.exit =3D igvm_reset_exit; + + uc->complete =3D igvm_complete; } =20 static void igvm_cfg_init(Object *obj) diff --git a/backends/igvm.c b/backends/igvm.c index 905bd8d98994..05d197fdfe85 100644 --- a/backends/igvm.c +++ b/backends/igvm.c @@ -867,7 +867,7 @@ static int qigvm_handle_policy(QIgvm *ctx, Error **errp) return 0; } =20 -static IgvmHandle qigvm_file_init(char *filename, Error **errp) +IgvmHandle qigvm_file_init(char *filename, Error **errp) { IgvmHandle igvm; g_autofree uint8_t *buf =3D NULL; @@ -896,10 +896,11 @@ int qigvm_process_file(IgvmCfg *cfg, ConfidentialGues= tSupport *cgs, QIgvm ctx; =20 memset(&ctx, 0, sizeof(ctx)); - ctx.file =3D qigvm_file_init(cfg->filename, errp); - if (ctx.file < 0) { + if (!cfg->file) { + error_setg(errp, "No IGVM file loaded."); return -1; } + ctx.file =3D cfg->file; =20 /* * The ConfidentialGuestSupport object is optional and allows a confid= ential @@ -990,7 +991,5 @@ cleanup_parameters: g_free(ctx.id_auth); =20 cleanup: - igvm_free(ctx.file); - return retval; } --=20 2.51.1 From nobody Thu Nov 20 12:26:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763468540; cv=none; d=zohomail.com; s=zohoarc; b=SBZjNQ51Wf7Vddg4ICfxR75kPvHE7kiqOD7JNwabG7kCPS3bPN1H2us/bZAa3rznwnMXNbN+w96H79Zb2e38oQO4Zs/ZJRg70iVcjxyyBuPGSjLe0vgn7GPQTaPVfkwORi1/70PbCASzt+iBKB/DluaceNfmCIVYPxaxWGKtSmg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763468540; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nAeTjmgqoilYb7echaBt27tnizEGJUjLY1rSJl9if8c=; b=MMC2wTTkJ0CZ3X8Oc0lRgjwu7HMOtwRvB2LkDRNHWnLK+9kJQyxhCa3YlGHUJVJNo/+z3mlvle4NSJpr7Y7S2dLLjTI6InsacpOyDW+0bESnRM+jbFxkf0js/70aQAsXMet6dhCKe6AaFEpC+vRkfac4S+8cYyYgOyOCsZGtrYQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176346854090873.16136284267407; Tue, 18 Nov 2025 04:22:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLKiT-0004t2-CD; Tue, 18 Nov 2025 07:21:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLKiQ-0004r7-Fy for qemu-devel@nongnu.org; Tue, 18 Nov 2025 07:21:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLKiP-0005Hv-4H for qemu-devel@nongnu.org; Tue, 18 Nov 2025 07:21:46 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-418-Ma_3a52dMOSnikmSxuF3iA-1; Tue, 18 Nov 2025 07:21:41 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4847018AB42D; Tue, 18 Nov 2025 12:21:40 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.167]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8D7FD1955F1B; Tue, 18 Nov 2025 12:21:39 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 895F7182C027; Tue, 18 Nov 2025 13:21:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763468504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nAeTjmgqoilYb7echaBt27tnizEGJUjLY1rSJl9if8c=; b=cr38T7Crs6HYmI5kenVTQQoXgYWRjsLATKcWdmz8S3lmLFnyOdYCXdoM1+CtuOXUqeimha u8j4DI2rIxRpaVkHVDOzPysP9ooq8k/1qMkOBv+DeernGwaGWXR7YN1qyiEbYYqZXQQZhS FTengSKHXfLCuNxzTkjYH2o/T4CuAH0= X-MC-Unique: Ma_3a52dMOSnikmSxuF3iA-1 X-Mimecast-MFC-AGG-ID: Ma_3a52dMOSnikmSxuF3iA_1763468500 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Eduardo Habkost , Ani Sinha , Paolo Bonzini , Marcel Apfelbaum , Richard Henderson , Stefano Garzarella , Luigi Leonardi , Oliver Steffen , "Michael S. Tsirkin" Subject: [PATCH 3/4] igvm: add trace point for igvm file loading and processing Date: Tue, 18 Nov 2025 13:21:31 +0100 Message-ID: <20251118122133.1695767-4-kraxel@redhat.com> In-Reply-To: <20251118122133.1695767-1-kraxel@redhat.com> References: <20251118122133.1695767-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763468543503158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann --- backends/igvm.c | 5 +++++ backends/trace-events | 2 ++ 2 files changed, 7 insertions(+) diff --git a/backends/igvm.c b/backends/igvm.c index 05d197fdfe85..a350c890cc95 100644 --- a/backends/igvm.c +++ b/backends/igvm.c @@ -18,6 +18,8 @@ #include "system/address-spaces.h" #include "hw/core/cpu.h" =20 +#include "trace.h" + #include #include =20 @@ -884,6 +886,8 @@ IgvmHandle qigvm_file_init(char *filename, Error **errp) error_setg(errp, "Unable to parse IGVM file %s: %d", filename, igv= m); return -1; } + + trace_igvm_file_loaded(filename, igvm); return igvm; } =20 @@ -901,6 +905,7 @@ int qigvm_process_file(IgvmCfg *cfg, ConfidentialGuestS= upport *cgs, return -1; } ctx.file =3D cfg->file; + trace_igvm_process_file(cfg->file, onlyVpContext); =20 /* * The ConfidentialGuestSupport object is optional and allows a confid= ential diff --git a/backends/trace-events b/backends/trace-events index 45ac46dc2454..7a00e9bf6c16 100644 --- a/backends/trace-events +++ b/backends/trace-events @@ -26,3 +26,5 @@ iommufd_backend_invalidate_cache(int iommufd, uint32_t id= , uint32_t data_type, u igvm_reset_enter(int type) "type=3D%u" igvm_reset_hold(int type) "type=3D%u" igvm_reset_exit(int type) "type=3D%u" +igvm_file_loaded(const char *fn, int32_t handle) "fn=3D%s, handle=3D0x%x" +igvm_process_file(int32_t handle, bool context_only) "handle=3D0x%x contex= t-only=3D%d" --=20 2.51.1 From nobody Thu Nov 20 12:26:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763468536; cv=none; d=zohomail.com; s=zohoarc; b=S8FYPGYDzGGNbt6r4G0/v38XdA8S6mLcxAs9Ya3lHlX21yE3p3ug5Uv7Y/XbUkBLK2+w0bc3K1TsDWKoPXqVVtL/wIunkugT5IWKlx8t58av0zNSTZxSYpZ+fRZLxuMDGNTDD7fXYjcxjhNNb59yKvQt+PQJBOjKHrFqnXxOSec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763468536; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pQivBRCSF6+GiWlSUjzSe5VG7ineUGQJlIEltid67L0=; b=SlBAoeaLkiHFYw2zn7eqZNyRG5ZizyDaMx2KM0IAgz7YvK44tmKKYHRnvHT0kqXpSpRmkxW6n7Nyk3QXYiyhDHkeMCqaRVENMhTwgjzthriH09uNXfeiUI9j/MjlWQCQh81ZMoUOFu47QHpg/yl0QAHYdnBRuC0hvOGKf6+F5vU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763468536777867.7049326941124; Tue, 18 Nov 2025 04:22:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLKiU-0004u2-Ov; Tue, 18 Nov 2025 07:21:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLKiS-0004sE-1Q for qemu-devel@nongnu.org; Tue, 18 Nov 2025 07:21:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLKiQ-0005IO-Hy for qemu-devel@nongnu.org; Tue, 18 Nov 2025 07:21:47 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-691-IDcom3MtNQmiuQqyN2YvLw-1; Tue, 18 Nov 2025 07:21:44 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3C87E18D95D1; Tue, 18 Nov 2025 12:21:43 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.167]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DC12019560B6; Tue, 18 Nov 2025 12:21:42 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A0022182C029; Tue, 18 Nov 2025 13:21:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763468505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pQivBRCSF6+GiWlSUjzSe5VG7ineUGQJlIEltid67L0=; b=aL1ytjlmttvDh86NPOd5h4TBj2HOD5ZxgN/wx8Hid3eNv3eXWz/tF0LpxiEG6sl3ANXHo7 6dB0nji1N6F/RzZO1kDvRrvuV+3hTQCgNOD7u9ULp8iFrpPhbdGh5JSLS+zci8JpIix5wM fOSBpS1Qh8s+8Gwyt6Kn51YkxkauqCk= X-MC-Unique: IDcom3MtNQmiuQqyN2YvLw-1 X-Mimecast-MFC-AGG-ID: IDcom3MtNQmiuQqyN2YvLw_1763468503 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Eduardo Habkost , Ani Sinha , Paolo Bonzini , Marcel Apfelbaum , Richard Henderson , Stefano Garzarella , Luigi Leonardi , Oliver Steffen , "Michael S. Tsirkin" Subject: [PATCH 4/4] igvm: move igvm file processing to reset callbacks Date: Tue, 18 Nov 2025 13:21:32 +0100 Message-ID: <20251118122133.1695767-5-kraxel@redhat.com> In-Reply-To: <20251118122133.1695767-1-kraxel@redhat.com> References: <20251118122133.1695767-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763468540264158500 Content-Type: text/plain; charset="utf-8" Move igvm file processing from machine init to reset callbacks. With that the igvm file is properly re-loaded on reset. Also the loading happens later in the init process now. This will simplify future support for some IGVM parameters which depend on initialization steps which happen after machine init. Signed-off-by: Gerd Hoffmann --- backends/igvm-cfg.c | 7 +++++++ hw/i386/pc_piix.c | 10 ---------- hw/i386/pc_q35.c | 10 ---------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/backends/igvm-cfg.c b/backends/igvm-cfg.c index 08501a67e58e..c1b45401f429 100644 --- a/backends/igvm-cfg.c +++ b/backends/igvm-cfg.c @@ -15,6 +15,8 @@ #include "system/igvm.h" #include "system/reset.h" #include "qom/object_interfaces.h" +#include "hw/qdev-core.h" +#include "hw/boards.h" =20 #include "trace.h" =20 @@ -44,7 +46,12 @@ static void igvm_reset_enter(Object *obj, ResetType type) =20 static void igvm_reset_hold(Object *obj, ResetType type) { + MachineState *ms =3D MACHINE(qdev_get_machine()); + IgvmCfg *igvm =3D IGVM_CFG(obj); + trace_igvm_reset_hold(type); + + qigvm_process_file(igvm, ms->cgs, false, &error_fatal); } =20 static void igvm_reset_exit(Object *obj, ResetType type) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 7b3611e973cd..b3b71df64bfc 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -320,16 +320,6 @@ static void pc_init1(MachineState *machine, const char= *pci_type) x86_nvdimm_acpi_dsmio, x86ms->fw_cfg, OBJECT(pcms)); } - -#if defined(CONFIG_IGVM) - /* Apply guest state from IGVM if supplied */ - if (x86ms->igvm) { - if (IGVM_CFG_GET_CLASS(x86ms->igvm) - ->process(x86ms->igvm, machine->cgs, false, &error_fatal) = < 0) { - g_assert_not_reached(); - } - } -#endif } =20 typedef enum PCSouthBridgeOption { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 6015e639d7bc..f2e6ebfe294c 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -328,16 +328,6 @@ static void pc_q35_init(MachineState *machine) x86_nvdimm_acpi_dsmio, x86ms->fw_cfg, OBJECT(pcms)); } - -#if defined(CONFIG_IGVM) - /* Apply guest state from IGVM if supplied */ - if (x86ms->igvm) { - if (IGVM_CFG_GET_CLASS(x86ms->igvm) - ->process(x86ms->igvm, machine->cgs, false, &error_fatal) = < 0) { - g_assert_not_reached(); - } - } -#endif } =20 #define DEFINE_Q35_MACHINE(major, minor) \ --=20 2.51.1