Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
lib/crc32: remove "_le" from crc32c base and arch functions
Following the standardization on crc32c() as the lib entry point for the
Castagnoli CRC32 instead of the previous mix of crc32c(), crc32c_le(),
and __crc32c_le(), make the same change to the underlying base and arch
functions that implement it.
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20250208024911.14936-7-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
+40
-40
+6
-6
arch/arm/lib/crc32-glue.c
+6
-6
arch/arm/lib/crc32-glue.c
···
59
59
}
60
60
EXPORT_SYMBOL(crc32_le_arch);
61
61
62
-
static u32 crc32c_le_scalar(u32 crc, const u8 *p, size_t len)
62
+
static u32 crc32c_scalar(u32 crc, const u8 *p, size_t len)
63
63
{
64
64
if (static_branch_likely(&have_crc32))
65
65
return crc32c_armv8_le(crc, p, len);
66
-
return crc32c_le_base(crc, p, len);
66
+
return crc32c_base(crc, p, len);
67
67
}
68
68
69
-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
69
+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
70
70
{
71
71
if (len >= PMULL_MIN_LEN + 15 &&
72
72
static_branch_likely(&have_pmull) && crypto_simd_usable()) {
···
74
74
75
75
/* align p to 16-byte boundary */
76
76
if (n) {
77
-
crc = crc32c_le_scalar(crc, p, n);
77
+
crc = crc32c_scalar(crc, p, n);
78
78
p += n;
79
79
len -= n;
80
80
}
···
85
85
p += n;
86
86
len -= n;
87
87
}
88
-
return crc32c_le_scalar(crc, p, len);
88
+
return crc32c_scalar(crc, p, len);
89
89
}
90
-
EXPORT_SYMBOL(crc32c_le_arch);
90
+
EXPORT_SYMBOL(crc32c_arch);
91
91
92
92
u32 crc32_be_arch(u32 crc, const u8 *p, size_t len)
93
93
{
+3
-3
arch/arm64/lib/crc32-glue.c
+3
-3
arch/arm64/lib/crc32-glue.c
···
43
43
}
44
44
EXPORT_SYMBOL(crc32_le_arch);
45
45
46
-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
46
+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
47
47
{
48
48
if (!alternative_has_cap_likely(ARM64_HAS_CRC32))
49
-
return crc32c_le_base(crc, p, len);
49
+
return crc32c_base(crc, p, len);
50
50
51
51
if (len >= min_len && cpu_have_named_feature(PMULL) && crypto_simd_usable()) {
52
52
kernel_neon_begin();
···
62
62
63
63
return crc32c_le_arm64(crc, p, len);
64
64
}
65
-
EXPORT_SYMBOL(crc32c_le_arch);
65
+
EXPORT_SYMBOL(crc32c_arch);
66
66
67
67
u32 crc32_be_arch(u32 crc, const u8 *p, size_t len)
68
68
{
+3
-3
arch/loongarch/lib/crc32-loongarch.c
+3
-3
arch/loongarch/lib/crc32-loongarch.c
···
65
65
}
66
66
EXPORT_SYMBOL(crc32_le_arch);
67
67
68
-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
68
+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
69
69
{
70
70
if (!static_branch_likely(&have_crc32))
71
-
return crc32c_le_base(crc, p, len);
71
+
return crc32c_base(crc, p, len);
72
72
73
73
while (len >= sizeof(u64)) {
74
74
u64 value = get_unaligned_le64(p);
···
100
100
101
101
return crc;
102
102
}
103
-
EXPORT_SYMBOL(crc32c_le_arch);
103
+
EXPORT_SYMBOL(crc32c_arch);
104
104
105
105
u32 crc32_be_arch(u32 crc, const u8 *p, size_t len)
106
106
{
+3
-3
arch/mips/lib/crc32-mips.c
+3
-3
arch/mips/lib/crc32-mips.c
···
108
108
}
109
109
EXPORT_SYMBOL(crc32_le_arch);
110
110
111
-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
111
+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
112
112
{
113
113
if (!static_branch_likely(&have_crc32))
114
-
return crc32c_le_base(crc, p, len);
114
+
return crc32c_base(crc, p, len);
115
115
116
116
if (IS_ENABLED(CONFIG_64BIT)) {
117
117
for (; len >= sizeof(u64); p += sizeof(u64), len -= sizeof(u64)) {
···
149
149
}
150
150
return crc;
151
151
}
152
-
EXPORT_SYMBOL(crc32c_le_arch);
152
+
EXPORT_SYMBOL(crc32c_arch);
153
153
154
154
u32 crc32_be_arch(u32 crc, const u8 *p, size_t len)
155
155
{
+5
-5
arch/powerpc/lib/crc32-glue.c
+5
-5
arch/powerpc/lib/crc32-glue.c
···
23
23
}
24
24
EXPORT_SYMBOL(crc32_le_arch);
25
25
26
-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
26
+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
27
27
{
28
28
unsigned int prealign;
29
29
unsigned int tail;
30
30
31
31
if (len < (VECTOR_BREAKPOINT + VMX_ALIGN) ||
32
32
!static_branch_likely(&have_vec_crypto) || !crypto_simd_usable())
33
-
return crc32c_le_base(crc, p, len);
33
+
return crc32c_base(crc, p, len);
34
34
35
35
if ((unsigned long)p & VMX_ALIGN_MASK) {
36
36
prealign = VMX_ALIGN - ((unsigned long)p & VMX_ALIGN_MASK);
37
-
crc = crc32c_le_base(crc, p, prealign);
37
+
crc = crc32c_base(crc, p, prealign);
38
38
len -= prealign;
39
39
p += prealign;
40
40
}
···
52
52
tail = len & VMX_ALIGN_MASK;
53
53
if (tail) {
54
54
p += len & ~VMX_ALIGN_MASK;
55
-
crc = crc32c_le_base(crc, p, tail);
55
+
crc = crc32c_base(crc, p, tail);
56
56
}
57
57
58
58
return crc;
59
59
}
60
-
EXPORT_SYMBOL(crc32c_le_arch);
60
+
EXPORT_SYMBOL(crc32c_arch);
61
61
62
62
u32 crc32_be_arch(u32 crc, const u8 *p, size_t len)
63
63
{
+3
-3
arch/riscv/lib/crc32-riscv.c
+3
-3
arch/riscv/lib/crc32-riscv.c
···
224
224
}
225
225
EXPORT_SYMBOL(crc32_le_arch);
226
226
227
-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
227
+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
228
228
{
229
229
return crc32_le_generic(crc, p, len, CRC32C_POLY_LE,
230
-
CRC32C_POLY_QT_LE, crc32c_le_base);
230
+
CRC32C_POLY_QT_LE, crc32c_base);
231
231
}
232
-
EXPORT_SYMBOL(crc32c_le_arch);
232
+
EXPORT_SYMBOL(crc32c_arch);
233
233
234
234
static inline u32 crc32_be_unaligned(u32 crc, unsigned char const *p,
235
235
size_t len)
+1
-1
arch/s390/lib/crc32-glue.c
+1
-1
arch/s390/lib/crc32-glue.c
···
62
62
63
63
DEFINE_CRC32_VX(crc32_le_arch, crc32_le_vgfm_16, crc32_le_base)
64
64
DEFINE_CRC32_VX(crc32_be_arch, crc32_be_vgfm_16, crc32_be_base)
65
-
DEFINE_CRC32_VX(crc32c_le_arch, crc32c_le_vgfm_16, crc32c_le_base)
65
+
DEFINE_CRC32_VX(crc32c_arch, crc32c_le_vgfm_16, crc32c_base)
66
66
67
67
static int __init crc32_s390_init(void)
68
68
{
+5
-5
arch/sparc/lib/crc32_glue.c
+5
-5
arch/sparc/lib/crc32_glue.c
···
27
27
28
28
void crc32c_sparc64(u32 *crcp, const u64 *data, size_t len);
29
29
30
-
u32 crc32c_le_arch(u32 crc, const u8 *data, size_t len)
30
+
u32 crc32c_arch(u32 crc, const u8 *data, size_t len)
31
31
{
32
32
size_t n = -(uintptr_t)data & 7;
33
33
34
34
if (!static_branch_likely(&have_crc32c_opcode))
35
-
return crc32c_le_base(crc, data, len);
35
+
return crc32c_base(crc, data, len);
36
36
37
37
if (n) {
38
38
/* Data isn't 8-byte aligned. Align it. */
39
39
n = min(n, len);
40
-
crc = crc32c_le_base(crc, data, n);
40
+
crc = crc32c_base(crc, data, n);
41
41
data += n;
42
42
len -= n;
43
43
}
···
48
48
len -= n;
49
49
}
50
50
if (len)
51
-
crc = crc32c_le_base(crc, data, len);
51
+
crc = crc32c_base(crc, data, len);
52
52
return crc;
53
53
}
54
-
EXPORT_SYMBOL(crc32c_le_arch);
54
+
EXPORT_SYMBOL(crc32c_arch);
55
55
56
56
u32 crc32_be_arch(u32 crc, const u8 *data, size_t len)
57
57
{
+3
-3
arch/x86/lib/crc32-glue.c
+3
-3
arch/x86/lib/crc32-glue.c
···
61
61
62
62
asmlinkage u32 crc32c_x86_3way(u32 crc, const u8 *buffer, size_t len);
63
63
64
-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
64
+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
65
65
{
66
66
size_t num_longs;
67
67
68
68
if (!static_branch_likely(&have_crc32))
69
-
return crc32c_le_base(crc, p, len);
69
+
return crc32c_base(crc, p, len);
70
70
71
71
if (IS_ENABLED(CONFIG_X86_64) && len >= CRC32C_PCLMUL_BREAKEVEN &&
72
72
static_branch_likely(&have_pclmulqdq) && crypto_simd_usable()) {
···
85
85
86
86
return crc;
87
87
}
88
-
EXPORT_SYMBOL(crc32c_le_arch);
88
+
EXPORT_SYMBOL(crc32c_arch);
89
89
90
90
u32 crc32_be_arch(u32 crc, const u8 *p, size_t len)
91
91
{
+2
-2
crypto/crc32c_generic.c
+2
-2
crypto/crc32c_generic.c
···
85
85
{
86
86
struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);
87
87
88
-
ctx->crc = crc32c_le_base(ctx->crc, data, length);
88
+
ctx->crc = crc32c_base(ctx->crc, data, length);
89
89
return 0;
90
90
}
91
91
···
108
108
109
109
static int __chksum_finup(u32 *crcp, const u8 *data, unsigned int len, u8 *out)
110
110
{
111
-
put_unaligned_le32(~crc32c_le_base(*crcp, data, len), out);
111
+
put_unaligned_le32(~crc32c_base(*crcp, data, len), out);
112
112
return 0;
113
113
}
114
114
+4
-4
include/linux/crc32.h
+4
-4
include/linux/crc32.h
···
12
12
u32 crc32_le_base(u32 crc, const u8 *p, size_t len);
13
13
u32 crc32_be_arch(u32 crc, const u8 *p, size_t len);
14
14
u32 crc32_be_base(u32 crc, const u8 *p, size_t len);
15
-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len);
16
-
u32 crc32c_le_base(u32 crc, const u8 *p, size_t len);
15
+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len);
16
+
u32 crc32c_base(u32 crc, const u8 *p, size_t len);
17
17
18
18
static inline u32 crc32_le(u32 crc, const void *p, size_t len)
19
19
{
···
32
32
static inline u32 crc32c(u32 crc, const void *p, size_t len)
33
33
{
34
34
if (IS_ENABLED(CONFIG_CRC32_ARCH))
35
-
return crc32c_le_arch(crc, p, len);
36
-
return crc32c_le_base(crc, p, len);
35
+
return crc32c_arch(crc, p, len);
36
+
return crc32c_base(crc, p, len);
37
37
}
38
38
39
39
/*
+2
-2
lib/crc32.c
+2
-2
lib/crc32.c
···
45
45
}
46
46
EXPORT_SYMBOL(crc32_le_base);
47
47
48
-
u32 crc32c_le_base(u32 crc, const u8 *p, size_t len)
48
+
u32 crc32c_base(u32 crc, const u8 *p, size_t len)
49
49
{
50
50
while (len--)
51
51
crc = (crc >> 8) ^ crc32ctable_le[(crc & 255) ^ *p++];
52
52
return crc;
53
53
}
54
-
EXPORT_SYMBOL(crc32c_le_base);
54
+
EXPORT_SYMBOL(crc32c_base);
55
55
56
56
/*
57
57
* This multiplies the polynomials x and y modulo the given modulus.