Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1946089a authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] NUMA aware block device control structure allocation 



Patch to allocate the control structures for for ide devices on the node of
the device itself (for NUMA systems).  The patch depends on the Slab API
change patch by Manfred and me (in mm) and the pcidev_to_node patch that I
posted today.

Does some realignment too.

Signed-off-by: default avatarJustin M. Forbes <jmforbes@linuxtx.org>
Signed-off-by: default avatarChristoph Lameter <christoph@lameter.com>
Signed-off-by: default avatarPravin Shelar <pravin@calsoftinc.com>
Signed-off-by: default avatarShobhit Dayal <shobhit@calsoftinc.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8c5a0908

drivers/block/as-iosched.c

+5 −3
Original line number Diff line number Diff line
@@ -1871,20 +1871,22 @@ static int as_init_queue(request_queue_t *q, elevator_t *e) 
	if (!arq_pool)

		return -ENOMEM;



	ad = kmalloc(sizeof(*ad), GFP_KERNEL);

	ad = kmalloc_node(sizeof(*ad), GFP_KERNEL, q->node);

	if (!ad)

		return -ENOMEM;

	memset(ad, 0, sizeof(*ad));



	ad->q = q; /* Identify what queue the data belongs to */



	ad->hash = kmalloc(sizeof(struct list_head)*AS_HASH_ENTRIES,GFP_KERNEL);

	ad->hash = kmalloc_node(sizeof(struct list_head)*AS_HASH_ENTRIES,

				GFP_KERNEL, q->node);

	if (!ad->hash) {

		kfree(ad);

		return -ENOMEM;

	}



	ad->arq_pool = mempool_create(BLKDEV_MIN_RQ, mempool_alloc_slab, mempool_free_slab, arq_pool);

	ad->arq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab,

				mempool_free_slab, arq_pool, q->node);

	if (!ad->arq_pool) {

		kfree(ad->hash);

		kfree(ad);

drivers/block/deadline-iosched.c

+5 −3
Original line number Diff line number Diff line
@@ -711,18 +711,20 @@ static int deadline_init_queue(request_queue_t *q, elevator_t *e) 
	if (!drq_pool)

		return -ENOMEM;



	dd = kmalloc(sizeof(*dd), GFP_KERNEL);

	dd = kmalloc_node(sizeof(*dd), GFP_KERNEL, q->node);

	if (!dd)

		return -ENOMEM;

	memset(dd, 0, sizeof(*dd));



	dd->hash = kmalloc(sizeof(struct list_head)*DL_HASH_ENTRIES,GFP_KERNEL);

	dd->hash = kmalloc_node(sizeof(struct list_head)*DL_HASH_ENTRIES,

				GFP_KERNEL, q->node);

	if (!dd->hash) {

		kfree(dd);

		return -ENOMEM;

	}



	dd->drq_pool = mempool_create(BLKDEV_MIN_RQ, mempool_alloc_slab, mempool_free_slab, drq_pool);

	dd->drq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab,

					mempool_free_slab, drq_pool, q->node);

	if (!dd->drq_pool) {

		kfree(dd->hash);

		kfree(dd);

drivers/block/genhd.c

+10 −3
Original line number Diff line number Diff line
@@ -582,10 +582,16 @@ struct seq_operations diskstats_op = { 
	.show	= diskstats_show

};





struct gendisk *alloc_disk(int minors)

{

	struct gendisk *disk = kmalloc(sizeof(struct gendisk), GFP_KERNEL);

	return alloc_disk_node(minors, -1);

}



struct gendisk *alloc_disk_node(int minors, int node_id)

{

	struct gendisk *disk;



	disk = kmalloc_node(sizeof(struct gendisk), GFP_KERNEL, node_id);

	if (disk) {

		memset(disk, 0, sizeof(struct gendisk));

		if (!init_disk_stats(disk)) {
@@ -594,7 +600,7 @@ struct gendisk *alloc_disk(int minors) 
		}

		if (minors > 1) {

			int size = (minors - 1) * sizeof(struct hd_struct *);

			disk->part = kmalloc(size, GFP_KERNEL);

			disk->part = kmalloc_node(size, GFP_KERNEL, node_id);

			if (!disk->part) {

				kfree(disk);

				return NULL;
@@ -610,6 +616,7 @@ struct gendisk *alloc_disk(int minors) 
}



EXPORT_SYMBOL(alloc_disk);

EXPORT_SYMBOL(alloc_disk_node);



struct kobject *get_disk(struct gendisk *disk)

{

drivers/block/ll_rw_blk.c

+23 −7
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/slab.h>

#include <linux/swap.h>

#include <linux/writeback.h>

#include <linux/blkdev.h>



/*

 * for max sense size
@@ -1645,7 +1646,8 @@ static int blk_init_free_list(request_queue_t *q) 
	init_waitqueue_head(&rl->wait[WRITE]);

	init_waitqueue_head(&rl->drain);



	rl->rq_pool = mempool_create(BLKDEV_MIN_RQ, mempool_alloc_slab, mempool_free_slab, request_cachep);

	rl->rq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab,

				mempool_free_slab, request_cachep, q->node);



	if (!rl->rq_pool)

		return -ENOMEM;
@@ -1657,8 +1659,15 @@ static int __make_request(request_queue_t *, struct bio *); 


request_queue_t *blk_alloc_queue(int gfp_mask)

{

	request_queue_t *q = kmem_cache_alloc(requestq_cachep, gfp_mask);

	return blk_alloc_queue_node(gfp_mask, -1);

}

EXPORT_SYMBOL(blk_alloc_queue);



request_queue_t *blk_alloc_queue_node(int gfp_mask, int node_id)

{

	request_queue_t *q;



	q = kmem_cache_alloc_node(requestq_cachep, gfp_mask, node_id);

	if (!q)

		return NULL;
@@ -1671,8 +1680,7 @@ request_queue_t *blk_alloc_queue(int gfp_mask) 


	return q;

}



EXPORT_SYMBOL(blk_alloc_queue);

EXPORT_SYMBOL(blk_alloc_queue_node);



/**

 * blk_init_queue  - prepare a request queue for use with a block device
@@ -1705,13 +1713,22 @@ EXPORT_SYMBOL(blk_alloc_queue); 
 *    blk_init_queue() must be paired with a blk_cleanup_queue() call

 *    when the block device is deactivated (such as at module unload).

 **/



request_queue_t *blk_init_queue(request_fn_proc *rfn, spinlock_t *lock)

{

	request_queue_t *q = blk_alloc_queue(GFP_KERNEL);

	return blk_init_queue_node(rfn, lock, -1);

}

EXPORT_SYMBOL(blk_init_queue);



request_queue_t *

blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)

{

	request_queue_t *q = blk_alloc_queue_node(GFP_KERNEL, node_id);



	if (!q)

		return NULL;



	q->node = node_id;

	if (blk_init_free_list(q))

		goto out_init;
@@ -1754,8 +1771,7 @@ out_init: 
	kmem_cache_free(requestq_cachep, q);

	return NULL;

}



EXPORT_SYMBOL(blk_init_queue);

EXPORT_SYMBOL(blk_init_queue_node);



int blk_get_queue(request_queue_t *q)

{

drivers/ide/ide-disk.c

+2 −1
Original line number Diff line number Diff line
@@ -1215,7 +1215,8 @@ static int ide_disk_probe(struct device *dev) 
	if (!idkp)

		goto failed;



	g = alloc_disk(1 << PARTN_BITS);

	g = alloc_disk_node(1 << PARTN_BITS,

			pcibus_to_node(drive->hwif->pci_dev->bus));

	if (!g)

		goto out_free_idkp;