microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

crush: remove mutable part of CRUSH map 

Then add it to the working state. It would be very nice if we didn't
have to take a lock to calculate a crush placement. By moving the
permutation array into the working data, we can treat the CRUSH map as
immutable.

Reflects ceph.git commit cbcd039651c0569551cb90d26ce27e1432671f2a.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2017-01-31 15:55:06 +01:00
Родитель 1b6a78b5b9
Коммит 66a0e2d579
6 изменённых файлов: 218 добавлений и 86 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
include/linux/ceph/osdmap.h
Просмотреть файл

@ -175,6 +175,7 @@ struct ceph_osdmap {
struct mutex crush_scratch_mutex; struct mutex crush_scratch_mutex;
int crush_scratch_ary[CEPH_PG_MAX_SIZE * 3]; int crush_scratch_ary[CEPH_PG_MAX_SIZE * 3];
void *crush_workspace;
}; };
static inline bool ceph_osd_exists(struct ceph_osdmap *map, int osd) static inline bool ceph_osd_exists(struct ceph_osdmap *map, int osd)

41
include/linux/crush/crush.h
Просмотреть файл

@ -135,13 +135,6 @@ struct crush_bucket {
__u32 size; /* num items */ __u32 size; /* num items */
__s32 *items; __s32 *items;
/*
* cached random permutation: used for uniform bucket and for
* the linear search fallback for the other bucket types.
*/
__u32 perm_x; /* @x for which *perm is defined */
__u32 perm_n; /* num elements of *perm that are permuted/defined */
__u32 *perm;
}; };
struct crush_bucket_uniform { struct crush_bucket_uniform {
@ -211,6 +204,21 @@ struct crush_map {
* device fails. */ * device fails. */
__u8 chooseleaf_stable; __u8 chooseleaf_stable;
/*
* This value is calculated after decode or construction by
* the builder. It is exposed here (rather than having a
* 'build CRUSH working space' function) so that callers can
* reserve a static buffer, allocate space on the stack, or
* otherwise avoid calling into the heap allocator if they
* want to. The size of the working space depends on the map,
* while the size of the scratch vector passed to the mapper
* depends on the size of the desired result set.
*
* Nothing stops the caller from allocating both in one swell
* foop and passing in two points, though.
*/
size_t working_size;
#ifndef __KERNEL__ #ifndef __KERNEL__
/* /*
* version 0 (original) of straw_calc has various flaws. version 1 * version 0 (original) of straw_calc has various flaws. version 1
@ -248,4 +256,23 @@ static inline int crush_calc_tree_node(int i)
return ((i+1) << 1)-1; return ((i+1) << 1)-1;
} }
/*
* These data structures are private to the CRUSH implementation. They
* are exposed in this header file because builder needs their
* definitions to calculate the total working size.
*
* Moving this out of the crush map allow us to treat the CRUSH map as
* immutable within the mapper and removes the requirement for a CRUSH
* map lock.
*/
struct crush_work_bucket {
__u32 perm_x; /* @x for which *perm is defined */
__u32 perm_n; /* num elements of *perm that are permuted/defined */
__u32 *perm; /* Permutation of the bucket's items */
};
struct crush_work {
struct crush_work_bucket **work; /* Per-bucket working store */
};
#endif #endif

4
include/linux/crush/mapper.h
Просмотреть файл

@ -15,6 +15,8 @@ extern int crush_do_rule(const struct crush_map *map,
int ruleno, int ruleno,
int x, int *result, int result_max, int x, int *result, int result_max,
const __u32 *weights, int weight_max, const __u32 *weights, int weight_max,
int *scratch); void *cwin, int *scratch);
void crush_init_workspace(const struct crush_map *map, void *v);
#endif #endif

5
net/ceph/crush/crush.c
Просмотреть файл

@ -45,7 +45,6 @@ int crush_get_bucket_item_weight(const struct crush_bucket *b, int p)
void crush_destroy_bucket_uniform(struct crush_bucket_uniform *b) void crush_destroy_bucket_uniform(struct crush_bucket_uniform *b)
{ {
kfree(b->h.perm);
kfree(b->h.items); kfree(b->h.items);
kfree(b); kfree(b);
} }
@ -54,14 +53,12 @@ void crush_destroy_bucket_list(struct crush_bucket_list *b)
{ {
kfree(b->item_weights); kfree(b->item_weights);
kfree(b->sum_weights); kfree(b->sum_weights);
kfree(b->h.perm);
kfree(b->h.items); kfree(b->h.items);
kfree(b); kfree(b);
} }
void crush_destroy_bucket_tree(struct crush_bucket_tree *b) void crush_destroy_bucket_tree(struct crush_bucket_tree *b)
{ {
kfree(b->h.perm);
kfree(b->h.items); kfree(b->h.items);
kfree(b->node_weights); kfree(b->node_weights);
kfree(b); kfree(b);
@ -71,7 +68,6 @@ void crush_destroy_bucket_straw(struct crush_bucket_straw *b)
{ {
kfree(b->straws); kfree(b->straws);
kfree(b->item_weights); kfree(b->item_weights);
kfree(b->h.perm);
kfree(b->h.items); kfree(b->h.items);
kfree(b); kfree(b);
} }
@ -79,7 +75,6 @@ void crush_destroy_bucket_straw(struct crush_bucket_straw *b)
void crush_destroy_bucket_straw2(struct crush_bucket_straw2 *b) void crush_destroy_bucket_straw2(struct crush_bucket_straw2 *b)
{ {
kfree(b->item_weights); kfree(b->item_weights);
kfree(b->h.perm);
kfree(b->h.items); kfree(b->h.items);
kfree(b); kfree(b);
} }

206
net/ceph/crush/mapper.c
Просмотреть файл

@ -54,7 +54,6 @@ int crush_find_rule(const struct crush_map *map, int ruleset, int type, int size
return -1; return -1;
} }
/* /*
* bucket choose methods * bucket choose methods
* *
@ -72,59 +71,60 @@ int crush_find_rule(const struct crush_map *map, int ruleset, int type, int size
* Since this is expensive, we optimize for the r=0 case, which * Since this is expensive, we optimize for the r=0 case, which
* captures the vast majority of calls. * captures the vast majority of calls.
*/ */
static int bucket_perm_choose(struct crush_bucket *bucket, static int bucket_perm_choose(const struct crush_bucket *bucket,
struct crush_work_bucket *work,
int x, int r) int x, int r)
{ {
unsigned int pr = r % bucket->size; unsigned int pr = r % bucket->size;
unsigned int i, s; unsigned int i, s;
/* start a new permutation if @x has changed */ /* start a new permutation if @x has changed */
if (bucket->perm_x != (__u32)x || bucket->perm_n == 0) { if (work->perm_x != (__u32)x || work->perm_n == 0) {
dprintk("bucket %d new x=%d\n", bucket->id, x); dprintk("bucket %d new x=%d\n", bucket->id, x);
bucket->perm_x = x; work->perm_x = x;
/* optimize common r=0 case */ /* optimize common r=0 case */
if (pr == 0) { if (pr == 0) {
s = crush_hash32_3(bucket->hash, x, bucket->id, 0) % s = crush_hash32_3(bucket->hash, x, bucket->id, 0) %
bucket->size; bucket->size;
bucket->perm[0] = s; work->perm[0] = s;
bucket->perm_n = 0xffff; /* magic value, see below */ work->perm_n = 0xffff; /* magic value, see below */
goto out; goto out;
} }
for (i = 0; i < bucket->size; i++) for (i = 0; i < bucket->size; i++)
bucket->perm[i] = i; work->perm[i] = i;
bucket->perm_n = 0; work->perm_n = 0;
} else if (bucket->perm_n == 0xffff) { } else if (work->perm_n == 0xffff) {
/* clean up after the r=0 case above */ /* clean up after the r=0 case above */
for (i = 1; i < bucket->size; i++) for (i = 1; i < bucket->size; i++)
bucket->perm[i] = i; work->perm[i] = i;
bucket->perm[bucket->perm[0]] = 0; work->perm[work->perm[0]] = 0;
bucket->perm_n = 1; work->perm_n = 1;
} }
/* calculate permutation up to pr */ /* calculate permutation up to pr */
for (i = 0; i < bucket->perm_n; i++) for (i = 0; i < work->perm_n; i++)
dprintk(" perm_choose have %d: %d\n", i, bucket->perm[i]); dprintk(" perm_choose have %d: %d\n", i, bucket->perm[i]);
while (bucket->perm_n <= pr) { while (work->perm_n <= pr) {
unsigned int p = bucket->perm_n; unsigned int p = work->perm_n;
/* no point in swapping the final entry */ /* no point in swapping the final entry */
if (p < bucket->size - 1) { if (p < bucket->size - 1) {
i = crush_hash32_3(bucket->hash, x, bucket->id, p) % i = crush_hash32_3(bucket->hash, x, bucket->id, p) %
(bucket->size - p); (bucket->size - p);
if (i) { if (i) {
unsigned int t = bucket->perm[p + i]; unsigned int t = work->perm[p + i];
bucket->perm[p + i] = bucket->perm[p]; work->perm[p + i] = work->perm[p];
bucket->perm[p] = t; work->perm[p] = t;
} }
dprintk(" perm_choose swap %d with %d\n", p, p+i); dprintk(" perm_choose swap %d with %d\n", p, p+i);
} }
bucket->perm_n++; work->perm_n++;
} }
for (i = 0; i < bucket->size; i++) for (i = 0; i < bucket->size; i++)
dprintk(" perm_choose %d: %d\n", i, bucket->perm[i]); dprintk(" perm_choose %d: %d\n", i, bucket->perm[i]);
s = bucket->perm[pr]; s = work->perm[pr];
out: out:
dprintk(" perm_choose %d sz=%d x=%d r=%d (%d) s=%d\n", bucket->id, dprintk(" perm_choose %d sz=%d x=%d r=%d (%d) s=%d\n", bucket->id,
bucket->size, x, r, pr, s); bucket->size, x, r, pr, s);
@ -132,14 +132,14 @@ out:
} }
/* uniform */ /* uniform */
static int bucket_uniform_choose(struct crush_bucket_uniform *bucket, static int bucket_uniform_choose(const struct crush_bucket_uniform *bucket,
int x, int r) struct crush_work_bucket *work, int x, int r)
{ {
return bucket_perm_choose(&bucket->h, x, r); return bucket_perm_choose(&bucket->h, work, x, r);
} }
/* list */ /* list */
static int bucket_list_choose(struct crush_bucket_list *bucket, static int bucket_list_choose(const struct crush_bucket_list *bucket,
int x, int r) int x, int r)
{ {
int i; int i;
@ -155,8 +155,9 @@ static int bucket_list_choose(struct crush_bucket_list *bucket,
w *= bucket->sum_weights[i]; w *= bucket->sum_weights[i];
w = w >> 16; w = w >> 16;
/*dprintk(" scaled %llx\n", w);*/ /*dprintk(" scaled %llx\n", w);*/
if (w < bucket->item_weights[i]) if (w < bucket->item_weights[i]) {
return bucket->h.items[i]; return bucket->h.items[i];
}
} }
dprintk("bad list sums for bucket %d\n", bucket->h.id); dprintk("bad list sums for bucket %d\n", bucket->h.id);
@ -192,7 +193,7 @@ static int terminal(int x)
return x & 1; return x & 1;
} }
static int bucket_tree_choose(struct crush_bucket_tree *bucket, static int bucket_tree_choose(const struct crush_bucket_tree *bucket,
int x, int r) int x, int r)
{ {
int n; int n;
@ -224,7 +225,7 @@ static int bucket_tree_choose(struct crush_bucket_tree *bucket,
/* straw */ /* straw */
static int bucket_straw_choose(struct crush_bucket_straw *bucket, static int bucket_straw_choose(const struct crush_bucket_straw *bucket,
int x, int r) int x, int r)
{ {
__u32 i; __u32 i;
@ -301,7 +302,7 @@ static __u64 crush_ln(unsigned int xin)
* *
*/ */
static int bucket_straw2_choose(struct crush_bucket_straw2 *bucket, static int bucket_straw2_choose(const struct crush_bucket_straw2 *bucket,
int x, int r) int x, int r)
{ {
unsigned int i, high = 0; unsigned int i, high = 0;
@ -344,37 +345,42 @@ static int bucket_straw2_choose(struct crush_bucket_straw2 *bucket,
high_draw = draw; high_draw = draw;
} }
} }
return bucket->h.items[high]; return bucket->h.items[high];
} }
static int crush_bucket_choose(struct crush_bucket *in, int x, int r) static int crush_bucket_choose(const struct crush_bucket *in,
struct crush_work_bucket *work,
int x, int r)
{ {
dprintk(" crush_bucket_choose %d x=%d r=%d\n", in->id, x, r); dprintk(" crush_bucket_choose %d x=%d r=%d\n", in->id, x, r);
BUG_ON(in->size == 0); BUG_ON(in->size == 0);
switch (in->alg) { switch (in->alg) {
case CRUSH_BUCKET_UNIFORM: case CRUSH_BUCKET_UNIFORM:
return bucket_uniform_choose((struct crush_bucket_uniform *)in, return bucket_uniform_choose(
x, r); (const struct crush_bucket_uniform *)in,
work, x, r);
case CRUSH_BUCKET_LIST: case CRUSH_BUCKET_LIST:
return bucket_list_choose((struct crush_bucket_list *)in, return bucket_list_choose((const struct crush_bucket_list *)in,
x, r); x, r);
case CRUSH_BUCKET_TREE: case CRUSH_BUCKET_TREE:
return bucket_tree_choose((struct crush_bucket_tree *)in, return bucket_tree_choose((const struct crush_bucket_tree *)in,
x, r); x, r);
case CRUSH_BUCKET_STRAW: case CRUSH_BUCKET_STRAW:
return bucket_straw_choose((struct crush_bucket_straw *)in, return bucket_straw_choose(
x, r); (const struct crush_bucket_straw *)in,
x, r);
case CRUSH_BUCKET_STRAW2: case CRUSH_BUCKET_STRAW2:
return bucket_straw2_choose((struct crush_bucket_straw2 *)in, return bucket_straw2_choose(
x, r); (const struct crush_bucket_straw2 *)in,
x, r);
default: default:
dprintk("unknown bucket %d alg %d\n", in->id, in->alg); dprintk("unknown bucket %d alg %d\n", in->id, in->alg);
return in->items[0]; return in->items[0];
} }
} }
/* /*
* true if device is marked "out" (failed, fully offloaded) * true if device is marked "out" (failed, fully offloaded)
* of the cluster * of the cluster
@ -416,7 +422,8 @@ static int is_out(const struct crush_map *map,
* @parent_r: r value passed from the parent * @parent_r: r value passed from the parent
*/ */
static int crush_choose_firstn(const struct crush_map *map, static int crush_choose_firstn(const struct crush_map *map,
struct crush_bucket *bucket, struct crush_work *work,
const struct crush_bucket *bucket,
const __u32 *weight, int weight_max, const __u32 *weight, int weight_max,
int x, int numrep, int type, int x, int numrep, int type,
int *out, int outpos, int *out, int outpos,
@ -434,7 +441,7 @@ static int crush_choose_firstn(const struct crush_map *map,
int rep; int rep;
unsigned int ftotal, flocal; unsigned int ftotal, flocal;
int retry_descent, retry_bucket, skip_rep; int retry_descent, retry_bucket, skip_rep;
struct crush_bucket *in = bucket; const struct crush_bucket *in = bucket;
int r; int r;
int i; int i;
int item = 0; int item = 0;
@ -473,9 +480,13 @@ static int crush_choose_firstn(const struct crush_map *map,
if (local_fallback_retries > 0 && if (local_fallback_retries > 0 &&
flocal >= (in->size>>1) && flocal >= (in->size>>1) &&
flocal > local_fallback_retries) flocal > local_fallback_retries)
item = bucket_perm_choose(in, x, r); item = bucket_perm_choose(
in, work->work[-1-in->id],
x, r);
else else
item = crush_bucket_choose(in, x, r); item = crush_bucket_choose(
in, work->work[-1-in->id],
x, r);
if (item >= map->max_devices) { if (item >= map->max_devices) {
dprintk(" bad item %d\n", item); dprintk(" bad item %d\n", item);
skip_rep = 1; skip_rep = 1;
@ -518,19 +529,21 @@ static int crush_choose_firstn(const struct crush_map *map,
sub_r = r >> (vary_r-1); sub_r = r >> (vary_r-1);
else else
sub_r = 0; sub_r = 0;
if (crush_choose_firstn(map, if (crush_choose_firstn(
map->buckets[-1-item], map,
weight, weight_max, work,
x, stable ? 1 : outpos+1, 0, map->buckets[-1-item],
out2, outpos, count, weight, weight_max,
recurse_tries, 0, x, stable ? 1 : outpos+1, 0,
local_retries, out2, outpos, count,
local_fallback_retries, recurse_tries, 0,
0, local_retries,
vary_r, local_fallback_retries,
stable, 0,
NULL, vary_r,
sub_r) <= outpos) stable,
NULL,
sub_r) <= outpos)
/* didn't get leaf */ /* didn't get leaf */
reject = 1; reject = 1;
} else { } else {
@ -600,7 +613,8 @@ reject:
* *
*/ */
static void crush_choose_indep(const struct crush_map *map, static void crush_choose_indep(const struct crush_map *map,
struct crush_bucket *bucket, struct crush_work *work,
const struct crush_bucket *bucket,
const __u32 *weight, int weight_max, const __u32 *weight, int weight_max,
int x, int left, int numrep, int type, int x, int left, int numrep, int type,
int *out, int outpos, int *out, int outpos,
@ -610,7 +624,7 @@ static void crush_choose_indep(const struct crush_map *map,
int *out2, int *out2,
int parent_r) int parent_r)
{ {
struct crush_bucket *in = bucket; const struct crush_bucket *in = bucket;
int endpos = outpos + left; int endpos = outpos + left;
int rep; int rep;
unsigned int ftotal; unsigned int ftotal;
@ -678,7 +692,9 @@ static void crush_choose_indep(const struct crush_map *map,
break; break;
} }
item = crush_bucket_choose(in, x, r); item = crush_bucket_choose(
in, work->work[-1-in->id],
x, r);
if (item >= map->max_devices) { if (item >= map->max_devices) {
dprintk(" bad item %d\n", item); dprintk(" bad item %d\n", item);
out[rep] = CRUSH_ITEM_NONE; out[rep] = CRUSH_ITEM_NONE;
@ -724,13 +740,15 @@ static void crush_choose_indep(const struct crush_map *map,
if (recurse_to_leaf) { if (recurse_to_leaf) {
if (item < 0) { if (item < 0) {
crush_choose_indep(map, crush_choose_indep(
map->buckets[-1-item], map,
weight, weight_max, work,
x, 1, numrep, 0, map->buckets[-1-item],
out2, rep, weight, weight_max,
recurse_tries, 0, x, 1, numrep, 0,
0, NULL, r); out2, rep,
recurse_tries, 0,
0, NULL, r);
if (out2[rep] == CRUSH_ITEM_NONE) { if (out2[rep] == CRUSH_ITEM_NONE) {
/* placed nothing; no leaf */ /* placed nothing; no leaf */
break; break;
@ -781,6 +799,53 @@ static void crush_choose_indep(const struct crush_map *map,
#endif #endif
} }
/*
* This takes a chunk of memory and sets it up to be a shiny new
* working area for a CRUSH placement computation. It must be called
* on any newly allocated memory before passing it in to
* crush_do_rule. It may be used repeatedly after that, so long as the
* map has not changed. If the map /has/ changed, you must make sure
* the working size is no smaller than what was allocated and re-run
* crush_init_workspace.
*
* If you do retain the working space between calls to crush, make it
* thread-local.
*/
void crush_init_workspace(const struct crush_map *map, void *v)
{
struct crush_work *w = v;
__s32 b;
/*
* We work by moving through the available space and setting
* values and pointers as we go.
*
* It's a bit like Forth's use of the 'allot' word since we
* set the pointer first and then reserve the space for it to
* point to by incrementing the point.
*/
v += sizeof(struct crush_work *);
w->work = v;
v += map->max_buckets * sizeof(struct crush_work_bucket *);
for (b = 0; b < map->max_buckets; ++b) {
if (!map->buckets[b])
continue;
w->work[b] = v;
switch (map->buckets[b]->alg) {
default:
v += sizeof(struct crush_work_bucket);
break;
}
w->work[b]->perm_x = 0;
w->work[b]->perm_n = 0;
w->work[b]->perm = v;
v += map->buckets[b]->size * sizeof(__u32);
}
BUG_ON(v - (void *)w != map->working_size);
}
/** /**
* crush_do_rule - calculate a mapping with the given input and rule * crush_do_rule - calculate a mapping with the given input and rule
* @map: the crush_map * @map: the crush_map
@ -790,14 +855,16 @@ static void crush_choose_indep(const struct crush_map *map,
* @result_max: maximum result size * @result_max: maximum result size
* @weight: weight vector (for map leaves) * @weight: weight vector (for map leaves)
* @weight_max: size of weight vector * @weight_max: size of weight vector
* @cwin: pointer to at least map->working_size bytes of memory
* @scratch: scratch vector for private use; must be >= 3 * result_max * @scratch: scratch vector for private use; must be >= 3 * result_max
*/ */
int crush_do_rule(const struct crush_map *map, int crush_do_rule(const struct crush_map *map,
int ruleno, int x, int *result, int result_max, int ruleno, int x, int *result, int result_max,
const __u32 *weight, int weight_max, const __u32 *weight, int weight_max,
int *scratch) void *cwin, int *scratch)
{ {
int result_len; int result_len;
struct crush_work *cw = cwin;
int *a = scratch; int *a = scratch;
int *b = scratch + result_max; int *b = scratch + result_max;
int *c = scratch + result_max*2; int *c = scratch + result_max*2;
@ -807,7 +874,7 @@ int crush_do_rule(const struct crush_map *map,
int *o; int *o;
int osize; int osize;
int *tmp; int *tmp;
struct crush_rule *rule; const struct crush_rule *rule;
__u32 step; __u32 step;
int i, j; int i, j;
int numrep; int numrep;
@ -840,7 +907,7 @@ int crush_do_rule(const struct crush_map *map,
for (step = 0; step < rule->len; step++) { for (step = 0; step < rule->len; step++) {
int firstn = 0; int firstn = 0;
struct crush_rule_step *curstep = &rule->steps[step]; const struct crush_rule_step *curstep = &rule->steps[step];
switch (curstep->op) { switch (curstep->op) {
case CRUSH_RULE_TAKE: case CRUSH_RULE_TAKE:
@ -936,6 +1003,7 @@ int crush_do_rule(const struct crush_map *map,
recurse_tries = choose_tries; recurse_tries = choose_tries;
osize += crush_choose_firstn( osize += crush_choose_firstn(
map, map,
cw,
map->buckets[bno], map->buckets[bno],
weight, weight_max, weight, weight_max,
x, numrep, x, numrep,
@ -956,6 +1024,7 @@ int crush_do_rule(const struct crush_map *map,
numrep : (result_max-osize)); numrep : (result_max-osize));
crush_choose_indep( crush_choose_indep(
map, map,
cw,
map->buckets[bno], map->buckets[bno],
weight, weight_max, weight, weight_max,
x, out_size, numrep, x, out_size, numrep,
@ -997,5 +1066,6 @@ int crush_do_rule(const struct crush_map *map,
break; break;
} }
} }
return result_len; return result_len;
} }

47
net/ceph/osdmap.c
Просмотреть файл

@ -153,6 +153,32 @@ bad:
return -EINVAL; return -EINVAL;
} }
static void crush_finalize(struct crush_map *c)
{
__s32 b;
/* Space for the array of pointers to per-bucket workspace */
c->working_size = sizeof(struct crush_work) +
c->max_buckets * sizeof(struct crush_work_bucket *);
for (b = 0; b < c->max_buckets; b++) {
if (!c->buckets[b])
continue;
switch (c->buckets[b]->alg) {
default:
/*
* The base case, permutation variables and
* the pointer to the permutation array.
*/
c->working_size += sizeof(struct crush_work_bucket);
break;
}
/* Every bucket has a permutation array. */
c->working_size += c->buckets[b]->size * sizeof(__u32);
}
}
static struct crush_map *crush_decode(void *pbyval, void *end) static struct crush_map *crush_decode(void *pbyval, void *end)
{ {
struct crush_map *c; struct crush_map *c;
@ -246,10 +272,6 @@ static struct crush_map *crush_decode(void *pbyval, void *end)
b->items = kcalloc(b->size, sizeof(__s32), GFP_NOFS); b->items = kcalloc(b->size, sizeof(__s32), GFP_NOFS);
if (b->items == NULL) if (b->items == NULL)
goto badmem; goto badmem;
b->perm = kcalloc(b->size, sizeof(u32), GFP_NOFS);
if (b->perm == NULL)
goto badmem;
b->perm_n = 0;
ceph_decode_need(p, end, b->size*sizeof(u32), bad); ceph_decode_need(p, end, b->size*sizeof(u32), bad);
for (j = 0; j < b->size; j++) for (j = 0; j < b->size; j++)
@ -368,6 +390,8 @@ static struct crush_map *crush_decode(void *pbyval, void *end)
dout("crush decode tunable chooseleaf_stable = %d\n", dout("crush decode tunable chooseleaf_stable = %d\n",
c->chooseleaf_stable); c->chooseleaf_stable);
crush_finalize(c);
done: done:
dout("crush_decode success\n"); dout("crush_decode success\n");
return c; return c;
@ -753,6 +777,7 @@ void ceph_osdmap_destroy(struct ceph_osdmap *map)
kfree(map->osd_weight); kfree(map->osd_weight);
kfree(map->osd_addr); kfree(map->osd_addr);
kfree(map->osd_primary_affinity); kfree(map->osd_primary_affinity);
kfree(map->crush_workspace);
kfree(map); kfree(map);
} }
@ -810,12 +835,23 @@ static int osdmap_set_max_osd(struct ceph_osdmap *map, int max)
static int osdmap_set_crush(struct ceph_osdmap *map, struct crush_map *crush) static int osdmap_set_crush(struct ceph_osdmap *map, struct crush_map *crush)
{ {
void *workspace;
if (IS_ERR(crush)) if (IS_ERR(crush))
return PTR_ERR(crush); return PTR_ERR(crush);
workspace = kmalloc(crush->working_size, GFP_NOIO);
if (!workspace) {
crush_destroy(crush);
return -ENOMEM;
}
crush_init_workspace(crush, workspace);
if (map->crush) if (map->crush)
crush_destroy(map->crush); crush_destroy(map->crush);
kfree(map->crush_workspace);
map->crush = crush; map->crush = crush;
map->crush_workspace = workspace;
return 0; return 0;
} }
@ -1940,7 +1976,8 @@ static int do_crush(struct ceph_osdmap *map, int ruleno, int x,
mutex_lock(&map->crush_scratch_mutex); mutex_lock(&map->crush_scratch_mutex);
r = crush_do_rule(map->crush, ruleno, x, result, result_max, r = crush_do_rule(map->crush, ruleno, x, result, result_max,
weight, weight_max, map->crush_scratch_ary); weight, weight_max, map->crush_workspace,
map->crush_scratch_ary);
mutex_unlock(&map->crush_scratch_mutex); mutex_unlock(&map->crush_scratch_mutex);
return r; return r;