Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drbd: implicitly truncate cpu-mask

Don't error out with misleading "out of memory"
if the cpu-mask has more bits set than there are CPUs.
Just truncate to nr_cpu_ids implicitly.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

authored by

Lars Ellenberg and committed by
Philipp Reisner
1e39152f 193cb00c

+14
+14
drivers/block/drbd/drbd_main.c
··· 2541 2541 if (nr_cpu_ids > 1 && res_opts->cpu_mask[0] != 0) { 2542 2542 err = bitmap_parse(res_opts->cpu_mask, DRBD_CPU_MASK_SIZE, 2543 2543 cpumask_bits(new_cpu_mask), nr_cpu_ids); 2544 + if (err == -EOVERFLOW) { 2545 + /* So what. mask it out. */ 2546 + cpumask_var_t tmp_cpu_mask; 2547 + if (zalloc_cpumask_var(&tmp_cpu_mask, GFP_KERNEL)) { 2548 + cpumask_setall(tmp_cpu_mask); 2549 + cpumask_and(new_cpu_mask, new_cpu_mask, tmp_cpu_mask); 2550 + drbd_warn(resource, "Overflow in bitmap_parse(%.12s%s), truncating to %u bits\n", 2551 + res_opts->cpu_mask, 2552 + strlen(res_opts->cpu_mask) > 12 ? "..." : "", 2553 + nr_cpu_ids); 2554 + free_cpumask_var(tmp_cpu_mask); 2555 + err = 0; 2556 + } 2557 + } 2544 2558 if (err) { 2545 2559 drbd_warn(resource, "bitmap_parse() failed with %d\n", err); 2546 2560 /* retcode = ERR_CPU_MASK_PARSE; */