Re: [PATCH 3/4] blk-mq: replace blk_mq_init_commands with a ->init_request method
On Wed, Mar 19, 2014 at 04:48:47PM +0800, Ming Lei wrote: > Actually it doesn't matter because flush_rq will be reinitialized > before using, not like common request. And driver should only > initialize req->special instead of the request itself, maybe it is > better to document the fact. I'll send a blurb to document this fact with the next round of updates. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3/4] blk-mq: replace blk_mq_init_commands with a ->init_request method
On Wed, Mar 19, 2014 at 3:54 PM, Christoph Hellwig wrote: > On Wed, Mar 19, 2014 at 11:08:20AM +0800, Ming Lei wrote: >> > + blk_rq_init(q, q->flush_rq); >> > + if (reg->cmd_size) >> > + q->flush_rq->special = >> > + blk_mq_rq_to_pdu(q->flush_rq); >> > + >> > + if (reg->ops->init_request(driver_data, >> > + NULL, q->flush_rq, -1)) >> > + goto err_flush_rq; >> > + } >> >> The above looks a bit weird because q->flush_rq is invisible to >> driver and should always be initialized no matter if driver defines >> its .init_request callback or not. > > You mean the blk_rq_init? We already do a real initialization before > actually using it, it's just there to prevent passing a half-initialized > one to the driver. > OK. Actually it doesn't matter because flush_rq will be reinitialized before using, not like common request. And driver should only initialize req->special instead of the request itself, maybe it is better to document the fact. Thanks, -- Ming Lei -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3/4] blk-mq: replace blk_mq_init_commands with a ->init_request method
On Wed, Mar 19, 2014 at 11:08:20AM +0800, Ming Lei wrote: > > + blk_rq_init(q, q->flush_rq); > > + if (reg->cmd_size) > > + q->flush_rq->special = > > + blk_mq_rq_to_pdu(q->flush_rq); > > + > > + if (reg->ops->init_request(driver_data, > > + NULL, q->flush_rq, -1)) > > + goto err_flush_rq; > > + } > > The above looks a bit weird because q->flush_rq is invisible to > driver and should always be initialized no matter if driver defines > its .init_request callback or not. You mean the blk_rq_init? We already do a real initialization before actually using it, it's just there to prevent passing a half-initialized one to the driver. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3/4] blk-mq: replace blk_mq_init_commands with a -init_request method
On Wed, Mar 19, 2014 at 11:08:20AM +0800, Ming Lei wrote: + blk_rq_init(q, q-flush_rq); + if (reg-cmd_size) + q-flush_rq-special = + blk_mq_rq_to_pdu(q-flush_rq); + + if (reg-ops-init_request(driver_data, + NULL, q-flush_rq, -1)) + goto err_flush_rq; + } The above looks a bit weird because q-flush_rq is invisible to driver and should always be initialized no matter if driver defines its .init_request callback or not. You mean the blk_rq_init? We already do a real initialization before actually using it, it's just there to prevent passing a half-initialized one to the driver. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3/4] blk-mq: replace blk_mq_init_commands with a -init_request method
On Wed, Mar 19, 2014 at 3:54 PM, Christoph Hellwig h...@infradead.org wrote: On Wed, Mar 19, 2014 at 11:08:20AM +0800, Ming Lei wrote: + blk_rq_init(q, q-flush_rq); + if (reg-cmd_size) + q-flush_rq-special = + blk_mq_rq_to_pdu(q-flush_rq); + + if (reg-ops-init_request(driver_data, + NULL, q-flush_rq, -1)) + goto err_flush_rq; + } The above looks a bit weird because q-flush_rq is invisible to driver and should always be initialized no matter if driver defines its .init_request callback or not. You mean the blk_rq_init? We already do a real initialization before actually using it, it's just there to prevent passing a half-initialized one to the driver. OK. Actually it doesn't matter because flush_rq will be reinitialized before using, not like common request. And driver should only initialize req-special instead of the request itself, maybe it is better to document the fact. Thanks, -- Ming Lei -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3/4] blk-mq: replace blk_mq_init_commands with a -init_request method
On Wed, Mar 19, 2014 at 04:48:47PM +0800, Ming Lei wrote: Actually it doesn't matter because flush_rq will be reinitialized before using, not like common request. And driver should only initialize req-special instead of the request itself, maybe it is better to document the fact. I'll send a blurb to document this fact with the next round of updates. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3/4] blk-mq: replace blk_mq_init_commands with a ->init_request method
On Mon, Mar 17, 2014 at 9:18 PM, Christoph Hellwig wrote:
> Bedides a simpler and cleared interface this also allows to initialize the
> flush_rq properly. The interface for that is still a bit messy as we don't
> have a hw_ctx available for the flush request, but that's something that
> should be fixable with a little work once the demand arises.
>
> Signed-off-by: Christoph Hellwig
> ---
> block/blk-mq.c | 65
> +---
> drivers/block/virtio_blk.c | 22 +++
> include/linux/blk-mq.h |9 +-
> 3 files changed, 50 insertions(+), 46 deletions(-)
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index e3284f6..c2ce99b 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -996,33 +996,6 @@ static void blk_mq_hctx_notify(void *data, unsigned long
> action,
> blk_mq_put_ctx(ctx);
> }
>
> -static void blk_mq_init_hw_commands(struct blk_mq_hw_ctx *hctx,
> - void (*init)(void *, struct blk_mq_hw_ctx
> *,
> - struct request *, unsigned int),
> - void *data)
> -{
> - unsigned int i;
> -
> - for (i = 0; i < hctx->queue_depth; i++) {
> - struct request *rq = hctx->rqs[i];
> -
> - init(data, hctx, rq, i);
> - }
> -}
> -
> -void blk_mq_init_commands(struct request_queue *q,
> - void (*init)(void *, struct blk_mq_hw_ctx *,
> - struct request *, unsigned int),
> - void *data)
> -{
> - struct blk_mq_hw_ctx *hctx;
> - unsigned int i;
> -
> - queue_for_each_hw_ctx(q, hctx, i)
> - blk_mq_init_hw_commands(hctx, init, data);
> -}
> -EXPORT_SYMBOL(blk_mq_init_commands);
> -
> static void blk_mq_free_rq_map(struct blk_mq_hw_ctx *hctx)
> {
> struct page *page;
> @@ -1050,10 +1023,12 @@ static size_t order_to_size(unsigned int order)
> }
>
> static int blk_mq_init_rq_map(struct blk_mq_hw_ctx *hctx,
> - unsigned int reserved_tags, int node)
> + struct blk_mq_reg *reg, void *driver_data, int node)
> {
> + unsigned int reserved_tags = reg->reserved_tags;
> unsigned int i, j, entries_per_page, max_order = 4;
> size_t rq_size, left;
> + int error;
>
> INIT_LIST_HEAD(>page_list);
>
> @@ -1102,14 +1077,23 @@ static int blk_mq_init_rq_map(struct blk_mq_hw_ctx
> *hctx,
> for (j = 0; j < to_do; j++) {
> hctx->rqs[i] = p;
> blk_mq_rq_init(hctx, hctx->rqs[i]);
> + if (reg->ops->init_request) {
> + error = reg->ops->init_request(driver_data,
> + hctx, hctx->rqs[i], i);
> + if (error)
> + goto err_rq_map;
> + }
> +
> p += rq_size;
> i++;
> }
> }
>
> - if (i < (reserved_tags + BLK_MQ_TAG_MIN))
> + if (i < (reserved_tags + BLK_MQ_TAG_MIN)) {
> + error = -ENOMEM;
> goto err_rq_map;
> - else if (i != hctx->queue_depth) {
> + }
> + if (i != hctx->queue_depth) {
> hctx->queue_depth = i;
> pr_warn("%s: queue depth set to %u because of low memory\n",
> __func__, i);
> @@ -1117,12 +1101,14 @@ static int blk_mq_init_rq_map(struct blk_mq_hw_ctx
> *hctx,
>
> hctx->tags = blk_mq_init_tags(hctx->queue_depth, reserved_tags, node);
> if (!hctx->tags) {
> -err_rq_map:
> - blk_mq_free_rq_map(hctx);
> - return -ENOMEM;
> + error = -ENOMEM;
> + goto err_rq_map;
> }
>
> return 0;
> +err_rq_map:
> + blk_mq_free_rq_map(hctx);
> + return error;
> }
>
> static int blk_mq_init_hw_queues(struct request_queue *q,
> @@ -1155,7 +1141,7 @@ static int blk_mq_init_hw_queues(struct request_queue
> *q,
> blk_mq_hctx_notify, hctx);
> blk_mq_register_cpu_notifier(>cpu_notifier);
>
> - if (blk_mq_init_rq_map(hctx, reg->reserved_tags, node))
> + if (blk_mq_init_rq_map(hctx, reg, driver_data, node))
> break;
>
> /*
> @@ -1334,6 +1320,17 @@ struct request_queue *blk_mq_init_queue(struct
> blk_mq_reg *reg,
> if (!q->flush_rq)
> goto err_hw;
>
> + if (reg->ops->init_request) {
> + blk_rq_init(q, q->flush_rq);
> + if (reg->cmd_size)
> + q->flush_rq->special =
> + blk_mq_rq_to_pdu(q->flush_rq);
> +
> + if
Re: [PATCH 3/4] blk-mq: replace blk_mq_init_commands with a -init_request method
On Mon, Mar 17, 2014 at 9:18 PM, Christoph Hellwig h...@infradead.org wrote:
Bedides a simpler and cleared interface this also allows to initialize the
flush_rq properly. The interface for that is still a bit messy as we don't
have a hw_ctx available for the flush request, but that's something that
should be fixable with a little work once the demand arises.
Signed-off-by: Christoph Hellwig h...@lst.de
---
block/blk-mq.c | 65
+---
drivers/block/virtio_blk.c | 22 +++
include/linux/blk-mq.h |9 +-
3 files changed, 50 insertions(+), 46 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index e3284f6..c2ce99b 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -996,33 +996,6 @@ static void blk_mq_hctx_notify(void *data, unsigned long
action,
blk_mq_put_ctx(ctx);
}
-static void blk_mq_init_hw_commands(struct blk_mq_hw_ctx *hctx,
- void (*init)(void *, struct blk_mq_hw_ctx
*,
- struct request *, unsigned int),
- void *data)
-{
- unsigned int i;
-
- for (i = 0; i hctx-queue_depth; i++) {
- struct request *rq = hctx-rqs[i];
-
- init(data, hctx, rq, i);
- }
-}
-
-void blk_mq_init_commands(struct request_queue *q,
- void (*init)(void *, struct blk_mq_hw_ctx *,
- struct request *, unsigned int),
- void *data)
-{
- struct blk_mq_hw_ctx *hctx;
- unsigned int i;
-
- queue_for_each_hw_ctx(q, hctx, i)
- blk_mq_init_hw_commands(hctx, init, data);
-}
-EXPORT_SYMBOL(blk_mq_init_commands);
-
static void blk_mq_free_rq_map(struct blk_mq_hw_ctx *hctx)
{
struct page *page;
@@ -1050,10 +1023,12 @@ static size_t order_to_size(unsigned int order)
}
static int blk_mq_init_rq_map(struct blk_mq_hw_ctx *hctx,
- unsigned int reserved_tags, int node)
+ struct blk_mq_reg *reg, void *driver_data, int node)
{
+ unsigned int reserved_tags = reg-reserved_tags;
unsigned int i, j, entries_per_page, max_order = 4;
size_t rq_size, left;
+ int error;
INIT_LIST_HEAD(hctx-page_list);
@@ -1102,14 +1077,23 @@ static int blk_mq_init_rq_map(struct blk_mq_hw_ctx
*hctx,
for (j = 0; j to_do; j++) {
hctx-rqs[i] = p;
blk_mq_rq_init(hctx, hctx-rqs[i]);
+ if (reg-ops-init_request) {
+ error = reg-ops-init_request(driver_data,
+ hctx, hctx-rqs[i], i);
+ if (error)
+ goto err_rq_map;
+ }
+
p += rq_size;
i++;
}
}
- if (i (reserved_tags + BLK_MQ_TAG_MIN))
+ if (i (reserved_tags + BLK_MQ_TAG_MIN)) {
+ error = -ENOMEM;
goto err_rq_map;
- else if (i != hctx-queue_depth) {
+ }
+ if (i != hctx-queue_depth) {
hctx-queue_depth = i;
pr_warn(%s: queue depth set to %u because of low memory\n,
__func__, i);
@@ -1117,12 +1101,14 @@ static int blk_mq_init_rq_map(struct blk_mq_hw_ctx
*hctx,
hctx-tags = blk_mq_init_tags(hctx-queue_depth, reserved_tags, node);
if (!hctx-tags) {
-err_rq_map:
- blk_mq_free_rq_map(hctx);
- return -ENOMEM;
+ error = -ENOMEM;
+ goto err_rq_map;
}
return 0;
+err_rq_map:
+ blk_mq_free_rq_map(hctx);
+ return error;
}
static int blk_mq_init_hw_queues(struct request_queue *q,
@@ -1155,7 +1141,7 @@ static int blk_mq_init_hw_queues(struct request_queue
*q,
blk_mq_hctx_notify, hctx);
blk_mq_register_cpu_notifier(hctx-cpu_notifier);
- if (blk_mq_init_rq_map(hctx, reg-reserved_tags, node))
+ if (blk_mq_init_rq_map(hctx, reg, driver_data, node))
break;
/*
@@ -1334,6 +1320,17 @@ struct request_queue *blk_mq_init_queue(struct
blk_mq_reg *reg,
if (!q-flush_rq)
goto err_hw;
+ if (reg-ops-init_request) {
+ blk_rq_init(q, q-flush_rq);
+ if (reg-cmd_size)
+ q-flush_rq-special =
+ blk_mq_rq_to_pdu(q-flush_rq);
+
+ if (reg-ops-init_request(driver_data,
+ NULL, q-flush_rq, -1))
+ goto err_flush_rq;
+ }
The above
[PATCH 3/4] blk-mq: replace blk_mq_init_commands with a ->init_request method
Bedides a simpler and cleared interface this also allows to initialize the
flush_rq properly. The interface for that is still a bit messy as we don't
have a hw_ctx available for the flush request, but that's something that
should be fixable with a little work once the demand arises.
Signed-off-by: Christoph Hellwig
---
block/blk-mq.c | 65 +---
drivers/block/virtio_blk.c | 22 +++
include/linux/blk-mq.h |9 +-
3 files changed, 50 insertions(+), 46 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index e3284f6..c2ce99b 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -996,33 +996,6 @@ static void blk_mq_hctx_notify(void *data, unsigned long
action,
blk_mq_put_ctx(ctx);
}
-static void blk_mq_init_hw_commands(struct blk_mq_hw_ctx *hctx,
- void (*init)(void *, struct blk_mq_hw_ctx *,
- struct request *, unsigned int),
- void *data)
-{
- unsigned int i;
-
- for (i = 0; i < hctx->queue_depth; i++) {
- struct request *rq = hctx->rqs[i];
-
- init(data, hctx, rq, i);
- }
-}
-
-void blk_mq_init_commands(struct request_queue *q,
- void (*init)(void *, struct blk_mq_hw_ctx *,
- struct request *, unsigned int),
- void *data)
-{
- struct blk_mq_hw_ctx *hctx;
- unsigned int i;
-
- queue_for_each_hw_ctx(q, hctx, i)
- blk_mq_init_hw_commands(hctx, init, data);
-}
-EXPORT_SYMBOL(blk_mq_init_commands);
-
static void blk_mq_free_rq_map(struct blk_mq_hw_ctx *hctx)
{
struct page *page;
@@ -1050,10 +1023,12 @@ static size_t order_to_size(unsigned int order)
}
static int blk_mq_init_rq_map(struct blk_mq_hw_ctx *hctx,
- unsigned int reserved_tags, int node)
+ struct blk_mq_reg *reg, void *driver_data, int node)
{
+ unsigned int reserved_tags = reg->reserved_tags;
unsigned int i, j, entries_per_page, max_order = 4;
size_t rq_size, left;
+ int error;
INIT_LIST_HEAD(>page_list);
@@ -1102,14 +1077,23 @@ static int blk_mq_init_rq_map(struct blk_mq_hw_ctx
*hctx,
for (j = 0; j < to_do; j++) {
hctx->rqs[i] = p;
blk_mq_rq_init(hctx, hctx->rqs[i]);
+ if (reg->ops->init_request) {
+ error = reg->ops->init_request(driver_data,
+ hctx, hctx->rqs[i], i);
+ if (error)
+ goto err_rq_map;
+ }
+
p += rq_size;
i++;
}
}
- if (i < (reserved_tags + BLK_MQ_TAG_MIN))
+ if (i < (reserved_tags + BLK_MQ_TAG_MIN)) {
+ error = -ENOMEM;
goto err_rq_map;
- else if (i != hctx->queue_depth) {
+ }
+ if (i != hctx->queue_depth) {
hctx->queue_depth = i;
pr_warn("%s: queue depth set to %u because of low memory\n",
__func__, i);
@@ -1117,12 +1101,14 @@ static int blk_mq_init_rq_map(struct blk_mq_hw_ctx
*hctx,
hctx->tags = blk_mq_init_tags(hctx->queue_depth, reserved_tags, node);
if (!hctx->tags) {
-err_rq_map:
- blk_mq_free_rq_map(hctx);
- return -ENOMEM;
+ error = -ENOMEM;
+ goto err_rq_map;
}
return 0;
+err_rq_map:
+ blk_mq_free_rq_map(hctx);
+ return error;
}
static int blk_mq_init_hw_queues(struct request_queue *q,
@@ -1155,7 +1141,7 @@ static int blk_mq_init_hw_queues(struct request_queue *q,
blk_mq_hctx_notify, hctx);
blk_mq_register_cpu_notifier(>cpu_notifier);
- if (blk_mq_init_rq_map(hctx, reg->reserved_tags, node))
+ if (blk_mq_init_rq_map(hctx, reg, driver_data, node))
break;
/*
@@ -1334,6 +1320,17 @@ struct request_queue *blk_mq_init_queue(struct
blk_mq_reg *reg,
if (!q->flush_rq)
goto err_hw;
+ if (reg->ops->init_request) {
+ blk_rq_init(q, q->flush_rq);
+ if (reg->cmd_size)
+ q->flush_rq->special =
+ blk_mq_rq_to_pdu(q->flush_rq);
+
+ if (reg->ops->init_request(driver_data,
+ NULL, q->flush_rq, -1))
+ goto err_flush_rq;
+ }
+
if (blk_mq_init_hw_queues(q, reg, driver_data))
goto err_flush_rq;
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index b1cb3f4..a2e925b 100644
[PATCH 3/4] blk-mq: replace blk_mq_init_commands with a -init_request method
Bedides a simpler and cleared interface this also allows to initialize the
flush_rq properly. The interface for that is still a bit messy as we don't
have a hw_ctx available for the flush request, but that's something that
should be fixable with a little work once the demand arises.
Signed-off-by: Christoph Hellwig h...@lst.de
---
block/blk-mq.c | 65 +---
drivers/block/virtio_blk.c | 22 +++
include/linux/blk-mq.h |9 +-
3 files changed, 50 insertions(+), 46 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index e3284f6..c2ce99b 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -996,33 +996,6 @@ static void blk_mq_hctx_notify(void *data, unsigned long
action,
blk_mq_put_ctx(ctx);
}
-static void blk_mq_init_hw_commands(struct blk_mq_hw_ctx *hctx,
- void (*init)(void *, struct blk_mq_hw_ctx *,
- struct request *, unsigned int),
- void *data)
-{
- unsigned int i;
-
- for (i = 0; i hctx-queue_depth; i++) {
- struct request *rq = hctx-rqs[i];
-
- init(data, hctx, rq, i);
- }
-}
-
-void blk_mq_init_commands(struct request_queue *q,
- void (*init)(void *, struct blk_mq_hw_ctx *,
- struct request *, unsigned int),
- void *data)
-{
- struct blk_mq_hw_ctx *hctx;
- unsigned int i;
-
- queue_for_each_hw_ctx(q, hctx, i)
- blk_mq_init_hw_commands(hctx, init, data);
-}
-EXPORT_SYMBOL(blk_mq_init_commands);
-
static void blk_mq_free_rq_map(struct blk_mq_hw_ctx *hctx)
{
struct page *page;
@@ -1050,10 +1023,12 @@ static size_t order_to_size(unsigned int order)
}
static int blk_mq_init_rq_map(struct blk_mq_hw_ctx *hctx,
- unsigned int reserved_tags, int node)
+ struct blk_mq_reg *reg, void *driver_data, int node)
{
+ unsigned int reserved_tags = reg-reserved_tags;
unsigned int i, j, entries_per_page, max_order = 4;
size_t rq_size, left;
+ int error;
INIT_LIST_HEAD(hctx-page_list);
@@ -1102,14 +1077,23 @@ static int blk_mq_init_rq_map(struct blk_mq_hw_ctx
*hctx,
for (j = 0; j to_do; j++) {
hctx-rqs[i] = p;
blk_mq_rq_init(hctx, hctx-rqs[i]);
+ if (reg-ops-init_request) {
+ error = reg-ops-init_request(driver_data,
+ hctx, hctx-rqs[i], i);
+ if (error)
+ goto err_rq_map;
+ }
+
p += rq_size;
i++;
}
}
- if (i (reserved_tags + BLK_MQ_TAG_MIN))
+ if (i (reserved_tags + BLK_MQ_TAG_MIN)) {
+ error = -ENOMEM;
goto err_rq_map;
- else if (i != hctx-queue_depth) {
+ }
+ if (i != hctx-queue_depth) {
hctx-queue_depth = i;
pr_warn(%s: queue depth set to %u because of low memory\n,
__func__, i);
@@ -1117,12 +1101,14 @@ static int blk_mq_init_rq_map(struct blk_mq_hw_ctx
*hctx,
hctx-tags = blk_mq_init_tags(hctx-queue_depth, reserved_tags, node);
if (!hctx-tags) {
-err_rq_map:
- blk_mq_free_rq_map(hctx);
- return -ENOMEM;
+ error = -ENOMEM;
+ goto err_rq_map;
}
return 0;
+err_rq_map:
+ blk_mq_free_rq_map(hctx);
+ return error;
}
static int blk_mq_init_hw_queues(struct request_queue *q,
@@ -1155,7 +1141,7 @@ static int blk_mq_init_hw_queues(struct request_queue *q,
blk_mq_hctx_notify, hctx);
blk_mq_register_cpu_notifier(hctx-cpu_notifier);
- if (blk_mq_init_rq_map(hctx, reg-reserved_tags, node))
+ if (blk_mq_init_rq_map(hctx, reg, driver_data, node))
break;
/*
@@ -1334,6 +1320,17 @@ struct request_queue *blk_mq_init_queue(struct
blk_mq_reg *reg,
if (!q-flush_rq)
goto err_hw;
+ if (reg-ops-init_request) {
+ blk_rq_init(q, q-flush_rq);
+ if (reg-cmd_size)
+ q-flush_rq-special =
+ blk_mq_rq_to_pdu(q-flush_rq);
+
+ if (reg-ops-init_request(driver_data,
+ NULL, q-flush_rq, -1))
+ goto err_flush_rq;
+ }
+
if (blk_mq_init_hw_queues(q, reg, driver_data))
goto err_flush_rq;
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index b1cb3f4..a2e925b 100644
---
