Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2195837/?format=api
{ "id": 2195837, "url": "http://patchwork.ozlabs.org/api/patches/2195837/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260212062522.99565-10-anisinha@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260212062522.99565-10-anisinha@redhat.com>", "list_archive_url": null, "date": "2026-02-12T06:24:53", "name": "[v4,09/31] kvm/i386: implement architecture support for kvm file descriptor change", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "4ad8cc8021db1d581d5918a3284ecd5cd13b2f1c", "submitter": { "id": 86030, "url": "http://patchwork.ozlabs.org/api/people/86030/?format=api", "name": "Ani Sinha", "email": "anisinha@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260212062522.99565-10-anisinha@redhat.com/mbox/", "series": [ { "id": 491935, "url": "http://patchwork.ozlabs.org/api/series/491935/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=491935", "date": "2026-02-12T06:24:45", "name": "Introduce support for confidential guest reset (x86)", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/491935/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2195837/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2195837/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=ObSIu7yj;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=google header.b=Hc2r0PcA;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fBQMy1Rsjz1xvb\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 12 Feb 2026 17:27:58 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1vqQ9T-0007gZ-SB; Thu, 12 Feb 2026 01:26:11 -0500", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <anisinha@redhat.com>)\n id 1vqQ9Q-0007c7-KP\n for qemu-devel@nongnu.org; Thu, 12 Feb 2026 01:26:10 -0500", "from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <anisinha@redhat.com>)\n id 1vqQ9P-0005EY-0x\n for qemu-devel@nongnu.org; Thu, 12 Feb 2026 01:26:08 -0500", "from mail-pg1-f199.google.com (mail-pg1-f199.google.com\n [209.85.215.199]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-561-hT-A8krOOgCRENulYDsmfA-1; Thu, 12 Feb 2026 01:26:04 -0500", "by mail-pg1-f199.google.com with SMTP id\n 41be03b00d2f7-b630b4d8d52so4137199a12.3\n for <qemu-devel@nongnu.org>; Wed, 11 Feb 2026 22:26:04 -0800 (PST)", "from rhel9-box.lan ([122.164.27.113])\n by smtp.googlemail.com with ESMTPSA id\n 98e67ed59e1d1-3567e7d95d8sm4894122a91.2.2026.02.11.22.26.00\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 11 Feb 2026 22:26:02 -0800 (PST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1770877566;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=22GpwhOlGGm3YDWl4oHQuQsIgR+l63T6jAvu0DmCDfs=;\n b=ObSIu7yjUx/8JCQPKCZZHwJLv2P+iCCksa/EJtsC6Q1V65MWavoniiMdJs/WjAmSNaZFTR\n 7n4r4bmqnjW+zhWSSyYfcV++6iCw4AZGXII/fEiKQGNPtzdQagO3zcZgO6yZh0WwSA7m4w\n Ie3tty4cAUnkAOok7COLUUHPt2N2LiY=", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=redhat.com; s=google; t=1770877563; x=1771482363; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=22GpwhOlGGm3YDWl4oHQuQsIgR+l63T6jAvu0DmCDfs=;\n b=Hc2r0PcAO9nPq36oicNoIJuISr3e3QYXDgYQNd6iZg/1FSRM1Gqv9gvVGc13uBvqEE\n xu5Y8n1J60b93/dRneAifVy+tgplS842sGXas5tcLpJpi2ndsGUNXWakDNQUg4zd7Kh+\n c/x/8RChtPNQxar+XIi6LcJpT8Nt+IONJKUubEHH0F3c0ZnpXfkM5C69pTrKJugi12LY\n j8Lzdt/VweTRSqAVK4XPDjvLki9XvBDsD3OuLlmaXVlB5uTL7Rp+SEWW4ZAr77IItWga\n +JpggVmKEbtM0vGcttJVNtpILHr2o58fJaYE2TeN4fnrQy0y0EC+SzlkmbkycwqOkKzR\n iZHQ==" ], "X-MC-Unique": "hT-A8krOOgCRENulYDsmfA-1", "X-Mimecast-MFC-AGG-ID": "hT-A8krOOgCRENulYDsmfA_1770877563", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1770877563; x=1771482363;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=22GpwhOlGGm3YDWl4oHQuQsIgR+l63T6jAvu0DmCDfs=;\n b=A7jT1d/lHGe9JIeOdwGvzBYCYS7/yIg0uKFuKwxwMaoT+hj0UHUJDGENiDBpukiE25\n gZGAFXEnSYaVReSSb93TRJkJTFdsJhYzymPOSnnyFpwGUx4v50w4P2YxWBB6TX36FZBA\n aqyY8hdUX1EXh/1b0js4uduZzkkvEDGfBvBgZuJsuZyJVKqSbdPSF5dTJ9hjIfiTCR2I\n fYNMuLT4V6B8YbHRS1bwVxrpW7WXepvTUIOkCFaPqR9pFWsvLDdV9LGRNv4sOqGTQnas\n mxBLwsS7qBaLBRrQ7WjSuoRvJfQ8OG1gjP1B3TR9NHqMWj4ZOL6vGVUn3SFepDHUq0/D\n Nz9w==", "X-Forwarded-Encrypted": "i=1;\n AJvYcCVry81shMM+1K6bCtDHb2O7MMwx6oYFZFz6DjS3AlJZ47+sv6+8IPBDetJIflUIGLjm9VDvBV6zd3oJ@nongnu.org", "X-Gm-Message-State": "AOJu0YxiDqUlJVqNCpfBpQAznVl17UoeJ783fKkshpKgsY2hq7m/0bqE\n z7aAc9zPY+yRZxK2vur2hB5ZBptjKhp28MIRsBArh6tzOPXkG7Sh5OA2lHOCYgI3zetb5I1lFUQ\n FCFYL8s86TiMbwGjZrt+7RN7ZxJe9Kfatns0R25w4gx50BqaRxCFhs5Xf", "X-Gm-Gg": "AZuq6aLFxTr7qp+Sn9Z6CncjnthoCvwQtCg9gqzlRrauoG0NeEQqHXYur9Yl6LKdNbi\n GjbR6jHGiryb/0JCtAzlHeKhW18mfxUjorvzoT0O8YNWPGY4bNogWQnT05qXnM7/gwBI+f4gDQW\n zfHS6fkxnaPJ4mOdH9tfWZwglf2/LWe4oDapLIi/sw6GRrXHhfIt0nYG0u/wQ04uiHzWd5sxCK8\n ZoEPGGAGHnAGz+0XV4rkpV4DRCJIdVr32wshZBi3i6jHTdwcHGNShgs+/+hUIZn6SGPq7jc0SX2\n 37u40EfiNug/OV/DmKBaGmahhxJSAnw59gxt0S3fgMpm+fnF1D6yB6ZUJRf9mDOumXxxbQRbBok\n PTU80qtXm7IlCAuxqephwEsJkZUGjmWEQEO5OyLAdz21FZ3cGy4wW4pA=", "X-Received": [ "by 2002:a05:6a20:9f05:b0:33b:5a3f:3cbe with SMTP id\n adf61e73a8af0-394488554a9mr1595686637.54.1770877563432;\n Wed, 11 Feb 2026 22:26:03 -0800 (PST)", "by 2002:a05:6a20:9f05:b0:33b:5a3f:3cbe with SMTP id\n adf61e73a8af0-394488554a9mr1595668637.54.1770877563001;\n Wed, 11 Feb 2026 22:26:03 -0800 (PST)" ], "From": "Ani Sinha <anisinha@redhat.com>", "To": "Paolo Bonzini <pbonzini@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>", "Cc": "kraxel@redhat.com, Ani Sinha <anisinha@redhat.com>, kvm@vger.kernel.org,\n qemu-devel@nongnu.org", "Subject": "[PATCH v4 09/31] kvm/i386: implement architecture support for kvm\n file descriptor change", "Date": "Thu, 12 Feb 2026 11:54:53 +0530", "Message-ID": "<20260212062522.99565-10-anisinha@redhat.com>", "X-Mailer": "git-send-email 2.42.0", "In-Reply-To": "<20260212062522.99565-1-anisinha@redhat.com>", "References": "<20260212062522.99565-1-anisinha@redhat.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Received-SPF": "pass client-ip=170.10.129.124;\n envelope-from=anisinha@redhat.com;\n 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,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n 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 <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "When the kvm file descriptor changes as a part of confidential guest reset,\nsome architecture specific setups including SEV/SEV-SNP/TDX specific setups\nneeds to be redone. These changes are implemented as a part of the\nkvm_arch_on_vmfd_change() callback which was introduced previously.\n\nSigned-off-by: Ani Sinha <anisinha@redhat.com>\n---\n target/i386/kvm/kvm.c | 82 ++++++++++++++++++++++++++----------\n target/i386/kvm/trace-events | 1 +\n 2 files changed, 60 insertions(+), 23 deletions(-)", "diff": "diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c\nindex 5d9b79529f..e82a6e9eda 100644\n--- a/target/i386/kvm/kvm.c\n+++ b/target/i386/kvm/kvm.c\n@@ -3268,14 +3268,52 @@ static int kvm_vm_enable_energy_msrs(KVMState *s)\n return 0;\n }\n \n+static int xen_init_wrapper(MachineState *ms, KVMState *s);\n+\n int kvm_arch_on_vmfd_change(MachineState *ms, KVMState *s)\n {\n- abort();\n+ int ret;\n+\n+ ret = kvm_arch_init(ms, s);\n+ if (ret < 0) {\n+ return ret;\n+ }\n+\n+ if (object_dynamic_cast(OBJECT(ms), TYPE_X86_MACHINE)) {\n+ X86MachineState *x86ms = X86_MACHINE(ms);\n+\n+ if (x86_machine_is_smm_enabled(x86ms)) {\n+ memory_listener_register(&smram_listener.listener,\n+ &smram_address_space);\n+ }\n+ kvm_set_max_apic_id(x86ms->apic_id_limit);\n+ }\n+\n+ trace_kvm_arch_on_vmfd_change();\n+ return 0;\n+}\n+\n+static int xen_init_wrapper(MachineState *ms, KVMState *s)\n+{\n+ int ret = 0;\n+#ifdef CONFIG_XEN_EMU\n+ if (!object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE)) {\n+ error_report(\"kvm: Xen support only available in PC machine\");\n+ return -ENOTSUP;\n+ }\n+ /* hyperv_enabled() doesn't work yet. */\n+ uint32_t msr = XEN_HYPERCALL_MSR;\n+ ret = kvm_xen_init(s, msr);\n+#else\n+ error_report(\"kvm: Xen support not enabled in qemu\");\n+ return -ENOTSUP;\n+#endif\n+ return ret;\n }\n \n bool kvm_arch_supports_vmfd_change(void)\n {\n- return false;\n+ return true;\n }\n \n int kvm_arch_init(MachineState *ms, KVMState *s)\n@@ -3283,6 +3321,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)\n int ret;\n struct utsname utsname;\n Error *local_err = NULL;\n+ static bool first = true;\n \n /*\n * Initialize confidential guest (SEV/TDX) context, if required\n@@ -3311,21 +3350,10 @@ int kvm_arch_init(MachineState *ms, KVMState *s)\n }\n \n if (s->xen_version) {\n-#ifdef CONFIG_XEN_EMU\n- if (!object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE)) {\n- error_report(\"kvm: Xen support only available in PC machine\");\n- return -ENOTSUP;\n- }\n- /* hyperv_enabled() doesn't work yet. */\n- uint32_t msr = XEN_HYPERCALL_MSR;\n- ret = kvm_xen_init(s, msr);\n+ ret = xen_init_wrapper(ms, s);\n if (ret < 0) {\n return ret;\n }\n-#else\n- error_report(\"kvm: Xen support not enabled in qemu\");\n- return -ENOTSUP;\n-#endif\n }\n \n ret = kvm_get_supported_msrs(s);\n@@ -3352,16 +3380,17 @@ int kvm_arch_init(MachineState *ms, KVMState *s)\n return ret;\n }\n \n- /* Tell fw_cfg to notify the BIOS to reserve the range. */\n- e820_add_entry(KVM_IDENTITY_BASE, 0x4000, E820_RESERVED);\n-\n+ if (first) {\n+ /* Tell fw_cfg to notify the BIOS to reserve the range. */\n+ e820_add_entry(KVM_IDENTITY_BASE, 0x4000, E820_RESERVED);\n+ }\n ret = kvm_vm_set_nr_mmu_pages(s);\n if (ret < 0) {\n return ret;\n }\n \n if (object_dynamic_cast(OBJECT(ms), TYPE_X86_MACHINE) &&\n- x86_machine_is_smm_enabled(X86_MACHINE(ms))) {\n+ x86_machine_is_smm_enabled(X86_MACHINE(ms)) && first) {\n smram_machine_done.notify = register_smram_listener;\n qemu_add_machine_init_done_notifier(&smram_machine_done);\n }\n@@ -3408,15 +3437,22 @@ int kvm_arch_init(MachineState *ms, KVMState *s)\n return ret;\n }\n \n- ret = kvm_msr_energy_thread_init(s, ms);\n- if (ret < 0) {\n- error_report(\"kvm : error RAPL feature requirement not met\");\n- return ret;\n+ if (first) {\n+ ret = kvm_msr_energy_thread_init(s, ms);\n+ if (ret < 0) {\n+ error_report(\"kvm : \"\n+ \"error RAPL feature requirement not met\");\n+ return ret;\n+ }\n }\n }\n }\n \n- kvm_vmfd_add_change_notifier(&kvm_vmfd_change_notifier);\n+ if (first) {\n+ kvm_vmfd_add_change_notifier(&kvm_vmfd_change_notifier);\n+ }\n+\n+ first = false;\n \n return 0;\n }\ndiff --git a/target/i386/kvm/trace-events b/target/i386/kvm/trace-events\nindex 74a6234ff7..2d213c9f9b 100644\n--- a/target/i386/kvm/trace-events\n+++ b/target/i386/kvm/trace-events\n@@ -6,6 +6,7 @@ kvm_x86_add_msi_route(int virq) \"Adding route entry for virq %d\"\n kvm_x86_remove_msi_route(int virq) \"Removing route entry for virq %d\"\n kvm_x86_update_msi_routes(int num) \"Updated %d MSI routes\"\n kvm_hc_map_gpa_range(uint64_t gpa, uint64_t size, uint64_t attributes, uint64_t flags) \"gpa 0x%\" PRIx64 \" size 0x%\" PRIx64 \" attributes 0x%\" PRIx64 \" flags 0x%\" PRIx64\n+kvm_arch_on_vmfd_change(void) \"\"\n \n # xen-emu.c\n kvm_xen_hypercall(int cpu, uint8_t cpl, uint64_t input, uint64_t a0, uint64_t a1, uint64_t a2, uint64_t ret) \"xen_hypercall: cpu %d cpl %d input %\" PRIu64 \" a0 0x%\" PRIx64 \" a1 0x%\" PRIx64 \" a2 0x%\" PRIx64\" ret 0x%\" PRIx64\n", "prefixes": [ "v4", "09/31" ] }