mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	This branch consists of: Qu Wenruo: lib: bitmap: fix the duplicated comments on bitmap_to_arr64() https://lore.kernel.org/lkml/0d85e1dbad52ad7fb5787c4432bdb36cbd24f632.1656063005.git.wqu@suse.com/ Alexander Lobakin: bitops: let optimize out non-atomic bitops on compile-time constants https://lore.kernel.org/lkml/20220624121313.2382500-1-alexandr.lobakin@intel.com/T/ Yury Norov: lib: cleanup bitmap-related headers https://lore.kernel.org/linux-arm-kernel/YtCVeOGLiQ4gNPSf@yury-laptop/T/#m305522194c4d38edfdaffa71fcaaf2e2ca00a961 Alexander Lobakin: x86/olpc: fix 'logical not is only applied to the left hand side' https://www.spinics.net/lists/kernel/msg4440064.html Yury Norov: lib/nodemask: inline wrappers around bitmap https://lore.kernel.org/all/20220723214537.2054208-1-yury.norov@gmail.com/ -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEi8GdvG6xMhdgpu/4sUSA/TofvsgFAmLpVvwACgkQsUSA/Tof vsiAHgwAwS9pl8GJ+fKYnue2CYo9349d2oT6BBUs/Rv8uqYEa4QkpYsR7NS733TG pos0hhoRvSOzrUP4qppXUjfJ+NkzLgpnKFOeWfFoNAKlHuaaMRvF3Y0Q/P8g0/Kg HPWcCQLHyCH9Wjs3e2TTgRjxTrHuruD2VJ401/PX/lw0DicUhmev5mUFa10uwFkP ZJRprjoFn9HJ0Hk16pFZDi36d3YumhACOcWRiJdoBDrEPV3S6lm9EeOy/yHBNp5k 9bKj+RboeT2t70KaZcKv+M5j1nu0cAhl7kRkjcxcmGyimI0l82Vgq9yFxhGqvWg8 RnCrJ5EaO08FGCAKG9GEwzdiNa24Gdq5XZSpQA7JZHmhmchpnnlNenJicyv0gOQi abChZeWSEsyA+78l2+kk9nezfVKUOnKDEZQxBVTOyWsmZYxHZV94oam340VjQDaY 4/fETdOy/qqPIxnpxAeFGWxZjcVaYiYPLj7KLPMsB0aAAF7pZrem465vSfgbrE81 +gCdqrWd =4dTW -----END PGP SIGNATURE----- Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux Pull bitmap updates from Yury Norov: - fix the duplicated comments on bitmap_to_arr64() (Qu Wenruo) - optimize out non-atomic bitops on compile-time constants (Alexander Lobakin) - cleanup bitmap-related headers (Yury Norov) - x86/olpc: fix 'logical not is only applied to the left hand side' (Alexander Lobakin) - lib/nodemask: inline wrappers around bitmap (Yury Norov) * tag 'bitmap-6.0-rc1' of https://github.com/norov/linux: (26 commits) lib/nodemask: inline next_node_in() and node_random() powerpc: drop dependency on <asm/machdep.h> in archrandom.h x86/olpc: fix 'logical not is only applied to the left hand side' lib/cpumask: move some one-line wrappers to header file headers/deps: mm: align MANITAINERS and Docs with new gfp.h structure headers/deps: mm: Split <linux/gfp_types.h> out of <linux/gfp.h> headers/deps: mm: Optimize <linux/gfp.h> header dependencies lib/cpumask: move trivial wrappers around find_bit to the header lib/cpumask: change return types to unsigned where appropriate cpumask: change return types to bool where appropriate lib/bitmap: change type of bitmap_weight to unsigned long lib/bitmap: change return types to bool where appropriate arm: align find_bit declarations with generic kernel iommu/vt-d: avoid invalid memory access via node_online(NUMA_NO_NODE) lib/test_bitmap: test the tail after bitmap_to_arr64() lib/bitmap: fix off-by-one in bitmap_to_arr64() lib: test_bitmap: add compile-time optimization/evaluations assertions bitmap: don't assume compiler evaluates small mem*() builtins calls net/ice: fix initializing the bitmap in the switch code bitops: let optimize out non-atomic bitops on compile-time constants ...
		
			
				
	
	
		
			102 lines
		
	
	
	
		
			2.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			102 lines
		
	
	
	
		
			2.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
// SPDX-License-Identifier: GPL-2.0-only
 | 
						|
/*
 | 
						|
 * From lib/bitmap.c
 | 
						|
 * Helper functions for bitmap.h.
 | 
						|
 */
 | 
						|
#include <linux/bitmap.h>
 | 
						|
 | 
						|
unsigned int __bitmap_weight(const unsigned long *bitmap, int bits)
 | 
						|
{
 | 
						|
	unsigned int k, w = 0, lim = bits/BITS_PER_LONG;
 | 
						|
 | 
						|
	for (k = 0; k < lim; k++)
 | 
						|
		w += hweight_long(bitmap[k]);
 | 
						|
 | 
						|
	if (bits % BITS_PER_LONG)
 | 
						|
		w += hweight_long(bitmap[k] & BITMAP_LAST_WORD_MASK(bits));
 | 
						|
 | 
						|
	return w;
 | 
						|
}
 | 
						|
 | 
						|
void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,
 | 
						|
		 const unsigned long *bitmap2, int bits)
 | 
						|
{
 | 
						|
	int k;
 | 
						|
	int nr = BITS_TO_LONGS(bits);
 | 
						|
 | 
						|
	for (k = 0; k < nr; k++)
 | 
						|
		dst[k] = bitmap1[k] | bitmap2[k];
 | 
						|
}
 | 
						|
 | 
						|
size_t bitmap_scnprintf(unsigned long *bitmap, unsigned int nbits,
 | 
						|
			char *buf, size_t size)
 | 
						|
{
 | 
						|
	/* current bit is 'cur', most recently seen range is [rbot, rtop] */
 | 
						|
	unsigned int cur, rbot, rtop;
 | 
						|
	bool first = true;
 | 
						|
	size_t ret = 0;
 | 
						|
 | 
						|
	rbot = cur = find_first_bit(bitmap, nbits);
 | 
						|
	while (cur < nbits) {
 | 
						|
		rtop = cur;
 | 
						|
		cur = find_next_bit(bitmap, nbits, cur + 1);
 | 
						|
		if (cur < nbits && cur <= rtop + 1)
 | 
						|
			continue;
 | 
						|
 | 
						|
		if (!first)
 | 
						|
			ret += scnprintf(buf + ret, size - ret, ",");
 | 
						|
 | 
						|
		first = false;
 | 
						|
 | 
						|
		ret += scnprintf(buf + ret, size - ret, "%d", rbot);
 | 
						|
		if (rbot < rtop)
 | 
						|
			ret += scnprintf(buf + ret, size - ret, "-%d", rtop);
 | 
						|
 | 
						|
		rbot = cur;
 | 
						|
	}
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
 | 
						|
bool __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
 | 
						|
		 const unsigned long *bitmap2, unsigned int bits)
 | 
						|
{
 | 
						|
	unsigned int k;
 | 
						|
	unsigned int lim = bits/BITS_PER_LONG;
 | 
						|
	unsigned long result = 0;
 | 
						|
 | 
						|
	for (k = 0; k < lim; k++)
 | 
						|
		result |= (dst[k] = bitmap1[k] & bitmap2[k]);
 | 
						|
	if (bits % BITS_PER_LONG)
 | 
						|
		result |= (dst[k] = bitmap1[k] & bitmap2[k] &
 | 
						|
			   BITMAP_LAST_WORD_MASK(bits));
 | 
						|
	return result != 0;
 | 
						|
}
 | 
						|
 | 
						|
bool __bitmap_equal(const unsigned long *bitmap1,
 | 
						|
		    const unsigned long *bitmap2, unsigned int bits)
 | 
						|
{
 | 
						|
	unsigned int k, lim = bits/BITS_PER_LONG;
 | 
						|
	for (k = 0; k < lim; ++k)
 | 
						|
		if (bitmap1[k] != bitmap2[k])
 | 
						|
			return false;
 | 
						|
 | 
						|
	if (bits % BITS_PER_LONG)
 | 
						|
		if ((bitmap1[k] ^ bitmap2[k]) & BITMAP_LAST_WORD_MASK(bits))
 | 
						|
			return false;
 | 
						|
 | 
						|
	return true;
 | 
						|
}
 | 
						|
 | 
						|
bool __bitmap_intersects(const unsigned long *bitmap1,
 | 
						|
			 const unsigned long *bitmap2, unsigned int bits)
 | 
						|
{
 | 
						|
	unsigned int k, lim = bits/BITS_PER_LONG;
 | 
						|
	for (k = 0; k < lim; ++k)
 | 
						|
		if (bitmap1[k] & bitmap2[k])
 | 
						|
			return true;
 | 
						|
 | 
						|
	if (bits % BITS_PER_LONG)
 | 
						|
		if ((bitmap1[k] & bitmap2[k]) & BITMAP_LAST_WORD_MASK(bits))
 | 
						|
			return true;
 | 
						|
	return false;
 | 
						|
}
 |