Merge tag 'net-5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

ef4ab3ba · Linus Torvalds <[email protected]> · 2022-07-07 10:08:20 -07:00

Pull networking fixes from Paolo Abeni:
 "Including fixes from bpf, netfilter, can, and bluetooth.

  Current release - regressions:

   - bluetooth: fix deadlock on hci_power_on_sync

  Previous releases - regressions:

   - sched: act_police: allow 'continue' action offload

   - eth: usbnet: fix memory leak in error case

   - eth: ibmvnic: properly dispose of all skbs during a failover

  Previous releases - always broken:

   - bpf:
       - fix insufficient bounds propagation from
         adjust_scalar_min_max_vals
       - clear page contiguity bit when unmapping pool

   - netfilter: nft_set_pipapo: release elements in clone from
     abort path

   - mptcp: netlink: issue MP_PRIO signals from userspace PMs

   - can:
       - rcar_canfd: fix data transmission failed on R-Car V3U
       - gs_usb: gs_usb_open/close(): fix memory leak

  Misc:

   - add Wenjia as SMC maintainer"

* tag 'net-5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (57 commits)
  wireguard: Kconfig: select CRYPTO_CHACHA_S390
  crypto: s390 - do not depend on CRYPTO_HW for SIMD implementations
  wireguard: selftests: use microvm on x86
  wireguard: selftests: always call kernel makefile
  wireguard: selftests: use virt machine on m68k
  wireguard: selftests: set fake real time in init
  r8169: fix accessing unset transport header
  net: rose: fix UAF bug caused by rose_t0timer_expiry
  usbnet: fix memory leak in error case
  Revert "tls: rx: move counting TlsDecryptErrors for sync"
  mptcp: update MIB_RMSUBFLOW in cmd_sf_destroy
  mptcp: fix local endpoint accounting
  selftests: mptcp: userspace PM support for MP_PRIO signals
  mptcp: netlink: issue MP_PRIO signals from userspace PMs
  mptcp: Acquire the subflow socket lock before modifying MP_PRIO flags
  mptcp: Avoid acquiring PM lock for subflow priority changes
  mptcp: fix locking in mptcp_nl_cmd_sf_destroy()
  net/mlx5e: Fix matchall police parameters validation
  net/sched: act_police: allow 'continue' action offload
  net: lan966x: hardcode the number of external ports
  ...

Commit: ef4ab3ba4e4f99b1f3af3a7b74815f59394d822e
Parents: 651a8536 · 07266d06

Merge commit. Changes below are compared with the first parent: 651a8536.

Changes

65 files changed · +1089 −524

File	Status	Add	Del	Content
Documentation/process/maintainer-netdev.rst	modified	+36	−0	View file
MAINTAINERS	modified	+96	−20	View file
crypto/Kconfig	modified	+114	−0	View file
drivers/crypto/Kconfig	modified	+0	−115	View file
drivers/net/Kconfig	modified	+1	−0	View file
drivers/net/can/grcan.c	modified	+0	−1	View file
drivers/net/can/m_can/m_can.c	modified	+5	−3	View file
drivers/net/can/rcar/rcar_canfd.c	modified	+4	−1	View file
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c	modified	+4	−2	View file
drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c	modified	+11	−11	View file
drivers/net/can/usb/gs_usb.c	modified	+21	−2	View file
drivers/net/can/usb/kvaser_usb/kvaser_usb.h	modified	+15	−10	View file
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c	modified	+158	−127	View file
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c	modified	+2	−2	View file
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c	modified	+68	−51	View file
drivers/net/can/xilinx_can.c	modified	+2	−2	View file
drivers/net/ethernet/ibm/ibmvnic.c	modified	+9	−0	View file
drivers/net/ethernet/intel/i40e/i40e.h	modified	+16	−0	View file
drivers/net/ethernet/intel/i40e/i40e_main.c	modified	+73	−0	View file
drivers/net/ethernet/intel/i40e/i40e_register.h	modified	+13	−0	View file
drivers/net/ethernet/intel/i40e/i40e_type.h	modified	+1	−0	View file
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c	modified	+4	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	modified	+6	−7	View file
drivers/net/ethernet/microchip/lan966x/lan966x_main.c	modified	+2	−6	View file
drivers/net/ethernet/microchip/lan966x/lan966x_main.h	modified	+1	−0	View file
drivers/net/ethernet/realtek/r8169_main.c	modified	+4	−6	View file
drivers/net/usb/catc.c	modified	+1	−1	View file
drivers/net/usb/usbnet.c	modified	+12	−5	View file
include/net/flow_offload.h	modified	+1	−0	View file
kernel/bpf/verifier.c	modified	+47	−66	View file
net/bluetooth/hci_core.c	modified	+3	−0	View file
net/bluetooth/hci_sync.c	modified	+0	−1	View file
net/can/bcm.c	modified	+14	−4	View file
net/mptcp/options.c	modified	+3	−0	View file
net/mptcp/pm_netlink.c	modified	+33	−13	View file
net/mptcp/pm_userspace.c	modified	+38	−13	View file
net/mptcp/protocol.c	modified	+7	−2	View file
net/mptcp/protocol.h	modified	+8	−1	View file
net/netfilter/nf_tables_api.c	modified	+8	−1	View file
net/netfilter/nft_set_pipapo.c	modified	+33	−15	View file
net/rose/rose_route.c	modified	+2	−2	View file
net/sched/act_police.c	modified	+1	−1	View file
net/tls/tls_sw.c	modified	+4	−4	View file
net/xdp/xsk_buff_pool.c	modified	+1	−0	View file
samples/fprobe/fprobe_example.c	modified	+7	−0	View file
tools/testing/selftests/bpf/verifier/jmp32.c	modified	+21	−0	View file
tools/testing/selftests/bpf/verifier/jump.c	modified	+22	−0	View file
tools/testing/selftests/net/forwarding/lib.sh	modified	+5	−1	View file
tools/testing/selftests/net/mptcp/pm_nl_ctl.c	modified	+71	−2	View file
tools/testing/selftests/net/mptcp/userspace_pm.sh	modified	+32	−0	View file
tools/testing/selftests/net/udpgro.sh	modified	+1	−1	View file
tools/testing/selftests/net/udpgro_bench.sh	modified	+1	−1	View file
tools/testing/selftests/net/udpgro_frglist.sh	modified	+1	−1	View file
tools/testing/selftests/net/udpgro_fwd.sh	modified	+1	−1	View file
tools/testing/selftests/net/veth.sh	modified	+3	−3	View file
tools/testing/selftests/wireguard/qemu/Makefile	modified	+11	−9	View file
tools/testing/selftests/wireguard/qemu/arch/arm.config	modified	+1	−0	View file
tools/testing/selftests/wireguard/qemu/arch/armeb.config	modified	+1	−0	View file
tools/testing/selftests/wireguard/qemu/arch/i686.config	modified	+6	−2	View file
tools/testing/selftests/wireguard/qemu/arch/m68k.config	modified	+4	−6	View file
tools/testing/selftests/wireguard/qemu/arch/mips.config	modified	+1	−0	View file
tools/testing/selftests/wireguard/qemu/arch/mipsel.config	modified	+1	−0	View file
tools/testing/selftests/wireguard/qemu/arch/powerpc.config	modified	+1	−0	View file
tools/testing/selftests/wireguard/qemu/arch/x86_64.config	modified	+5	−2	View file
tools/testing/selftests/wireguard/qemu/init.c	modified	+11	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/process/maintainer-netdev.rst

View file

diff --git a/Documentation/process/maintainer-netdev.rst b/Documentation/process/maintainer-netdev.rst
index c456b52..d140070 100644
--- a/Documentation/process/maintainer-netdev.rst
+++ b/Documentation/process/maintainer-netdev.rst
@@ -6,6 +6,15 @@
 netdev FAQ
 ==========
 
+tl;dr
+-----
+
+ - designate your patch to a tree - ``[PATCH net]`` or ``[PATCH net-next]``
+ - for fixes the ``Fixes:`` tag is required, regardless of the tree
+ - don't post large series (> 15 patches), break them up
+ - don't repost your patches within one 24h period
+ - reverse xmas tree
+
 What is netdev?
 ---------------
 It is a mailing list for all network-related Linux stuff.  This
@@ -136,6 +145,20 @@ it to the maintainer to figure out what is the most recent and current
 version that should be applied. If there is any doubt, the maintainer
 will reply and ask what should be done.
 
+How do I divide my work into patches?
+-------------------------------------
+
+Put yourself in the shoes of the reviewer. Each patch is read separately
+and therefore should constitute a comprehensible step towards your stated
+goal.
+
+Avoid sending series longer than 15 patches. Larger series takes longer
+to review as reviewers will defer looking at it until they find a large
+chunk of time. A small series can be reviewed in a short time, so Maintainers
+just do it. As a result, a sequence of smaller series gets merged quicker and
+with better review coverage. Re-posting large series also increases the mailing
+list traffic.
+
 I made changes to only a few patches in a patch series should I resend only those changed?
 ------------------------------------------------------------------------------------------
 No, please resend the entire patch series and make sure you do number your
@@ -183,6 +206,19 @@ it is requested that you make it look like this::
    * another line of text
    */
 
+What is "reverse xmas tree"?
+----------------------------
+
+Netdev has a convention for ordering local variables in functions.
+Order the variable declaration lines longest to shortest, e.g.::
+
+  struct scatterlist *sg;
+  struct sk_buff *skb;
+  int err, i;
+
+If there are dependencies between the variables preventing the ordering
+move the initialization out of line.
+
 I am working in existing code which uses non-standard formatting. Which formatting should I use?
 ------------------------------------------------------------------------------------------------
 Make your code follow the most recent guidelines, so that eventually all code

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 7fa5f08..926bdf8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3618,16 +3618,18 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
 F:	drivers/iio/accel/bma400*
 
-BPF (Safe dynamic programs and tools)
+BPF [GENERAL] (Safe Dynamic Programs and Tools)
 M:	Alexei Starovoitov <[email protected]>
 M:	Daniel Borkmann <[email protected]>
 M:	Andrii Nakryiko <[email protected]>
-R:	Martin KaFai Lau <[email protected]>
-R:	Song Liu <[email protected]>
+R:	Martin KaFai Lau <[email protected]>
+R:	Song Liu <[email protected]>
 R:	Yonghong Song <[email protected]>
 R:	John Fastabend <[email protected]>
 R:	KP Singh <[email protected]>
-L:	[email protected]
+R:	Stanislav Fomichev <[email protected]>
+R:	Hao Luo <[email protected]>
+R:	Jiri Olsa <[email protected]>
 L:	[email protected]
 S:	Supported
 W:	https://bpf.io/
@@ -3659,12 +3661,9 @@ F:	scripts/pahole-version.sh
 F:	tools/bpf/
 F:	tools/lib/bpf/
 F:	tools/testing/selftests/bpf/
-N:	bpf
-K:	bpf
 
 BPF JIT for ARM
 M:	Shubham Bansal <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Odd Fixes
 F:	arch/arm/net/
@@ -3673,7 +3672,6 @@ BPF JIT for ARM64
 M:	Daniel Borkmann <[email protected]>
 M:	Alexei Starovoitov <[email protected]>
 M:	Zi Shen Lim <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Supported
 F:	arch/arm64/net/
@@ -3681,14 +3679,12 @@ F:	arch/arm64/net/
 BPF JIT for MIPS (32-BIT AND 64-BIT)
 M:	Johan Almbladh <[email protected]>
 M:	Paul Burton <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	arch/mips/net/
 
 BPF JIT for NFP NICs
 M:	Jakub Kicinski <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Odd Fixes
 F:	drivers/net/ethernet/netronome/nfp/bpf/
@@ -3696,7 +3692,6 @@ F:	drivers/net/ethernet/netronome/nfp/bpf/
 BPF JIT for POWERPC (32-BIT AND 64-BIT)
 M:	Naveen N. Rao <[email protected]>
 M:	Michael Ellerman <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Supported
 F:	arch/powerpc/net/
@@ -3704,7 +3699,6 @@ F:	arch/powerpc/net/
 BPF JIT for RISC-V (32-bit)
 M:	Luke Nelson <[email protected]>
 M:	Xi Wang <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	arch/riscv/net/
@@ -3712,7 +3706,6 @@ X:	arch/riscv/net/bpf_jit_comp64.c
 
 BPF JIT for RISC-V (64-bit)
 M:	Björn Töpel <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	arch/riscv/net/
@@ -3722,7 +3715,6 @@ BPF JIT for S390
 M:	Ilya Leoshkevich <[email protected]>
 M:	Heiko Carstens <[email protected]>
 M:	Vasily Gorbik <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Supported
 F:	arch/s390/net/
@@ -3730,14 +3722,12 @@ X:	arch/s390/net/pnet.c
 
 BPF JIT for SPARC (32-BIT AND 64-BIT)
 M:	David S. Miller <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Odd Fixes
 F:	arch/sparc/net/
 
 BPF JIT for X86 32-BIT
 M:	Wang YanQing <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Odd Fixes
 F:	arch/x86/net/bpf_jit_comp32.c
@@ -3745,13 +3735,60 @@ F:	arch/x86/net/bpf_jit_comp32.c
 BPF JIT for X86 64-BIT
 M:	Alexei Starovoitov <[email protected]>
 M:	Daniel Borkmann <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Supported
 F:	arch/x86/net/
 X:	arch/x86/net/bpf_jit_comp32.c
 
-BPF LSM (Security Audit and Enforcement using BPF)
+BPF [CORE]
+M:	Alexei Starovoitov <[email protected]>
+M:	Daniel Borkmann <[email protected]>
+R:	John Fastabend <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	kernel/bpf/verifier.c
+F:	kernel/bpf/tnum.c
+F:	kernel/bpf/core.c
+F:	kernel/bpf/syscall.c
+F:	kernel/bpf/dispatcher.c
+F:	kernel/bpf/trampoline.c
+F:	include/linux/bpf*
+F:	include/linux/filter.h
+
+BPF [BTF]
+M:	Martin KaFai Lau <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	kernel/bpf/btf.c
+F:	include/linux/btf*
+
+BPF [TRACING]
+M:	Song Liu <[email protected]>
+R:	Jiri Olsa <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	kernel/trace/bpf_trace.c
+F:	kernel/bpf/stackmap.c
+
+BPF [NETWORKING] (tc BPF, sock_addr)
+M:	Martin KaFai Lau <[email protected]>
+M:	Daniel Borkmann <[email protected]>
+R:	John Fastabend <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Maintained
+F:	net/core/filter.c
+F:	net/sched/act_bpf.c
+F:	net/sched/cls_bpf.c
+
+BPF [NETWORKING] (struct_ops, reuseport)
+M:	Martin KaFai Lau <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Maintained
+F:	kernel/bpf/bpf_struct*
+
+BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
 M:	KP Singh <[email protected]>
 R:	Florent Revest <[email protected]>
 R:	Brendan Jackman <[email protected]>
@@ -3762,7 +3799,27 @@ F:	include/linux/bpf_lsm.h
 F:	kernel/bpf/bpf_lsm.c
 F:	security/bpf/
 
-BPF L7 FRAMEWORK
+BPF [STORAGE & CGROUPS]
+M:	Martin KaFai Lau <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	kernel/bpf/cgroup.c
+F:	kernel/bpf/*storage.c
+F:	kernel/bpf/bpf_lru*
+
+BPF [RINGBUF]
+M:	Andrii Nakryiko <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	kernel/bpf/ringbuf.c
+
+BPF [ITERATOR]
+M:	Yonghong Song <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	kernel/bpf/*iter.c
+
+BPF [L7 FRAMEWORK] (sockmap)
 M:	John Fastabend <[email protected]>
 M:	Jakub Sitnicki <[email protected]>
 L:	[email protected]
@@ -3775,13 +3832,31 @@ F:	net/ipv4/tcp_bpf.c
 F:	net/ipv4/udp_bpf.c
 F:	net/unix/unix_bpf.c
 
-BPFTOOL
+BPF [LIBRARY] (libbpf)
+M:	Andrii Nakryiko <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	tools/lib/bpf/
+
+BPF [TOOLING] (bpftool)
 M:	Quentin Monnet <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	kernel/bpf/disasm.*
 F:	tools/bpf/bpftool/
 
+BPF [SELFTESTS] (Test Runners & Infrastructure)
+M:	Andrii Nakryiko <[email protected]>
+R:	Mykola Lysenko <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	tools/testing/selftests/bpf/
+
+BPF [MISC]
+L:	[email protected]
+S:	Odd Fixes
+K:	(?:\b|_)bpf(?:\b|_)
+
 BROADCOM B44 10/100 ETHERNET DRIVER
 M:	Michael Chan <[email protected]>
 L:	[email protected]
@@ -18109,6 +18184,7 @@ F:	drivers/misc/sgi-xp/
 
 SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
 M:	Karsten Graul <[email protected]>
+M:	Wenjia Zhang <[email protected]>
 L:	[email protected]
 S:	Supported
 W:	http://www.ibm.com/developerworks/linux/linux390/

crypto/Kconfig

View file

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 1d44893..7b81685 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -666,6 +666,18 @@ config CRYPTO_CRC32_MIPS
 	  CRC32c and CRC32 CRC algorithms implemented using mips crypto
 	  instructions, when available.
 
+config CRYPTO_CRC32_S390
+	tristate "CRC-32 algorithms"
+	depends on S390
+	select CRYPTO_HASH
+	select CRC32
+	help
+	  Select this option if you want to use hardware accelerated
+	  implementations of CRC algorithms.  With this option, you
+	  can optimize the computation of CRC-32 (IEEE 802.3 Ethernet)
+	  and CRC-32C (Castagnoli).
+
+	  It is available with IBM z13 or later.
 
 config CRYPTO_XXHASH
 	tristate "xxHash hash algorithm"
@@ -898,6 +910,16 @@ config CRYPTO_SHA512_SSSE3
 	  Extensions version 1 (AVX1), or Advanced Vector Extensions
 	  version 2 (AVX2) instructions, when available.
 
+config CRYPTO_SHA512_S390
+	tristate "SHA384 and SHA512 digest algorithm"
+	depends on S390
+	select CRYPTO_HASH
+	help
+	  This is the s390 hardware accelerated implementation of the
+	  SHA512 secure hash standard.
+
+	  It is available as of z10.
+
 config CRYPTO_SHA1_OCTEON
 	tristate "SHA1 digest algorithm (OCTEON)"
 	depends on CPU_CAVIUM_OCTEON
@@ -930,6 +952,16 @@ config CRYPTO_SHA1_PPC_SPE
 	  SHA-1 secure hash standard (DFIPS 180-4) implemented
 	  using powerpc SPE SIMD instruction set.
 
+config CRYPTO_SHA1_S390
+	tristate "SHA1 digest algorithm"
+	depends on S390
+	select CRYPTO_HASH
+	help
+	  This is the s390 hardware accelerated implementation of the
+	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
+
+	  It is available as of z990.
+
 config CRYPTO_SHA256
 	tristate "SHA224 and SHA256 digest algorithm"
 	select CRYPTO_HASH
@@ -970,6 +1002,16 @@ config CRYPTO_SHA256_SPARC64
 	  SHA-256 secure hash standard (DFIPS 180-2) implemented
 	  using sparc64 crypto instructions, when available.
 
+config CRYPTO_SHA256_S390
+	tristate "SHA256 digest algorithm"
+	depends on S390
+	select CRYPTO_HASH
+	help
+	  This is the s390 hardware accelerated implementation of the
+	  SHA256 secure hash standard (DFIPS 180-2).
+
+	  It is available as of z9.
+
 config CRYPTO_SHA512
 	tristate "SHA384 and SHA512 digest algorithms"
 	select CRYPTO_HASH
@@ -1010,6 +1052,26 @@ config CRYPTO_SHA3
 	  References:
 	  http://keccak.noekeon.org/
 
+config CRYPTO_SHA3_256_S390
+	tristate "SHA3_224 and SHA3_256 digest algorithm"
+	depends on S390
+	select CRYPTO_HASH
+	help
+	  This is the s390 hardware accelerated implementation of the
+	  SHA3_256 secure hash standard.
+
+	  It is available as of z14.
+
+config CRYPTO_SHA3_512_S390
+	tristate "SHA3_384 and SHA3_512 digest algorithm"
+	depends on S390
+	select CRYPTO_HASH
+	help
+	  This is the s390 hardware accelerated implementation of the
+	  SHA3_512 secure hash standard.
+
+	  It is available as of z14.
+
 config CRYPTO_SM3
 	tristate
 
@@ -1070,6 +1132,16 @@ config CRYPTO_GHASH_CLMUL_NI_INTEL
 	  This is the x86_64 CLMUL-NI accelerated implementation of
 	  GHASH, the hash function used in GCM (Galois/Counter mode).
 
+config CRYPTO_GHASH_S390
+	tristate "GHASH hash function"
+	depends on S390
+	select CRYPTO_HASH
+	help
+	  This is the s390 hardware accelerated implementation of GHASH,
+	  the hash function used in GCM (Galois/Counter mode).
+
+	  It is available as of z196.
+
 comment "Ciphers"
 
 config CRYPTO_AES
@@ -1185,6 +1257,23 @@ config CRYPTO_AES_PPC_SPE
 	  architecture specific assembler implementations that work on 1KB
 	  tables or 256 bytes S-boxes.
 
+config CRYPTO_AES_S390
+	tristate "AES cipher algorithms"
+	depends on S390
+	select CRYPTO_ALGAPI
+	select CRYPTO_SKCIPHER
+	help
+	  This is the s390 hardware accelerated implementation of the
+	  AES cipher algorithms (FIPS-197).
+
+	  As of z9 the ECB and CBC modes are hardware accelerated
+	  for 128 bit keys.
+	  As of z10 the ECB and CBC modes are hardware accelerated
+	  for all AES key sizes.
+	  As of z196 the CTR mode is hardware accelerated for all AES
+	  key sizes and XTS mode is hardware accelerated for 256 and
+	  512 bit keys.
+
 config CRYPTO_ANUBIS
 	tristate "Anubis cipher algorithm"
 	depends on CRYPTO_USER_API_ENABLE_OBSOLETE
@@ -1415,6 +1504,19 @@ config CRYPTO_DES3_EDE_X86_64
 	  algorithm are provided; regular processing one input block and
 	  one that processes three blocks parallel.
 
+config CRYPTO_DES_S390
+	tristate "DES and Triple DES cipher algorithms"
+	depends on S390
+	select CRYPTO_ALGAPI
+	select CRYPTO_SKCIPHER
+	select CRYPTO_LIB_DES
+	help
+	  This is the s390 hardware accelerated implementation of the
+	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
+
+	  As of z990 the ECB and CBC mode are hardware accelerated.
+	  As of z196 the CTR mode is hardware accelerated.
+
 config CRYPTO_FCRYPT
 	tristate "FCrypt cipher algorithm"
 	select CRYPTO_ALGAPI
@@ -1474,6 +1576,18 @@ config CRYPTO_CHACHA_MIPS
 	select CRYPTO_SKCIPHER
 	select CRYPTO_ARCH_HAVE_LIB_CHACHA
 
+config CRYPTO_CHACHA_S390
+	tristate "ChaCha20 stream cipher"
+	depends on S390
+	select CRYPTO_SKCIPHER
+	select CRYPTO_LIB_CHACHA_GENERIC
+	select CRYPTO_ARCH_HAVE_LIB_CHACHA
+	help
+	  This is the s390 SIMD implementation of the ChaCha20 stream
+	  cipher (RFC 7539).
+
+	  It is available as of z13.
+
 config CRYPTO_SEED
 	tristate "SEED cipher algorithm"
 	depends on CRYPTO_USER_API_ENABLE_OBSOLETE

drivers/crypto/Kconfig

View file

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ee99c02..3e6aa31 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -133,98 +133,6 @@ config CRYPTO_PAES_S390
 	  Select this option if you want to use the paes cipher
 	  for example to use protected key encrypted devices.
 
-config CRYPTO_SHA1_S390
-	tristate "SHA1 digest algorithm"
-	depends on S390
-	select CRYPTO_HASH
-	help
-	  This is the s390 hardware accelerated implementation of the
-	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
-
-	  It is available as of z990.
-
-config CRYPTO_SHA256_S390
-	tristate "SHA256 digest algorithm"
-	depends on S390
-	select CRYPTO_HASH
-	help
-	  This is the s390 hardware accelerated implementation of the
-	  SHA256 secure hash standard (DFIPS 180-2).
-
-	  It is available as of z9.
-
-config CRYPTO_SHA512_S390
-	tristate "SHA384 and SHA512 digest algorithm"
-	depends on S390
-	select CRYPTO_HASH
-	help
-	  This is the s390 hardware accelerated implementation of the
-	  SHA512 secure hash standard.
-
-	  It is available as of z10.
-
-config CRYPTO_SHA3_256_S390
-	tristate "SHA3_224 and SHA3_256 digest algorithm"
-	depends on S390
-	select CRYPTO_HASH
-	help
-	  This is the s390 hardware accelerated implementation of the
-	  SHA3_256 secure hash standard.
-
-	  It is available as of z14.
-
-config CRYPTO_SHA3_512_S390
-	tristate "SHA3_384 and SHA3_512 digest algorithm"
-	depends on S390
-	select CRYPTO_HASH
-	help
-	  This is the s390 hardware accelerated implementation of the
-	  SHA3_512 secure hash standard.
-
-	  It is available as of z14.
-
-config CRYPTO_DES_S390
-	tristate "DES and Triple DES cipher algorithms"
-	depends on S390
-	select CRYPTO_ALGAPI
-	select CRYPTO_SKCIPHER
-	select CRYPTO_LIB_DES
-	help
-	  This is the s390 hardware accelerated implementation of the
-	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
-
-	  As of z990 the ECB and CBC mode are hardware accelerated.
-	  As of z196 the CTR mode is hardware accelerated.
-
-config CRYPTO_AES_S390
-	tristate "AES cipher algorithms"
-	depends on S390
-	select CRYPTO_ALGAPI
-	select CRYPTO_SKCIPHER
-	help
-	  This is the s390 hardware accelerated implementation of the
-	  AES cipher algorithms (FIPS-197).
-
-	  As of z9 the ECB and CBC modes are hardware accelerated
-	  for 128 bit keys.
-	  As of z10 the ECB and CBC modes are hardware accelerated
-	  for all AES key sizes.
-	  As of z196 the CTR mode is hardware accelerated for all AES
-	  key sizes and XTS mode is hardware accelerated for 256 and
-	  512 bit keys.
-
-config CRYPTO_CHACHA_S390
-	tristate "ChaCha20 stream cipher"
-	depends on S390
-	select CRYPTO_SKCIPHER
-	select CRYPTO_LIB_CHACHA_GENERIC
-	select CRYPTO_ARCH_HAVE_LIB_CHACHA
-	help
-	  This is the s390 SIMD implementation of the ChaCha20 stream
-	  cipher (RFC 7539).
-
-	  It is available as of z13.
-
 config S390_PRNG
 	tristate "Pseudo random number generator device driver"
 	depends on S390
@@ -238,29 +146,6 @@ config S390_PRNG
 
 	  It is available as of z9.
 
-config CRYPTO_GHASH_S390
-	tristate "GHASH hash function"
-	depends on S390
-	select CRYPTO_HASH
-	help
-	  This is the s390 hardware accelerated implementation of GHASH,
-	  the hash function used in GCM (Galois/Counter mode).
-