qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
	"Zhenzhong Duan" <zhenzhong.duan@intel.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Steve Sistare" <steven.sistare@oracle.com>,
	"Cédric Le Goater" <clg@redhat.com>
Subject: [PULL 05/12] accel/kvm: Fix an erroneous check on coalesced_mmio_ring
Date: Wed, 22 Oct 2025 14:18:39 +0200	[thread overview]
Message-ID: <20251022121846.874152-6-clg@redhat.com> (raw)
In-Reply-To: <20251022121846.874152-1-clg@redhat.com>

From: Zhenzhong Duan <zhenzhong.duan@intel.com>

According to KVM uAPI, coalesced mmio page is KVM_COALESCED_MMIO_PAGE_OFFSET
offset from kvm_run pages. For x86 it's 2 pages offset, for arm it's 1 page
offset currently. We shouldn't presume it's hardcoded 1 page or else
coalesced_mmio_ring will not be cleared in do_kvm_destroy_vcpu() in x86.

Fixes: 7ed0919119b0 ("migration: close kvm after cpr")
Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Steve Sistare <steven.sistare@oracle.com>
Link: https://lore.kernel.org/qemu-devel/20250928085432.40107-6-zhenzhong.duan@intel.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
 accel/kvm/kvm-all.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 56031925c4e9e6d46fb0e026e7b8dede2dabc7d2..f9254ae6546671e4569c190a098447becbdac0e0 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -525,7 +525,8 @@ static int do_kvm_destroy_vcpu(CPUState *cpu)
     }
 
     /* If I am the CPU that created coalesced_mmio_ring, then discard it */
-    if (s->coalesced_mmio_ring == (void *)cpu->kvm_run + PAGE_SIZE) {
+    if (s->coalesced_mmio_ring ==
+           (void *)cpu->kvm_run + s->coalesced_mmio * PAGE_SIZE) {
         s->coalesced_mmio_ring = NULL;
     }
 
-- 
2.51.0



  parent reply	other threads:[~2025-10-22 12:21 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-22 12:18 [PULL 00/12] vfio queue Cédric Le Goater
2025-10-22 12:18 ` [PULL 01/12] vfio/container: Remap only populated parts in a section Cédric Le Goater
2025-10-22 12:18 ` [PULL 02/12] vfio/cpr-legacy: drop an erroneous assert Cédric Le Goater
2025-10-22 12:18 ` [PULL 03/12] vfio/iommufd: Set cpr.ioas_id on source side for CPR transfer Cédric Le Goater
2025-10-22 12:18 ` [PULL 04/12] vfio/iommufd: Restore vbasedev's reference to hwpt after " Cédric Le Goater
2025-10-22 12:18 ` Cédric Le Goater [this message]
2025-10-22 12:18 ` [PULL 06/12] vfio/container: Support unmap all in one ioctl() Cédric Le Goater
2025-10-22 12:18 ` [PULL 07/12] vfio/iommufd: " Cédric Le Goater
2025-10-22 12:18 ` [PULL 08/12] vfio/listener: Add an assertion for unmap_all Cédric Le Goater
2025-10-22 12:18 ` [PULL 09/12] docs/system/devices/vfio-user: fix formatting Cédric Le Goater
2025-10-22 12:18 ` [PULL 10/12] MAINTAINERS: Update Alex Williamson's email address Cédric Le Goater
2025-10-22 12:18 ` [PULL 11/12] vfio: rename field to "num_initial_regions" Cédric Le Goater
2025-10-22 12:18 ` [PULL 12/12] vfio: only check region info cache for initial regions Cédric Le Goater
2025-10-22 12:55 ` [PULL 00/12] vfio queue Cédric Le Goater
2025-10-23  9:53   ` Michael Tokarev
2025-10-23 12:16     ` Cédric Le Goater
2025-10-22 14:31 ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251022121846.874152-6-clg@redhat.com \
    --to=clg@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=steven.sistare@oracle.com \
    --cc=zhenzhong.duan@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).