| Message ID | 20230705024001.177585-1-yukuai1@huaweicloud.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | scsi/sg: fix checking return value of blk_get_queue() | expand |
On Wed, Jul 05, 2023 at 10:40 AM +0800, Yu Kuai <yukuai1@huaweicloud.com> wrote: > From: Yu Kuai <yukuai3@huawei.com> > > Commit fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") > make a mess how blk_get_queue() is called, blk_get_queue() returns true > on success while the caller expects it returns 0 on success. > > Fix this problem and also add a corresponding error message on failure. > > Fixes: fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") > Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com> > Closes: https://lore.kernel.org/all/87lefv622n.fsf@linux.ibm.com/ > Signed-off-by: Yu Kuai <yukuai3@huawei.com> > --- > drivers/scsi/sg.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c > index 89fa046c7158..0d8afffd1683 100644 > --- a/drivers/scsi/sg.c > +++ b/drivers/scsi/sg.c > @@ -1497,9 +1497,10 @@ sg_add_device(struct device *cl_dev) > int error; > unsigned long iflags; > > - error = blk_get_queue(scsidp->request_queue); > - if (error) > - return error; > + if (!blk_get_queue(scsidp->request_queue)) { > + pr_warn("%s: get scsi_device queue failed\n", __func__); > + return -ENODEV; > + } > > error = -ENOMEM; > cdev = cdev_alloc(); > -- > 2.39.2 Thanks. Tested-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Ooops, yes:
Reviewed-by: Christoph Hellwig <hch@lst.de>
On Wed, Jul 05, 2023 at 10:40 AM +0800, Yu Kuai <yukuai1@huaweicloud.com> wrote: > From: Yu Kuai <yukuai3@huawei.com> > > Commit fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") > make a mess how blk_get_queue() is called, blk_get_queue() returns true > on success while the caller expects it returns 0 on success. > > Fix this problem and also add a corresponding error message on failure. > > Fixes: fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") > Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com> > Closes: https://lore.kernel.org/all/87lefv622n.fsf@linux.ibm.com/ > Signed-off-by: Yu Kuai <yukuai3@huawei.com> > --- > drivers/scsi/sg.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c > index 89fa046c7158..0d8afffd1683 100644 > --- a/drivers/scsi/sg.c > +++ b/drivers/scsi/sg.c > @@ -1497,9 +1497,10 @@ sg_add_device(struct device *cl_dev) > int error; > unsigned long iflags; > > - error = blk_get_queue(scsidp->request_queue); > - if (error) > - return error; > + if (!blk_get_queue(scsidp->request_queue)) { > + pr_warn("%s: get scsi_device queue failed\n", __func__); > + return -ENODEV; > + } > > error = -ENOMEM; > cdev = cdev_alloc(); > -- > 2.39.2 Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
On Jul 05, 2023 / 10:40, Yu Kuai wrote: > From: Yu Kuai <yukuai3@huawei.com> > > Commit fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") > make a mess how blk_get_queue() is called, blk_get_queue() returns true > on success while the caller expects it returns 0 on success. > > Fix this problem and also add a corresponding error message on failure. > > Fixes: fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") > Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com> > Closes: https://lore.kernel.org/all/87lefv622n.fsf@linux.ibm.com/ > Signed-off-by: Yu Kuai <yukuai3@huawei.com> I observed that /dev/sg* files are not created with kernel v6.5-rc1, and it causes blktests scsi/002 failure. I confirmed this patch fixes it. Thanks. Tested-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Hi, Jens 在 2023/07/05 10:40, Yu Kuai 写道: > From: Yu Kuai <yukuai3@huawei.com> > > Commit fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") > make a mess how blk_get_queue() is called, blk_get_queue() returns true > on success while the caller expects it returns 0 on success. > > Fix this problem and also add a corresponding error message on failure. > > Fixes: fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") > Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com> > Closes: https://lore.kernel.org/all/87lefv622n.fsf@linux.ibm.com/ > Signed-off-by: Yu Kuai <yukuai3@huawei.com> Sorry about the trouble... Can you apply this patch? I notice that the original patch is applied to stable. Thanks, Kuai > --- > drivers/scsi/sg.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c > index 89fa046c7158..0d8afffd1683 100644 > --- a/drivers/scsi/sg.c > +++ b/drivers/scsi/sg.c > @@ -1497,9 +1497,10 @@ sg_add_device(struct device *cl_dev) > int error; > unsigned long iflags; > > - error = blk_get_queue(scsidp->request_queue); > - if (error) > - return error; > + if (!blk_get_queue(scsidp->request_queue)) { > + pr_warn("%s: get scsi_device queue failed\n", __func__); > + return -ENODEV; > + } > > error = -ENOMEM; > cdev = cdev_alloc(); >
On 7/18/23 7:09?PM, Yu Kuai wrote: > Hi, Jens > > ? 2023/07/05 10:40, Yu Kuai ??: >> From: Yu Kuai <yukuai3@huawei.com> >> >> Commit fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") >> make a mess how blk_get_queue() is called, blk_get_queue() returns true >> on success while the caller expects it returns 0 on success. >> >> Fix this problem and also add a corresponding error message on failure. >> >> Fixes: fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") >> Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com> >> Closes: https://lore.kernel.org/all/87lefv622n.fsf@linux.ibm.com/ >> Signed-off-by: Yu Kuai <yukuai3@huawei.com> > > Sorry about the trouble... Can you apply this patch? I notice that the > original patch is applied to stable. I can, I had assumed that Martin would pick it up on the SCSI side?
Jens, >> Sorry about the trouble... Can you apply this patch? I notice that the >> original patch is applied to stable. > > I can, I had assumed that Martin would pick it up on the SCSI side? Ah, but since the offending commit went through block I didn't have it in SCSI until I set up the new trees. Now applied to 6.5/scsi-fixes.
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 89fa046c7158..0d8afffd1683 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -1497,9 +1497,10 @@ sg_add_device(struct device *cl_dev) int error; unsigned long iflags; - error = blk_get_queue(scsidp->request_queue); - if (error) - return error; + if (!blk_get_queue(scsidp->request_queue)) { + pr_warn("%s: get scsi_device queue failed\n", __func__); + return -ENODEV; + } error = -ENOMEM; cdev = cdev_alloc();