{"id":812539,"url":"http://patchwork.ozlabs.org/api/patches/812539/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911174933.20789-3-david@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","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":"<20170911174933.20789-3-david@redhat.com>","list_archive_url":null,"date":"2017-09-11T17:49:29","name":"[v1,2/6] kvm: factor out alignment of memory section","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"20ace51e00fc2d39fbb4d1a12e0dac1352bd7e02","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/?format=json","name":"David Hildenbrand","email":"david@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911174933.20789-3-david@redhat.com/mbox/","series":[{"id":2539,"url":"http://patchwork.ozlabs.org/api/series/2539/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2539","date":"2017-09-11T17:49:27","name":"QEMU: kvm: cleanup kvm_slot handling","version":1,"mbox":"http://patchwork.ozlabs.org/series/2539/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812539/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812539/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=david@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrbhK6d3gz9s7F\n\tfor ;\n\tTue, 12 Sep 2017 04:15:45 +1000 (AEST)","from localhost ([::1]:59674 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drTFH-0007iP-6l\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 14:15:43 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:49125)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drSq8-0000kJ-CP\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:49:45 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drSq7-00088n-Eh\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:49:44 -0400","from mx1.redhat.com ([209.132.183.28]:57622)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1drSq7-00087p-5f\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:49:43 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 2CA5BC0D8D65;\n\tMon, 11 Sep 2017 17:49:42 +0000 (UTC)","from t460s.redhat.com (ovpn-116-74.ams2.redhat.com [10.36.116.74])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 9EE626442B;\n\tMon, 11 Sep 2017 17:49:40 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 2CA5BC0D8D65","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 19:49:29 +0200","Message-Id":"<20170911174933.20789-3-david@redhat.com>","In-Reply-To":"<20170911174933.20789-1-david@redhat.com>","References":"<20170911174933.20789-1-david@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tMon, 11 Sep 2017 17:49:42 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v1 2/6] kvm: factor out alignment of memory\n\tsection","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Paolo Bonzini , david@redhat.com,\n\tkvm@vger.kernel.org, =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?=\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Factor it out, so we can reuse it later.\n\nSigned-off-by: David Hildenbrand \n---\n accel/kvm/kvm-all.c | 59 +++++++++++++++++++++++++++++++++++------------------\n 1 file changed, 39 insertions(+), 20 deletions(-)","diff":"diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c\nindex 985b179ab6..e0d100bd30 100644\n--- a/accel/kvm/kvm-all.c\n+++ b/accel/kvm/kvm-all.c\n@@ -190,6 +190,36 @@ static KVMSlot *kvm_lookup_matching_slot(KVMMemoryListener *kml,\n }\n \n /*\n+ * Calculate and align the start address and the size of the section.\n+ * Return the size. If the size is 0, the aligned section is empty.\n+ */\n+static hwaddr kvm_align_section(MemoryRegionSection *section,\n+ hwaddr *start)\n+{\n+ hwaddr size = int128_get64(section->size);\n+ hwaddr delta;\n+\n+ *start = section->offset_within_address_space;\n+\n+ /* kvm works in page size chunks, but the function may be called\n+ with sub-page size and unaligned start address. Pad the start\n+ address to next and truncate size to previous page boundary. */\n+ delta = qemu_real_host_page_size - (*start & ~qemu_real_host_page_mask);\n+ delta &= ~qemu_real_host_page_mask;\n+ *start += delta;\n+ if (delta > size) {\n+ return 0;\n+ }\n+ size -= delta;\n+ size &= qemu_real_host_page_mask;\n+ if (*start & ~qemu_real_host_page_mask) {\n+ return 0;\n+ }\n+\n+ return size;\n+}\n+\n+/*\n * Find overlapping slot with lowest start address\n */\n static KVMSlot *kvm_lookup_overlapping_slot(KVMMemoryListener *kml,\n@@ -700,25 +730,8 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml,\n int err;\n MemoryRegion *mr = section->mr;\n bool writeable = !mr->readonly && !mr->rom_device;\n- hwaddr start_addr = section->offset_within_address_space;\n- ram_addr_t size = int128_get64(section->size);\n- void *ram = NULL;\n- unsigned delta;\n-\n- /* kvm works in page size chunks, but the function may be called\n- with sub-page size and unaligned start address. Pad the start\n- address to next and truncate size to previous page boundary. */\n- delta = qemu_real_host_page_size - (start_addr & ~qemu_real_host_page_mask);\n- delta &= ~qemu_real_host_page_mask;\n- if (delta > size) {\n- return;\n- }\n- start_addr += delta;\n- size -= delta;\n- size &= qemu_real_host_page_mask;\n- if (!size || (start_addr & ~qemu_real_host_page_mask)) {\n- return;\n- }\n+ hwaddr start_addr, size;\n+ void *ram;\n \n if (!memory_region_is_ram(mr)) {\n if (writeable || !kvm_readonly_mem_allowed) {\n@@ -730,7 +743,13 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml,\n }\n }\n \n- ram = memory_region_get_ram_ptr(mr) + section->offset_within_region + delta;\n+ size = kvm_align_section(section, &start_addr);\n+ if (!size) {\n+ return;\n+ }\n+\n+ ram = memory_region_get_ram_ptr(mr) + section->offset_within_region +\n+ (section->offset_within_address_space - start_addr);\n \n while (1) {\n mem = kvm_lookup_overlapping_slot(kml, start_addr, start_addr + size);\n","prefixes":["v1","2/6"]}