From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4Aqo-0006mq-5G for qemu-devel@nongnu.org; Thu, 05 Apr 2018 15:47:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f4Aqk-0005kH-7t for qemu-devel@nongnu.org; Thu, 05 Apr 2018 15:47:14 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46620 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f4Aqk-0005jv-2C for qemu-devel@nongnu.org; Thu, 05 Apr 2018 15:47:10 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA5F54057295 for ; Thu, 5 Apr 2018 19:47:04 +0000 (UTC) Date: Thu, 5 Apr 2018 20:46:55 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20180405194654.GB2277@work-vm> References: <20180323153939.16684-1-dgilbert@redhat.com> <20180405121313.3bf29ca8@w520.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180405121313.3bf29ca8@w520.home> Subject: Re: [Qemu-devel] [PATCH v2] vhost: Allow adjoining regions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson Cc: qemu-devel@nongnu.org, mst@redhat.com * Alex Williamson (alex.williamson@redhat.com) wrote: > On Fri, 23 Mar 2018 15:39:39 +0000 > "Dr. David Alan Gilbert (git)" wrote: > > > From: "Dr. David Alan Gilbert" > > > > My rework of section adding combines overlapping or adjoining regions, > > but checks they're actually the same underlying RAM block. > > Fix the case where two blocks adjoin 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 > > Signed-off-by: Dr. David Alan Gilbert > > --- > > > Ping? This error report is a regression and should be considered for > 2.12. > > Tested-by: Alex Williamson It's a change in vhost - so mst is taking it ? 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..2a720cca3d 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; > > + /* adjoining 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; > > + } > > } > > } > > } > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK