Commit 3c9f0c93 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-6.15-2025-03-20' of git://git.infradead.org/nvme into for-6.15/block 

Pull NVMe updates from Keith:

"nvme updates for Linux 6.15

 - Secure concatenation for TCP transport (Hannes)
 - Multipath sysfs visibility (Nilay)
 - Various cleanups (Qasim, Baruch, Wang, Chen, Mike, Damien, Li)
 - Correct use of 64-bit BARs for pci-epf target (Niklas)
 - Socket fix for selinux when used in containers (Peijie)"

* tag 'nvme-6.15-2025-03-20' of git://git.infradead.org/nvme: (22 commits)
  nvmet: replace max(a, min(b, c)) by clamp(val, lo, hi)
  nvme-tcp: fix selinux denied when calling sock_sendmsg
  nvmet: pci-epf: Always configure BAR0 as 64-bit
  nvmet: Remove duplicate uuid_copy
  nvme: zns: Simplify nvme_zone_parse_entry()
  nvmet: pci-epf: Remove redundant 'flush_workqueue()' calls
  nvmet-fc: Remove unused functions
  nvme-pci: remove stale comment
  nvme-fc: Utilise min3() to simplify queue count calculation
  nvme-multipath: Add visibility for queue-depth io-policy
  nvme-multipath: Add visibility for numa io-policy
  nvme-multipath: Add visibility for round-robin io-policy
  nvmet: add tls_concat and tls_key debugfs entries
  nvmet-tcp: support secure channel concatenation
  nvmet: Add 'sq' argument to alloc_ctrl_args
  nvme-fabrics: reset admin connection for secure concatenation
  nvme-tcp: request secure channel concatenation
  nvme-keyring: add nvme_tls_psk_refresh()
  nvme: add nvme_auth_derive_tls_psk()
  nvme: add nvme_auth_generate_digest()
  ...
parents fc22b34e 64ea88e3

crypto/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -141,6 +141,12 @@ config CRYPTO_ACOMP 
	select CRYPTO_ALGAPI

	select CRYPTO_ACOMP2



config CRYPTO_HKDF

	tristate

	select CRYPTO_SHA256 if !CONFIG_CRYPTO_MANAGER_DISABLE_TESTS

	select CRYPTO_SHA512 if !CONFIG_CRYPTO_MANAGER_DISABLE_TESTS

	select CRYPTO_HASH2



config CRYPTO_MANAGER

	tristate "Cryptographic algorithm manager"

	select CRYPTO_MANAGER2

crypto/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o 
obj-$(CONFIG_CRYPTO_AKCIPHER2) += akcipher.o

obj-$(CONFIG_CRYPTO_SIG2) += sig.o

obj-$(CONFIG_CRYPTO_KPP2) += kpp.o

obj-$(CONFIG_CRYPTO_HKDF) += hkdf.o



dh_generic-y := dh.o

dh_generic-y += dh_helper.o

crypto/hkdf.c

0 → 100644
+573 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/nvme/common/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ config NVME_AUTH 
	select CRYPTO_SHA512

	select CRYPTO_DH

	select CRYPTO_DH_RFC7919_GROUPS

	select CRYPTO_HKDF

drivers/nvme/common/auth.c

+337 −0

File changed.

Preview size limit exceeded, changes collapsed.