Commit 33e67710 authored by Yury Norov's avatar Yury Norov
Browse files

cpumask: switch for_each_cpu{,_not} to use for_each_bit() 



The difference between for_each_cpu() and for_each_set_bit()
is that the latter uses cpumask_next() instead of find_next_bit(),
and so calls cpumask_check().

This check is useless because the iterator value is not provided by
user. It generates false-positives for the very last iteration
of for_each_cpu().

Signed-off-by: default avatarYury Norov <yury.norov@gmail.com>
parent 854701ba

include/linux/cpumask.h

+3 −9
Original line number Diff line number Diff line
@@ -246,9 +246,7 @@ unsigned int cpumask_next_and(int n, const struct cpumask *src1p, 
 * After the loop, cpu is >= nr_cpu_ids.

 */

#define for_each_cpu(cpu, mask)				\

	for ((cpu) = -1;				\

		(cpu) = cpumask_next((cpu), (mask)),	\

		(cpu) < nr_cpu_ids;)

	for_each_set_bit(cpu, cpumask_bits(mask), nr_cpumask_bits)



/**

 * for_each_cpu_not - iterate over every cpu in a complemented mask
@@ -258,9 +256,7 @@ unsigned int cpumask_next_and(int n, const struct cpumask *src1p, 
 * After the loop, cpu is >= nr_cpu_ids.

 */

#define for_each_cpu_not(cpu, mask)				\

	for ((cpu) = -1;					\

		(cpu) = cpumask_next_zero((cpu), (mask)),	\

		(cpu) < nr_cpu_ids;)

	for_each_clear_bit(cpu, cpumask_bits(mask), nr_cpumask_bits)



#if NR_CPUS == 1

static inline
@@ -313,9 +309,7 @@ unsigned int __pure cpumask_next_wrap(int n, const struct cpumask *mask, int sta 
 * After the loop, cpu is >= nr_cpu_ids.

 */

#define for_each_cpu_and(cpu, mask1, mask2)				\

	for ((cpu) = -1;						\

		(cpu) = cpumask_next_and((cpu), (mask1), (mask2)),	\

		(cpu) < nr_cpu_ids;)

	for_each_and_bit(cpu, cpumask_bits(mask1), cpumask_bits(mask2), nr_cpumask_bits)



/**

 * cpumask_any_but - return a "random" in a cpumask, but not this one.

include/linux/find.h

+5 −0
Original line number Diff line number Diff line
@@ -390,6 +390,11 @@ unsigned long find_next_bit_le(const void *addr, unsigned 
	     (bit) < (size);					\

	     (bit) = find_next_bit((addr), (size), (bit) + 1))



#define for_each_and_bit(bit, addr1, addr2, size) \

	for ((bit) = find_next_and_bit((addr1), (addr2), (size), 0);		\

	     (bit) < (size);							\

	     (bit) = find_next_and_bit((addr1), (addr2), (size), (bit) + 1))



/* same as for_each_set_bit() but use bit as value to start with */

#define for_each_set_bit_from(bit, addr, size) \

	for ((bit) = find_next_bit((addr), (size), (bit));	\