Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1621875 > unrolled thread
| Started by | Johannes Thumshirn <jthumshirn@suse.de> |
|---|---|
| First post | 2017-04-12 09:30 +0200 |
| Last post | 2017-04-14 04:20 +0200 |
| Articles | 4 — 4 participants |
Back to article view | Back to linux.kernel
[PATCH v2] scsi: return correct blkprep status code in case scsi_init_io() fails. Johannes Thumshirn <jthumshirn@suse.de> - 2017-04-12 09:30 +0200
Re: [PATCH v2] scsi: return correct blkprep status code in case scsi_init_io() fails. Hannes Reinecke <hare@suse.de> - 2017-04-12 09:30 +0200
Re: [PATCH v2] scsi: return correct blkprep status code in case scsi_init_io() fails. Bart Van Assche <Bart.VanAssche@sandisk.com> - 2017-04-13 17:20 +0200
Re: [PATCH v2] scsi: return correct blkprep status code in case scsi_init_io() fails. "Martin K. Petersen" <martin.petersen@oracle.com> - 2017-04-14 04:20 +0200
| From | Johannes Thumshirn <jthumshirn@suse.de> |
|---|---|
| Date | 2017-04-12 09:30 +0200 |
| Subject | [PATCH v2] scsi: return correct blkprep status code in case scsi_init_io() fails. |
| Message-ID | <tvkSZ-1CE-3@gated-at.bofh.it> |
When instrumenting the SCSI layer to run into the
!blk_rq_nr_phys_segments(rq) case the following warning emitted from the
block layer:
blk_peek_request: bad return=-22
This happens because since commit fd3fc0b4d730 ('scsi: don't BUG_ON()
empty DMA transfers') we return the wrong error value from scsi_prep_fn()
back to the block layer.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Fixes: fd3fc0b4d730 scsi: don't BUG_ON() empty DMA transfers
Cc: <stable@vger.kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
Changes to v1:
* s/iscsi_prep_fn()/scsi_prep_fn()
* Add Cc stable
drivers/scsi/scsi_lib.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 19125d72f322..5558e212368b 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1061,10 +1061,10 @@ int scsi_init_io(struct scsi_cmnd *cmd)
struct scsi_device *sdev = cmd->device;
struct request *rq = cmd->request;
bool is_mq = (rq->mq_ctx != NULL);
- int error;
+ int error = BLKPREP_KILL;
if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq)))
- return -EINVAL;
+ goto err_exit;
error = scsi_init_sgtable(rq, &cmd->sdb);
if (error)
--
2.12.0
[toc] | [next] | [standalone]
| From | Hannes Reinecke <hare@suse.de> |
|---|---|
| Date | 2017-04-12 09:30 +0200 |
| Subject | Re: [PATCH v2] scsi: return correct blkprep status code in case scsi_init_io() fails. |
| Message-ID | <tvkT0-1CE-21@gated-at.bofh.it> |
| In reply to | #1621875 |
On 04/12/2017 09:21 AM, Johannes Thumshirn wrote:
> When instrumenting the SCSI layer to run into the
> !blk_rq_nr_phys_segments(rq) case the following warning emitted from the
> block layer:
>
> blk_peek_request: bad return=-22
>
> This happens because since commit fd3fc0b4d730 ('scsi: don't BUG_ON()
> empty DMA transfers') we return the wrong error value from scsi_prep_fn()
> back to the block layer.
>
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
> Fixes: fd3fc0b4d730 scsi: don't BUG_ON() empty DMA transfers
> Cc: <stable@vger.kernel.org>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> ---
> Changes to v1:
> * s/iscsi_prep_fn()/scsi_prep_fn()
> * Add Cc stable
>
> drivers/scsi/scsi_lib.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index 19125d72f322..5558e212368b 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -1061,10 +1061,10 @@ int scsi_init_io(struct scsi_cmnd *cmd)
> struct scsi_device *sdev = cmd->device;
> struct request *rq = cmd->request;
> bool is_mq = (rq->mq_ctx != NULL);
> - int error;
> + int error = BLKPREP_KILL;
>
> if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq)))
> - return -EINVAL;
> + goto err_exit;
>
> error = scsi_init_sgtable(rq, &cmd->sdb);
> if (error)
>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Cheers,
Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
hare@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
[toc] | [prev] | [next] | [standalone]
| From | Bart Van Assche <Bart.VanAssche@sandisk.com> |
|---|---|
| Date | 2017-04-13 17:20 +0200 |
| Subject | Re: [PATCH v2] scsi: return correct blkprep status code in case scsi_init_io() fails. |
| Message-ID | <tvOHo-4KC-13@gated-at.bofh.it> |
| In reply to | #1621875 |
On Wed, 2017-04-12 at 09:21 +0200, Johannes Thumshirn wrote:
> When instrumenting the SCSI layer to run into the
> !blk_rq_nr_phys_segments(rq) case the following warning emitted from the
> block layer:
>
> blk_peek_request: bad return=-22
>
> This happens because since commit fd3fc0b4d730 ('scsi: don't BUG_ON()
> empty DMA transfers') we return the wrong error value from scsi_prep_fn()
> back to the block layer.
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
[toc] | [prev] | [next] | [standalone]
| From | "Martin K. Petersen" <martin.petersen@oracle.com> |
|---|---|
| Date | 2017-04-14 04:20 +0200 |
| Message-ID | <tvZ06-3xy-5@gated-at.bofh.it> |
| In reply to | #1621875 |
Johannes Thumshirn <jthumshirn@suse.de> writes: > When instrumenting the SCSI layer to run into the > !blk_rq_nr_phys_segments(rq) case the following warning emitted from > the block layer: Applied to 4.11/scsi-fixes. -- Martin K. Petersen Oracle Linux Engineering
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web