Re: [patch,v2 01/10] scsi: add scsi_host_alloc_node

[Jeff Moyer]

Bart Van Assche bvanass...@acm.org writes:

 On 11/02/12 22:45, Jeff Moyer wrote:
 diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
 index 593085a..7d7ad8b 100644
 --- a/drivers/scsi/hosts.c
 +++ b/drivers/scsi/hosts.c
 @@ -336,16 +336,25 @@ static struct device_type scsi_host_type = {
**/
   struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int 
 privsize)
   {
 +return scsi_host_alloc_node(sht, privsize, -1);

 Using NUMA_NO_NODE here might improve readability.

Agreed, I'll fix that.

 diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
 index 4908480..a1b5c8e 100644
 --- a/include/scsi/scsi_host.h
 +++ b/include/scsi/scsi_host.h
 @@ -733,6 +733,12 @@ struct Scsi_Host {
  struct device *dma_dev;

  /*
 + * Numa node this device is closest to, used for allocating
 + * data structures locally.
 + */
 +int numa_node;

 Have you considered using #ifdef CONFIG_NUMA / #endif here ? I've
 noticed that all other numa_node members in structures under include/
 have this.

That was an oversight, thanks for pointing it out.  I'll fix it up.

Cheers,
Jeff
--
To unsubscribe from this list: send the line unsubscribe linux-scsi in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[patch,v2 01/10] scsi: add scsi_host_alloc_node

[Jeff Moyer]

Allow an LLD to specify on which numa node to allocate scsi data
structures.  Thanks to Bart Van Assche for the suggestion.

Signed-off-by: Jeff Moyer jmo...@redhat.com
---
 drivers/scsi/hosts.c |   13 +++--
 include/scsi/scsi_host.h |8 
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 593085a..7d7ad8b 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -336,16 +336,25 @@ static struct device_type scsi_host_type = {
  **/
 struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
 {
+   return scsi_host_alloc_node(sht, privsize, -1);
+}
+EXPORT_SYMBOL(scsi_host_alloc);
+
+struct Scsi_Host *scsi_host_alloc_node(struct scsi_host_template *sht,
+  int privsize, int node)
+{
struct Scsi_Host *shost;
gfp_t gfp_mask = GFP_KERNEL;
 
if (sht-unchecked_isa_dma  privsize)
gfp_mask |= __GFP_DMA;
 
-   shost = kzalloc(sizeof(struct Scsi_Host) + privsize, gfp_mask);
+   shost = kzalloc_node(sizeof(struct Scsi_Host) + privsize,
+gfp_mask, node);
if (!shost)
return NULL;
 
+   shost-numa_node = node;
shost-host_lock = shost-default_lock;
spin_lock_init(shost-host_lock);
shost-shost_state = SHOST_CREATED;
@@ -443,7 +452,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template 
*sht, int privsize)
kfree(shost);
return NULL;
 }
-EXPORT_SYMBOL(scsi_host_alloc);
+EXPORT_SYMBOL(scsi_host_alloc_node);
 
 struct Scsi_Host *scsi_register(struct scsi_host_template *sht, int privsize)
 {
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 4908480..a1b5c8e 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -733,6 +733,12 @@ struct Scsi_Host {
struct device *dma_dev;
 
/*
+* Numa node this device is closest to, used for allocating
+* data structures locally.
+*/
+   int numa_node;
+
+   /*
 * We should ensure that this is aligned, both for better performance
 * and also because some compilers (m68k) don't automatically force
 * alignment to a long boundary.
@@ -776,6 +782,8 @@ extern int scsi_queue_work(struct Scsi_Host *, struct 
work_struct *);
 extern void scsi_flush_work(struct Scsi_Host *);
 
 extern struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *, int);
+extern struct Scsi_Host *scsi_host_alloc_node(struct scsi_host_template *,
+ int, int);
 extern int __must_check scsi_add_host_with_dma(struct Scsi_Host *,
   struct device *,
   struct device *);
-- 
1.7.1

--
To unsubscribe from this list: send the line unsubscribe linux-scsi in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html