Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1486765

Re: [PATCH 06/14] blk-mq: Fix hardware context data node selection

Show all headers | View raw

On Sun, Sep 18, 2016 at 09:37:16AM +0200, Alexander Gordeev wrote:
> CC: linux-block@vger.kernel.org
> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>

Makes sense.

Reviewed-by: Omar Sandoval <osandov@fb.com>

> ---
>  block/blk-mq.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index a38fd2e..9fbfe31 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -1712,13 +1712,9 @@ static int blk_mq_init_hctx(struct request_queue *q,
>  		struct blk_mq_tag_set *set,
>  		struct blk_mq_hw_ctx *hctx, unsigned hctx_idx)
>  {
> -	int node;
> +	int node = hctx->numa_node;
>  	unsigned flush_start_tag = set->queue_depth;
>  
> -	node = hctx->numa_node;
> -	if (node == NUMA_NO_NODE)
> -		node = hctx->numa_node = set->numa_node;
> -
>  	INIT_WORK(&hctx->run_work, blk_mq_run_work_fn);
>  	INIT_DELAYED_WORK(&hctx->delay_work, blk_mq_delay_work_fn);
>  	spin_lock_init(&hctx->lock);
> @@ -1999,6 +1995,9 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,
>  			break;
>  
>  		node = blk_mq_hw_queue_to_node(q->mq_map, i);
> +		if (node == NUMA_NO_NODE)
> +			node = set->numa_node;
> +
>  		hctxs[i] = kzalloc_node(sizeof(struct blk_mq_hw_ctx),
>  					GFP_KERNEL, node);
>  		if (!hctxs[i])
> -- 
> 1.8.3.1
> 

-- 
Omar

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/14] blk-mq: Minor fixes and cleanups Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:40 +0200
  [PATCH 14/14] blk-mq: Set flush_start_tag to BLK_MQ_MAX_DEPTH Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:40 +0200
  [PATCH 01/14] blk-mq: Fix memory leaks on queue cleanup Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:40 +0200
    Re: [PATCH 01/14] blk-mq: Fix memory leaks on queue cleanup Christoph Hellwig <hch@infradead.org> - 2016-09-19 16:00 +0200
  [PATCH 04/14] blk-mq: Do not limit number of queues to 'nr_cpu_ids' in allocations Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:40 +0200
    Re: [PATCH 04/14] blk-mq: Do not limit number of queues to  'nr_cpu_ids' in allocations Omar Sandoval <osandov@osandov.com> - 2016-09-19 19:50 +0200
      Re: [PATCH 04/14] blk-mq: Do not limit number of queues to  'nr_cpu_ids' in allocations Alexander Gordeev <agordeev@redhat.com> - 2016-09-20 13:40 +0200
        Re: [PATCH 04/14] blk-mq: Do not limit number of queues to  'nr_cpu_ids' in allocations Omar Sandoval <osandov@osandov.com> - 2016-09-20 19:30 +0200
  [PATCH 11/14] blk-mq: Move hardware context init code into single location Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:40 +0200
  [PATCH 02/14] blk-mq: Fix a potential NULL pointer assignment to hctx tags Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:40 +0200
    Re: [PATCH 02/14] blk-mq: Fix a potential NULL pointer assignment to  hctx tags Omar Sandoval <osandov@osandov.com> - 2016-09-19 20:40 +0200
  [PATCH 03/14] block: Get rid of unused request_queue::nr_queues member Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:40 +0200
    Re: [PATCH 03/14] block: Get rid of unused request_queue::nr_queues  member Omar Sandoval <osandov@osandov.com> - 2016-09-19 20:40 +0200
  [PATCH 05/14] blk-mq: Remove a redundant assignment Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:50 +0200
    Re: [PATCH 05/14] blk-mq: Remove a redundant assignment Omar Sandoval <osandov@osandov.com> - 2016-09-19 20:40 +0200
  [PATCH 07/14] blk-mq: Cleanup a loop exit condition Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:50 +0200
    Re: [PATCH 07/14] blk-mq: Cleanup a loop exit condition Omar Sandoval <osandov@osandov.com> - 2016-09-19 21:10 +0200
      Re: [PATCH 07/14] blk-mq: Cleanup a loop exit condition Alexander Gordeev <agordeev@redhat.com> - 2016-09-20 13:30 +0200
  [PATCH 08/14] blk-mq: Get rid of unnecessary blk_mq_free_hw_queues() Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:50 +0200
  [PATCH 09/14] blk-mq: Move duplicating code to blk_mq_exit_hctx() Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:50 +0200
    Re: [PATCH 09/14] blk-mq: Move duplicating code to blk_mq_exit_hctx() Omar Sandoval <osandov@osandov.com> - 2016-09-19 20:00 +0200
  [PATCH 12/14] blk-mq: Rework blk_mq_init_hctx() function Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:50 +0200
  [PATCH 06/14] blk-mq: Fix hardware context data node selection Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:50 +0200
    Re: [PATCH 06/14] blk-mq: Fix hardware context data node selection Omar Sandoval <osandov@osandov.com> - 2016-09-19 21:00 +0200
  [PATCH 13/14] blk-mq: Pair blk_mq_hctx_kobj_init() with blk_mq_hctx_kobj_put() Alexander Gordeev <agordeev@redhat.com> - 2016-09-18 09:50 +0200

csiph-web