Re: [Qemu-devel] [PATCH] scsi-disk: Fix crash if request is invaild or disk is no medium
On 07/03/19 10:12, Zhengui li wrote:
> From: Zhengui Li
>
> Qemu will crash with the assertion error that "assert(r->req.aiocb !=
> NULL)" in scsi_read_complete if request is invaild or disk is no medium.
> The error is below:
> qemu-kvm: hw/scsi/scsi_disk.c:299: scsi_read_complete: Assertion
> `r->req.aiocb != NULL' failed.
>
> This patch add a funtion scsi_read_complete_noio to fix it.
>
> Signed-off-by: Zhengui Li
> ---
> hw/scsi/scsi-disk.c | 37 -
> 1 file changed, 24 insertions(+), 13 deletions(-)
>
> diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
> index d4e83ae..624df3c 100644
> --- a/hw/scsi/scsi-disk.c
> +++ b/hw/scsi/scsi-disk.c
> @@ -296,22 +296,15 @@ static void scsi_dma_complete(void *opaque, int ret)
> aio_context_release(blk_get_aio_context(s->qdev.conf.blk));
> }
>
> -static void scsi_read_complete(void * opaque, int ret)
> +static void scsi_read_complete_noio(SCSIDiskReq *r, int ret)
> {
> -SCSIDiskReq *r = (SCSIDiskReq *)opaque;
> -SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
> -int n;
> +uint32_t n;
>
> -assert(r->req.aiocb != NULL);
> -r->req.aiocb = NULL;
> -aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk));
> -if (scsi_disk_req_check_error(r, ret, true)) {
> +assert(r->req.aiocb == NULL);
> +if (scsi_disk_req_check_error(r, ret, false)) {
> goto done;
> }
>
> -block_acct_done(blk_get_stats(s->qdev.conf.blk), >acct);
> -trace_scsi_disk_read_complete(r->req.tag, r->qiov.size);
> -
> n = r->qiov.size / 512;
> r->sector += n;
> r->sector_count -= n;
> @@ -319,6 +312,24 @@ static void scsi_read_complete(void * opaque, int ret)
>
> done:
> scsi_req_unref(>req);
> +}
> +
> +static void scsi_read_complete(void *opaque, int ret)
> +{
> +SCSIDiskReq *r = (SCSIDiskReq *)opaque;
> +SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
> +
> +assert(r->req.aiocb != NULL);
> +r->req.aiocb = NULL;
> +
> +aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk));
> +if (ret < 0) {
> +block_acct_failed(blk_get_stats(s->qdev.conf.blk), >acct);
> +} else {
> +block_acct_done(blk_get_stats(s->qdev.conf.blk), >acct);
> +trace_scsi_disk_read_complete(r->req.tag, r->qiov.size);
> +}
> +scsi_read_complete_noio(r, ret);
> aio_context_release(blk_get_aio_context(s->qdev.conf.blk));
> }
>
> @@ -395,12 +406,12 @@ static void scsi_read_data(SCSIRequest *req)
> scsi_req_ref(>req);
> if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
> trace_scsi_disk_read_data_invalid();
> -scsi_read_complete(r, -EINVAL);
> +scsi_read_complete_noio(r, -EINVAL);
> return;
> }
>
> if (!blk_is_available(req->dev->conf.blk)) {
> -scsi_read_complete(r, -ENOMEDIUM);
> +scsi_read_complete_noio(r, -ENOMEDIUM);
> return;
> }
>
>
Queued, thanks.
Paolo
Re: [Qemu-devel] [PATCH] scsi-disk: Fix crash if request is invaild or disk is no medium
On 3/7/19 3:12 AM, Zhengui li wrote: > From: Zhengui Li > > Qemu will crash with the assertion error that "assert(r->req.aiocb != > NULL)" in scsi_read_complete if request is invaild or disk is no medium. s/invaild/invalid/ > The error is below: > qemu-kvm: hw/scsi/scsi_disk.c:299: scsi_read_complete: Assertion > `r->req.aiocb != NULL' failed. > > This patch add a funtion scsi_read_complete_noio to fix it. > s/funtion/function/ > Signed-off-by: Zhengui Li > --- > hw/scsi/scsi-disk.c | 37 - > 1 file changed, 24 insertions(+), 13 deletions(-) > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org signature.asc Description: OpenPGP digital signature
[Qemu-devel] [PATCH] scsi-disk: Fix crash if request is invaild or disk is no medium
From: Zhengui Li
Qemu will crash with the assertion error that "assert(r->req.aiocb !=
NULL)" in scsi_read_complete if request is invaild or disk is no medium.
The error is below:
qemu-kvm: hw/scsi/scsi_disk.c:299: scsi_read_complete: Assertion
`r->req.aiocb != NULL' failed.
This patch add a funtion scsi_read_complete_noio to fix it.
Signed-off-by: Zhengui Li
---
hw/scsi/scsi-disk.c | 37 -
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index d4e83ae..624df3c 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -296,22 +296,15 @@ static void scsi_dma_complete(void *opaque, int ret)
aio_context_release(blk_get_aio_context(s->qdev.conf.blk));
}
-static void scsi_read_complete(void * opaque, int ret)
+static void scsi_read_complete_noio(SCSIDiskReq *r, int ret)
{
-SCSIDiskReq *r = (SCSIDiskReq *)opaque;
-SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
-int n;
+uint32_t n;
-assert(r->req.aiocb != NULL);
-r->req.aiocb = NULL;
-aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk));
-if (scsi_disk_req_check_error(r, ret, true)) {
+assert(r->req.aiocb == NULL);
+if (scsi_disk_req_check_error(r, ret, false)) {
goto done;
}
-block_acct_done(blk_get_stats(s->qdev.conf.blk), >acct);
-trace_scsi_disk_read_complete(r->req.tag, r->qiov.size);
-
n = r->qiov.size / 512;
r->sector += n;
r->sector_count -= n;
@@ -319,6 +312,24 @@ static void scsi_read_complete(void * opaque, int ret)
done:
scsi_req_unref(>req);
+}
+
+static void scsi_read_complete(void *opaque, int ret)
+{
+SCSIDiskReq *r = (SCSIDiskReq *)opaque;
+SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
+
+assert(r->req.aiocb != NULL);
+r->req.aiocb = NULL;
+
+aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk));
+if (ret < 0) {
+block_acct_failed(blk_get_stats(s->qdev.conf.blk), >acct);
+} else {
+block_acct_done(blk_get_stats(s->qdev.conf.blk), >acct);
+trace_scsi_disk_read_complete(r->req.tag, r->qiov.size);
+}
+scsi_read_complete_noio(r, ret);
aio_context_release(blk_get_aio_context(s->qdev.conf.blk));
}
@@ -395,12 +406,12 @@ static void scsi_read_data(SCSIRequest *req)
scsi_req_ref(>req);
if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
trace_scsi_disk_read_data_invalid();
-scsi_read_complete(r, -EINVAL);
+scsi_read_complete_noio(r, -EINVAL);
return;
}
if (!blk_is_available(req->dev->conf.blk)) {
-scsi_read_complete(r, -ENOMEDIUM);
+scsi_read_complete_noio(r, -ENOMEDIUM);
return;
}
--
2.7.2.windows.1
Re: [Qemu-devel] [PATCH] scsi-disk: Fix crash if request is invaild or disk is no medium
Patchew URL:
https://patchew.org/QEMU/1551949037-15528-1-git-send-email-lizhen...@huawei.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 1551949037-15528-1-git-send-email-lizhen...@huawei.com
Subject: [Qemu-devel] [PATCH] scsi-disk: Fix crash if request is invaild or
disk is no medium
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
* [new tag]
patchew/1551949037-15528-1-git-send-email-lizhen...@huawei.com ->
patchew/1551949037-15528-1-git-send-email-lizhen...@huawei.com
Switched to a new branch 'test'
501088e7d7 scsi-disk: Fix crash if request is invaild or disk is no medium
=== OUTPUT BEGIN ===
ERROR: space prohibited between function name and open parenthesis '('
#38: FILE: hw/scsi/scsi-disk.c:303:
+assert (r->req.aiocb == NULL);
ERROR: "foo * bar" should be "foo *bar"
#55: FILE: hw/scsi/scsi-disk.c:317:
+static void scsi_read_complete(void * opaque, int ret)
total: 2 errors, 0 warnings, 64 lines checked
Commit 501088e7d763 (scsi-disk: Fix crash if request is invaild or disk is no
medium) has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/1551949037-15528-1-git-send-email-lizhen...@huawei.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-de...@redhat.com
[Qemu-devel] [PATCH] scsi-disk: Fix crash if request is invaild or disk is no medium
From: Zhengui Li
Qemu will crash with the assertion error that "assert(r->req.aiocb !=
NULL)" in scsi_read_complete if request is invaild or disk is no medium.
The error is below:
qemu-kvm: hw/scsi/scsi_disk.c:299: scsi_read_complete: Assertion
`r->req.aiocb != NULL' failed.
This patch add a funtion scsi_read_complete_noio to fix it.
Signed-off-by: Zhengui Li
---
hw/scsi/scsi-disk.c | 37 -
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index d4e83ae..624df3c 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -296,22 +296,15 @@ static void scsi_dma_complete(void *opaque, int ret)
aio_context_release(blk_get_aio_context(s->qdev.conf.blk));
}
-static void scsi_read_complete(void * opaque, int ret)
+static void scsi_read_complete_noio(SCSIDiskReq *r, int ret)
{
-SCSIDiskReq *r = (SCSIDiskReq *)opaque;
-SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
-int n;
+uint32_t n;
-assert(r->req.aiocb != NULL);
-r->req.aiocb = NULL;
-aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk));
-if (scsi_disk_req_check_error(r, ret, true)) {
+assert (r->req.aiocb == NULL);
+if (scsi_disk_req_check_error(r, ret, false)) {
goto done;
}
-block_acct_done(blk_get_stats(s->qdev.conf.blk), >acct);
-trace_scsi_disk_read_complete(r->req.tag, r->qiov.size);
-
n = r->qiov.size / 512;
r->sector += n;
r->sector_count -= n;
@@ -319,6 +312,24 @@ static void scsi_read_complete(void * opaque, int ret)
done:
scsi_req_unref(>req);
+}
+
+static void scsi_read_complete(void * opaque, int ret)
+{
+SCSIDiskReq *r = (SCSIDiskReq *)opaque;
+SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
+
+assert(r->req.aiocb != NULL);
+r->req.aiocb = NULL;
+
+aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk));
+if (ret < 0) {
+block_acct_failed(blk_get_stats(s->qdev.conf.blk), >acct);
+} else {
+block_acct_done(blk_get_stats(s->qdev.conf.blk), >acct);
+trace_scsi_disk_read_complete(r->req.tag, r->qiov.size);
+}
+scsi_read_complete_noio(r, ret);
aio_context_release(blk_get_aio_context(s->qdev.conf.blk));
}
@@ -395,12 +406,12 @@ static void scsi_read_data(SCSIRequest *req)
scsi_req_ref(>req);
if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
trace_scsi_disk_read_data_invalid();
-scsi_read_complete(r, -EINVAL);
+scsi_read_complete_noio(r, -EINVAL);
return;
}
if (!blk_is_available(req->dev->conf.blk)) {
-scsi_read_complete(r, -ENOMEDIUM);
+scsi_read_complete_noio(r, -ENOMEDIUM);
return;
}
--
2.7.2.windows.1
