Patchwork vhost_dev_unassign_memory() don't assert if removing first entry in list.

login
register
mail settings
Submitter Jes Sorensen
Date July 23, 2010, 3:16 p.m.
Message ID <1279898202-7223-1-git-send-email-Jes.Sorensen@redhat.com>
Download mbox | patch
Permalink /patch/59810/
State New
Headers show

Comments

Jes Sorensen - July 23, 2010, 3:16 p.m.
From: Jes Sorensen <Jes.Sorensen@redhat.com>

If removing an entry from the list which is fully included in the
region and this is the first entry in the list. In this case 'to' can
go to -1, which is perfectly valid. Don't assert() on this case.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 hw/vhost.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
Michael S. Tsirkin - July 24, 2010, 7:03 p.m.
On Fri, Jul 23, 2010 at 05:16:42PM +0200, Jes.Sorensen@redhat.com wrote:
> From: Jes Sorensen <Jes.Sorensen@redhat.com>
> 
> If removing an entry from the list which is fully included in the
> region and this is the first entry in the list. In this case 'to' can
> go to -1, which is perfectly valid. Don't assert() on this case.
> 
> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
> ---
>  hw/vhost.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/vhost.c b/hw/vhost.c
> index d37a66e..f30cf91 100644
> --- a/hw/vhost.c
> +++ b/hw/vhost.c
> @@ -119,7 +119,6 @@ static void vhost_dev_unassign_memory(struct vhost_dev *dev,
>          if (start_addr <= reg->guest_phys_addr && memlast >= reglast) {
>              --dev->mem->nregions;
>              --to;
> -            assert(to >= 0);
>              ++overlap_middle;
>              continue;
>          }

Good catch.
I think I must have meant dev->mem->nregions >= 0.  Does this work
if you put in that assertion, or did I miss something else?

> -- 
> 1.7.1.1
Jes Sorensen - July 26, 2010, 6:49 a.m.
On 07/24/10 21:03, Michael S. Tsirkin wrote:
> On Fri, Jul 23, 2010 at 05:16:42PM +0200, Jes.Sorensen@redhat.com wrote:
>> From: Jes Sorensen <Jes.Sorensen@redhat.com>
>> diff --git a/hw/vhost.c b/hw/vhost.c
>> index d37a66e..f30cf91 100644
>> --- a/hw/vhost.c
>> +++ b/hw/vhost.c
>> @@ -119,7 +119,6 @@ static void vhost_dev_unassign_memory(struct vhost_dev *dev,
>>          if (start_addr <= reg->guest_phys_addr && memlast >= reglast) {
>>              --dev->mem->nregions;
>>              --to;
>> -            assert(to >= 0);
>>              ++overlap_middle;
>>              continue;
>>          }
> 
> Good catch.
> I think I must have meant dev->mem->nregions >= 0.  Does this work
> if you put in that assertion, or did I miss something else?

It should work, but I don't see the point in adding the assert for that
case since the loop shouldn't be able to run down to nregions < 0.

Cheers,
Jes
Michael S. Tsirkin - July 26, 2010, 9:30 a.m.
On Mon, Jul 26, 2010 at 08:49:19AM +0200, Jes Sorensen wrote:
> On 07/24/10 21:03, Michael S. Tsirkin wrote:
> > On Fri, Jul 23, 2010 at 05:16:42PM +0200, Jes.Sorensen@redhat.com wrote:
> >> From: Jes Sorensen <Jes.Sorensen@redhat.com>
> >> diff --git a/hw/vhost.c b/hw/vhost.c
> >> index d37a66e..f30cf91 100644
> >> --- a/hw/vhost.c
> >> +++ b/hw/vhost.c
> >> @@ -119,7 +119,6 @@ static void vhost_dev_unassign_memory(struct vhost_dev *dev,
> >>          if (start_addr <= reg->guest_phys_addr && memlast >= reglast) {
> >>              --dev->mem->nregions;
> >>              --to;
> >> -            assert(to >= 0);
> >>              ++overlap_middle;
> >>              continue;
> >>          }
> > 
> > Good catch.
> > I think I must have meant dev->mem->nregions >= 0.  Does this work
> > if you put in that assertion, or did I miss something else?
> 
> It should work, but I don't see the point in adding the assert for that
> case since the loop shouldn't be able to run down to nregions < 0.

Yes, we never decrement twice for the same region, so it will never
become negative.  Unless there's a bug in code. Which is exactly what
assert guards against.
This can also be seen as a form of documentation which checks
itself for currectness.
Maybe we should have assert(to >= -1) as well.

But I don't feel strongly about these asserts, if you dislike them,
let me know and I'll apply as is.


> Cheers,
> Jes

Patch

diff --git a/hw/vhost.c b/hw/vhost.c
index d37a66e..f30cf91 100644
--- a/hw/vhost.c
+++ b/hw/vhost.c
@@ -119,7 +119,6 @@  static void vhost_dev_unassign_memory(struct vhost_dev *dev,
         if (start_addr <= reg->guest_phys_addr && memlast >= reglast) {
             --dev->mem->nregions;
             --to;
-            assert(to >= 0);
             ++overlap_middle;
             continue;
         }