Commit 3508f318 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.9/dm-fixes-2' of... 

Merge tag 'for-6.9/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper fixes from Mike Snitzer:

 - Fix MAINTAINERS to not include M: dm-devel for DM entries.

 - Fix DM vdo's murmurhash to use proper byteswapping methods.

 - Fix DM integrity clang warning about comparison out-of-range.

* tag 'for-6.9/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm integrity: fix out-of-range warning
  dm vdo murmurhash3: use kernel byteswapping routines instead of GCC ones
  MAINTAINERS: Remove incorrect M: tag for dm-devel@lists.linux.dev
parents 033e4491 8e91c234

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -6156,7 +6156,6 @@ DEVICE-MAPPER (LVM) 
M:	Alasdair Kergon <agk@redhat.com>

M:	Mike Snitzer <snitzer@kernel.org>

M:	Mikulas Patocka <mpatocka@redhat.com>

M:	dm-devel@lists.linux.dev

L:	dm-devel@lists.linux.dev

S:	Maintained

Q:	http://patchwork.kernel.org/project/dm-devel/list/

drivers/md/dm-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -4221,7 +4221,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned int argc, char **argv 
		} else if (sscanf(opt_string, "sectors_per_bit:%llu%c", &llval, &dummy) == 1) {

			log2_sectors_per_bitmap_bit = !llval ? 0 : __ilog2_u64(llval);

		} else if (sscanf(opt_string, "bitmap_flush_interval:%u%c", &val, &dummy) == 1) {

			if (val >= (uint64_t)UINT_MAX * 1000 / HZ) {

			if ((uint64_t)val >= (uint64_t)UINT_MAX * 1000 / HZ) {

				r = -EINVAL;

				ti->error = "Invalid bitmap_flush_interval argument";

				goto bad;

drivers/md/dm-vdo/murmurhash3.c

+8 −25
Original line number Diff line number Diff line
@@ -8,33 +8,14 @@ 


#include "murmurhash3.h"



#include <asm/unaligned.h>



static inline u64 rotl64(u64 x, s8 r)

{

	return (x << r) | (x >> (64 - r));

}



#define ROTL64(x, y) rotl64(x, y)

static __always_inline u64 getblock64(const u64 *p, int i)

{

#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

	return p[i];

#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

	return __builtin_bswap64(p[i]);

#else

#error "can't figure out byte order"

#endif

}



static __always_inline void putblock64(u64 *p, int i, u64 value)

{

#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

	p[i] = value;

#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

	p[i] = __builtin_bswap64(value);

#else

#error "can't figure out byte order"

#endif

}



/* Finalization mix - force all bits of a hash block to avalanche */
@@ -60,6 +41,8 @@ void murmurhash3_128(const void *key, const int len, const u32 seed, void *out) 
	const u64 c1 = 0x87c37b91114253d5LLU;

	const u64 c2 = 0x4cf5ad432745937fLLU;



	u64 *hash_out = out;



	/* body */



	const u64 *blocks = (const u64 *)(data);
@@ -67,8 +50,8 @@ void murmurhash3_128(const void *key, const int len, const u32 seed, void *out) 
	int i;



	for (i = 0; i < nblocks; i++) {

		u64 k1 = getblock64(blocks, i * 2 + 0);

		u64 k2 = getblock64(blocks, i * 2 + 1);

		u64 k1 = get_unaligned_le64(&blocks[i * 2]);

		u64 k2 = get_unaligned_le64(&blocks[i * 2 + 1]);



		k1 *= c1;

		k1 = ROTL64(k1, 31);
@@ -170,6 +153,6 @@ void murmurhash3_128(const void *key, const int len, const u32 seed, void *out) 
	h1 += h2;

	h2 += h1;



	putblock64((u64 *)out, 0, h1);

	putblock64((u64 *)out, 1, h2);

	put_unaligned_le64(h1, &hash_out[0]);

	put_unaligned_le64(h2, &hash_out[1]);

}