From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: KVM <kvm@vger.kernel.org>, Cornelia Huck <cohuck@redhat.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
linux-s390 <linux-s390@vger.kernel.org>,
Janosch Frank <frankja@linux.vnet.ibm.com>,
David Hildenbrand <david@redhat.com>,
Thomas Huth <thuth@redhat.com>
Subject: [PULL 09/12] kvm: clear dirty bitmaps from all overlapping memslots
Date: Fri, 31 Jan 2020 16:02:04 +0100 [thread overview]
Message-ID: <20200131150207.73127-10-borntraeger@de.ibm.com> (raw)
In-Reply-To: <20200131150207.73127-1-borntraeger@de.ibm.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Currently MemoryRegionSection has 1:1 mapping to KVMSlot.
However next patch will allow splitting MemoryRegionSection into
several KVMSlot-s, make sure that kvm_physical_log_slot_clear()
is able to handle such 1:N mapping.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-Id: <20190924144751.24149-3-imammedo@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
accel/kvm/kvm-all.c | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index a85ec09486dd..ff9b95c0d103 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -589,8 +589,8 @@ static int kvm_log_clear_one_slot(KVMSlot *mem, int as_id, uint64_t start,
* satisfy the KVM interface requirement. Firstly, do the start
* page alignment on 64 host pages
*/
- bmap_start = (start - mem->start_addr) & KVM_CLEAR_LOG_MASK;
- start_delta = start - mem->start_addr - bmap_start;
+ bmap_start = start & KVM_CLEAR_LOG_MASK;
+ start_delta = start - bmap_start;
bmap_start /= psize;
/*
@@ -694,8 +694,8 @@ static int kvm_physical_log_clear(KVMMemoryListener *kml,
MemoryRegionSection *section)
{
KVMState *s = kvm_state;
- uint64_t start, size;
- KVMSlot *mem = NULL;
+ uint64_t start, size, offset, count;
+ KVMSlot *mem;
int ret, i;
if (!s->manual_dirty_log_protect) {
@@ -713,22 +713,30 @@ static int kvm_physical_log_clear(KVMMemoryListener *kml,
kvm_slots_lock(kml);
- /* Find any possible slot that covers the section */
for (i = 0; i < s->nr_slots; i++) {
mem = &kml->slots[i];
- if (mem->start_addr <= start &&
- start + size <= mem->start_addr + mem->memory_size) {
+ /* Discard slots that are empty or do not overlap the section */
+ if (!mem->memory_size ||
+ mem->start_addr > start + size - 1 ||
+ start > mem->start_addr + mem->memory_size - 1) {
+ continue;
+ }
+
+ if (start >= mem->start_addr) {
+ /* The slot starts before section or is aligned to it. */
+ offset = start - mem->start_addr;
+ count = MIN(mem->memory_size - offset, size);
+ } else {
+ /* The slot starts after section. */
+ offset = 0;
+ count = MIN(mem->memory_size, size - (mem->start_addr - start));
+ }
+ ret = kvm_log_clear_one_slot(mem, kml->as_id, offset, count);
+ if (ret < 0) {
break;
}
}
- /*
- * We should always find one memslot until this point, otherwise
- * there could be something wrong from the upper layer
- */
- assert(mem && i != s->nr_slots);
- ret = kvm_log_clear_one_slot(mem, kml->as_id, start, size);
-
kvm_slots_unlock(kml);
return ret;
--
2.21.0
next prev parent reply other threads:[~2020-01-31 15:02 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-31 15:01 [PULL 00/12] s390x qemu updates 20190930 Christian Borntraeger
2020-01-31 15:01 ` [PULL 01/12] MAINTAINERS: Update S390 PCI Maintainer Christian Borntraeger
2020-01-31 15:01 ` [PULL 02/12] s390: PCI: fix IOMMU region init Christian Borntraeger
2020-01-31 15:01 ` [PULL 03/12] s390x: sclp: refactor invalid command check Christian Borntraeger
2020-01-31 15:01 ` [PULL 04/12] s390x: sclp: boundary check Christian Borntraeger
2020-01-31 15:02 ` [PULL 05/12] s390x: sclp: fix error handling for oversize control blocks Christian Borntraeger
2020-01-31 15:02 ` [PULL 06/12] s390x: sclp: Report insufficient SCCB length Christian Borntraeger
2020-01-31 15:02 ` [PULL 07/12] configure: Remove s390 (31-bit mode) from the list of supported CPUs Christian Borntraeger
2020-01-31 15:02 ` [PULL 08/12] kvm: extract kvm_log_clear_one_slot Christian Borntraeger
2020-01-31 15:02 ` Christian Borntraeger [this message]
2020-01-31 15:02 ` [PULL 10/12] kvm: split too big memory section on several memslots Christian Borntraeger
2020-01-31 15:02 ` [PULL 11/12] s390: do not call memory_region_allocate_system_memory() multiple times Christian Borntraeger
2020-01-31 15:02 ` [PULL 12/12] s390/kvm: split kvm mem slots at 4TB Christian Borntraeger
2020-01-31 15:03 ` [PULL 00/12] s390x qemu updates 20190930 Christian Borntraeger
-- strict thread matches above, loose matches on Subject: below --
2019-09-30 13:19 Christian Borntraeger
2019-09-30 13:19 ` [PULL 09/12] kvm: clear dirty bitmaps from all overlapping memslots Christian Borntraeger
2019-10-02 16:01 ` Kevin Wolf
2019-10-02 16:13 ` Christian Borntraeger
2019-10-02 16:18 ` 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=20200131150207.73127-10-borntraeger@de.ibm.com \
--to=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.vnet.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=thuth@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 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).