From nobody Mon Feb 9 18:18:43 2026 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=1768413081; cv=none; d=zohomail.com; s=zohoarc; b=P5IVC9STeOMO+9uAZdnOAtvoJ/lePcoeQwBvtyaPb2cqt9yiZvopWwbYMG4484rXMllFn59J61zyl6YO7SlSpV2x2U0CMxs66rXR3LPcaKrpvmGqDBdCFLHdFPIyg3rFa+oirNJf9uNV/65JBPgE2ZoyGWLBcYJh6wtJ7yYmrVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768413081; 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=HvCtcU3X4zMESaba3Y3b7w8sMF9sxZxPO6xg8lxyFYQ=; b=fn+9Mtq6aofY+oKqK91dSjPK+waxuWKKeKAFK7FPcfaw0QyOV24WMEUudG/6TjkZ1yt1d2hnrQtDiEObedRCwGmUpSfOKA8sV7PxHDoHMYF+nF7geK6T59bsL5qEgG2Fl/GzUSnuuR1FHztAkbj38iE5UO/w1ze83zDQ+8wLG4c= 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 1768413081383887.9573820779123; Wed, 14 Jan 2026 09:51:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vg51C-0001qJ-Bb; Wed, 14 Jan 2026 12:50:56 -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 1vg517-0001pE-0d for qemu-devel@nongnu.org; Wed, 14 Jan 2026 12:50:50 -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 1vg515-0008W4-09 for qemu-devel@nongnu.org; Wed, 14 Jan 2026 12:50:48 -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-564-tc7883kNPQ2uBFRJqFbSRA-1; Wed, 14 Jan 2026 12:50:42 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 429621800342; Wed, 14 Jan 2026 17:50:41 +0000 (UTC) Received: from osteffen-laptop.redhat.com (unknown [10.45.224.90]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1FB4C1800665; Wed, 14 Jan 2026 17:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768413046; 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=HvCtcU3X4zMESaba3Y3b7w8sMF9sxZxPO6xg8lxyFYQ=; b=QxqBsTRmxADS1SV85dlLzYk/RbI5O+KnLol9uhcPAn7nYqxSuoFcjl+B0Y+C0wFEi476bv fz822JqgXv9Qe3CC6+4Zjli2P5QfyW47GsFkV7oMbrnX3QgJmS0dJ0Mi1B7EHx2KxWIkjl bzzALfM1D+BeTDrEduIZ6cZNko8zRBw= X-MC-Unique: tc7883kNPQ2uBFRJqFbSRA-1 X-Mimecast-MFC-AGG-ID: tc7883kNPQ2uBFRJqFbSRA_1768413041 From: Oliver Steffen To: qemu-devel@nongnu.org Cc: Marcelo Tosatti , Ani Sinha , Zhao Liu , Joerg Roedel , Richard Henderson , kvm@vger.kernel.org, Paolo Bonzini , Eduardo Habkost , Gerd Hoffmann , "Michael S. Tsirkin" , Igor Mammedov , Stefano Garzarella , Marcel Apfelbaum , Luigi Leonardi , Oliver Steffen Subject: [PATCH v4 4/5] igvm: Pass machine state to IGVM file processing Date: Wed, 14 Jan 2026 18:50:06 +0100 Message-ID: <20260114175007.90845-5-osteffen@redhat.com> In-Reply-To: <20260114175007.90845-1-osteffen@redhat.com> References: <20260114175007.90845-1-osteffen@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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 (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=osteffen@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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: qemu development 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: 1768413084806158500 Content-Type: text/plain; charset="utf-8" Pass the full MachineState to the IGVM backend during file processing, instead of just the ConfidentialGuestSupport struct (which is a member of the MachineState). This replaces the cgs parameter of qigvm_process_file() with the machine state to make it available in the IGVM processing context. We will use it later to generate MADT data there to pass to the guest as IGVM parameter. Signed-off-by: Oliver Steffen Reviewed-by: Luigi Leonardi --- backends/igvm-cfg.c | 2 +- backends/igvm.c | 30 +++++++++++++++++------------- include/system/igvm-cfg.h | 3 ++- include/system/igvm.h | 5 +++-- target/i386/sev.c | 3 +-- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/backends/igvm-cfg.c b/backends/igvm-cfg.c index c1b45401f4..1b35dc0a49 100644 --- a/backends/igvm-cfg.c +++ b/backends/igvm-cfg.c @@ -51,7 +51,7 @@ static void igvm_reset_hold(Object *obj, ResetType type) =20 trace_igvm_reset_hold(type); =20 - qigvm_process_file(igvm, ms->cgs, false, &error_fatal); + qigvm_process_file(igvm, ms, false, &error_fatal); } =20 static void igvm_reset_exit(Object *obj, ResetType type) diff --git a/backends/igvm.c b/backends/igvm.c index ccb2f51cd9..cb2f997c87 100644 --- a/backends/igvm.c +++ b/backends/igvm.c @@ -11,6 +11,7 @@ =20 #include "qemu/osdep.h" =20 +#include "hw/boards.h" #include "qapi/error.h" #include "qemu/target-info-qapi.h" #include "system/igvm.h" @@ -70,7 +71,7 @@ struct QEMU_PACKED sev_id_authentication { */ typedef struct QIgvm { IgvmHandle file; - ConfidentialGuestSupport *cgs; + MachineState *machine_state; ConfidentialGuestSupportClass *cgsc; uint32_t compatibility_mask; unsigned current_header_index; @@ -235,7 +236,8 @@ static void *qigvm_prepare_memory(QIgvm *ctx, uint64_t = addr, uint64_t size, g_autofree char *region_name =3D g_strdup_printf("igvm.%X", region_identifier); igvm_pages =3D g_new0(MemoryRegion, 1); - if (ctx->cgs && ctx->cgs->require_guest_memfd) { + if (ctx->machine_state->cgs && + ctx->machine_state->cgs->require_guest_memfd) { if (!memory_region_init_ram_guest_memfd(igvm_pages, NULL, region_name, size, err= p)) { return NULL; @@ -355,7 +357,7 @@ static int qigvm_process_mem_region(QIgvm *ctx, unsigne= d start_index, * If a confidential guest support object is provided then use it to s= et the * guest state. */ - if (ctx->cgs) { + if (ctx->machine_state->cgs) { cgs_page_type =3D qigvm_type_to_cgs_type(page_type, flags->unmeasured, zero); if (cgs_page_type < 0) { @@ -457,7 +459,7 @@ static int qigvm_directive_vp_context(QIgvm *ctx, const= uint8_t *header_data, =20 data =3D (uint8_t *)igvm_get_buffer(ctx->file, data_handle); =20 - if (ctx->cgs) { + if (ctx->machine_state->cgs) { result =3D ctx->cgsc->set_guest_state( vp_context->gpa, data, igvm_get_buffer_size(ctx->file, data_ha= ndle), CGS_PAGE_TYPE_VMSA, vp_context->vp_index, errp); @@ -525,7 +527,7 @@ static int qigvm_directive_parameter_insert(QIgvm *ctx, * If a confidential guest support object is provided then use= it to * set the guest state. */ - if (ctx->cgs) { + if (ctx->machine_state->cgs) { result =3D ctx->cgsc->set_guest_state(param->gpa, region, param_entry->size, CGS_PAGE_TYPE_UNMEASUR= ED, 0, @@ -568,7 +570,7 @@ static int qigvm_directive_memory_map(QIgvm *ctx, const= uint8_t *header_data, ConfidentialGuestMemoryMapEntry cgmm_entry; int retval =3D 0; =20 - if (ctx->cgs && ctx->cgsc->get_mem_map_entry) { + if (ctx->machine_state->cgs && ctx->cgsc->get_mem_map_entry) { get_mem_map_entry =3D ctx->cgsc->get_mem_map_entry; =20 } else if (target_arch() =3D=3D SYS_EMU_TARGET_X86_64) { @@ -690,7 +692,7 @@ static int qigvm_directive_required_memory(QIgvm *ctx, if (!region) { return -1; } - if (ctx->cgs) { + if (ctx->machine_state->cgs) { result =3D ctx->cgsc->set_guest_state(mem->gpa, region, mem->number_of_by= tes, CGS_PAGE_TYPE_REQUIRED_MEMORY, 0, e= rrp); @@ -808,14 +810,14 @@ static int qigvm_supported_platform_compat_mask(QIgvm= *ctx, Error **errp) sizeof( IGVM_VHS_VARIABLE_HEAD= ER)); if ((platform->platform_type =3D=3D IGVM_PLATFORM_TYPE_SEV_ES)= && - ctx->cgs) { + ctx->machine_state->cgs) { if (ctx->cgsc->check_support( CGS_PLATFORM_SEV_ES, platform->platform_version, platform->highest_vtl, platform->shared_gpa_bounda= ry)) { compatibility_mask_sev_es =3D platform->compatibility_= mask; } } else if ((platform->platform_type =3D=3D IGVM_PLATFORM_TYPE_= SEV) && - ctx->cgs) { + ctx->machine_state->cgs) { if (ctx->cgsc->check_support( CGS_PLATFORM_SEV, platform->platform_version, platform->highest_vtl, platform->shared_gpa_bounda= ry)) { @@ -823,7 +825,7 @@ static int qigvm_supported_platform_compat_mask(QIgvm *= ctx, Error **errp) } } else if ((platform->platform_type =3D=3D IGVM_PLATFORM_TYPE_SEV_SNP) && - ctx->cgs) { + ctx->machine_state->cgs) { if (ctx->cgsc->check_support( CGS_PLATFORM_SEV_SNP, platform->platform_version, platform->highest_vtl, platform->shared_gpa_bounda= ry)) { @@ -896,7 +898,7 @@ IgvmHandle qigvm_file_init(char *filename, Error **errp) return igvm; } =20 -int qigvm_process_file(IgvmCfg *cfg, ConfidentialGuestSupport *cgs, +int qigvm_process_file(IgvmCfg *cfg, MachineState *machine_state, bool onlyVpContext, Error **errp) { int32_t header_count; @@ -917,8 +919,10 @@ int qigvm_process_file(IgvmCfg *cfg, ConfidentialGuest= Support *cgs, * guest platform to perform extra processing, such as page measuremen= t, on * IGVM directives. */ - ctx.cgs =3D cgs; - ctx.cgsc =3D cgs ? CONFIDENTIAL_GUEST_SUPPORT_GET_CLASS(cgs) : NULL; + ctx.machine_state =3D machine_state; + ctx.cgsc =3D machine_state->cgs ? + CONFIDENTIAL_GUEST_SUPPORT_GET_CLASS(machine_state->cgs= ) : + NULL; =20 /* * Check that the IGVM file provides configuration for the current diff --git a/include/system/igvm-cfg.h b/include/system/igvm-cfg.h index 7dc48677fd..51bf8d9844 100644 --- a/include/system/igvm-cfg.h +++ b/include/system/igvm-cfg.h @@ -12,6 +12,7 @@ #ifndef QEMU_IGVM_CFG_H #define QEMU_IGVM_CFG_H =20 +#include "hw/boards.h" #include "qom/object.h" #include "hw/resettable.h" =20 @@ -42,7 +43,7 @@ typedef struct IgvmCfgClass { * * Returns 0 for ok and -1 on error. */ - int (*process)(IgvmCfg *cfg, ConfidentialGuestSupport *cgs, + int (*process)(IgvmCfg *cfg, MachineState *machine_state, bool onlyVpContext, Error **errp); =20 } IgvmCfgClass; diff --git a/include/system/igvm.h b/include/system/igvm.h index ec2538daa0..ce023fbc9e 100644 --- a/include/system/igvm.h +++ b/include/system/igvm.h @@ -14,11 +14,12 @@ =20 #include "system/confidential-guest-support.h" #include "system/igvm-cfg.h" +#include "hw/boards.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); +int qigvm_process_file(IgvmCfg *igvm, MachineState *machine_state, + bool onlyVpContext, Error **errp); =20 /* x86 native */ int qigvm_x86_get_mem_map_entry(int index, diff --git a/target/i386/sev.c b/target/i386/sev.c index fd2dada013..91a55ebd81 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -1892,8 +1892,7 @@ static int sev_common_kvm_init(ConfidentialGuestSuppo= rt *cgs, Error **errp) */ if (x86machine->igvm) { if (IGVM_CFG_GET_CLASS(x86machine->igvm) - ->process(x86machine->igvm, machine->cgs, true, errp) = =3D=3D - -1) { + ->process(x86machine->igvm, machine, true, errp) =3D= =3D -1) { return -1; } /* --=20 2.52.0