| Message ID | 20181025211039.11559-6-axboe@kernel.dk |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | blk-mq driver conversions and legacy path removal | expand |
On Thu, 2018-10-25 at 15:10 -0600, Jens Axboe wrote: > This check is only viable for non scsi-mq. Since that is going away, > kill this legacy check. > > Cc: Bart Van Assche <bvanassche@acm.org> > Cc: Parav Pandit <parav@mellanox.com> > Cc: linux-scsi@vger.kernel.org > Signed-off-by: Jens Axboe <axboe@kernel.dk> > --- > drivers/infiniband/ulp/srp/ib_srp.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c > index 0b34e909505f..5a79444c2f3c 100644 > --- a/drivers/infiniband/ulp/srp/ib_srp.c > +++ b/drivers/infiniband/ulp/srp/ib_srp.c > @@ -1334,13 +1334,6 @@ static void srp_terminate_io(struct srp_rport *rport) > struct scsi_device *sdev; > int i, j; > > - /* > - * Invoking srp_terminate_io() while srp_queuecommand() is running > - * is not safe. Hence the warning statement below. > - */ > - shost_for_each_device(sdev, shost) > - WARN_ON_ONCE(sdev->request_queue->request_fn_active); > - > for (i = 0; i < target->ch_count; i++) { > ch = &target->ch[i]; It seems like Hannes' and my Signed-off-by/Reviewed-by tags are missing? See also https://marc.info/?l=linux-scsi&m=153970174514608. Bart.
On 10/25/18 3:23 PM, Bart Van Assche wrote: > On Thu, 2018-10-25 at 15:10 -0600, Jens Axboe wrote: >> This check is only viable for non scsi-mq. Since that is going away, >> kill this legacy check. >> >> Cc: Bart Van Assche <bvanassche@acm.org> >> Cc: Parav Pandit <parav@mellanox.com> >> Cc: linux-scsi@vger.kernel.org >> Signed-off-by: Jens Axboe <axboe@kernel.dk> >> --- >> drivers/infiniband/ulp/srp/ib_srp.c | 7 ------- >> 1 file changed, 7 deletions(-) >> >> diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c >> index 0b34e909505f..5a79444c2f3c 100644 >> --- a/drivers/infiniband/ulp/srp/ib_srp.c >> +++ b/drivers/infiniband/ulp/srp/ib_srp.c >> @@ -1334,13 +1334,6 @@ static void srp_terminate_io(struct srp_rport *rport) >> struct scsi_device *sdev; >> int i, j; >> >> - /* >> - * Invoking srp_terminate_io() while srp_queuecommand() is running >> - * is not safe. Hence the warning statement below. >> - */ >> - shost_for_each_device(sdev, shost) >> - WARN_ON_ONCE(sdev->request_queue->request_fn_active); >> - >> for (i = 0; i < target->ch_count; i++) { >> ch = &target->ch[i]; > > It seems like Hannes' and my Signed-off-by/Reviewed-by tags are missing? > See also https://marc.info/?l=linux-scsi&m=153970174514608. Sorry, forgot to update that one. I'll do that for v2. Thanks for letting me know.
On 10/25/18 11:10 PM, Jens Axboe wrote: > This check is only viable for non scsi-mq. Since that is going away, > kill this legacy check. > > Cc: Bart Van Assche <bvanassche@acm.org> > Cc: Parav Pandit <parav@mellanox.com> > Cc: linux-scsi@vger.kernel.org > Signed-off-by: Jens Axboe <axboe@kernel.dk> > --- > drivers/infiniband/ulp/srp/ib_srp.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c > index 0b34e909505f..5a79444c2f3c 100644 > --- a/drivers/infiniband/ulp/srp/ib_srp.c > +++ b/drivers/infiniband/ulp/srp/ib_srp.c > @@ -1334,13 +1334,6 @@ static void srp_terminate_io(struct srp_rport *rport) > struct scsi_device *sdev; > int i, j; > > - /* > - * Invoking srp_terminate_io() while srp_queuecommand() is running > - * is not safe. Hence the warning statement below. > - */ > - shost_for_each_device(sdev, shost) > - WARN_ON_ONCE(sdev->request_queue->request_fn_active); > - > for (i = 0; i < target->ch_count; i++) { > ch = &target->ch[i]; > > I _think_ I've already killed that one; please do check the latest tree from Doug Ledford. Cheers, Hannes
On 10/26/18 1:08 AM, Hannes Reinecke wrote: > On 10/25/18 11:10 PM, Jens Axboe wrote: >> This check is only viable for non scsi-mq. Since that is going away, >> kill this legacy check. >> >> Cc: Bart Van Assche <bvanassche@acm.org> >> Cc: Parav Pandit <parav@mellanox.com> >> Cc: linux-scsi@vger.kernel.org >> Signed-off-by: Jens Axboe <axboe@kernel.dk> >> --- >> drivers/infiniband/ulp/srp/ib_srp.c | 7 ------- >> 1 file changed, 7 deletions(-) >> >> diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c >> index 0b34e909505f..5a79444c2f3c 100644 >> --- a/drivers/infiniband/ulp/srp/ib_srp.c >> +++ b/drivers/infiniband/ulp/srp/ib_srp.c >> @@ -1334,13 +1334,6 @@ static void srp_terminate_io(struct srp_rport *rport) >> struct scsi_device *sdev; >> int i, j; >> >> - /* >> - * Invoking srp_terminate_io() while srp_queuecommand() is running >> - * is not safe. Hence the warning statement below. >> - */ >> - shost_for_each_device(sdev, shost) >> - WARN_ON_ONCE(sdev->request_queue->request_fn_active); >> - >> for (i = 0; i < target->ch_count; i++) { >> ch = &target->ch[i]; >> >> > I _think_ I've already killed that one; please do check the latest tree > from Doug Ledford. I don't know which tree is Doug's, but as long as it's queued up for mainline, that's all I care about. I'm still rebasing this branch, so it'll just get dropped when it shows up in mainline.
On Fri, 2018-10-26 at 08:32 -0600, Jens Axboe wrote: > On 10/26/18 1:08 AM, Hannes Reinecke wrote: > > On 10/25/18 11:10 PM, Jens Axboe wrote: > > > This check is only viable for non scsi-mq. Since that is going away, > > > kill this legacy check. > > > > > > Cc: Bart Van Assche <bvanassche@acm.org> > > > Cc: Parav Pandit <parav@mellanox.com> > > > Cc: linux-scsi@vger.kernel.org > > > Signed-off-by: Jens Axboe <axboe@kernel.dk> > > > --- > > > drivers/infiniband/ulp/srp/ib_srp.c | 7 ------- > > > 1 file changed, 7 deletions(-) > > > > > > diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c > > > index 0b34e909505f..5a79444c2f3c 100644 > > > --- a/drivers/infiniband/ulp/srp/ib_srp.c > > > +++ b/drivers/infiniband/ulp/srp/ib_srp.c > > > @@ -1334,13 +1334,6 @@ static void srp_terminate_io(struct srp_rport *rport) > > > struct scsi_device *sdev; > > > int i, j; > > > > > > - /* > > > - * Invoking srp_terminate_io() while srp_queuecommand() is running > > > - * is not safe. Hence the warning statement below. > > > - */ > > > - shost_for_each_device(sdev, shost) > > > - WARN_ON_ONCE(sdev->request_queue->request_fn_active); > > > - > > > for (i = 0; i < target->ch_count; i++) { > > > ch = &target->ch[i]; > > > > > > > > > > I _think_ I've already killed that one; please do check the latest tree > > from Doug Ledford. > > I don't know which tree is Doug's, but as long as it's queued up > for mainline, that's all I care about. I'm still rebasing this > branch, so it'll just get dropped when it shows up in mainline. Doug and Jason share a git repository. I think this is the git repository they ask Linus to pull from: git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git. Although Doug had reported to have queued the above patch I haven't found that patch in the RDMA git repository. Bart.
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 0b34e909505f..5a79444c2f3c 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -1334,13 +1334,6 @@ static void srp_terminate_io(struct srp_rport *rport) struct scsi_device *sdev; int i, j; - /* - * Invoking srp_terminate_io() while srp_queuecommand() is running - * is not safe. Hence the warning statement below. - */ - shost_for_each_device(sdev, shost) - WARN_ON_ONCE(sdev->request_queue->request_fn_active); - for (i = 0; i < target->ch_count; i++) { ch = &target->ch[i];
This check is only viable for non scsi-mq. Since that is going away, kill this legacy check. Cc: Bart Van Assche <bvanassche@acm.org> Cc: Parav Pandit <parav@mellanox.com> Cc: linux-scsi@vger.kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk> --- drivers/infiniband/ulp/srp/ib_srp.c | 7 ------- 1 file changed, 7 deletions(-)