OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crush: ensuring at most num-rep osds are selected 

commit 45002267e8 upstream.

Crush temporary buffers are allocated as per replica size configured
by the user.  When there are more final osds (to be selected as per
rule) than the replicas, buffer overlaps and it causes crash.  Now, it
ensures that at most num-rep osds are selected even if more number of
osds are allowed by the rule.

Reflects ceph.git commits 6b4d1aa99718e3b367496326c1e64551330fabc0,
                          234b066ba04976783d15ff2abc3e81b6cc06fb10.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ilya Dryomov 2015-04-14 16:04:23 +03:00 committed by Greg Kroah-Hartman
parent e99d350e5b
commit 9e56322af5
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/ceph/crush/mapper.c
View File

@ -290,6 +290,7 @@ static int is_out(const struct crush_map *map,
* @type: the type of item to choose * @type: the type of item to choose
* @out: pointer to output vector * @out: pointer to output vector
* @outpos: our position in that vector * @outpos: our position in that vector
* @out_size: size of the out vector
* @tries: number of attempts to make * @tries: number of attempts to make
* @recurse_tries: number of attempts to have recursive chooseleaf make * @recurse_tries: number of attempts to have recursive chooseleaf make
* @local_retries: localized retries * @local_retries: localized retries
@ -302,6 +303,7 @@ static int crush_choose_firstn(const struct crush_map *map,
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,
int out_size,
unsigned int tries, unsigned int tries,
unsigned int recurse_tries, unsigned int recurse_tries,
unsigned int local_retries, unsigned int local_retries,
@ -318,11 +320,12 @@ static int crush_choose_firstn(const struct crush_map *map,
int item = 0; int item = 0;
int itemtype; int itemtype;
int collide, reject; int collide, reject;
int count = out_size;
dprintk("CHOOSE%s bucket %d x %d outpos %d numrep %d\n", recurse_to_leaf ? "_LEAF" : "", dprintk("CHOOSE%s bucket %d x %d outpos %d numrep %d\n", recurse_to_leaf ? "_LEAF" : "",
bucket->id, x, outpos, numrep); bucket->id, x, outpos, numrep);
for (rep = outpos; rep < numrep; rep++) { for (rep = outpos; rep < numrep && count > 0 ; rep++) {
/* keep trying until we get a non-out, non-colliding item */ /* keep trying until we get a non-out, non-colliding item */
ftotal = 0; ftotal = 0;
skip_rep = 0; skip_rep = 0;
@ -391,7 +394,7 @@ static int crush_choose_firstn(const struct crush_map *map,
map->buckets[-1-item], map->buckets[-1-item],
weight, weight_max, weight, weight_max,
x, outpos+1, 0, x, outpos+1, 0,
out2, outpos, out2, outpos, count,
recurse_tries, 0, recurse_tries, 0,
local_retries, local_retries,
local_fallback_retries, local_fallback_retries,
@ -449,6 +452,7 @@ reject:
dprintk("CHOOSE got %d\n", item); dprintk("CHOOSE got %d\n", item);
out[outpos] = item; out[outpos] = item;
outpos++; outpos++;
count--;
} }
dprintk("CHOOSE returns %d\n", outpos); dprintk("CHOOSE returns %d\n", outpos);
@ -640,6 +644,7 @@ int crush_do_rule(const struct crush_map *map,
__u32 step; __u32 step;
int i, j; int i, j;
int numrep; int numrep;
int out_size;
/* /*
* the original choose_total_tries value was off by one (it * the original choose_total_tries value was off by one (it
* counted "retries" and not "tries"). add one. * counted "retries" and not "tries"). add one.
@ -740,6 +745,7 @@ int crush_do_rule(const struct crush_map *map,
x, numrep, x, numrep,
curstep->arg2, curstep->arg2,
o+osize, j, o+osize, j,
result_max-osize,
choose_tries, choose_tries,
recurse_tries, recurse_tries,
choose_local_retries, choose_local_retries,
@ -747,11 +753,13 @@ int crush_do_rule(const struct crush_map *map,
recurse_to_leaf, recurse_to_leaf,
c+osize); c+osize);
} else { } else {
out_size = ((numrep < (result_max-osize)) ?
numrep : (result_max-osize));
crush_choose_indep( crush_choose_indep(
map, map,
map->buckets[-1-w[i]], map->buckets[-1-w[i]],
weight, weight_max, weight, weight_max,
x, numrep, numrep, x, out_size, numrep,
curstep->arg2, curstep->arg2,
o+osize, j, o+osize, j,
choose_tries, choose_tries,
@ -760,7 +768,7 @@ int crush_do_rule(const struct crush_map *map,
recurse_to_leaf, recurse_to_leaf,
c+osize, c+osize,
0); 0);
osize += numrep; osize += out_size;
} }
} }