Re: [PATCH 4/4] blk-mq: add a exit_request method

2014-03-19 Thread Christoph Hellwig 
On Wed, Mar 19, 2014 at 01:22:07PM +0800, Ming Lei wrote:
> exit_request definition is missed.

oops that accidentally went into another commit.

New version below:

---
From: Christoph Hellwig 
Subject: blk-mq: add a exit_request method

This gives drivers an easy way to free any ressources allocated in
->init_request.

Signed-off-by: Christoph Hellwig 

diff --git a/block/blk-mq.c b/block/blk-mq.c
index c2ce99b..c7e723e 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1000,6 +1000,16 @@ static void blk_mq_free_rq_map(struct blk_mq_hw_ctx 
*hctx)
 {
struct page *page;
 
+   if (hctx->rqs && hctx->queue->mq_ops->exit_request) {
+   int i;
+
+   for (i = 0; i < hctx->queue_depth; i++) {
+   if (!hctx->rqs[i])
+   continue;
+   hctx->queue->mq_ops->exit_request(hctx, hctx->rqs[i]);
+   }
+   }
+
while (!list_empty(>page_list)) {
page = list_first_entry(>page_list, struct page, lru);
list_del_init(>lru);
@@ -1332,7 +1342,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_reg 
*reg,
}
 
if (blk_mq_init_hw_queues(q, reg, driver_data))
-   goto err_flush_rq;
+   goto err_flush_rq_init;
 
blk_mq_map_swqueue(q);
 
@@ -1342,6 +1352,9 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_reg 
*reg,
 
return q;
 
+err_flush_rq_init:
+   if (reg->ops->exit_request)
+   reg->ops->exit_request(NULL, q->flush_rq);
 err_flush_rq:
kfree(q->flush_rq);
 err_hw:
@@ -1387,6 +1400,9 @@ void blk_mq_free_queue(struct request_queue *q)
mutex_lock(_q_mutex);
list_del_init(>all_q_node);
mutex_unlock(_q_mutex);
+
+   if (q->mq_ops->exit_request)
+   q->mq_ops->exit_request(NULL, q->flush_rq);
 }
 
 /* Basically redo blk_mq_init_queue with queue frozen */
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 4d34957..ff194f8 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -68,6 +68,7 @@ typedef int (init_hctx_fn)(struct blk_mq_hw_ctx *, void *, 
unsigned int);
 typedef void (exit_hctx_fn)(struct blk_mq_hw_ctx *, unsigned int);
 typedef int (init_request_fn)(void *, struct blk_mq_hw_ctx *,
struct request *, unsigned int);
+typedef void (exit_request_fn)(struct blk_mq_hw_ctx *, struct request *);
 
 struct blk_mq_ops {
/*
@@ -104,8 +105,10 @@ struct blk_mq_ops {
/*
 * Called for every command allocated by the block layer to allow
 * the driver to set up driver specific data.
+* Ditto for exit/teardown.
 */
init_request_fn *init_request;
+   exit_request_fn *exit_request;
 };
 
 enum {
--
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 4/4] blk-mq: add a exit_request method

2014-03-19 Thread Christoph Hellwig 
On Wed, Mar 19, 2014 at 01:22:07PM +0800, Ming Lei wrote:
 exit_request definition is missed.

oops that accidentally went into another commit.

New version below:

---
From: Christoph Hellwig h...@infradead.org
Subject: blk-mq: add a exit_request method

This gives drivers an easy way to free any ressources allocated in
-init_request.

Signed-off-by: Christoph Hellwig h...@lst.de

diff --git a/block/blk-mq.c b/block/blk-mq.c
index c2ce99b..c7e723e 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1000,6 +1000,16 @@ static void blk_mq_free_rq_map(struct blk_mq_hw_ctx 
*hctx)
 {
struct page *page;
 
+   if (hctx-rqs  hctx-queue-mq_ops-exit_request) {
+   int i;
+
+   for (i = 0; i  hctx-queue_depth; i++) {
+   if (!hctx-rqs[i])
+   continue;
+   hctx-queue-mq_ops-exit_request(hctx, hctx-rqs[i]);
+   }
+   }
+
while (!list_empty(hctx-page_list)) {
page = list_first_entry(hctx-page_list, struct page, lru);
list_del_init(page-lru);
@@ -1332,7 +1342,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_reg 
*reg,
}
 
if (blk_mq_init_hw_queues(q, reg, driver_data))
-   goto err_flush_rq;
+   goto err_flush_rq_init;
 
blk_mq_map_swqueue(q);
 
@@ -1342,6 +1352,9 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_reg 
*reg,
 
return q;
 
+err_flush_rq_init:
+   if (reg-ops-exit_request)
+   reg-ops-exit_request(NULL, q-flush_rq);
 err_flush_rq:
kfree(q-flush_rq);
 err_hw:
@@ -1387,6 +1400,9 @@ void blk_mq_free_queue(struct request_queue *q)
mutex_lock(all_q_mutex);
list_del_init(q-all_q_node);
mutex_unlock(all_q_mutex);
+
+   if (q-mq_ops-exit_request)
+   q-mq_ops-exit_request(NULL, q-flush_rq);
 }
 
 /* Basically redo blk_mq_init_queue with queue frozen */
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 4d34957..ff194f8 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -68,6 +68,7 @@ typedef int (init_hctx_fn)(struct blk_mq_hw_ctx *, void *, 
unsigned int);
 typedef void (exit_hctx_fn)(struct blk_mq_hw_ctx *, unsigned int);
 typedef int (init_request_fn)(void *, struct blk_mq_hw_ctx *,
struct request *, unsigned int);
+typedef void (exit_request_fn)(struct blk_mq_hw_ctx *, struct request *);
 
 struct blk_mq_ops {
/*
@@ -104,8 +105,10 @@ struct blk_mq_ops {
/*
 * Called for every command allocated by the block layer to allow
 * the driver to set up driver specific data.
+* Ditto for exit/teardown.
 */
init_request_fn *init_request;
+   exit_request_fn *exit_request;
 };
 
 enum {
--
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 4/4] blk-mq: add a exit_request method

2014-03-18 Thread Ming Lei 
On Mon, Mar 17, 2014 at 9:18 PM, Christoph Hellwig  wrote:
> This gives drivers an easy way to free any resources allocated in
> ->init_request.
>
> Signed-off-by: Christoph Hellwig 
> ---
>  block/blk-mq.c |   18 +-
>  1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index c2ce99b..c7e723e 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -1000,6 +1000,16 @@ static void blk_mq_free_rq_map(struct blk_mq_hw_ctx 
> *hctx)
>  {
> struct page *page;
>
> +   if (hctx->rqs && hctx->queue->mq_ops->exit_request) {

exit_request definition is missed.


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 4/4] blk-mq: add a exit_request method

2014-03-18 Thread Ming Lei 
On Mon, Mar 17, 2014 at 9:18 PM, Christoph Hellwig h...@infradead.org wrote:
 This gives drivers an easy way to free any resources allocated in
 -init_request.

 Signed-off-by: Christoph Hellwig h...@lst.de
 ---
  block/blk-mq.c |   18 +-
  1 file changed, 17 insertions(+), 1 deletion(-)

 diff --git a/block/blk-mq.c b/block/blk-mq.c
 index c2ce99b..c7e723e 100644
 --- a/block/blk-mq.c
 +++ b/block/blk-mq.c
 @@ -1000,6 +1000,16 @@ static void blk_mq_free_rq_map(struct blk_mq_hw_ctx 
 *hctx)
  {
 struct page *page;

 +   if (hctx-rqs  hctx-queue-mq_ops-exit_request) {

exit_request definition is missed.


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/

[PATCH 4/4] blk-mq: add a exit_request method

2014-03-17 Thread Christoph Hellwig 
This gives drivers an easy way to free any resources allocated in
->init_request.

Signed-off-by: Christoph Hellwig 
---
 block/blk-mq.c |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index c2ce99b..c7e723e 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1000,6 +1000,16 @@ static void blk_mq_free_rq_map(struct blk_mq_hw_ctx 
*hctx)
 {
struct page *page;
 
+   if (hctx->rqs && hctx->queue->mq_ops->exit_request) {
+   int i;
+
+   for (i = 0; i < hctx->queue_depth; i++) {
+   if (!hctx->rqs[i])
+   continue;
+   hctx->queue->mq_ops->exit_request(hctx, hctx->rqs[i]);
+   }
+   }
+
while (!list_empty(>page_list)) {
page = list_first_entry(>page_list, struct page, lru);
list_del_init(>lru);
@@ -1332,7 +1342,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_reg 
*reg,
}
 
if (blk_mq_init_hw_queues(q, reg, driver_data))
-   goto err_flush_rq;
+   goto err_flush_rq_init;
 
blk_mq_map_swqueue(q);
 
@@ -1342,6 +1352,9 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_reg 
*reg,
 
return q;
 
+err_flush_rq_init:
+   if (reg->ops->exit_request)
+   reg->ops->exit_request(NULL, q->flush_rq);
 err_flush_rq:
kfree(q->flush_rq);
 err_hw:
@@ -1387,6 +1400,9 @@ void blk_mq_free_queue(struct request_queue *q)
mutex_lock(_q_mutex);
list_del_init(>all_q_node);
mutex_unlock(_q_mutex);
+
+   if (q->mq_ops->exit_request)
+   q->mq_ops->exit_request(NULL, q->flush_rq);
 }
 
 /* Basically redo blk_mq_init_queue with queue frozen */
-- 
1.7.10.4


--
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/

[PATCH 4/4] blk-mq: add a exit_request method

2014-03-17 Thread Christoph Hellwig 
This gives drivers an easy way to free any resources allocated in
-init_request.

Signed-off-by: Christoph Hellwig h...@lst.de
---
 block/blk-mq.c |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index c2ce99b..c7e723e 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1000,6 +1000,16 @@ static void blk_mq_free_rq_map(struct blk_mq_hw_ctx 
*hctx)
 {
struct page *page;
 
+   if (hctx-rqs  hctx-queue-mq_ops-exit_request) {
+   int i;
+
+   for (i = 0; i  hctx-queue_depth; i++) {
+   if (!hctx-rqs[i])
+   continue;
+   hctx-queue-mq_ops-exit_request(hctx, hctx-rqs[i]);
+   }
+   }
+
while (!list_empty(hctx-page_list)) {
page = list_first_entry(hctx-page_list, struct page, lru);
list_del_init(page-lru);
@@ -1332,7 +1342,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_reg 
*reg,
}
 
if (blk_mq_init_hw_queues(q, reg, driver_data))
-   goto err_flush_rq;
+   goto err_flush_rq_init;
 
blk_mq_map_swqueue(q);
 
@@ -1342,6 +1352,9 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_reg 
*reg,
 
return q;
 
+err_flush_rq_init:
+   if (reg-ops-exit_request)
+   reg-ops-exit_request(NULL, q-flush_rq);
 err_flush_rq:
kfree(q-flush_rq);
 err_hw:
@@ -1387,6 +1400,9 @@ void blk_mq_free_queue(struct request_queue *q)
mutex_lock(all_q_mutex);
list_del_init(q-all_q_node);
mutex_unlock(all_q_mutex);
+
+   if (q-mq_ops-exit_request)
+   q-mq_ops-exit_request(NULL, q-flush_rq);
 }
 
 /* Basically redo blk_mq_init_queue with queue frozen */
-- 
1.7.10.4


--
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/