All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Radim Krčmář" <rkrcmar@redhat.com>,
	kvm@vger.kernel.org, david@redhat.com
Subject: [PATCH v1 5/6] kvm: kvm_log_start/stop are only called with known sections
Date: Mon, 11 Sep 2017 19:49:32 +0200	[thread overview]
Message-ID: <20170911174933.20789-6-david@redhat.com> (raw)
In-Reply-To: <20170911174933.20789-1-david@redhat.com>

Let's properly align the sections first and bail out if we would ever
get called with a memory section we don't know yet.

Signed-off-by: David Hildenbrand <david@redhat.com>
---
 accel/kvm/kvm-all.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index b677d1b13e..2ae459453d 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -411,15 +411,21 @@ static int kvm_slot_update_flags(KVMMemoryListener *kml, KVMSlot *mem,
 static int kvm_section_update_flags(KVMMemoryListener *kml,
                                     MemoryRegionSection *section)
 {
-    hwaddr phys_addr = section->offset_within_address_space;
-    ram_addr_t size = int128_get64(section->size);
-    KVMSlot *mem = kvm_lookup_matching_slot(kml, phys_addr, size);
+    hwaddr start_addr, size;
+    KVMSlot *mem;
 
-    if (mem == NULL)  {
+    size = kvm_align_section(section, &start_addr);
+    if (!size) {
         return 0;
-    } else {
-        return kvm_slot_update_flags(kml, mem, section->mr);
     }
+
+    mem = kvm_lookup_matching_slot(kml, start_addr, size);
+    if (!mem) {
+        fprintf(stderr, "%s: error finding slot\n", __func__);
+        abort();
+    }
+
+    return kvm_slot_update_flags(kml, mem, section->mr);
 }
 
 static void kvm_log_start(MemoryListener *listener,
-- 
2.13.5

WARNING: multiple messages have this Message-ID (diff)
From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Radim Krčmář" <rkrcmar@redhat.com>,
	kvm@vger.kernel.org, david@redhat.com
Subject: [Qemu-devel] [PATCH v1 5/6] kvm: kvm_log_start/stop are only called with known sections
Date: Mon, 11 Sep 2017 19:49:32 +0200	[thread overview]
Message-ID: <20170911174933.20789-6-david@redhat.com> (raw)
In-Reply-To: <20170911174933.20789-1-david@redhat.com>

Let's properly align the sections first and bail out if we would ever
get called with a memory section we don't know yet.

Signed-off-by: David Hildenbrand <david@redhat.com>
---
 accel/kvm/kvm-all.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index b677d1b13e..2ae459453d 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -411,15 +411,21 @@ static int kvm_slot_update_flags(KVMMemoryListener *kml, KVMSlot *mem,
 static int kvm_section_update_flags(KVMMemoryListener *kml,
                                     MemoryRegionSection *section)
 {
-    hwaddr phys_addr = section->offset_within_address_space;
-    ram_addr_t size = int128_get64(section->size);
-    KVMSlot *mem = kvm_lookup_matching_slot(kml, phys_addr, size);
+    hwaddr start_addr, size;
+    KVMSlot *mem;
 
-    if (mem == NULL)  {
+    size = kvm_align_section(section, &start_addr);
+    if (!size) {
         return 0;
-    } else {
-        return kvm_slot_update_flags(kml, mem, section->mr);
     }
+
+    mem = kvm_lookup_matching_slot(kml, start_addr, size);
+    if (!mem) {
+        fprintf(stderr, "%s: error finding slot\n", __func__);
+        abort();
+    }
+
+    return kvm_slot_update_flags(kml, mem, section->mr);
 }
 
 static void kvm_log_start(MemoryListener *listener,
-- 
2.13.5

  parent reply	other threads:[~2017-09-11 17:49 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-11 17:49 [PATCH v1 0/6] QEMU: kvm: cleanup kvm_slot handling David Hildenbrand
2017-09-11 17:49 ` [Qemu-devel] " David Hildenbrand
2017-09-11 17:49 ` [PATCH v1 1/6] kvm: require JOIN_MEMORY_REGIONS_WORKS David Hildenbrand
2017-09-11 17:49   ` [Qemu-devel] " David Hildenbrand
2017-09-11 17:49 ` [PATCH v1 2/6] kvm: factor out alignment of memory section David Hildenbrand
2017-09-11 17:49   ` [Qemu-devel] " David Hildenbrand
2017-09-11 17:49 ` [PATCH v1 3/6] kvm: use start + size for memory ranges David Hildenbrand
2017-09-11 17:49   ` [Qemu-devel] " David Hildenbrand
2017-09-11 17:49 ` [PATCH v1 4/6] kvm: we never have overlapping slots in kvm_set_phys_mem() David Hildenbrand
2017-09-11 17:49   ` [Qemu-devel] " David Hildenbrand
2017-09-11 17:49 ` David Hildenbrand [this message]
2017-09-11 17:49   ` [Qemu-devel] [PATCH v1 5/6] kvm: kvm_log_start/stop are only called with known sections David Hildenbrand
2017-10-10  9:06   ` Thomas Huth
2017-10-10 13:29     ` Paolo Bonzini
2017-10-16  7:16       ` David Hildenbrand
2017-10-16  8:52         ` Thomas Huth
2017-10-16  9:19           ` David Hildenbrand
2017-09-11 17:49 ` [PATCH v1 6/6] kvm: kvm_log_sync() is only called with known memory sections David Hildenbrand
2017-09-11 17:49   ` [Qemu-devel] " David Hildenbrand
2017-09-12  7:39 ` [PATCH v1 0/6] QEMU: kvm: cleanup kvm_slot handling Paolo Bonzini
2017-09-12  7:39   ` [Qemu-devel] " Paolo Bonzini

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=20170911174933.20789-6-david@redhat.com \
    --to=david@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rkrcmar@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.