Commit 2f0f267e authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: remove deprecated functions. 



Using these functions with offstack cpus is unsafe.  They use all NR_CPUS
bits, unstead of nr_cpumask_bits.

In particular, lustre (in staging) used cpus_ and that caused a bug.

Reported-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 1ed1835f

include/linux/cpumask.h

+0 −151
Original line number Diff line number Diff line
@@ -815,155 +815,4 @@ cpumap_print_to_pagebuf(bool list, char *buf, const struct cpumask *mask) 
	[0 ... BITS_TO_LONGS(NR_CPUS)-1] =  0UL				\

} }



/*

 *

 * From here down, all obsolete.  Use cpumask_ variants!

 *

 */

#ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS



#define CPU_MASK_CPU0							\

(cpumask_t) { {								\

	[0] =  1UL							\

} }



#if NR_CPUS == 1

#define first_cpu(src)		({ (void)(src); 0; })

#define next_cpu(n, src)	({ (void)(src); 1; })

#define any_online_cpu(mask)	0

#define for_each_cpu_mask(cpu, mask)	\

	for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask)

#else /* NR_CPUS > 1 */

int __first_cpu(const cpumask_t *srcp);

int __next_cpu(int n, const cpumask_t *srcp);



#define first_cpu(src)		__first_cpu(&(src))

#define next_cpu(n, src)	__next_cpu((n), &(src))

#define any_online_cpu(mask) cpumask_any_and(&mask, cpu_online_mask)

#define for_each_cpu_mask(cpu, mask)			\

	for ((cpu) = -1;				\

		(cpu) = next_cpu((cpu), (mask)),	\

		(cpu) < NR_CPUS; )

#endif /* SMP */



#if NR_CPUS <= 64



#define for_each_cpu_mask_nr(cpu, mask)	for_each_cpu_mask(cpu, mask)



#else /* NR_CPUS > 64 */



int __next_cpu_nr(int n, const cpumask_t *srcp);

#define for_each_cpu_mask_nr(cpu, mask)			\

	for ((cpu) = -1;				\

		(cpu) = __next_cpu_nr((cpu), &(mask)),	\

		(cpu) < nr_cpu_ids; )



#endif /* NR_CPUS > 64 */



#define cpus_addr(src) ((src).bits)



#define cpu_set(cpu, dst) __cpu_set((cpu), &(dst))

static inline void __cpu_set(int cpu, volatile cpumask_t *dstp)

{

	set_bit(cpu, dstp->bits);

}



#define cpu_clear(cpu, dst) __cpu_clear((cpu), &(dst))

static inline void __cpu_clear(int cpu, volatile cpumask_t *dstp)

{

	clear_bit(cpu, dstp->bits);

}



#define cpus_setall(dst) __cpus_setall(&(dst), NR_CPUS)

static inline void __cpus_setall(cpumask_t *dstp, unsigned int nbits)

{

	bitmap_fill(dstp->bits, nbits);

}



#define cpus_clear(dst) __cpus_clear(&(dst), NR_CPUS)

static inline void __cpus_clear(cpumask_t *dstp, unsigned int nbits)

{

	bitmap_zero(dstp->bits, nbits);

}



/* No static inline type checking - see Subtlety (1) above. */

#define cpu_isset(cpu, cpumask) test_bit((cpu), (cpumask).bits)



#define cpu_test_and_set(cpu, cpumask) __cpu_test_and_set((cpu), &(cpumask))

static inline int __cpu_test_and_set(int cpu, cpumask_t *addr)

{

	return test_and_set_bit(cpu, addr->bits);

}



#define cpus_and(dst, src1, src2) __cpus_and(&(dst), &(src1), &(src2), NR_CPUS)

static inline int __cpus_and(cpumask_t *dstp, const cpumask_t *src1p,

					const cpumask_t *src2p, unsigned int nbits)

{

	return bitmap_and(dstp->bits, src1p->bits, src2p->bits, nbits);

}



#define cpus_or(dst, src1, src2) __cpus_or(&(dst), &(src1), &(src2), NR_CPUS)

static inline void __cpus_or(cpumask_t *dstp, const cpumask_t *src1p,

					const cpumask_t *src2p, unsigned int nbits)

{

	bitmap_or(dstp->bits, src1p->bits, src2p->bits, nbits);

}



#define cpus_xor(dst, src1, src2) __cpus_xor(&(dst), &(src1), &(src2), NR_CPUS)

static inline void __cpus_xor(cpumask_t *dstp, const cpumask_t *src1p,

					const cpumask_t *src2p, unsigned int nbits)

{

	bitmap_xor(dstp->bits, src1p->bits, src2p->bits, nbits);

}



#define cpus_andnot(dst, src1, src2) \

				__cpus_andnot(&(dst), &(src1), &(src2), NR_CPUS)

static inline int __cpus_andnot(cpumask_t *dstp, const cpumask_t *src1p,

					const cpumask_t *src2p, unsigned int nbits)

{

	return bitmap_andnot(dstp->bits, src1p->bits, src2p->bits, nbits);

}



#define cpus_equal(src1, src2) __cpus_equal(&(src1), &(src2), NR_CPUS)

static inline int __cpus_equal(const cpumask_t *src1p,

					const cpumask_t *src2p, unsigned int nbits)

{

	return bitmap_equal(src1p->bits, src2p->bits, nbits);

}



#define cpus_intersects(src1, src2) __cpus_intersects(&(src1), &(src2), NR_CPUS)

static inline int __cpus_intersects(const cpumask_t *src1p,

					const cpumask_t *src2p, unsigned int nbits)

{

	return bitmap_intersects(src1p->bits, src2p->bits, nbits);

}



#define cpus_subset(src1, src2) __cpus_subset(&(src1), &(src2), NR_CPUS)

static inline int __cpus_subset(const cpumask_t *src1p,

					const cpumask_t *src2p, unsigned int nbits)

{

	return bitmap_subset(src1p->bits, src2p->bits, nbits);

}



#define cpus_empty(src) __cpus_empty(&(src), NR_CPUS)

static inline int __cpus_empty(const cpumask_t *srcp, unsigned int nbits)

{

	return bitmap_empty(srcp->bits, nbits);

}



#define cpus_weight(cpumask) __cpus_weight(&(cpumask), NR_CPUS)

static inline int __cpus_weight(const cpumask_t *srcp, unsigned int nbits)

{

	return bitmap_weight(srcp->bits, nbits);

}



#define cpus_shift_left(dst, src, n) \

			__cpus_shift_left(&(dst), &(src), (n), NR_CPUS)

static inline void __cpus_shift_left(cpumask_t *dstp,

					const cpumask_t *srcp, int n, int nbits)

{

	bitmap_shift_left(dstp->bits, srcp->bits, n, nbits);

}

#endif /* !CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS */



#endif /* __LINUX_CPUMASK_H */

lib/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -397,10 +397,6 @@ config CPUMASK_OFFSTACK 
	  them on the stack.  This is a bit more expensive, but avoids

	  stack overflow.



config DISABLE_OBSOLETE_CPUMASK_FUNCTIONS

       bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS

       depends on BROKEN



config CPU_RMAP

	bool

	depends on SMP