* [Qemu-devel] [PATCH] vhost: Allow abutting regions
@ 2018-03-23 12:46 Dr. David Alan Gilbert (git)
2018-03-23 14:27 ` Michael S. Tsirkin
2018-03-23 14:40 ` Michael S. Tsirkin
0 siblings, 2 replies; 5+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2018-03-23 12:46 UTC (permalink / raw)
To: qemu-devel, mst, alex.williamson
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
My rework of section adding combines overlapping or abutting regions,
but checks they're actually the same underlying RAM block.
Fix the case where two blocks abut but don't overlap; that new region
should get added (but not combined), but my previous patch was disallowing it.
Fixes: c1ece84e7c9
Reported-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
hw/virtio/vhost.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 250f886acb..fc9062a89f 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -595,10 +595,15 @@ static void vhost_region_add_section(struct vhost_dev *dev,
prev_sec->offset_within_address_space,
prev_sec->offset_within_region);
} else {
- error_report("%s: Overlapping but not coherent sections "
- "at %"PRIx64,
- __func__, mrs_gpa);
- return;
+ /* abutting regions are fine, but overlapping ones with
+ * different blocks/offsets shouldn't happen
+ */
+ if (mrs_gpa != prev_gpa_end + 1) {
+ error_report("%s: Overlapping but not coherent sections "
+ "at %"PRIx64,
+ __func__, mrs_gpa);
+ return;
+ }
}
}
}
--
2.14.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] vhost: Allow abutting regions
2018-03-23 12:46 [Qemu-devel] [PATCH] vhost: Allow abutting regions Dr. David Alan Gilbert (git)
@ 2018-03-23 14:27 ` Michael S. Tsirkin
2018-03-23 14:53 ` Dr. David Alan Gilbert
2018-03-23 14:40 ` Michael S. Tsirkin
1 sibling, 1 reply; 5+ messages in thread
From: Michael S. Tsirkin @ 2018-03-23 14:27 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git); +Cc: qemu-devel, alex.williamson
On Fri, Mar 23, 2018 at 12:46:37PM +0000, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> My rework of section adding combines overlapping or abutting regions,
> but checks they're actually the same underlying RAM block.
> Fix the case where two blocks abut but don't overlap; that new region
> should get added (but not combined), but my previous patch was disallowing it.
>
> Fixes: c1ece84e7c9
>
> Reported-by: Alex Williamson <alex.williamson@redhat.com>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Can we replace abutting with adjacent pls?
> ---
> hw/virtio/vhost.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
> index 250f886acb..fc9062a89f 100644
> --- a/hw/virtio/vhost.c
> +++ b/hw/virtio/vhost.c
> @@ -595,10 +595,15 @@ static void vhost_region_add_section(struct vhost_dev *dev,
> prev_sec->offset_within_address_space,
> prev_sec->offset_within_region);
> } else {
> - error_report("%s: Overlapping but not coherent sections "
> - "at %"PRIx64,
> - __func__, mrs_gpa);
> - return;
> + /* abutting regions are fine, but overlapping ones with
> + * different blocks/offsets shouldn't happen
> + */
> + if (mrs_gpa != prev_gpa_end + 1) {
> + error_report("%s: Overlapping but not coherent sections "
> + "at %"PRIx64,
> + __func__, mrs_gpa);
> + return;
> + }
> }
> }
> }
> --
> 2.14.3
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] vhost: Allow abutting regions
2018-03-23 14:27 ` Michael S. Tsirkin
@ 2018-03-23 14:53 ` Dr. David Alan Gilbert
2018-03-23 15:16 ` Michael S. Tsirkin
0 siblings, 1 reply; 5+ messages in thread
From: Dr. David Alan Gilbert @ 2018-03-23 14:53 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: qemu-devel, alex.williamson
* Michael S. Tsirkin (mst@redhat.com) wrote:
> On Fri, Mar 23, 2018 at 12:46:37PM +0000, Dr. David Alan Gilbert (git) wrote:
> > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> >
> > My rework of section adding combines overlapping or abutting regions,
> > but checks they're actually the same underlying RAM block.
> > Fix the case where two blocks abut but don't overlap; that new region
> > should get added (but not combined), but my previous patch was disallowing it.
> >
> > Fixes: c1ece84e7c9
> >
> > Reported-by: Alex Williamson <alex.williamson@redhat.com>
> > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>
> Can we replace abutting with adjacent pls?
Sure; do you want to fix that in commit?
Dave
> > ---
> > hw/virtio/vhost.c | 13 +++++++++----
> > 1 file changed, 9 insertions(+), 4 deletions(-)
> >
> > diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
> > index 250f886acb..fc9062a89f 100644
> > --- a/hw/virtio/vhost.c
> > +++ b/hw/virtio/vhost.c
> > @@ -595,10 +595,15 @@ static void vhost_region_add_section(struct vhost_dev *dev,
> > prev_sec->offset_within_address_space,
> > prev_sec->offset_within_region);
> > } else {
> > - error_report("%s: Overlapping but not coherent sections "
> > - "at %"PRIx64,
> > - __func__, mrs_gpa);
> > - return;
> > + /* abutting regions are fine, but overlapping ones with
> > + * different blocks/offsets shouldn't happen
> > + */
> > + if (mrs_gpa != prev_gpa_end + 1) {
> > + error_report("%s: Overlapping but not coherent sections "
> > + "at %"PRIx64,
> > + __func__, mrs_gpa);
> > + return;
> > + }
> > }
> > }
> > }
> > --
> > 2.14.3
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] vhost: Allow abutting regions
2018-03-23 14:53 ` Dr. David Alan Gilbert
@ 2018-03-23 15:16 ` Michael S. Tsirkin
0 siblings, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2018-03-23 15:16 UTC (permalink / raw)
To: Dr. David Alan Gilbert; +Cc: qemu-devel, alex.williamson
On Fri, Mar 23, 2018 at 02:53:38PM +0000, Dr. David Alan Gilbert wrote:
> * Michael S. Tsirkin (mst@redhat.com) wrote:
> > On Fri, Mar 23, 2018 at 12:46:37PM +0000, Dr. David Alan Gilbert (git) wrote:
> > > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> > >
> > > My rework of section adding combines overlapping or abutting regions,
> > > but checks they're actually the same underlying RAM block.
> > > Fix the case where two blocks abut but don't overlap; that new region
> > > should get added (but not combined), but my previous patch was disallowing it.
> > >
> > > Fixes: c1ece84e7c9
> > >
> > > Reported-by: Alex Williamson <alex.williamson@redhat.com>
> > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> >
> > Can we replace abutting with adjacent pls?
>
> Sure; do you want to fix that in commit?
>
> Dave
Rather.
> > > ---
> > > hw/virtio/vhost.c | 13 +++++++++----
> > > 1 file changed, 9 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
> > > index 250f886acb..fc9062a89f 100644
> > > --- a/hw/virtio/vhost.c
> > > +++ b/hw/virtio/vhost.c
> > > @@ -595,10 +595,15 @@ static void vhost_region_add_section(struct vhost_dev *dev,
> > > prev_sec->offset_within_address_space,
> > > prev_sec->offset_within_region);
> > > } else {
> > > - error_report("%s: Overlapping but not coherent sections "
> > > - "at %"PRIx64,
> > > - __func__, mrs_gpa);
> > > - return;
> > > + /* abutting regions are fine, but overlapping ones with
> > > + * different blocks/offsets shouldn't happen
> > > + */
> > > + if (mrs_gpa != prev_gpa_end + 1) {
> > > + error_report("%s: Overlapping but not coherent sections "
> > > + "at %"PRIx64,
> > > + __func__, mrs_gpa);
> > > + return;
> > > + }
> > > }
> > > }
> > > }
> > > --
> > > 2.14.3
> --
> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] vhost: Allow abutting regions
2018-03-23 12:46 [Qemu-devel] [PATCH] vhost: Allow abutting regions Dr. David Alan Gilbert (git)
2018-03-23 14:27 ` Michael S. Tsirkin
@ 2018-03-23 14:40 ` Michael S. Tsirkin
1 sibling, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2018-03-23 14:40 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git); +Cc: qemu-devel, alex.williamson
On Fri, Mar 23, 2018 at 12:46:37PM +0000, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> My rework of section adding combines overlapping or abutting regions,
> but checks they're actually the same underlying RAM block.
> Fix the case where two blocks abut but don't overlap; that new region
> should get added (but not combined), but my previous patch was disallowing it.
>
> Fixes: c1ece84e7c9
>
> Reported-by: Alex Williamson <alex.williamson@redhat.com>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
I prefer adjacent and not abutting.
> ---
> hw/virtio/vhost.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
> index 250f886acb..fc9062a89f 100644
> --- a/hw/virtio/vhost.c
> +++ b/hw/virtio/vhost.c
> @@ -595,10 +595,15 @@ static void vhost_region_add_section(struct vhost_dev *dev,
> prev_sec->offset_within_address_space,
> prev_sec->offset_within_region);
> } else {
> - error_report("%s: Overlapping but not coherent sections "
> - "at %"PRIx64,
> - __func__, mrs_gpa);
> - return;
> + /* abutting regions are fine, but overlapping ones with
> + * different blocks/offsets shouldn't happen
> + */
> + if (mrs_gpa != prev_gpa_end + 1) {
> + error_report("%s: Overlapping but not coherent sections "
> + "at %"PRIx64,
> + __func__, mrs_gpa);
> + return;
> + }
> }
> }
> }
> --
> 2.14.3
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-23 15:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-23 12:46 [Qemu-devel] [PATCH] vhost: Allow abutting regions Dr. David Alan Gilbert (git)
2018-03-23 14:27 ` Michael S. Tsirkin
2018-03-23 14:53 ` Dr. David Alan Gilbert
2018-03-23 15:16 ` Michael S. Tsirkin
2018-03-23 14:40 ` Michael S. Tsirkin
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.