From nobody Mon Feb 9 19:28:06 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=1748589949; cv=none; d=zohomail.com; s=zohoarc; b=SO4De+fDvfmEZxaMPfIq4p2rn2K2a13gFh3iSx5eaP/rlXy/0/OUglKOLEJgSMSe1s0f17sRv/qBToDkjXRvk1aDCCsR1TrxmUKp26rSIgPd6sVb6KzjsvgWSi9itoXnPD4Sf/bfvdfluv5r+IACQZRQKV2pAYl3n8m9Cz0KjK0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748589949; h=Content-Type: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=UmlnASzT6uLp8Nbxl99fMI929DWjn8v4QS2tMXfKp4U=; b=YvNo7RG3FdnAN7VNRsx/V9qJsq8arK+eW7Y4r6E8tSnRUqtFIlHDnxQjbdJXOdAk2CkaL03ES7FTEPRQsChnSbMyN5EbrriSLwkrz81ecPlAG/XbmQ1DD1P426GvJmk/efymknfXqK9o7cAN3NoTZATqOKZN4s1AbFDW1H3KK0w= 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 1748589948979191.34675997166494; Fri, 30 May 2025 00:25:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKtwQ-0001XP-Aq; Fri, 30 May 2025 03:14:10 -0400 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 1uKtwG-0001NL-3z for qemu-devel@nongnu.org; Fri, 30 May 2025 03:14:00 -0400 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 1uKtwE-0006v7-2x for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:59 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-141-KudR8q1NONWShev_0Jq2HQ-1; Fri, 30 May 2025 03:13:55 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-ad212166df4so130926666b.0 for ; Fri, 30 May 2025 00:13:55 -0700 (PDT) Received: from [192.168.122.1] ([151.49.64.79]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ada5eb54d24sm274588666b.123.2025.05.30.00.13.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 00:13:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748589236; 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=UmlnASzT6uLp8Nbxl99fMI929DWjn8v4QS2tMXfKp4U=; b=CDKjcz2yaTxyftUkkSRg1NSJgVL4O2BvrVqPvODYLPiaBAV+YM1bKZT/ugddZRiaEpCUBE Sj6V7LAwzV/Piq2+XjX/UXC7oNVA3SFxbXdwq6nMVruq4C9H/qaXEbB7wSL6OE1D0XjBkL 6R4xuo/kG9AHvjEnRvCpLZatgDp9nes= X-MC-Unique: KudR8q1NONWShev_0Jq2HQ-1 X-Mimecast-MFC-AGG-ID: KudR8q1NONWShev_0Jq2HQ_1748589234 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748589233; x=1749194033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UmlnASzT6uLp8Nbxl99fMI929DWjn8v4QS2tMXfKp4U=; b=G8o9L9YqmNjJFv8ZeMfXMZjUaRZkW2lb9H+7Xk6h3DDVs4TudYm3SdAnwP8eLFuYzq 9HO0seTyj+u64gxUcVPQzXnUuV6sN28k7vwQ5DO5B47R9ABsPjgV6KVhDPbi4OwEckvF z70fVX0rBFhQzpVg3oNM2F+4Ui7d4QYGqxhILzKrz81U9lnQAhmiThpwHMZ7jY3Z1fKS hF5HjKJHaRz/XYq+4leUmmMVw8L87qnGBOirtbv7eLBHVoS5YH6/HNv7qTVBjbZT0k5q lWV8SstFLB0YV7Bic3G4NDkluCtRUPfVTq0c0lZ50JILIjdwoTIFF7oSd9plq1g/Odvq evDA== X-Gm-Message-State: AOJu0Yw8SdnT2ahnNzi2GCpDviZASuGYH7j7Ucpy/IqkyFmmmcr4AC2/ LaGYn1KEzsf1SytUSxJOrS/lbh2jrRL0pli2kv8BYjBUUAZiZVcy6LRHXQPWxEkLHE83S7SD4Rd TgtDFkqx5ZNfK9XUjN0LCmaZ517SZ6EhcINwSb/Dwps+O307nBqCxhtQ63V1zjVmqr20QHurJos hRxMM/uLsVXF8rpA4nh40N66kgL9h8c1Iq428eXc76 X-Gm-Gg: ASbGncuQacpxhw4NT/KBbhX4WdKhg0MSOgNRX2GJAleXBDyG9dLtyE3LA4lfFRjUxAx irEtT523GKWGzCF2c7o3yn5OQBLMkN381iiwZexgmrnSWjyG0Z00veIVpPOHMPZvhJpOBCwRXqF aSeWhpbQSuZJfexAG7oAA7Bk2/SDmfZ4nubtX0nMq1w2ROQlkwEn6u8HoB88IkniMxuDxiMALwk Ybh6BouO3Xnjq9aT6BnysFweQ3GnIDVXZ/vKSdomZFDWcApK+mzoVFaNpC090CC1jxrIL6VhTAr NlLm+ADVsUGSSg== X-Received: by 2002:a17:907:9801:b0:ad1:e4e9:6b4f with SMTP id a640c23a62f3a-adb322b2c9cmr206675866b.36.1748589233294; Fri, 30 May 2025 00:13:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEWo/qg0Z0qi2XNXq2IH2GCfA63o1nfMQdqL9tPj+Cs59B8OYnZ88SX8dnQr0cvzzxpi1/xAw== X-Received: by 2002:a17:907:9801:b0:ad1:e4e9:6b4f with SMTP id a640c23a62f3a-adb322b2c9cmr206673066b.36.1748589232845; Fri, 30 May 2025 00:13:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Isaku Yamahata , Xiaoyao Li , Markus Armbruster , Zhao Liu Subject: [PULL 25/77] i386/tdx: Support user configurable mrconfigid/mrowner/mrownerconfig Date: Fri, 30 May 2025 09:11:55 +0200 Message-ID: <20250530071250.2050910-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530071250.2050910-1-pbonzini@redhat.com> References: <20250530071250.2050910-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.902, 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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: 1748589950318116600 From: Isaku Yamahata Three sha384 hash values, mrconfigid, mrowner and mrownerconfig, of a TD can be provided for TDX attestation. Detailed meaning of them can be found: https://lore.kernel.org/qemu-devel/31d6dbc1-f453-4cef-ab08-4813f4e0f= f92@intel.com/ Allow user to specify those values via property mrconfigid, mrowner and mrownerconfig. They are all in base64 format. example -object tdx-guest, \ mrconfigid=3DASNFZ4mrze8BI0VniavN7wEjRWeJq83vASNFZ4mrze8BI0VniavN7wEjRWeJ= q83v,\ mrowner=3DASNFZ4mrze8BI0VniavN7wEjRWeJq83vASNFZ4mrze8BI0VniavN7wEjRWeJq83= v,\ mrownerconfig=3DASNFZ4mrze8BI0VniavN7wEjRWeJq83vASNFZ4mrze8BI0VniavN7wEjR= WeJq83v Signed-off-by: Isaku Yamahata Co-developed-by: Xiaoyao Li Signed-off-by: Xiaoyao Li Acked-by: Markus Armbruster Reviewed-by: Zhao Liu Link: https://lore.kernel.org/r/20250508150002.689633-14-xiaoyao.li@intel.c= om Signed-off-by: Paolo Bonzini --- qapi/qom.json | 16 +++++++- target/i386/kvm/tdx.h | 3 ++ target/i386/kvm/tdx.c | 95 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 1 deletion(-) diff --git a/qapi/qom.json b/qapi/qom.json index 5a88d364236..45cd47508b0 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -1060,11 +1060,25 @@ # pages. Some guest OS (e.g., Linux TD guest) may require this to # be set, otherwise they refuse to boot. # +# @mrconfigid: ID for non-owner-defined configuration of the guest TD, +# e.g., run-time or OS configuration (base64 encoded SHA384 digest). +# Defaults to all zeros. +# +# @mrowner: ID for the guest TD=E2=80=99s owner (base64 encoded SHA384 dig= est). +# Defaults to all zeros. +# +# @mrownerconfig: ID for owner-defined configuration of the guest TD, +# e.g., specific to the workload rather than the run-time or OS +# (base64 encoded SHA384 digest). Defaults to all zeros. +# # Since: 10.1 ## { 'struct': 'TdxGuestProperties', 'data': { '*attributes': 'uint64', - '*sept-ve-disable': 'bool' } } + '*sept-ve-disable': 'bool', + '*mrconfigid': 'str', + '*mrowner': 'str', + '*mrownerconfig': 'str' } } =20 ## # @ThreadContextProperties: diff --git a/target/i386/kvm/tdx.h b/target/i386/kvm/tdx.h index 4e2b5c61ff5..e472b11fb0d 100644 --- a/target/i386/kvm/tdx.h +++ b/target/i386/kvm/tdx.h @@ -24,6 +24,9 @@ typedef struct TdxGuest { bool initialized; uint64_t attributes; /* TD attributes */ uint64_t xfam; + char *mrconfigid; /* base64 encoded sha348 digest */ + char *mrowner; /* base64 encoded sha348 digest */ + char *mrownerconfig; /* base64 encoded sha348 digest */ } TdxGuest; =20 #ifdef CONFIG_TDX diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c index c78a0e8b5ed..671f23d910a 100644 --- a/target/i386/kvm/tdx.c +++ b/target/i386/kvm/tdx.c @@ -11,8 +11,10 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/base64.h" #include "qapi/error.h" #include "qom/object_interfaces.h" +#include "crypto/hash.h" =20 #include "hw/i386/x86.h" #include "kvm_i386.h" @@ -240,6 +242,7 @@ int tdx_pre_create_vcpu(CPUState *cpu, Error **errp) CPUX86State *env =3D &x86cpu->env; g_autofree struct kvm_tdx_init_vm *init_vm =3D NULL; Error *local_err =3D NULL; + size_t data_len; int retry =3D 10000; int r =3D 0; =20 @@ -251,6 +254,45 @@ int tdx_pre_create_vcpu(CPUState *cpu, Error **errp) init_vm =3D g_malloc0(sizeof(struct kvm_tdx_init_vm) + sizeof(struct kvm_cpuid_entry2) * KVM_MAX_CPUID_EN= TRIES); =20 + if (tdx_guest->mrconfigid) { + g_autofree uint8_t *data =3D qbase64_decode(tdx_guest->mrconfigid, + strlen(tdx_guest->mrconfigid), &data_len, er= rp); + if (!data) { + return -1; + } + if (data_len !=3D QCRYPTO_HASH_DIGEST_LEN_SHA384) { + error_setg(errp, "TDX: failed to decode mrconfigid"); + return -1; + } + memcpy(init_vm->mrconfigid, data, data_len); + } + + if (tdx_guest->mrowner) { + g_autofree uint8_t *data =3D qbase64_decode(tdx_guest->mrowner, + strlen(tdx_guest->mrowner), &data_len, errp); + if (!data) { + return -1; + } + if (data_len !=3D QCRYPTO_HASH_DIGEST_LEN_SHA384) { + error_setg(errp, "TDX: failed to decode mrowner"); + return -1; + } + memcpy(init_vm->mrowner, data, data_len); + } + + if (tdx_guest->mrownerconfig) { + g_autofree uint8_t *data =3D qbase64_decode(tdx_guest->mrownerconf= ig, + strlen(tdx_guest->mrownerconfig), &data_len, e= rrp); + if (!data) { + return -1; + } + if (data_len !=3D QCRYPTO_HASH_DIGEST_LEN_SHA384) { + error_setg(errp, "TDX: failed to decode mrownerconfig"); + return -1; + } + memcpy(init_vm->mrownerconfig, data, data_len); + } + r =3D setup_td_guest_attributes(x86cpu, errp); if (r) { return r; @@ -314,6 +356,51 @@ static void tdx_guest_set_sept_ve_disable(Object *obj,= bool value, Error **errp) } } =20 +static char *tdx_guest_get_mrconfigid(Object *obj, Error **errp) +{ + TdxGuest *tdx =3D TDX_GUEST(obj); + + return g_strdup(tdx->mrconfigid); +} + +static void tdx_guest_set_mrconfigid(Object *obj, const char *value, Error= **errp) +{ + TdxGuest *tdx =3D TDX_GUEST(obj); + + g_free(tdx->mrconfigid); + tdx->mrconfigid =3D g_strdup(value); +} + +static char *tdx_guest_get_mrowner(Object *obj, Error **errp) +{ + TdxGuest *tdx =3D TDX_GUEST(obj); + + return g_strdup(tdx->mrowner); +} + +static void tdx_guest_set_mrowner(Object *obj, const char *value, Error **= errp) +{ + TdxGuest *tdx =3D TDX_GUEST(obj); + + g_free(tdx->mrowner); + tdx->mrowner =3D g_strdup(value); +} + +static char *tdx_guest_get_mrownerconfig(Object *obj, Error **errp) +{ + TdxGuest *tdx =3D TDX_GUEST(obj); + + return g_strdup(tdx->mrownerconfig); +} + +static void tdx_guest_set_mrownerconfig(Object *obj, const char *value, Er= ror **errp) +{ + TdxGuest *tdx =3D TDX_GUEST(obj); + + g_free(tdx->mrownerconfig); + tdx->mrownerconfig =3D g_strdup(value); +} + /* tdx guest */ OBJECT_DEFINE_TYPE_WITH_INTERFACES(TdxGuest, tdx_guest, @@ -337,6 +424,14 @@ static void tdx_guest_init(Object *obj) object_property_add_bool(obj, "sept-ve-disable", tdx_guest_get_sept_ve_disable, tdx_guest_set_sept_ve_disable); + object_property_add_str(obj, "mrconfigid", + tdx_guest_get_mrconfigid, + tdx_guest_set_mrconfigid); + object_property_add_str(obj, "mrowner", + tdx_guest_get_mrowner, tdx_guest_set_mrowner); + object_property_add_str(obj, "mrownerconfig", + tdx_guest_get_mrownerconfig, + tdx_guest_set_mrownerconfig); } =20 static void tdx_guest_finalize(Object *obj) --=20 2.49.0