Skip to content

Commit b82f722

Browse files
ebiggerskuba-moo
authored andcommitted
lib/crc32: remove unused support for CRC32C combination
crc32c_combine() and crc32c_shift() are no longer used (except by the KUnit test that tests them), and their current implementation is very slow. Remove them. Signed-off-by: Eric Biggers <ebiggers@google.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Link: https://patch.msgid.link/20250519175012.36581-8-ebiggers@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 70c96c7 commit b82f722

File tree

3 files changed

+0
-35
lines changed

3 files changed

+0
-35
lines changed

include/linux/crc32.h

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -76,29 +76,6 @@ static inline u32 crc32_le_combine(u32 crc1, u32 crc2, size_t len2)
7676
return crc32_le_shift(crc1, len2) ^ crc2;
7777
}
7878

79-
u32 crc32c_shift(u32 crc, size_t len);
80-
81-
/**
82-
* crc32c_combine - Combine two crc32c check values into one. For two sequences
83-
* of bytes, seq1 and seq2 with lengths len1 and len2, crc32c()
84-
* check values were calculated for each, crc1 and crc2.
85-
*
86-
* @crc1: crc32c of the first block
87-
* @crc2: crc32c of the second block
88-
* @len2: length of the second block
89-
*
90-
* Return: The crc32c() check value of seq1 and seq2 concatenated, requiring
91-
* only crc1, crc2, and len2. Note: If seq_full denotes the concatenated
92-
* memory area of seq1 with seq2, and crc_full the crc32c() value of
93-
* seq_full, then crc_full == crc32c_combine(crc1, crc2, len2) when
94-
* crc_full was seeded with the same initializer as crc1, and crc2 seed
95-
* was 0. See also crc_combine_test().
96-
*/
97-
static inline u32 crc32c_combine(u32 crc1, u32 crc2, size_t len2)
98-
{
99-
return crc32c_shift(crc1, len2) ^ crc2;
100-
}
101-
10279
#define crc32(seed, data, length) crc32_le(seed, (unsigned char const *)(data), length)
10380

10481
/*

lib/crc32.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,6 @@ u32 crc32_le_shift(u32 crc, size_t len)
119119
}
120120
EXPORT_SYMBOL(crc32_le_shift);
121121

122-
u32 crc32c_shift(u32 crc, size_t len)
123-
{
124-
return crc32_generic_shift(crc, len, CRC32C_POLY_LE);
125-
}
126-
EXPORT_SYMBOL(crc32c_shift);
127-
128122
u32 crc32_be_base(u32 crc, const u8 *p, size_t len)
129123
{
130124
while (len--)

lib/tests/crc_kunit.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,17 +391,11 @@ static u64 crc32c_wrapper(u64 crc, const u8 *p, size_t len)
391391
return crc32c(crc, p, len);
392392
}
393393

394-
static u64 crc32c_combine_wrapper(u64 crc1, u64 crc2, size_t len2)
395-
{
396-
return crc32c_combine(crc1, crc2, len2);
397-
}
398-
399394
static const struct crc_variant crc_variant_crc32c = {
400395
.bits = 32,
401396
.le = true,
402397
.poly = 0x82f63b78,
403398
.func = crc32c_wrapper,
404-
.combine_func = crc32c_combine_wrapper,
405399
};
406400

407401
static void crc32c_test(struct kunit *test)

0 commit comments

Comments
 (0)