| Message ID | 1493391340-24629-7-git-send-email-axboe@fb.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Apr 28, 2017 at 08:55:39AM -0600, Jens Axboe wrote: > We have update the troublesome driver (mtip32xx) to deal with this > appropriately. So kill the hack that bypassed scheduler allocation > and insertion for reserved requests. > > Signed-off-by: Jens Axboe <axboe@fb.com> > --- > block/blk-mq-sched.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c > index 8b361e192e8a..e79e9f18d7c2 100644 > --- a/block/blk-mq-sched.c > +++ b/block/blk-mq-sched.c > @@ -82,11 +82,7 @@ struct request *blk_mq_sched_get_request(struct request_queue *q, > if (likely(!data->hctx)) > data->hctx = blk_mq_map_queue(q, data->ctx->cpu); > > - /* > - * For a reserved tag, allocate a normal request since we might > - * have driver dependencies on the value of the internal tag. > - */ > - if (e && !(data->flags & BLK_MQ_REQ_RESERVED)) { > + if (e) { > data->flags |= BLK_MQ_REQ_INTERNAL; > > /* Reviewed-by: Ming Lei <ming.lei@redhat.com> Thanks, Ming
On 04/28/2017 04:55 PM, Jens Axboe wrote: > We have update the troublesome driver (mtip32xx) to deal with this > appropriately. So kill the hack that bypassed scheduler allocation > and insertion for reserved requests. > updated? > Signed-off-by: Jens Axboe <axboe@fb.com> > --- > block/blk-mq-sched.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c > index 8b361e192e8a..e79e9f18d7c2 100644 > --- a/block/blk-mq-sched.c > +++ b/block/blk-mq-sched.c > @@ -82,11 +82,7 @@ struct request *blk_mq_sched_get_request(struct request_queue *q, > if (likely(!data->hctx)) > data->hctx = blk_mq_map_queue(q, data->ctx->cpu); > > - /* > - * For a reserved tag, allocate a normal request since we might > - * have driver dependencies on the value of the internal tag. > - */ > - if (e && !(data->flags & BLK_MQ_REQ_RESERVED)) { > + if (e) { > data->flags |= BLK_MQ_REQ_INTERNAL; > > /* > Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 8b361e192e8a..e79e9f18d7c2 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -82,11 +82,7 @@ struct request *blk_mq_sched_get_request(struct request_queue *q, if (likely(!data->hctx)) data->hctx = blk_mq_map_queue(q, data->ctx->cpu); - /* - * For a reserved tag, allocate a normal request since we might - * have driver dependencies on the value of the internal tag. - */ - if (e && !(data->flags & BLK_MQ_REQ_RESERVED)) { + if (e) { data->flags |= BLK_MQ_REQ_INTERNAL; /*
We have update the troublesome driver (mtip32xx) to deal with this appropriately. So kill the hack that bypassed scheduler allocation and insertion for reserved requests. Signed-off-by: Jens Axboe <axboe@fb.com> --- block/blk-mq-sched.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)