On Sat, Mar 04, 2023 at 03:08:49PM -0800, Linus Torvalds wrote:
> On Sat, Mar 4, 2023 at 1:10 PM Linus Torvalds
> <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
> >
> > Whether the end result _works_ or not, I still haven't checked.
>
> Well, this particular patch at least boots for me for my normal
> config. Not that I've run any extensive tests, but I'm writing this
> email while running this patch, so ..
>
> Linus
I didn't test it properly, but the approach looks good. Need some time
to think on implications of the new rule. At the first glance, there
should be no major impact on cpumask machinery.
It should be very well tested on arm and m68k because they implement
their own bitmap functions.
Please see comments inline.
Thanks,
Yury
[...]
> diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
> index 10c92bd9b807..bd9576e8d856 100644
> --- a/include/linux/cpumask.h
> +++ b/include/linux/cpumask.h
> @@ -50,8 +50,30 @@ static inline void set_nr_cpu_ids(unsigned int nr)
> #endif
> }
>
> -/* Deprecated. Always use nr_cpu_ids. */
> -#define nr_cpumask_bits nr_cpu_ids
> +/*
> + * The difference between nr_cpumask_bits and nr_cpu_ids is that
> + * 'nr_cpu_ids' is the actual number of CPU ids in the system, while
> + * nr_cpumask_bits is a "reasonable upper value" that is often more
> + * efficient because it can be a fixed constant.
> + *
> + * So when clearing or traversing a cpumask, use 'nr_cpumask_bits',
> + * but when checking exact limits (and when _setting_ bits), use the
> + * tighter exact limit of 'nr_cpu_ids'.
> + *
> + * NOTE! The code depends on any exyta bits in nr_cpumask_bits a always
s/exyta/extra ?
s/a always/as always ?
> + * being (a) allocated and (b) zero, so that the only effect of using
> + * 'nr_cpumask_bits' is that we might return a higher maximum CPU value
> + * (which is why we have that pattern of
> + *
> + * Returns >= nr_cpu_ids if no cpus set.
> + *
> + * for many of the functions - they can return that higher value).
> + */
> +#ifndef CONFIG_CPUMASK_OFFSTACK
> + #define nr_cpumask_bits ((unsigned int)NR_CPUS)
> +#else
> + #define nr_cpumask_bits nr_cpu_ids
> +#endif
>
> /*
> * The following particular system cpumasks and operations manage
> @@ -114,7 +136,7 @@ static __always_inline void cpu_max_bits_warn(unsigned int cpu, unsigned int bit
> /* verify cpu argument to cpumask_* operators */
> static __always_inline unsigned int cpumask_check(unsigned int cpu)
> {
> - cpu_max_bits_warn(cpu, nr_cpumask_bits);
> + cpu_max_bits_warn(cpu, nr_cpu_ids);
> return cpu;
> }
>
> @@ -248,16 +270,6 @@ unsigned int cpumask_next_and(int n, const struct cpumask *src1p,
> #define for_each_cpu(cpu, mask) \
> for_each_set_bit(cpu, cpumask_bits(mask), nr_cpumask_bits)
>
> -/**
> - * for_each_cpu_not - iterate over every cpu in a complemented mask
> - * @cpu: the (optionally unsigned) integer iterator
> - * @mask: the cpumask pointer
> - *
> - * After the loop, cpu is >= nr_cpu_ids.
> - */
> -#define for_each_cpu_not(cpu, mask) \
> - for_each_clear_bit(cpu, cpumask_bits(mask), nr_cpumask_bits)
> -
We can do it like:
for ((bit) = 0;
(bit) = find_next_zero_bit((addr), nr_cpumask_bits, (bit)),
(bit) < nr_cpu_ids;
(bit)++)
> #if NR_CPUS == 1
> static inline
> unsigned int cpumask_next_wrap(int n, const struct cpumask *mask, int start, bool wrap)
> @@ -495,10 +507,14 @@ static __always_inline bool cpumask_test_and_clear_cpu(int cpu, struct cpumask *
> /**
> * cpumask_setall - set all cpus (< nr_cpu_ids) in a cpumask
> * @dstp: the cpumask pointer
> + *
> + * Note: since we set bits, we should use the tighter 'bitmap_set()' with
> + * the eact number of bits, not 'bitmap_fill()' that will fill past the
s/eact/exact
> + * end.
> */
> static inline void cpumask_setall(struct cpumask *dstp)
> {
> - bitmap_fill(cpumask_bits(dstp), nr_cpumask_bits);
> + bitmap_set(cpumask_bits(dstp), 0, nr_cpu_ids);
> }
It should be like:
+ bitmap_set(cpumask_bits(dstp), 0, nr_cpu_ids);
+ bitmap_clear(cpumask_bits(dstp), nr_cpu_ids, nr_cpumask_bits);
Because bitmap_set() will not zero memory beyond round_up(nr_cpu_ids, 64).
