From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [PULL 16/17] vhost: Only align sections for vhost-user
Date: Wed, 22 Jan 2020 00:52:31 -0500 [thread overview]
Message-ID: <20200122055115.429945-17-mst@redhat.com> (raw)
In-Reply-To: <20200122055115.429945-1-mst@redhat.com>
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
I added hugepage alignment code in c1ece84e7c9 to deal with
vhost-user + postcopy which needs aligned pages when using userfault.
However, on x86 the lower 2MB of address space tends to be shotgun'd
with small fragments around the 512-640k range - e.g. video RAM, and
with HyperV synic pages tend to sit around there - again splitting
it up. The alignment code complains with a 'Section rounded to ...'
error and gives up.
Since vhost-user already filters out devices without an fd
(see vhost-user.c vhost_user_mem_section_filter) it shouldn't be
affected by those overlaps.
Turn the alignment off on vhost-kernel so that it doesn't try
and align, and thus won't hit the rounding issues.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20200116202414.157959-3-dgilbert@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/virtio/vhost.c | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 774d87d98e..25fd469179 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -547,26 +547,28 @@ static void vhost_region_add_section(struct vhost_dev *dev,
uintptr_t mrs_host = (uintptr_t)memory_region_get_ram_ptr(section->mr) +
section->offset_within_region;
RAMBlock *mrs_rb = section->mr->ram_block;
- size_t mrs_page = qemu_ram_pagesize(mrs_rb);
trace_vhost_region_add_section(section->mr->name, mrs_gpa, mrs_size,
mrs_host);
- /* Round the section to it's page size */
- /* First align the start down to a page boundary */
- uint64_t alignage = mrs_host & (mrs_page - 1);
- if (alignage) {
- mrs_host -= alignage;
- mrs_size += alignage;
- mrs_gpa -= alignage;
+ if (dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER) {
+ /* Round the section to it's page size */
+ /* First align the start down to a page boundary */
+ size_t mrs_page = qemu_ram_pagesize(mrs_rb);
+ uint64_t alignage = mrs_host & (mrs_page - 1);
+ if (alignage) {
+ mrs_host -= alignage;
+ mrs_size += alignage;
+ mrs_gpa -= alignage;
+ }
+ /* Now align the size up to a page boundary */
+ alignage = mrs_size & (mrs_page - 1);
+ if (alignage) {
+ mrs_size += mrs_page - alignage;
+ }
+ trace_vhost_region_add_section_aligned(section->mr->name, mrs_gpa, mrs_size,
+ mrs_host);
}
- /* Now align the size up to a page boundary */
- alignage = mrs_size & (mrs_page - 1);
- if (alignage) {
- mrs_size += mrs_page - alignage;
- }
- trace_vhost_region_add_section_aligned(section->mr->name, mrs_gpa, mrs_size,
- mrs_host);
if (dev->n_tmp_sections) {
/* Since we already have at least one section, lets see if
--
MST
next prev parent reply other threads:[~2020-01-22 6:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 5:51 [PULL 00/17] virtio, pc: fixes, features Michael S. Tsirkin
2020-01-22 5:51 ` [PULL 01/17] q35: implement 128K SMRAM at default SMBASE address Michael S. Tsirkin
2020-01-22 5:51 ` [PULL 02/17] tests: q35: MCH: add default SMBASE SMRAM lock test Michael S. Tsirkin
2020-01-22 5:51 ` [PULL 03/17] acpi: cpuhp: spec: clarify 'CPU selector' register usage and endianness Michael S. Tsirkin
2020-01-22 5:51 ` [PULL 04/17] acpi: cpuhp: spec: fix 'Command data' description Michael S. Tsirkin
2020-01-22 5:52 ` [PULL 05/17] acpi: cpuhp: spec: clarify store into 'Command data' when 'Command field' == 0 Michael S. Tsirkin
2020-01-22 5:52 ` [PULL 06/17] acpi: cpuhp: introduce 'Command data 2' field Michael S. Tsirkin
2020-01-22 5:52 ` [PULL 07/17] acpi: cpuhp: spec: add typical usecases Michael S. Tsirkin
2020-01-22 5:52 ` [PULL 08/17] acpi: cpuhp: add CPHP_GET_CPU_ID_CMD command Michael S. Tsirkin
2020-01-22 5:52 ` [PULL 09/17] bios-tables-test: document expected file update Michael S. Tsirkin
2020-01-22 5:52 ` [PULL 10/17] virtio-9p-device: fix memleak in virtio_9p_device_unrealize Michael S. Tsirkin
2020-01-22 5:52 ` [PULL 11/17] virtio-9p-device: convert to new virtio_delete_queue Michael S. Tsirkin
2020-01-22 5:52 ` [PULL 12/17] virtio-scsi: delete vqs in unrealize to avoid memleaks Michael S. Tsirkin
2020-01-22 5:52 ` [PULL 13/17] virtio-scsi: convert to new virtio_delete_queue Michael S. Tsirkin
2020-01-22 5:52 ` [PULL 14/17] vhost-vsock: delete vqs in vhost_vsock_unrealize to avoid memleaks Michael S. Tsirkin
2020-01-22 5:52 ` [PULL 15/17] vhost: Add names to section rounded warning Michael S. Tsirkin
2020-01-22 5:52 ` Michael S. Tsirkin [this message]
2020-01-22 5:52 ` [PULL 17/17] i386:acpi: Remove _HID from the SMBus ACPI entry Michael S. Tsirkin
2020-01-22 6:17 ` [PULL 00/17] virtio, pc: fixes, features no-reply
2020-01-22 6:23 ` no-reply
2020-01-22 6:25 ` Michael S. Tsirkin
2020-01-22 6:50 ` Michael S. Tsirkin
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=20200122055115.429945-17-mst@redhat.com \
--to=mst@redhat.com \
--cc=dgilbert@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).