Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 23:50:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

crush: be more tolerant of nonsensical crush maps

Browse Source 
If we get a map that doesn't make sense, error out or ignore the badness
instead of BUGging out.  This reflects the ceph.git commits
9895f0bff7dc68e9b49b572613d242315fb11b6c and
8ded26472058d5205803f244c2f33cb6cb10de79.

Reviewed-by: Alex Elder <elder@inktank.com>
Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-05-07 15:35:24 -07:00
parent c90f95ed46
commit a1f4895be8
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,8 +152,8 @@ static int bucket_list_choose(struct crush_bucket_list *bucket,
return bucket->h.items[i]; return bucket->h.items[i];
} }
BUG_ON(1); dprintk("bad list sums for bucket %d\n", bucket->h.id);
return 0; return bucket->h.items[0];
} }
@ -239,6 +239,7 @@ static int bucket_straw_choose(struct crush_bucket_straw *bucket,
static int crush_bucket_choose(struct crush_bucket *in, int x, int r) static int crush_bucket_choose(struct crush_bucket *in, 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);
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((struct crush_bucket_uniform *)in,
@ -253,7 +254,7 @@ static int crush_bucket_choose(struct crush_bucket *in, int x, int r)
return bucket_straw_choose((struct crush_bucket_straw *)in, return bucket_straw_choose((struct crush_bucket_straw *)in,
x, r); x, r);
default: default:
BUG_ON(1); dprintk("unknown bucket %d alg %d\n", in->id, in->alg);
return in->items[0]; return in->items[0];
} }
} }
@ -354,7 +355,11 @@ static int crush_choose(const struct crush_map *map,
item = bucket_perm_choose(in, x, r); item = bucket_perm_choose(in, x, r);
else else
item = crush_bucket_choose(in, x, r); item = crush_bucket_choose(in, x, r);
BUG_ON(item >= map->max_devices); if (item >= map->max_devices) {
dprintk(" bad item %d\n", item);
skip_rep = 1;
break;
}
/* desired type? */ /* desired type? */
if (item < 0) if (item < 0)
@ -365,8 +370,12 @@ static int crush_choose(const struct crush_map *map,
/* keep going? */ /* keep going? */
if (itemtype != type) { if (itemtype != type) {
BUG_ON(item >= 0 || if (item >= 0 ||
(-1-item) >= map->max_buckets); (-1-item) >= map->max_buckets) {
dprintk(" bad item type %d\n", type);
skip_rep = 1;
break;
}
in = map->buckets[-1-item]; in = map->buckets[-1-item];
retry_bucket = 1; retry_bucket = 1;
continue; continue;
@ -478,7 +487,10 @@ int crush_do_rule(const struct crush_map *map,
int numrep; int numrep;
int firstn; int firstn;
BUG_ON(ruleno >= map->max_rules); if ((__u32)ruleno >= map->max_rules) {
dprintk(" bad ruleno %d\n", ruleno);
return 0;
}
rule = map->rules[ruleno]; rule = map->rules[ruleno];
result_len = 0; result_len = 0;
@ -528,7 +540,8 @@ int crush_do_rule(const struct crush_map *map,
firstn = 1; firstn = 1;
case CRUSH_RULE_CHOOSE_LEAF_INDEP: case CRUSH_RULE_CHOOSE_LEAF_INDEP:
case CRUSH_RULE_CHOOSE_INDEP: case CRUSH_RULE_CHOOSE_INDEP:
BUG_ON(wsize == 0); if (wsize == 0)
break;
recurse_to_leaf = recurse_to_leaf =
rule->steps[step].op == rule->steps[step].op ==
@ -597,7 +610,9 @@ int crush_do_rule(const struct crush_map *map,
break; break;
default: default:
BUG_ON(1); dprintk(" unknown op %d at step %d\n",
curstep->op, step);
break;
} }
} }
return result_len; return result_len;