lib/crc: drop "glue" from filenames
Subsystems (7)
cover lib/crc: drop "glue" from filenames
This series fixes an odd naming convention that was unnecessarily carried over from the original Crypto API code.
I'm planning to take this via the crc tree.
Eric Biggers (7):
arm/crc: drop "glue" from filenames
arm64/crc: drop "glue" from filenames
powerpc/crc: drop "glue" from filenames
powerpc/crc: rename crc32-vpmsum_core.S to crc-vpmsum-template.S s390/crc: drop "glue" from filenames
sparc/crc: drop "glue" from filenames
x86/crc: drop "glue" from filenames
arch/arm/lib/Makefile | 4 ++--
arch/arm/lib/{crc-t10dif-glue.c => crc-t10dif.c} | 0
arch/arm/lib/{crc32-glue.c => crc32.c} | 0
arch/arm64/lib/Makefile | 4 ++--
arch/arm64/lib/{crc-t10dif-glue.c => crc-t10dif.c} | 0
arch/arm64/lib/{crc32.S => crc32-core.S} | 0
arch/arm64/lib/{crc32-glue.c => crc32.c} | 0
arch/powerpc/lib/Makefile | 4 ++--
arch/powerpc/lib/{crc-t10dif-glue.c => crc-t10dif.c} | 0
.../lib/{crc32-vpmsum_core.S => crc-vpmsum-template.S} | 0
arch/powerpc/lib/{crc32-glue.c => crc32.c} | 0
arch/powerpc/lib/crc32c-vpmsum_asm.S | 2 +-
arch/powerpc/lib/crct10dif-vpmsum_asm.S | 2 +-
arch/s390/lib/Makefile | 2 +-
arch/s390/lib/{crc32-glue.c => crc32.c} | 0
arch/sparc/lib/Makefile | 2 +-
arch/sparc/lib/{crc32_glue.c => crc32.c} | 2 +-
arch/x86/lib/Makefile | 6 +++---
arch/x86/lib/{crc-t10dif-glue.c => crc-t10dif.c} | 0
arch/x86/lib/{crc32-glue.c => crc32.c} | 0
arch/x86/lib/{crc64-glue.c => crc64.c} | 0
21 files changed, 14 insertions(+), 14 deletions(-)
rename arch/arm/lib/{crc-t10dif-glue.c => crc-t10dif.c} (100%)
rename arch/arm/lib/{crc32-glue.c => crc32.c} (100%)
rename arch/arm64/lib/{crc-t10dif-glue.c => crc-t10dif.c} (100%)
rename arch/arm64/lib/{crc32.S => crc32-core.S} (100%)
rename arch/arm64/lib/{crc32-glue.c => crc32.c} (100%)
rename arch/powerpc/lib/{crc-t10dif-glue.c => crc-t10dif.c} (100%)
rename arch/powerpc/lib/{crc32-vpmsum_core.S => crc-vpmsum-template.S} (100%)
rename arch/powerpc/lib/{crc32-glue.c => crc32.c} (100%)
rename arch/s390/lib/{crc32-glue.c => crc32.c} (100%)
rename arch/sparc/lib/{crc32_glue.c => crc32.c} (97%)
rename arch/x86/lib/{crc-t10dif-glue.c => crc-t10dif.c} (100%)
rename arch/x86/lib/{crc32-glue.c => crc32.c} (100%)
rename arch/x86/lib/{crc64-glue.c => crc64.c} (100%)base-commit: 1ec3d4ff5c77422927896c1f7d0ed01267ec1213
Signature · 1 line
2.49.0
PATCH 1/7 arm/crc: drop "glue" from filenames
From: Eric Biggers <[email protected]>
The use of the term "glue" in filenames is a Crypto API-ism that rarely shows up elsewhere in lib/ or arch/*/lib/. I think adopting it there was a mistake. The library just uses standard functions, so the amount of code that could be considered "glue" is quite small. And while often the C functions just wrap the assembly functions, there are also cases like crc32c_arch() in arch/x86/lib/crc32-glue.c that blur the line by in-lining the actual implementation into the C function. That's not "glue code", but rather the actual code.
Therefore, let's drop "glue" from the filenames and instead use e.g. crc32.c instead of crc32-glue.c.
---
arch/arm/lib/Makefile | 4 ++--
arch/arm/lib/{crc-t10dif-glue.c => crc-t10dif.c} | 0
arch/arm/lib/{crc32-glue.c => crc32.c} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename arch/arm/lib/{crc-t10dif-glue.c => crc-t10dif.c} (100%)
rename arch/arm/lib/{crc32-glue.c => crc32.c} (100%)arch/arm/lib/Makefile +2 -2
@@ -45,9 +45,9 @@ ifeq ($(CONFIG_KERNEL_MODE_NEON),y) endif obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o obj-$(CONFIG_CRC32_ARCH) += crc32-arm.o -crc32-arm-y := crc32-glue.o crc32-core.o +crc32-arm-y := crc32.o crc32-core.o obj-$(CONFIG_CRC_T10DIF_ARCH) += crc-t10dif-arm.o -crc-t10dif-arm-y := crc-t10dif-glue.o crc-t10dif-core.o +crc-t10dif-arm-y := crc-t10dif.o crc-t10dif-core.o
arch/arm/lib/crc-t10dif.c renamed from arch/arm/lib/crc-t10dif-glue.c +0 -0
arch/arm/lib/crc32.c renamed from arch/arm/lib/crc32-glue.c +0 -0
Signature · 1 line
2.49.0
PATCH 2/7 arm64/crc: drop "glue" from filenames
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
The use of the term "glue" in filenames is a Crypto API-ism that rarely shows up elsewhere in lib/ or arch/*/lib/. I think adopting it there was a mistake. The library just uses standard functions, so the amount of code that could be considered "glue" is quite small. And while often the C functions just wrap the assembly functions, there are also cases like crc32c_arch() in arch/x86/lib/crc32-glue.c that blur the line by in-lining the actual implementation into the C function. That's not "glue code", but rather the actual code.
Therefore, let's drop "glue" from the filenames and instead use e.g. crc32.c instead of crc32-glue.c.
---
arch/arm64/lib/Makefile | 4 ++--
arch/arm64/lib/{crc-t10dif-glue.c => crc-t10dif.c} | 0
arch/arm64/lib/{crc32.S => crc32-core.S} | 0
arch/arm64/lib/{crc32-glue.c => crc32.c} | 0
4 files changed, 2 insertions(+), 2 deletions(-)
rename arch/arm64/lib/{crc-t10dif-glue.c => crc-t10dif.c} (100%)
rename arch/arm64/lib/{crc32.S => crc32-core.S} (100%)
rename arch/arm64/lib/{crc32-glue.c => crc32.c} (100%)arch/arm64/lib/Makefile +2 -2
@@ -12,14 +12,14 @@ CFLAGS_REMOVE_xor-neon.o += $(CC_FLAGS_NO_FPU) endif lib-$(CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE) += uaccess_flushcache.o obj-$(CONFIG_CRC32_ARCH) += crc32-arm64.o -crc32-arm64-y := crc32.o crc32-glue.o +crc32-arm64-y := crc32.o crc32-core.o obj-$(CONFIG_CRC_T10DIF_ARCH) += crc-t10dif-arm64.o -crc-t10dif-arm64-y := crc-t10dif-glue.o crc-t10dif-core.o +crc-t10dif-arm64-y := crc-t10dif.o crc-t10dif-core.o obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o obj-$(CONFIG_ARM64_MTE) += mte.o
arch/arm64/lib/crc-t10dif.c renamed from arch/arm64/lib/crc-t10dif-glue.c +0 -0
arch/arm64/lib/crc32-core.S renamed from arch/arm64/lib/crc32.S +0 -0
arch/arm64/lib/crc32.c renamed from arch/arm64/lib/crc32-glue.c +0 -0
Signature · 1 line
2.49.0
PATCH 3/7 powerpc/crc: drop "glue" from filenames
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
The use of the term "glue" in filenames is a Crypto API-ism that rarely shows up elsewhere in lib/ or arch/*/lib/. I think adopting it there was a mistake. The library just uses standard functions, so the amount of code that could be considered "glue" is quite small. And while often the C functions just wrap the assembly functions, there are also cases like crc32c_arch() in arch/x86/lib/crc32-glue.c that blur the line by in-lining the actual implementation into the C function. That's not "glue code", but rather the actual code.
Therefore, let's drop "glue" from the filenames and instead use e.g. crc32.c instead of crc32-glue.c.
---
arch/powerpc/lib/Makefile | 4 ++--
arch/powerpc/lib/{crc-t10dif-glue.c => crc-t10dif.c} | 0
arch/powerpc/lib/{crc32-glue.c => crc32.c} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename arch/powerpc/lib/{crc-t10dif-glue.c => crc-t10dif.c} (100%)
rename arch/powerpc/lib/{crc32-glue.c => crc32.c} (100%)arch/powerpc/lib/Makefile +2 -2
@@ -77,11 +77,11 @@ obj-$(CONFIG_ALTIVEC) += xor_vmx.o xor_vmx_glue.o CFLAGS_xor_vmx.o += -mhard-float -maltivec $(call cc-option,-mabi=altivec) # Enable <altivec.h> CFLAGS_xor_vmx.o += -isystem $(shell $(CC) -print-file-name=include) obj-$(CONFIG_CRC32_ARCH) += crc32-powerpc.o -crc32-powerpc-y := crc32-glue.o crc32c-vpmsum_asm.o +crc32-powerpc-y := crc32.o crc32c-vpmsum_asm.o obj-$(CONFIG_CRC_T10DIF_ARCH) += crc-t10dif-powerpc.o -crc-t10dif-powerpc-y := crc-t10dif-glue.o crct10dif-vpmsum_asm.o +crc-t10dif-powerpc-y := crc-t10dif.o crct10dif-vpmsum_asm.o obj-$(CONFIG_PPC64) += $(obj64-y)
arch/powerpc/lib/crc-t10dif.c renamed from arch/powerpc/lib/crc-t10dif-glue.c +0 -0
arch/powerpc/lib/crc32.c renamed from arch/powerpc/lib/crc32-glue.c +0 -0
Signature · 1 line
2.49.0
PATCH 4/7 powerpc/crc: rename crc32-vpmsum_core.S to crc-vpmsum-template.S
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Rename crc32-vpmsum_core.S to crc-vpmsum-template.S to properly convey that (a) it actually generates code for both 32-bit and 16-bit CRCs, not just 32-bit CRCs; and (b) it has "template" semantics, like x86's crc-pclmul-template.S, in the sense that it's included by other files.
---
arch/powerpc/lib/{crc32-vpmsum_core.S => crc-vpmsum-template.S} | 0
arch/powerpc/lib/crc32c-vpmsum_asm.S | 2 +-
arch/powerpc/lib/crct10dif-vpmsum_asm.S | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename arch/powerpc/lib/{crc32-vpmsum_core.S => crc-vpmsum-template.S} (100%)arch/powerpc/lib/crc-vpmsum-template.S renamed from arch/powerpc/lib/crc32-vpmsum_core.S +0 -0
arch/powerpc/lib/crc32c-vpmsum_asm.S +1 -1
@@ -837,6 +837,6 @@ /* 33 bit reflected Barrett constant n */ .octa 0x00000000000000000000000105ec76f1 #define CRC_FUNCTION_NAME __crc32c_vpmsum #define REFLECT -#include "crc32-vpmsum_core.S" +#include "crc-vpmsum-template.S"
arch/powerpc/lib/crct10dif-vpmsum_asm.S +1 -1
@@ -840,6 +840,6 @@ .octa 0x000000000000000000000001f65a57f8 /* x^64 div p(x) */ /* Barrett constant n */ .octa 0x0000000000000000000000018bb70000 #define CRC_FUNCTION_NAME __crct10dif_vpmsum -#include "crc32-vpmsum_core.S" +#include "crc-vpmsum-template.S"
Signature · 1 line
2.49.0
PATCH 5/7 s390/crc: drop "glue" from filenames
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
The use of the term "glue" in filenames is a Crypto API-ism that does not show up elsewhere in lib/. I think adopting it there was a mistake. The library just uses standard functions, so the amount of code that could be considered "glue" is quite small. And while often the C functions just wrap the assembly functions, there are also cases like crc32c_arch() in arch/x86/lib/crc32-glue.c that blur the line by in-lining the actual implementation into the C function. That's not "glue code", but rather the actual code.
Therefore, let's drop "glue" from the filenames and instead use e.g. crc32.c instead of crc32-glue.c.
---
arch/s390/lib/Makefile | 2 +-
arch/s390/lib/{crc32-glue.c => crc32.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename arch/s390/lib/{crc32-glue.c => crc32.c} (100%)arch/s390/lib/Makefile +1 -1
@@ -24,6 +24,6 @@ obj-$(CONFIG_S390_MODULES_SANITY_TEST_HELPERS) += test_modules_helpers.o lib-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o obj-$(CONFIG_EXPOLINE_EXTERN) += expoline.o obj-$(CONFIG_CRC32_ARCH) += crc32-s390.o -crc32-s390-y := crc32-glue.o crc32le-vx.o crc32be-vx.o +crc32-s390-y := crc32.o crc32le-vx.o crc32be-vx.o
arch/s390/lib/crc32.c renamed from arch/s390/lib/crc32-glue.c +0 -0
Signature · 1 line
2.49.0
Re: [PATCH 5/7] s390/crc: drop "glue" from filenames
Quoted 14 lines · Eric Biggers
From: Eric Biggers <[email protected]>
The use of the term "glue" in filenames is a Crypto API-ism that does not show up elsewhere in
lib/. I think adopting it there was a mistake. The library just uses standard functions, so the amount of code that could be considered "glue" is quite small. And while often the C functions just wrap the assembly functions, there are also cases likecrc32c_arch()inarch/x86/lib/crc32-glue.cthat blur the line by in-lining the actual implementation into the C function. That's not "glue code", but rather the actual code.Therefore, let's drop "glue" from the filenames and instead use e.g.
crc32.cinstead ofcrc32-glue.c.
Quoted 6 lines
Signed-off-by Eric Biggers <[email protected]>--- arch/s390/lib/Makefile | 2 +- arch/s390/lib/{crc32-glue.c => crc32.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename arch/s390/lib/{crc32-glue.c => crc32.c} (100%)
PATCH 6/7 sparc/crc: drop "glue" from filenames
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
The use of the term "glue" in filenames is a Crypto API-ism that rarely shows up elsewhere in lib/ or arch/*/lib/. I think adopting it there was a mistake. The library just uses standard functions, so the amount of code that could be considered "glue" is quite small. And while often the C functions just wrap the assembly functions, there are also cases like crc32c_arch() in arch/x86/lib/crc32-glue.c that blur the line by in-lining the actual implementation into the C function. That's not "glue code", but rather the actual code.
Therefore, let's drop "glue" from the filenames and instead use e.g. crc32.c instead of crc32-glue.c.
---
arch/sparc/lib/Makefile | 2 +-
arch/sparc/lib/{crc32_glue.c => crc32.c} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename arch/sparc/lib/{crc32_glue.c => crc32.c} (97%)arch/sparc/lib/Makefile +1 -1
@@ -52,6 +52,6 @@ lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o xor.o hweight.o ffs.o obj-$(CONFIG_SPARC64) += iomap.o obj-$(CONFIG_SPARC32) += atomic32.o obj-$(CONFIG_SPARC64) += PeeCeeI.o obj-$(CONFIG_CRC32_ARCH) += crc32-sparc.o -crc32-sparc-y := crc32_glue.o crc32c_asm.o +crc32-sparc-y := crc32.o crc32c_asm.o
arch/sparc/lib/crc32.c renamed from arch/sparc/lib/crc32_glue.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0-only -/* Glue code for CRC32C optimized for sparc64 crypto opcodes. +/* CRC32c (Castagnoli), sparc64 crc32c opcode accelerated * * This is based largely upon arch/x86/crypto/crc32c-intel.c * * Copyright (C) 2008 Intel Corporation * Authors: Austin Zhang <[email protected]>
Signature · 1 line
2.49.0
PATCH 7/7 x86/crc: drop "glue" from filenames
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
The use of the term "glue" in filenames is a Crypto API-ism that rarely shows up elsewhere in lib/ or arch/*/lib/. I think adopting it there was a mistake. The library just uses standard functions, so the amount of code that could be considered "glue" is quite small. And while often the C functions just wrap the assembly functions, there are also cases like crc32c_arch() in arch/x86/lib/crc32-glue.c that blur the line by in-lining the actual implementation into the C function. That's not "glue code", but rather the actual code.
Therefore, let's drop "glue" from the filenames and instead use e.g. crc32.c instead of crc32-glue.c.
---
arch/x86/lib/Makefile | 6 +++---
arch/x86/lib/{crc-t10dif-glue.c => crc-t10dif.c} | 0
arch/x86/lib/{crc32-glue.c => crc32.c} | 0
arch/x86/lib/{crc64-glue.c => crc64.c} | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename arch/x86/lib/{crc-t10dif-glue.c => crc-t10dif.c} (100%)
rename arch/x86/lib/{crc32-glue.c => crc32.c} (100%)
rename arch/x86/lib/{crc64-glue.c => crc64.c} (100%)arch/x86/lib/Makefile +3 -3
@@ -37,18 +37,18 @@ lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o insn-eval.o lib-$(CONFIG_RANDOMIZE_BASE) += kaslr.o lib-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o lib-$(CONFIG_MITIGATION_RETPOLINE) += retpoline.o obj-$(CONFIG_CRC32_ARCH) += crc32-x86.o -crc32-x86-y := crc32-glue.o crc32-pclmul.o +crc32-x86-y := crc32.o crc32-pclmul.o crc32-x86-$(CONFIG_64BIT) += crc32c-3way.o obj-$(CONFIG_CRC64_ARCH) += crc64-x86.o -crc64-x86-y := crc64-glue.o crc64-pclmul.o +crc64-x86-y := crc64.o crc64-pclmul.o obj-$(CONFIG_CRC_T10DIF_ARCH) += crc-t10dif-x86.o -crc-t10dif-x86-y := crc-t10dif-glue.o crc16-msb-pclmul.o +crc-t10dif-x86-y := crc-t10dif.o crc16-msb-pclmul.o obj-y += msr.o msr-reg.o msr-reg-export.o hweight.o obj-y += iomem.o ifeq ($(CONFIG_X86_32),y)
arch/x86/lib/crc-t10dif.c renamed from arch/x86/lib/crc-t10dif-glue.c +0 -0
arch/x86/lib/crc32.c renamed from arch/x86/lib/crc32-glue.c +0 -0
arch/x86/lib/crc64.c renamed from arch/x86/lib/crc64-glue.c +0 -0
Signature · 1 line
2.49.0
Quoted 6 lines · Eric Biggers
This series fixes an odd naming convention that was unnecessarily carried over from the original Crypto API code.
I'm planning to take this via the crc tree.
Quoted 9 lines
Eric Biggers (7):
arm/crc: drop "glue" from filenames
arm64/crc: drop "glue" from filenames
powerpc/crc: drop "glue" from filenames
powerpc/crc: renamecrc32-vpmsum_core.Stocrc-vpmsum-template.Ss390/crc: drop "glue" from filenames
sparc/crc: drop "glue" from filenames
x86/crc: drop "glue" from filenames
Quoted 40 lines
arch/arm/lib/Makefile | 4 ++-- arch/arm/lib/{crc-t10dif-glue.c => crc-t10dif.c} | 0 arch/arm/lib/{crc32-glue.c => crc32.c} | 0 arch/arm64/lib/Makefile | 4 ++-- arch/arm64/lib/{crc-t10dif-glue.c => crc-t10dif.c} | 0 arch/arm64/lib/{crc32.S => crc32-core.S} | 0 arch/arm64/lib/{crc32-glue.c => crc32.c} | 0 arch/powerpc/lib/Makefile | 4 ++-- arch/powerpc/lib/{crc-t10dif-glue.c => crc-t10dif.c} | 0 .../lib/{crc32-vpmsum_core.S => crc-vpmsum-template.S} | 0 arch/powerpc/lib/{crc32-glue.c => crc32.c} | 0 arch/powerpc/lib/crc32c-vpmsum_asm.S | 2 +- arch/powerpc/lib/crct10dif-vpmsum_asm.S | 2 +- arch/s390/lib/Makefile | 2 +- arch/s390/lib/{crc32-glue.c => crc32.c} | 0 arch/sparc/lib/Makefile | 2 +- arch/sparc/lib/{crc32_glue.c => crc32.c} | 2 +- arch/x86/lib/Makefile | 6 +++--- arch/x86/lib/{crc-t10dif-glue.c => crc-t10dif.c} | 0 arch/x86/lib/{crc32-glue.c => crc32.c} | 0 arch/x86/lib/{crc64-glue.c => crc64.c} | 0 21 files changed, 14 insertions(+), 14 deletions(-) rename arch/arm/lib/{crc-t10dif-glue.c => crc-t10dif.c} (100%) rename arch/arm/lib/{crc32-glue.c => crc32.c} (100%) rename arch/arm64/lib/{crc-t10dif-glue.c => crc-t10dif.c} (100%) rename arch/arm64/lib/{crc32.S => crc32-core.S} (100%) rename arch/arm64/lib/{crc32-glue.c => crc32.c} (100%) rename arch/powerpc/lib/{crc-t10dif-glue.c => crc-t10dif.c} (100%) rename arch/powerpc/lib/{crc32-vpmsum_core.S => crc-vpmsum-template.S} (100%) rename arch/powerpc/lib/{crc32-glue.c => crc32.c} (100%) rename arch/s390/lib/{crc32-glue.c => crc32.c} (100%) rename arch/sparc/lib/{crc32_glue.c => crc32.c} (97%) rename arch/x86/lib/{crc-t10dif-glue.c => crc-t10dif.c} (100%) rename arch/x86/lib/{crc32-glue.c => crc32.c} (100%) rename arch/x86/lib/{crc64-glue.c => crc64.c} (100%)base-commit:
1ec3d4ff5c77422927896c1f7d0ed01267ec1213--
2.49.0
Eric,
Quoted 2 lines
This series fixes an odd naming convention that was unnecessarily carried over from the original Crypto API code.
LGTM.
Signature · 1 line
Martin K. Petersen
Martin K. Petersen
Reviewed-byQuoted 5 lines
Quoted 3 lines
This series fixes an odd naming convention that was unnecessarily carried over from the original Crypto API code.
LGTM.
Signature · 1 line
Martin K. Petersen