From nobody Sat Nov 15 19:42:07 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=1748589793; cv=none; d=zohomail.com; s=zohoarc; b=QLYoO95G4EzGVvp8tXm2NB0Qro9CiYu4pUfq6LIifaPSk0R9Yj8a0+aDVXW8NzwKwPMv5dIeGNB6+luaKPzp0MKXtzSHSDxQIxTMAG9dLfIUSDTreQPJW4qgiD4W9UsnW62Dn0hvDYw93/nG8bsQmDM6/Wdnrtb3fKQGi6JUAaY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748589793; 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=y2yZPFE2x7MAbiDB9fX5abOpoo6aCi+feBOYXevYx+0=; b=dn7TVTqhg7oeh85f7fotL65zZWO+ns12DcIjj6UThKYZ4Yh1/QoWEA/m6VyiNdLCnc64PBk+rQqC6hs9roVhL5XwW0WrYHfwkUY5WHpmGa4jZFkutFh/fb87Z+F4hUVwy2IhPt6FZWOTHrRwXC7OBklBnepN9yMwuLS7W3xeJXw= 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 174858979319363.04571397757377; Fri, 30 May 2025 00:23:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKtx5-0002sZ-Mm; Fri, 30 May 2025 03:14:52 -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-0002Eq-ND for qemu-devel@nongnu.org; Fri, 30 May 2025 03:14:28 -0400 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 1uKtwf-0006yC-5a for qemu-devel@nongnu.org; Fri, 30 May 2025 03:14:26 -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-576-VxT98QgjMRGA1kvNG7iKUw-1; Fri, 30 May 2025 03:14:23 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-ad56a52edc5so177904866b.0 for ; Fri, 30 May 2025 00:14:22 -0700 (PDT) Received: from [192.168.122.1] ([151.49.64.79]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-adb2c842b9fsm180561666b.143.2025.05.30.00.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 00:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748589264; 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=y2yZPFE2x7MAbiDB9fX5abOpoo6aCi+feBOYXevYx+0=; b=QPgGq180WCpx9BRu5kLu1FzilbSStl1uu+sFseI04LQl2MONVZvUMyqSpwFvODuXk4PmcL i61yY2TWOngUvZrX6xCWdlCkve93lprcM5Nsj/G1GZy3o7Y8OjRr3NpLeR6qX8TP9XFoTB FpS0oFdoAI+zHDOXQ/ZqMc+vrXWpc7c= X-MC-Unique: VxT98QgjMRGA1kvNG7iKUw-1 X-Mimecast-MFC-AGG-ID: VxT98QgjMRGA1kvNG7iKUw_1748589262 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748589261; x=1749194061; 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=y2yZPFE2x7MAbiDB9fX5abOpoo6aCi+feBOYXevYx+0=; b=w3FCOab44Bd3nuWe/4vlPPPf57IxXpsqOr7hChbWsf5SE8PqySvp6XLghk+DfRywQv PlVoTvgmOXQF1+crvRorvdy0dEG9iaxabXcnbV8zuQtL14p1JEJ1S/VP5nAqMCF8fhbV 2Q35+AG4Y5fJYolIpFpwO2XwK+qnX0Xb9BAlUAPqrmzFStn0FE3iCj70uhfvPne5+Eox JUKSfwiFmSwAATQeAdpZ7Mx2GcxW8aRCw49LxjCURmQoiBL12NMkx2Di3q3Y0Yf5IF/6 ZqzzhklqHiLlYyTpIKFlt55jK7H06wvkRf33Alg5kSjtalM+lJSsYvtTSdOC+QKrcgNh TAgA== X-Gm-Message-State: AOJu0YznBQocAFgJCya1W/tfI+rM3/4PvgD+lzk4ZPKnAzNH1vxE9ec6 8epywfAuIM3uaBRtuMF+ZRzPgQrO3Nk5qb3AGsaITaqNRSQMMeIH8zvL8d/iXqbn0UB+Yhel92U Mwv7abzkWl9y/pvQewn7v9Ei3nQ2KYdTGreNuTwnOkucBDwBJ30GyoWvnqnH1c780GlGpVgt5XW 5E/OkGTVHvPQCneg3/eEcEtgbG+Ve1Jc7RNzWEkmjB X-Gm-Gg: ASbGnctNJcWSz+egm+doBRku5ILn9U+JBZ0yGvI/ewKV+CycjtaXypzfqo9UzKPTnzZ UrNCXUqZtDbSD90Fd/c/aOgZ17DauVgqAlPu+JIUbMr6aR4Njs29GhIe2XBzMg20grRrCybi58J VHuuYHmo9rQ+/DcGS5xxAw3/QIOjVFSlWRIYS8jpFX70mykR4bc+ur98QRuBuasJPbitsB1mLPV vh4IMwyYAwvqGNa9y8Iflbq4qYys6xv3OggvWKENr43IUESu2rTL+iMwBsIIxqHZIZoD1cyWDQ/ joGbWXtE7avG8g== X-Received: by 2002:a17:907:6ea2:b0:ad5:45d6:5fd5 with SMTP id a640c23a62f3a-adb322a35c9mr192377966b.30.1748589261473; Fri, 30 May 2025 00:14:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEMCcYKn1as2ZS6p06BoIA0jGjYQex16RpfvKNmVkWpT7Azb+aw9b3mGwWAQCD4sz/9PWB0zQ== X-Received: by 2002:a17:907:6ea2:b0:ad5:45d6:5fd5 with SMTP id a640c23a62f3a-adb322a35c9mr192375566b.30.1748589261066; Fri, 30 May 2025 00:14:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Isaku Yamahata , Xiaoyao Li , Gerd Hoffmann , Zhao Liu Subject: [PULL 36/77] i386/tdx: Add TDVF memory via KVM_TDX_INIT_MEM_REGION Date: Fri, 30 May 2025 09:12:06 +0200 Message-ID: <20250530071250.2050910-37-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-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.133.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: 1748589794363116600 Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata TDVF firmware (CODE and VARS) needs to be copied to TD's private memory via KVM_TDX_INIT_MEM_REGION, as well as TD HOB and TEMP memory. If the TDVF section has TDVF_SECTION_ATTRIBUTES_MR_EXTEND set in the flag, calling KVM_TDX_EXTEND_MEMORY to extend the measurement. After populating the TDVF memory, the original image located in shared ramblock can be discarded. Signed-off-by: Isaku Yamahata Signed-off-by: Xiaoyao Li Acked-by: Gerd Hoffmann Reviewed-by: Zhao Liu Link: https://lore.kernel.org/r/20250508150002.689633-25-xiaoyao.li@intel.c= om Signed-off-by: Paolo Bonzini --- target/i386/kvm/tdx.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c index e20ffee9550..43529a9e0ed 100644 --- a/target/i386/kvm/tdx.c +++ b/target/i386/kvm/tdx.c @@ -17,6 +17,7 @@ #include "qom/object_interfaces.h" #include "crypto/hash.h" #include "system/system.h" +#include "system/ramblock.h" =20 #include "hw/i386/e820_memory_layout.h" #include "hw/i386/tdvf.h" @@ -262,6 +263,9 @@ static void tdx_finalize_vm(Notifier *notifier, void *u= nused) { TdxFirmware *tdvf =3D &tdx_guest->tdvf; TdxFirmwareEntry *entry; + RAMBlock *ram_block; + Error *local_err =3D NULL; + int r; =20 tdx_init_ram_entries(); =20 @@ -297,6 +301,44 @@ static void tdx_finalize_vm(Notifier *notifier, void *= unused) sizeof(TdxRamEntry), &tdx_ram_entry_compare); =20 tdvf_hob_create(tdx_guest, tdx_get_hob_entry(tdx_guest)); + + for_each_tdx_fw_entry(tdvf, entry) { + struct kvm_tdx_init_mem_region region; + uint32_t flags; + + region =3D (struct kvm_tdx_init_mem_region) { + .source_addr =3D (uint64_t)entry->mem_ptr, + .gpa =3D entry->address, + .nr_pages =3D entry->size >> 12, + }; + + flags =3D entry->attributes & TDVF_SECTION_ATTRIBUTES_MR_EXTEND ? + KVM_TDX_MEASURE_MEMORY_REGION : 0; + + do { + error_free(local_err); + local_err =3D NULL; + r =3D tdx_vcpu_ioctl(first_cpu, KVM_TDX_INIT_MEM_REGION, flags, + ®ion, &local_err); + } while (r =3D=3D -EAGAIN || r =3D=3D -EINTR); + if (r < 0) { + error_report_err(local_err); + exit(1); + } + + if (entry->type =3D=3D TDVF_SECTION_TYPE_TD_HOB || + entry->type =3D=3D TDVF_SECTION_TYPE_TEMP_MEM) { + qemu_ram_munmap(-1, entry->mem_ptr, entry->size); + entry->mem_ptr =3D NULL; + } + } + + /* + * TDVF image has been copied into private region above via + * KVM_MEMORY_MAPPING. It becomes useless. + */ + ram_block =3D tdx_guest->tdvf_mr->ram_block; + ram_block_discard_range(ram_block, 0, ram_block->max_length); } =20 static Notifier tdx_machine_done_notify =3D { --=20 2.49.0