Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755572Ab2KITSk (ORCPT ); Fri, 9 Nov 2012 14:18:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45612 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755337Ab2KITS2 (ORCPT ); Fri, 9 Nov 2012 14:18:28 -0500 From: Jeff Moyer To: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Bart Van Assche , "James E.J. Bottomley" Subject: [patch,v3 04/10] scsi: allocate scsi_cmnd-s from the device's local numa node Date: Fri, 9 Nov 2012 14:18:01 -0500 Message-Id: <1352488687-19935-5-git-send-email-jmoyer@redhat.com> In-Reply-To: <1352488687-19935-1-git-send-email-jmoyer@redhat.com> References: <1352488687-19935-1-git-send-email-jmoyer@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1916 Lines: 61 Signed-off-by: Jeff Moyer --- drivers/scsi/scsi.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 2936b44..1750702 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -173,16 +173,19 @@ static DEFINE_MUTEX(host_cmd_pool_mutex); * NULL on failure */ static struct scsi_cmnd * -scsi_pool_alloc_command(struct scsi_host_cmd_pool *pool, gfp_t gfp_mask) +scsi_pool_alloc_command(struct scsi_host_cmd_pool *pool, gfp_t gfp_mask, + int node) { struct scsi_cmnd *cmd; - cmd = kmem_cache_zalloc(pool->cmd_slab, gfp_mask | pool->gfp_mask); + cmd = kmem_cache_alloc_node(pool->cmd_slab, + gfp_mask | pool->gfp_mask | __GFP_ZERO, + node); if (!cmd) return NULL; - cmd->sense_buffer = kmem_cache_alloc(pool->sense_slab, - gfp_mask | pool->gfp_mask); + cmd->sense_buffer = kmem_cache_alloc_node(pool->sense_slab, + gfp_mask | pool->gfp_mask, node); if (!cmd->sense_buffer) { kmem_cache_free(pool->cmd_slab, cmd); return NULL; @@ -223,7 +226,8 @@ scsi_host_alloc_command(struct Scsi_Host *shost, gfp_t gfp_mask) { struct scsi_cmnd *cmd; - cmd = scsi_pool_alloc_command(shost->cmd_pool, gfp_mask); + cmd = scsi_pool_alloc_command(shost->cmd_pool, gfp_mask, + scsi_host_get_numa_node(shost)); if (!cmd) return NULL; @@ -435,7 +439,7 @@ struct scsi_cmnd *scsi_allocate_command(gfp_t gfp_mask) if (!pool) return NULL; - return scsi_pool_alloc_command(pool, gfp_mask); + return scsi_pool_alloc_command(pool, gfp_mask, NUMA_NO_NODE); } EXPORT_SYMBOL(scsi_allocate_command); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/