From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 Mar 2025 17:01:55 +0000 (-0700)
Subject: Merge tag 'v6.15-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: nvme-6.15-2025-04-02~44
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e5e0e6bebef3a21081fd1057c40468d4cff1a60d;p=nvme.git

Merge tag 'v6.15-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto updates from Herbert Xu:
 "API:
   - Remove legacy compression interface
   - Improve scatterwalk API
   - Add request chaining to ahash and acomp
   - Add virtual address support to ahash and acomp
   - Add folio support to acomp
   - Remove NULL dst support from acomp

  Algorithms:
   - Library options are fuly hidden (selected by kernel users only)
   - Add Kerberos5 algorithms
   - Add VAES-based ctr(aes) on x86
   - Ensure LZO respects output buffer length on compression
   - Remove obsolete SIMD fallback code path from arm/ghash-ce

  Drivers:
   - Add support for PCI device 0x1134 in ccp
   - Add support for rk3588's standalone TRNG in rockchip
   - Add Inside Secure SafeXcel EIP-93 crypto engine support in eip93
   - Fix bugs in tegra uncovered by multi-threaded self-test
   - Fix corner cases in hisilicon/sec2

  Others:
   - Add SG_MITER_LOCAL to sg miter
   - Convert ubifs, hibernate and xfrm_ipcomp from legacy API to acomp"

* tag 'v6.15-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (187 commits)
  crypto: testmgr - Add multibuffer acomp testing
  crypto: acomp - Fix synchronous acomp chaining fallback
  crypto: testmgr - Add multibuffer hash testing
  crypto: hash - Fix synchronous ahash chaining fallback
  crypto: arm/ghash-ce - Remove SIMD fallback code path
  crypto: essiv - Replace memcpy() + NUL-termination with strscpy()
  crypto: api - Call crypto_alg_put in crypto_unregister_alg
  crypto: scompress - Fix incorrect stream freeing
  crypto: lib/chacha - remove unused arch-specific init support
  crypto: remove obsolete 'comp' compression API
  crypto: compress_null - drop obsolete 'comp' implementation
  crypto: cavium/zip - drop obsolete 'comp' implementation
  crypto: zstd - drop obsolete 'comp' implementation
  crypto: lzo - drop obsolete 'comp' implementation
  crypto: lzo-rle - drop obsolete 'comp' implementation
  crypto: lz4hc - drop obsolete 'comp' implementation
  crypto: lz4 - drop obsolete 'comp' implementation
  crypto: deflate - drop obsolete 'comp' implementation
  crypto: 842 - drop obsolete 'comp' implementation
  crypto: nx - Migrate to scomp API
  ...
---

e5e0e6bebef3a21081fd1057c40468d4cff1a60d
diff --cc arch/x86/crypto/aesni-intel_glue.c
index 3e9ab5cdade4,e141b7995304..bc655d794a95
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@@ -1580,10 -1623,11 +1603,11 @@@ static int __init register_avx_algs(voi
  	if (err)
  		return err;
  
 -	if (x86_match_cpu(zmm_exclusion_list)) {
 +	if (boot_cpu_has(X86_FEATURE_PREFER_YMM)) {
  		int i;
  
- 		aes_xts_alg_vaes_avx10_512.base.cra_priority = 1;
+ 		for (i = 0; i < ARRAY_SIZE(skcipher_algs_vaes_avx10_512); i++)
+ 			skcipher_algs_vaes_avx10_512[i].base.cra_priority = 1;
  		for (i = 0; i < ARRAY_SIZE(aes_gcm_algs_vaes_avx10_512); i++)
  			aes_gcm_algs_vaes_avx10_512[i].base.cra_priority = 1;
  	}
diff --cc crypto/Makefile
index c95e95e75ad4,f22ebd6fb221..0e6ab5ffd3f7
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@@ -156,7 -155,11 +156,8 @@@ obj-$(CONFIG_CRYPTO_CRC32C) += crc32c_g
  obj-$(CONFIG_CRYPTO_CRC32) += crc32_generic.o
  CFLAGS_crc32c_generic.o += -DARCH=$(ARCH)
  CFLAGS_crc32_generic.o += -DARCH=$(ARCH)
 -obj-$(CONFIG_CRYPTO_CRCT10DIF) += crct10dif_generic.o
 -CFLAGS_crct10dif_generic.o += -DARCH=$(ARCH)
 -obj-$(CONFIG_CRYPTO_CRC64_ROCKSOFT) += crc64_rocksoft_generic.o
  obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o
+ obj-$(CONFIG_CRYPTO_KRB5ENC) += krb5enc.o
  obj-$(CONFIG_CRYPTO_LZO) += lzo.o lzo-rle.o
  obj-$(CONFIG_CRYPTO_LZ4) += lz4.o
  obj-$(CONFIG_CRYPTO_LZ4HC) += lz4hc.o