mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-14 21:01:29 +00:00
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block: [PATCH] elevator: elv_list_lock does not need irq disabling [BLOCK] Don't pin lots of memory in mempools cfq-iosched: speedup cic rb lookup ll_rw_blk: add io_context private pointer cfq-iosched: get rid of cfqq hash cfq-iosched: tighten queue request overlap condition cfq-iosched: improve sync vs async workloads cfq-iosched: never allow an async queue idling cfq-iosched: get rid of ->dispatch_slice cfq-iosched: don't pass unused preemption variable around cfq-iosched: get rid of ->cur_rr and ->cfq_list cfq-iosched: slice offset should take ioprio into account [PATCH] cfq-iosched: style cleanups and comments cfq-iosched: sort IDLE queues into the rbtree cfq-iosched: sort RT queues into the rbtree [PATCH] cfq-iosched: speed up rbtree handling cfq-iosched: rework the whole round-robin list concept cfq-iosched: minor updates cfq-iosched: development update cfq-iosched: improve preemption for cooperating tasks
This commit is contained in:
commit
cd9bb7e736
File diff suppressed because it is too large
Load Diff
@ -134,13 +134,13 @@ static struct elevator_type *elevator_get(const char *name)
|
||||
{
|
||||
struct elevator_type *e;
|
||||
|
||||
spin_lock_irq(&elv_list_lock);
|
||||
spin_lock(&elv_list_lock);
|
||||
|
||||
e = elevator_find(name);
|
||||
if (e && !try_module_get(e->elevator_owner))
|
||||
e = NULL;
|
||||
|
||||
spin_unlock_irq(&elv_list_lock);
|
||||
spin_unlock(&elv_list_lock);
|
||||
|
||||
return e;
|
||||
}
|
||||
@ -965,10 +965,11 @@ void elv_unregister_queue(struct request_queue *q)
|
||||
int elv_register(struct elevator_type *e)
|
||||
{
|
||||
char *def = "";
|
||||
spin_lock_irq(&elv_list_lock);
|
||||
|
||||
spin_lock(&elv_list_lock);
|
||||
BUG_ON(elevator_find(e->elevator_name));
|
||||
list_add_tail(&e->list, &elv_list);
|
||||
spin_unlock_irq(&elv_list_lock);
|
||||
spin_unlock(&elv_list_lock);
|
||||
|
||||
if (!strcmp(e->elevator_name, chosen_elevator) ||
|
||||
(!*chosen_elevator &&
|
||||
@ -998,9 +999,9 @@ void elv_unregister(struct elevator_type *e)
|
||||
read_unlock(&tasklist_lock);
|
||||
}
|
||||
|
||||
spin_lock_irq(&elv_list_lock);
|
||||
spin_lock(&elv_list_lock);
|
||||
list_del_init(&e->list);
|
||||
spin_unlock_irq(&elv_list_lock);
|
||||
spin_unlock(&elv_list_lock);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(elv_unregister);
|
||||
|
||||
@ -1118,7 +1119,7 @@ ssize_t elv_iosched_show(request_queue_t *q, char *name)
|
||||
struct list_head *entry;
|
||||
int len = 0;
|
||||
|
||||
spin_lock_irq(&elv_list_lock);
|
||||
spin_lock(&elv_list_lock);
|
||||
list_for_each(entry, &elv_list) {
|
||||
struct elevator_type *__e;
|
||||
|
||||
@ -1128,7 +1129,7 @@ ssize_t elv_iosched_show(request_queue_t *q, char *name)
|
||||
else
|
||||
len += sprintf(name+len, "%s ", __e->elevator_name);
|
||||
}
|
||||
spin_unlock_irq(&elv_list_lock);
|
||||
spin_unlock(&elv_list_lock);
|
||||
|
||||
len += sprintf(len+name, "\n");
|
||||
return len;
|
||||
|
@ -3741,6 +3741,7 @@ static struct io_context *current_io_context(gfp_t gfp_flags, int node)
|
||||
ret->nr_batch_requests = 0; /* because this is 0 */
|
||||
ret->aic = NULL;
|
||||
ret->cic_root.rb_node = NULL;
|
||||
ret->ioc_data = NULL;
|
||||
/* make sure set_task_ioprio() sees the settings above */
|
||||
smp_wmb();
|
||||
tsk->io_context = ret;
|
||||
|
@ -867,7 +867,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
|
||||
goto bad4;
|
||||
}
|
||||
|
||||
cc->bs = bioset_create(MIN_IOS, MIN_IOS, 4);
|
||||
cc->bs = bioset_create(MIN_IOS, MIN_IOS);
|
||||
if (!cc->bs) {
|
||||
ti->error = "Cannot allocate crypt bioset";
|
||||
goto bad_bs;
|
||||
|
@ -60,7 +60,7 @@ static int resize_pool(unsigned int new_ios)
|
||||
if (!_io_pool)
|
||||
return -ENOMEM;
|
||||
|
||||
_bios = bioset_create(16, 16, 4);
|
||||
_bios = bioset_create(16, 16);
|
||||
if (!_bios) {
|
||||
mempool_destroy(_io_pool);
|
||||
_io_pool = NULL;
|
||||
|
@ -1012,7 +1012,7 @@ static struct mapped_device *alloc_dev(int minor)
|
||||
if (!md->tio_pool)
|
||||
goto bad3;
|
||||
|
||||
md->bs = bioset_create(16, 16, 4);
|
||||
md->bs = bioset_create(16, 16);
|
||||
if (!md->bs)
|
||||
goto bad_no_bioset;
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
|
||||
#define SG_MEMPOOL_NR ARRAY_SIZE(scsi_sg_pools)
|
||||
#define SG_MEMPOOL_SIZE 32
|
||||
#define SG_MEMPOOL_SIZE 2
|
||||
|
||||
struct scsi_host_sg_pool {
|
||||
size_t size;
|
||||
|
41
fs/bio.c
41
fs/bio.c
@ -28,7 +28,7 @@
|
||||
#include <linux/blktrace_api.h>
|
||||
#include <scsi/sg.h> /* for struct sg_iovec */
|
||||
|
||||
#define BIO_POOL_SIZE 256
|
||||
#define BIO_POOL_SIZE 2
|
||||
|
||||
static struct kmem_cache *bio_slab __read_mostly;
|
||||
|
||||
@ -38,7 +38,7 @@ static struct kmem_cache *bio_slab __read_mostly;
|
||||
* a small number of entries is fine, not going to be performance critical.
|
||||
* basically we just need to survive
|
||||
*/
|
||||
#define BIO_SPLIT_ENTRIES 8
|
||||
#define BIO_SPLIT_ENTRIES 2
|
||||
mempool_t *bio_split_pool __read_mostly;
|
||||
|
||||
struct biovec_slab {
|
||||
@ -1120,7 +1120,7 @@ struct bio_pair *bio_split(struct bio *bi, mempool_t *pool, int first_sectors)
|
||||
* create memory pools for biovec's in a bio_set.
|
||||
* use the global biovec slabs created for general use.
|
||||
*/
|
||||
static int biovec_create_pools(struct bio_set *bs, int pool_entries, int scale)
|
||||
static int biovec_create_pools(struct bio_set *bs, int pool_entries)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -1128,9 +1128,6 @@ static int biovec_create_pools(struct bio_set *bs, int pool_entries, int scale)
|
||||
struct biovec_slab *bp = bvec_slabs + i;
|
||||
mempool_t **bvp = bs->bvec_pools + i;
|
||||
|
||||
if (pool_entries > 1 && i >= scale)
|
||||
pool_entries >>= 1;
|
||||
|
||||
*bvp = mempool_create_slab_pool(pool_entries, bp->slab);
|
||||
if (!*bvp)
|
||||
return -ENOMEM;
|
||||
@ -1161,7 +1158,7 @@ void bioset_free(struct bio_set *bs)
|
||||
kfree(bs);
|
||||
}
|
||||
|
||||
struct bio_set *bioset_create(int bio_pool_size, int bvec_pool_size, int scale)
|
||||
struct bio_set *bioset_create(int bio_pool_size, int bvec_pool_size)
|
||||
{
|
||||
struct bio_set *bs = kzalloc(sizeof(*bs), GFP_KERNEL);
|
||||
|
||||
@ -1172,7 +1169,7 @@ struct bio_set *bioset_create(int bio_pool_size, int bvec_pool_size, int scale)
|
||||
if (!bs->bio_pool)
|
||||
goto bad;
|
||||
|
||||
if (!biovec_create_pools(bs, bvec_pool_size, scale))
|
||||
if (!biovec_create_pools(bs, bvec_pool_size))
|
||||
return bs;
|
||||
|
||||
bad:
|
||||
@ -1196,38 +1193,12 @@ static void __init biovec_init_slabs(void)
|
||||
|
||||
static int __init init_bio(void)
|
||||
{
|
||||
int megabytes, bvec_pool_entries;
|
||||
int scale = BIOVEC_NR_POOLS;
|
||||
|
||||
bio_slab = kmem_cache_create("bio", sizeof(struct bio), 0,
|
||||
SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
|
||||
|
||||
biovec_init_slabs();
|
||||
|
||||
megabytes = nr_free_pages() >> (20 - PAGE_SHIFT);
|
||||
|
||||
/*
|
||||
* find out where to start scaling
|
||||
*/
|
||||
if (megabytes <= 16)
|
||||
scale = 0;
|
||||
else if (megabytes <= 32)
|
||||
scale = 1;
|
||||
else if (megabytes <= 64)
|
||||
scale = 2;
|
||||
else if (megabytes <= 96)
|
||||
scale = 3;
|
||||
else if (megabytes <= 128)
|
||||
scale = 4;
|
||||
|
||||
/*
|
||||
* Limit number of entries reserved -- mempools are only used when
|
||||
* the system is completely unable to allocate memory, so we only
|
||||
* need enough to make progress.
|
||||
*/
|
||||
bvec_pool_entries = 1 + scale;
|
||||
|
||||
fs_bio_set = bioset_create(BIO_POOL_SIZE, bvec_pool_entries, scale);
|
||||
fs_bio_set = bioset_create(BIO_POOL_SIZE, 2);
|
||||
if (!fs_bio_set)
|
||||
panic("bio: can't allocate bios\n");
|
||||
|
||||
|
@ -276,7 +276,7 @@ extern struct bio_pair *bio_split(struct bio *bi, mempool_t *pool,
|
||||
extern mempool_t *bio_split_pool;
|
||||
extern void bio_pair_release(struct bio_pair *dbio);
|
||||
|
||||
extern struct bio_set *bioset_create(int, int, int);
|
||||
extern struct bio_set *bioset_create(int, int);
|
||||
extern void bioset_free(struct bio_set *);
|
||||
|
||||
extern struct bio *bio_alloc(gfp_t, int);
|
||||
|
@ -116,6 +116,7 @@ struct io_context {
|
||||
|
||||
struct as_io_context *aic;
|
||||
struct rb_root cic_root;
|
||||
void *ioc_data;
|
||||
};
|
||||
|
||||
void put_io_context(struct io_context *ioc);
|
||||
|
Loading…
Reference in New Issue
Block a user