block/nvme: support nested aio_poll()

[PATCH 2/7] block/nvme: drop tautologous assertion

Posted by Stefan Hajnoczi 5 years, 5 months ago

nvme_process_completion() explicitly checks cid so the assertion that
follows is always true:

  if (cid == 0 || cid > NVME_QUEUE_SIZE) {
      ...
      continue;
  }
  assert(cid <= NVME_QUEUE_SIZE);

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/nvme.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/block/nvme.c b/block/nvme.c
index 7eb4512666..5286227074 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -336,7 +336,6 @@ static bool nvme_process_completion(BDRVNVMeState *s, NVMeQueuePair *q)
                     cid);
             continue;
         }
-        assert(cid <= NVME_QUEUE_SIZE);
         trace_nvme_complete_command(s, q->index, cid);
         preq = &q->reqs[cid - 1];
         req = *preq;
-- 
2.25.3

Re: [PATCH 2/7] block/nvme: drop tautologous assertion

Posted by Sergio Lopez 5 years, 5 months ago

On Tue, May 19, 2020 at 06:11:33PM +0100, Stefan Hajnoczi wrote:
> nvme_process_completion() explicitly checks cid so the assertion that
> follows is always true:
> 
>   if (cid == 0 || cid > NVME_QUEUE_SIZE) {
>       ...
>       continue;
>   }
>   assert(cid <= NVME_QUEUE_SIZE);
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  block/nvme.c | 1 -
>  1 file changed, 1 deletion(-)

Reviewed-by: Sergio Lopez <slp@redhat.com>

Re: [PATCH 2/7] block/nvme: drop tautologous assertion

Posted by Philippe Mathieu-Daudé 5 years, 5 months ago

On 5/19/20 7:11 PM, Stefan Hajnoczi wrote:
> nvme_process_completion() explicitly checks cid so the assertion that
> follows is always true:
> 
>   if (cid == 0 || cid > NVME_QUEUE_SIZE) {
>       ...
>       continue;
>   }
>   assert(cid <= NVME_QUEUE_SIZE);
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  block/nvme.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/block/nvme.c b/block/nvme.c
> index 7eb4512666..5286227074 100644
> --- a/block/nvme.c
> +++ b/block/nvme.c
> @@ -336,7 +336,6 @@ static bool nvme_process_completion(BDRVNVMeState *s, NVMeQueuePair *q)
>                      cid);
>              continue;
>          }
> -        assert(cid <= NVME_QUEUE_SIZE);
>          trace_nvme_complete_command(s, q->index, cid);
>          preq = &q->reqs[cid - 1];
>          req = *preq;
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>