From nobody Sun Apr 12 04:28:13 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=1772441207; cv=none; d=zohomail.com; s=zohoarc; b=fOeA39+lKg0yVmE9wPAgwApKm9iQHVKO3mQp8yeKuw4EJhDnGGHuMNXpj53d3yamr0WSHcsnlxkrV2jXqqTyhvQ/Re9lYWFFJ6T9CPE1z7bC6arpUGMlwUTQYc2sKbdK60YAx5xgOHF0rcZFJtzvDTYJWndQrH3ARiE7jeRzRi4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772441207; 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=ux3ZnPMEDtYfBdP2aeSQqPPs5FTXOfyYnyLyR49twAs=; b=V3AV0bjoj0OAeIe0qSPYWnfVowrWG9/4jup8a4sgnp9OPMlMJViHTXvUNflOPwiAouGI8rT++LCXTUZRBiRpuNKjDpQc1UklPvK4hTiIyljR+QTGc2b2xfqvmm4OM4dWgFnzJdJQyA4M8YbdIruBMqO6IXJSXR1rxQQaq+JuvwU= 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 177244120720668.6426400975887; Mon, 2 Mar 2026 00:46:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vwyvL-0006lK-N7; Mon, 02 Mar 2026 03:46:43 -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 1vwyup-0005ND-FM for qemu-devel@nongnu.org; Mon, 02 Mar 2026 03:46:15 -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 1vwyug-0001x0-LH for qemu-devel@nongnu.org; Mon, 02 Mar 2026 03:46:09 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-13-qDQbRtwfNZGsIcCSL89sqA-1; Mon, 02 Mar 2026 03:45:59 -0500 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-439b50320a0so676545f8f.1 for ; Mon, 02 Mar 2026 00:45:58 -0800 (PST) Received: from [192.168.10.48] ([151.95.144.138]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439b130abfasm10471900f8f.34.2026.03.02.00.45.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2026 00:45:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772441160; 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=ux3ZnPMEDtYfBdP2aeSQqPPs5FTXOfyYnyLyR49twAs=; b=L3EJBUtcTuWbMltmEQBT3mhuCEdULIukR88VwGAX06OjaFMJq6hPjqmS+BuU1PYWVwh08u xo52UgdOgx2wTohbHuOyrm016dbhriNZX7BI1lNGrbtbAyLPgL6zLCZOodtfBjxXzPu2yn 12RSiT/E8T3nDnwvuXp3E+/w8njp+90= X-MC-Unique: qDQbRtwfNZGsIcCSL89sqA-1 X-Mimecast-MFC-AGG-ID: qDQbRtwfNZGsIcCSL89sqA_1772441158 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1772441156; x=1773045956; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ux3ZnPMEDtYfBdP2aeSQqPPs5FTXOfyYnyLyR49twAs=; b=Oo9wqoc/4j4apNXoc5mZHXnurPQYpBGPG8GwT3y3i66LDp0YlwmeZjjx31H8002T2b cjLvtNl5Akalq4zty0FOgPCz3WLK3T7su02Jlx1Lcgk3wmTOpXdx1F1iEOjOf0XD5/6I DhYJjmWOpsru9Wqzs5BBWj0fQGrFcYXPgTTLEhe3e3rbuoTeQF/KtqTd7kbm0vRaLL56 SYxSNpEqWdd1RdnYhEHrLR+4X7tl+UTP7/lSHDzc/SrsGq7nPPTWSXuIQK0dErXDWOBm maLRVoeGx7umGiWXC1MRW4NXNz7Wmp76KpdRbNXusxkLVoN6bxrAG0TXEYhswf+5SEMp yxxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772441156; x=1773045956; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ux3ZnPMEDtYfBdP2aeSQqPPs5FTXOfyYnyLyR49twAs=; b=KktemO0eX5vxJyhJMJlC7HiyOPAXRh+PkWhzfor+I1F6z/uFykuDGHJH+JeH+mLoKs TyUba32DkoLlynuNtfOZKp3THdS22xFePqaMb8ttEo4TBzgpinfJF3aygFDEfXXaagsC yhono5EMyfJuSlXk2H5oNKLxfl+2CqkeQTRXJTDeH8LuNvnCy4g1u5hscdevQ5fTmKd+ l/BfNm3QN6oQdA0fOFEt+qtO6w7weU4/J+xEVYL23AyL97xRb2YbloAAivX4FDHIy3yP uLI8eGR5FZccVJ7gWzx0tlhhoRQiId9G9P+/33NtASagFD88sZqimm+NcSK0ZuOU28H5 E2qg== X-Gm-Message-State: AOJu0Yxo714zUUqVXFBAdKzY4pALNwkFXNCtgMwKNX7s0HxMN/LKEoAd mRRP23uDBOYZk2MmTMsLPdYCrIDcqyxVjIYOrgTHbwCYENSJ3d0qxs82CIdjBg+kaYMUzz3/7Zf GMTwVTt0SlS6us1ZSAmwNzoACBkRH9vvJsCyhN4XNQe4hTfi/dqZBTs7G+m3t3sfnZkXKPGQ+cx jtZiZmkWbEZjoONJYeM+HnI93xRUoSTS2FovUidb6e X-Gm-Gg: ATEYQzzEUvV+9Ee7ZQNnUIo2qfaNft+fiKVHCGjilU1im8VebhMs242H6qpRpOaa8AJ 2o3Dlzzg4EXLVnUDnNRLGclrfX2V/nxn/iSOqB/S2Cq+SassRN+s6ODuiuYTmYpVwD+3beE1lvD vrdr+38a2XzO7vqXfqAaD7Ec9mq1X26k21ioe0O2ZOqiQpdbJmh4iLF5klYOHH2qUEEb7gdNqPO yTLgr3012OykncuIowEG10pIf419PKyTxiRJnczoEu/9XZbLShCZ5DusRLB8EXJusHdE48xnceS FjtZhax3rNDpb0lrod8fZ3DCSKR1RuByQwVYKA+q55evYyGDrbpYe0QOcCm/TsGKYKywUKtl66E UReuJJwJwBiNvwSzaiNGKseR/oAKCA0nB/IgPZU3/g8GLft+LTp+bnk1qpNOoAD3+HVzOm/SFF4 WMOM2rx7TB4GC5yC7ccBi6N9jlf5Q= X-Received: by 2002:a05:6000:2c06:b0:439:8559:98b with SMTP id ffacd0b85a97d-4399d97f826mr18661065f8f.9.1772441156015; Mon, 02 Mar 2026 00:45:56 -0800 (PST) X-Received: by 2002:a05:6000:2c06:b0:439:8559:98b with SMTP id ffacd0b85a97d-4399d97f826mr18661028f8f.9.1772441155513; Mon, 02 Mar 2026 00:45:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Ani Sinha Subject: [PULL 051/102] kvm/i386: implement architecture support for kvm file descriptor change Date: Mon, 2 Mar 2026 09:42:46 +0100 Message-ID: <20260302084338.473368-52-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302084338.473368-1-pbonzini@redhat.com> References: <20260302084338.473368-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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.012, RCVD_IN_VALIDITY_RPBL_BLOCKED=1.188, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1772441207931158500 Content-Type: text/plain; charset="utf-8" From: Ani Sinha When the kvm file descriptor changes as a part of confidential guest reset, some architecture specific setups including SEV/SEV-SNP/TDX specific setups needs to be redone. These changes are implemented as a part of the kvm_arch_on_vmfd_change() callback which was introduced previously. Signed-off-by: Ani Sinha Link: https://lore.kernel.org/r/20260225035000.385950-11-anisinha@redhat.com Signed-off-by: Paolo Bonzini --- target/i386/kvm/kvm.c | 49 ++++++++++++++++++++++++++++-------- target/i386/kvm/trace-events | 1 + 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 8edfbb834c6..40e4b3f1283 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -3407,12 +3407,30 @@ static int kvm_vm_enable_energy_msrs(KVMState *s) =20 int kvm_arch_on_vmfd_change(MachineState *ms, KVMState *s) { - abort(); + int ret; + + ret =3D kvm_arch_init(ms, s); + if (ret < 0) { + return ret; + } + + if (object_dynamic_cast(OBJECT(ms), TYPE_X86_MACHINE)) { + X86MachineState *x86ms =3D X86_MACHINE(ms); + + if (x86_machine_is_smm_enabled(x86ms)) { + memory_listener_register(&smram_listener.listener, + &smram_address_space); + } + kvm_set_max_apic_id(x86ms->apic_id_limit); + } + + trace_kvm_arch_on_vmfd_change(); + return 0; } =20 bool kvm_arch_supports_vmfd_change(void) { - return false; + return true; } =20 int kvm_arch_init(MachineState *ms, KVMState *s) @@ -3420,6 +3438,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) int ret; struct utsname utsname; Error *local_err =3D NULL; + static bool first =3D true; =20 /* * Initialize confidential guest (SEV/TDX) context, if required @@ -3489,16 +3508,17 @@ int kvm_arch_init(MachineState *ms, KVMState *s) return ret; } =20 - /* Tell fw_cfg to notify the BIOS to reserve the range. */ - e820_add_entry(KVM_IDENTITY_BASE, 0x4000, E820_RESERVED); - + if (first) { + /* Tell fw_cfg to notify the BIOS to reserve the range. */ + e820_add_entry(KVM_IDENTITY_BASE, 0x4000, E820_RESERVED); + } ret =3D kvm_vm_set_nr_mmu_pages(s); if (ret < 0) { return ret; } =20 if (object_dynamic_cast(OBJECT(ms), TYPE_X86_MACHINE) && - x86_machine_is_smm_enabled(X86_MACHINE(ms))) { + x86_machine_is_smm_enabled(X86_MACHINE(ms)) && first) { smram_machine_done.notify =3D register_smram_listener; qemu_add_machine_init_done_notifier(&smram_machine_done); } @@ -3545,16 +3565,23 @@ int kvm_arch_init(MachineState *ms, KVMState *s) return ret; } =20 - ret =3D kvm_msr_energy_thread_init(s, ms); - if (ret < 0) { - error_report("kvm : error RAPL feature requirement not met= "); - return ret; + if (first) { + ret =3D kvm_msr_energy_thread_init(s, ms); + if (ret < 0) { + error_report("kvm : " + "error RAPL feature requirement not met"); + return ret; + } } } } =20 pmu_cap =3D kvm_check_extension(s, KVM_CAP_PMU_CAPABILITY); - kvm_vmfd_add_change_notifier(&kvm_vmfd_change_notifier); + + if (first) { + kvm_vmfd_add_change_notifier(&kvm_vmfd_change_notifier); + } + first =3D false; =20 return 0; } diff --git a/target/i386/kvm/trace-events b/target/i386/kvm/trace-events index 74a6234ff7f..2d213c9f9b6 100644 --- a/target/i386/kvm/trace-events +++ b/target/i386/kvm/trace-events @@ -6,6 +6,7 @@ kvm_x86_add_msi_route(int virq) "Adding route entry for vir= q %d" kvm_x86_remove_msi_route(int virq) "Removing route entry for virq %d" kvm_x86_update_msi_routes(int num) "Updated %d MSI routes" kvm_hc_map_gpa_range(uint64_t gpa, uint64_t size, uint64_t attributes, uin= t64_t flags) "gpa 0x%" PRIx64 " size 0x%" PRIx64 " attributes 0x%" PRIx64 "= flags 0x%" PRIx64 +kvm_arch_on_vmfd_change(void) "" =20 # xen-emu.c kvm_xen_hypercall(int cpu, uint8_t cpl, uint64_t input, uint64_t a0, uint6= 4_t a1, uint64_t a2, uint64_t ret) "xen_hypercall: cpu %d cpl %d input %" P= RIu64 " a0 0x%" PRIx64 " a1 0x%" PRIx64 " a2 0x%" PRIx64" ret 0x%" PRIx64 --=20 2.53.0