From nobody Sun Dec 14 12:13:28 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=1765552145; cv=none; d=zohomail.com; s=zohoarc; b=TD3pqtyiX713zNzSHPt1BTGt4s0zk263h6iYsdrSUmqhEqt7Bh+mgNmn642lpq9aQnubVNBd4wFgyFECt6YSJV8aj7OvHdfN6jc4v3C5LNBtVGcXZP8yTUkQlGyCAwC8qvxMaJKWtylM4NXNHeHGMmwtAzhuliaC3OZSZr4PIV4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765552145; 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=PjEcZQ1uHJTqefFeQEkw1uWuzKF1uPikpHMJbHt4BwE=; b=Afa4/P2LbVpMIhAXvMcGk1GpIp3zo/ERGIVQEOZ3FawJgcVKbISelRk1JFz/iNRBUjkQBtasXg5e0aJZBs1e0ZBgIoY8+kxOJVlKMMUoXdDFiXzJufDbPUgFg5roGGnsXIL+COhce98g2IpZ/8VdhfvNmKGadTURP/jaaf3OTjs= 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 176555214525822.50571723158089; Fri, 12 Dec 2025 07:09:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vU4hQ-0001we-Pz; Fri, 12 Dec 2025 10:04:52 -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 1vU4hN-0001sH-1E for qemu-devel@nongnu.org; Fri, 12 Dec 2025 10:04:49 -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 1vU4hI-0005f5-Qo for qemu-devel@nongnu.org; Fri, 12 Dec 2025 10:04:47 -0500 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-479-Q9dWWLpHOde8MA3jf8Db1A-1; Fri, 12 Dec 2025 10:04:42 -0500 Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-29557f43d56so16160475ad.3 for ; Fri, 12 Dec 2025 07:04:42 -0800 (PST) Received: from rhel9-box.lan ([122.172.173.62]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-29ee9d38ad1sm57046655ad.29.2025.12.12.07.04.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Dec 2025 07:04:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765551884; 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=PjEcZQ1uHJTqefFeQEkw1uWuzKF1uPikpHMJbHt4BwE=; b=RuESubHuIvr7XIO8mJKF+fI4jYiUoTyNfVFn3w0F/8PMtvsddB13x7l3OBPGx1DH0PSrMO PiW0Ehkpd3JMwWBPhWndNH1WeMph8T03SrdRpNEBx5VAKzQc7OgZQMyPif9rndgzsdsesk alrV5FbwCl1ZH3zhAD54KCZ0ROcEg20= X-MC-Unique: Q9dWWLpHOde8MA3jf8Db1A-1 X-Mimecast-MFC-AGG-ID: Q9dWWLpHOde8MA3jf8Db1A_1765551882 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1765551881; x=1766156681; 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=PjEcZQ1uHJTqefFeQEkw1uWuzKF1uPikpHMJbHt4BwE=; b=IpDv+S5os0ozC3oFdt+KV5xFfhyUpkftotkdYettq5BGy+SRhethdxAJmbJJVvwphA X/ZdQX7DpZ4hphIsqiD0E2M0ejvG1wZsaZ8eVlhG/Xtwa1uaDBeijNFIRoAIm1M4IeEI O7+FKONfUMz+HKmlLxCjk4QRQgbQJYkIOK05pzuoCLMX7StOxhsGKV6m/SZW0/ISVUi+ 27IU+rNUNpd+wFFYF+Fq5OrmQr3TX4gg2npBI3VBRkZZrmm0pvHJ59k7nPEehGOI3y4U pk0ysJfprsjwVcvt07tnXB3FREcQKOlsqRgIP6PziFJFUbb6Cc/Nzntrz6RR+MZDgN1r 0dtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765551881; x=1766156681; 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=PjEcZQ1uHJTqefFeQEkw1uWuzKF1uPikpHMJbHt4BwE=; b=aZg7xQCHaN42R4E/f8MkXrxevAw07cAiw3sT+phzroF8IQdk9U6RPKMIehwlXonx8B Av6hrSg8IneOhxasLc1XrXtQ8LVJT0mHzQyxQNoLwnQKLVTBa0goy3uF0eP8Z/H078N9 /9iLHW2B9YAn4dP9aeZHgVMRVo/uT1g8KMatfZx213+YzEEJ6xiOPBsdEaKlaXawUCbO vsCqCNXdegVdEzJ3KhF5bFUTxxy/ryh/ahujP+Q6ujGDGOnmayLj8n3kfiWtgm3Z7j7B EjvnPC9OLgATrEd0Lgivu5CYT5UUHe8zlPKzAa9thSO9/dWlwmYugvZdIK/i0fMtayoK ph+w== X-Forwarded-Encrypted: i=1; AJvYcCU0AJNnd6rkTdtixVHvVVolU/UmzIT2/nZWamvNMVParFLJgDpzkaoxPYLKa+lMnqHh3ScLQJPAuJeu@nongnu.org X-Gm-Message-State: AOJu0Ywk/Qt38rUfvIBdwueE097Xc8R2lX+/31FElWdtv5NJOeWdT9TB o7ifK8tqrPAv1eduItwPpR16x8y5u0xJsqkDmT3/Qyx8Uplfj1JjLrGjqo7vUXPLhxwguj9EUox vYGyz1KGGKNI/P8cM8X1oHkb1sgwX5pTSdCJlDn3qtGbXaleg9/R+dZet X-Gm-Gg: AY/fxX4w2/o7u8Ouj/Nt2+Oh5PrpHgrHOy8rI8WmM4TRQ/gjLnsTCyh3XesDB6b9FeA HtdJQdTUjqHXZ+NRhxfu5stQk6SMMLvOLNa4OXeWCbcyF2t9Kk9clgJZWE4tnPqZ/ENgtkChYtz Zo5vAi5/HvfYv4hOVfC6MgzKz4r8zUvQ0oHj6JUaMUqekau/JU6MhZVnvFJQWm+ZliKa+ROV3qU 9O/JG6G/nYNKS2QS3n76JCO6szYva55af6FJc1zNZXn1Aejbo02P6ADv9W2rV//6MNzpGo9/n7f MER7/1BaMzzSMB/ZqTxwiCsWlb8s9F4JO1PzuTUHrgPykAutrlIXXO0grHDnAcxlY8gDLrcnFGn Jf/wpGvoKYYow5gULxEECxnhK1rYKaOrtbgSHPfbxlDg= X-Received: by 2002:a17:903:230a:b0:2a0:81c1:6194 with SMTP id d9443c01a7336-2a081c16442mr6958315ad.47.1765551881154; Fri, 12 Dec 2025 07:04:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IH8yblFgCzrr9m/ubmrYBSTPLesJuI39hqhYZI5/jPqA3lpx4dP+VaBeRXVg2kOQXvwTndbgA== X-Received: by 2002:a17:903:230a:b0:2a0:81c1:6194 with SMTP id d9443c01a7336-2a081c16442mr6957515ad.47.1765551880158; Fri, 12 Dec 2025 07:04:40 -0800 (PST) From: Ani Sinha To: Paolo Bonzini , Peter Maydell , Marcelo Tosatti , Song Gao , Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo , Nicholas Piggin , Harsh Prateek Bora , Chinmay Rath , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Halil Pasic , Christian Borntraeger , Eric Farman , Matthew Rosato , Richard Henderson , Ilya Leoshkevich , David Hildenbrand , Thomas Huth Cc: vkuznets@redhat.com, kraxel@redhat.com, qemu-devel@nongnu.org, Ani Sinha , kvm@vger.kernel.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-s390x@nongnu.org Subject: [PATCH v1 04/28] accel/kvm: add changes required to support KVM VM file descriptor change Date: Fri, 12 Dec 2025 20:33:32 +0530 Message-ID: <20251212150359.548787-5-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20251212150359.548787-1-anisinha@redhat.com> References: <20251212150359.548787-1-anisinha@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=anisinha@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_H2=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=unavailable 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: 1765552147546158500 Content-Type: text/plain; charset="utf-8" This change adds common kvm specific support to handle KVM VM file descript= or change. KVM VM file descriptor can change as a part of confidential guest r= eset mechanism. A new function api kvm_arch_vmfd_change_ops() per architecture platform is added in order to implement architecture specific changes required to support it. A subsequent patch will add x86 specific implementation for kvm_arch_vmfd_change_ops as currently only x86 supports confidential guest reset. Signed-off-by: Ani Sinha --- accel/kvm/kvm-all.c | 70 ++++++++++++++++++++++++++++++++++++-- include/system/kvm.h | 1 + target/arm/kvm.c | 5 +++ target/i386/kvm/kvm.c | 5 +++ target/loongarch/kvm/kvm.c | 5 +++ target/mips/kvm.c | 5 +++ target/ppc/kvm.c | 5 +++ target/riscv/kvm/kvm-cpu.c | 5 +++ target/s390x/kvm/kvm.c | 5 +++ 9 files changed, 103 insertions(+), 3 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 28006d73c5..c9564bf681 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2415,11 +2415,9 @@ void kvm_irqchip_set_qemuirq_gsi(KVMState *s, qemu_i= rq irq, int gsi) g_hash_table_insert(s->gsimap, irq, GINT_TO_POINTER(gsi)); } =20 -static void kvm_irqchip_create(KVMState *s) +static void do_kvm_irqchip_create(KVMState *s) { int ret; - - assert(s->kernel_irqchip_split !=3D ON_OFF_AUTO_AUTO); if (kvm_check_extension(s, KVM_CAP_IRQCHIP)) { ; } else if (kvm_check_extension(s, KVM_CAP_S390_IRQCHIP)) { @@ -2452,7 +2450,13 @@ static void kvm_irqchip_create(KVMState *s) fprintf(stderr, "Create kernel irqchip failed: %s\n", strerror(-re= t)); exit(1); } +} =20 +static void kvm_irqchip_create(KVMState *s) +{ + assert(s->kernel_irqchip_split !=3D ON_OFF_AUTO_AUTO); + + do_kvm_irqchip_create(s); kvm_kernel_irqchip =3D true; /* If we have an in-kernel IRQ chip then we must have asynchronous * interrupt delivery (though the reverse is not necessarily true) @@ -2607,6 +2611,65 @@ static int kvm_setup_dirty_ring(KVMState *s) return 0; } =20 +static int kvm_reset_vmfd(MachineState *ms) +{ + KVMState *s; + KVMMemoryListener *kml; + int ret, type; + Error *err =3D NULL; + + s =3D KVM_STATE(ms->accelerator); + kml =3D &s->memory_listener; + + memory_listener_unregister(&kml->listener); + memory_listener_unregister(&kvm_io_listener); + + if (s->vmfd >=3D 0) { + close(s->vmfd); + } + + type =3D find_kvm_machine_type(ms); + if (type < 0) { + return -EINVAL; + } + + ret =3D do_kvm_create_vm(s, type); + if (ret < 0) { + return ret; + } + + s->vmfd =3D ret; + + kvm_setup_dirty_ring(s); + + /* rebind memory to new vm fd */ + ret =3D ram_block_rebind(&err); + if (ret < 0) { + return ret; + } + assert(!err); + + ret =3D kvm_arch_vmfd_change_ops(ms, s); + if (ret < 0) { + return ret; + } + + if (s->kernel_irqchip_allowed) { + do_kvm_irqchip_create(s); + } + + /* these can be only called after ram_block_rebind() */ + memory_listener_register(&kml->listener, &address_space_memory); + memory_listener_register(&kvm_io_listener, &address_space_io); + + /* + * kvm fd has changed. Commit the irq routes to KVM once more. + */ + kvm_irqchip_commit_routes(s); + + return ret; +} + static int kvm_init(AccelState *as, MachineState *ms) { MachineClass *mc =3D MACHINE_GET_CLASS(ms); @@ -4014,6 +4077,7 @@ static void kvm_accel_class_init(ObjectClass *oc, con= st void *data) AccelClass *ac =3D ACCEL_CLASS(oc); ac->name =3D "KVM"; ac->init_machine =3D kvm_init; + ac->reset_vmfd =3D kvm_reset_vmfd; ac->has_memory =3D kvm_accel_has_memory; ac->allowed =3D &kvm_allowed; ac->gdbstub_supported_sstep_flags =3D kvm_gdbstub_sstep_flags; diff --git a/include/system/kvm.h b/include/system/kvm.h index 8f9eecf044..ade13dd8cc 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -358,6 +358,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s); int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp); int kvm_arch_init_vcpu(CPUState *cpu); int kvm_arch_destroy_vcpu(CPUState *cpu); +int kvm_arch_vmfd_change_ops(MachineState *ms, KVMState *s); =20 #ifdef TARGET_KVM_HAVE_RESET_PARKED_VCPU void kvm_arch_reset_parked_vcpu(unsigned long vcpu_id, int kvm_fd); diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 0d57081e69..919bf95ae1 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -1568,6 +1568,11 @@ void kvm_arch_init_irq_routing(KVMState *s) { } =20 +int kvm_arch_vmfd_change_ops(MachineState *ms, KVMState *s) +{ + abort(); +} + int kvm_arch_irqchip_create(KVMState *s) { if (kvm_kernel_irqchip_split()) { diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 02819de625..cdfcb70f40 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -3252,6 +3252,11 @@ static int kvm_vm_enable_energy_msrs(KVMState *s) return 0; } =20 +int kvm_arch_vmfd_change_ops(MachineState *ms, KVMState *s) +{ + abort(); +} + int kvm_arch_init(MachineState *ms, KVMState *s) { int ret; diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c index 26e40c9bdc..4171781346 100644 --- a/target/loongarch/kvm/kvm.c +++ b/target/loongarch/kvm/kvm.c @@ -1312,6 +1312,11 @@ int kvm_arch_irqchip_create(KVMState *s) return kvm_check_extension(s, KVM_CAP_DEVICE_CTRL); } =20 +int kvm_arch_vmfd_change_ops(MachineState *ms, KVMState *s) +{ + return 0; +} + void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run) { } diff --git a/target/mips/kvm.c b/target/mips/kvm.c index 912cd5dfa0..28730da06b 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -44,6 +44,11 @@ unsigned long kvm_arch_vcpu_id(CPUState *cs) return cs->cpu_index; } =20 +int kvm_arch_vmfd_change_ops(MachineState *ms, KVMState *s) +{ + return 0; +} + int kvm_arch_init(MachineState *ms, KVMState *s) { /* MIPS has 128 signals */ diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 43124bf1c7..a48dc7670b 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -180,6 +180,11 @@ int kvm_arch_irqchip_create(KVMState *s) return 0; } =20 +int kvm_arch_vmfd_change_ops(MachineState *ms, KVMState *s) +{ + return 0; +} + static int kvm_arch_sync_sregs(PowerPCCPU *cpu) { CPUPPCState *cenv =3D &cpu->env; diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 47e672c7aa..ca384a8b85 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -1545,6 +1545,11 @@ int kvm_arch_irqchip_create(KVMState *s) return kvm_check_extension(s, KVM_CAP_DEVICE_CTRL); } =20 +int kvm_arch_vmfd_change_ops(MachineState *ms, KVMState *s) +{ + return 0; +} + int kvm_arch_process_async_events(CPUState *cs) { return 0; diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index 916dac1f14..671c854634 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -393,6 +393,11 @@ int kvm_arch_irqchip_create(KVMState *s) return 0; } =20 +int kvm_arch_vmfd_change_ops(MachineState *ms, KVMState *s) +{ + return 0; +} + unsigned long kvm_arch_vcpu_id(CPUState *cpu) { return cpu->cpu_index; --=20 2.42.0