| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250929093828.2714469Af2-agordeev@linux.ibm.com>
Date: Mon, 29 Sep 2025 11:38:28 +0200
From: Alexander Gordeev <agordeev@...ux.ibm.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Vasily Gorbik <gor@...ux.ibm.com>, Heiko Carstens <hca@...ux.ibm.com>,
linux-s390@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [GIT PULL] s390 updates for 6.18 merge window
Hi Linus,
please pull s390 updates for the 6.18 merge window.
There are two merge conflicts:
With the net-next tree resolved in linux-next:
https://lore.kernel.org/linux-next/aNKbgf7GyU5JP3Zh@finisterre.sirena.org.uk/
---
diff --cc arch/s390/configs/debug_defconfig
index b692c95f8083,fdde8ee0d7bd..000000000000
--- a/arch/s390/configs/debug_defconfig
+++ b/arch/s390/configs/debug_defconfig
@@@ -118,15 -118,12 +118,17 @@@ CONFIG_PACKET=
CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_TLS_DEVICE=y
+CONFIG_TLS_TOE=y
CONFIG_XFRM_USER=m
CONFIG_NET_KEY=m
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+ CONFIG_DIBS=y
+ CONFIG_DIBS_LO=y
+ CONFIG_SMC=m
CONFIG_SMC_DIAG=m
- CONFIG_SMC_LO=y
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y
diff --cc arch/s390/configs/defconfig
index 22c801449139,bf9e7dbd4a89..000000000000
--- a/arch/s390/configs/defconfig
+++ b/arch/s390/configs/defconfig
@@@ -109,15 -109,12 +109,17 @@@ CONFIG_PACKET=
CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_TLS_DEVICE=y
+CONFIG_TLS_TOE=y
CONFIG_XFRM_USER=m
CONFIG_NET_KEY=m
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+ CONFIG_DIBS=y
+ CONFIG_DIBS_LO=y
+ CONFIG_SMC=m
CONFIG_SMC_DIAG=m
- CONFIG_SMC_LO=y
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y
---
And with the kspp tree also resolved in linux-next:
https://lore.kernel.org/linux-next/aNVUMLnpNVGWz7Pb@sirena.org.uk/
---
diff --cc arch/s390/include/asm/bitops.h
index 1564dd3a5a82,fbcc3e1cc776..000000000000
--- a/arch/s390/include/asm/bitops.h
+++ b/arch/s390/include/asm/bitops.h
@@@ -189,26 -191,58 +189,26 @@@ static __always_inline __attribute_cons
* This is defined the same way as the libc and
* compiler builtin ffs routines (man ffs).
*/
- static __always_inline __flatten int ffs(int word)
-static inline __attribute_const__ int ffs(int word)
++static __always_inline __flatten __attribute_const__ int ffs(int word)
{
- unsigned long mask = 2 * BITS_PER_LONG - 1;
unsigned int val = (unsigned int)word;
- return (1 + (__flogr(-val & val) ^ (BITS_PER_LONG - 1))) & mask;
+ return BITS_PER_LONG - __flogr(-val & val);
}
-/**
- * __fls - find last (most-significant) set bit in a long word
- * @word: the word to search
- *
- * Undefined if no set bit exists, so code should check against 0 first.
- */
-static inline __attribute_const__ unsigned long __fls(unsigned long word)
-{
- return __flogr(word) ^ (BITS_PER_LONG - 1);
-}
+#else /* CONFIG_CC_HAS_BUILTIN_FFS */
-/**
- * fls64 - find last set bit in a 64-bit word
- * @word: the word to search
- *
- * This is defined in a similar way as the libc and compiler builtin
- * ffsll, but returns the position of the most significant set bit.
- *
- * fls64(value) returns 0 if value is 0 or the position of the last
- * set bit if value is nonzero. The last (most significant) bit is
- * at position 64.
- */
-static inline __attribute_const__ int fls64(unsigned long word)
-{
- unsigned long mask = 2 * BITS_PER_LONG - 1;
+#include <asm-generic/bitops/builtin-ffs.h>
- return (1 + (__flogr(word) ^ (BITS_PER_LONG - 1))) & mask;
-}
-
-/**
- * fls - find last (most-significant) bit set
- * @word: the word to search
- *
- * This is defined the same way as ffs.
- * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
- */
-static inline __attribute_const__ int fls(unsigned int word)
-{
- return fls64(word);
-}
+#endif /* CONFIG_CC_HAS_BUILTIN_FFS */
+#include <asm-generic/bitops/builtin-__ffs.h>
+#include <asm-generic/bitops/ffz.h>
+#include <asm-generic/bitops/builtin-__fls.h>
+#include <asm-generic/bitops/builtin-fls.h>
+#include <asm-generic/bitops/fls64.h>
#include <asm/arch_hweight.h>
#include <asm-generic/bitops/const_hweight.h>
-#include <asm-generic/bitops/ffz.h>
#include <asm-generic/bitops/sched.h>
#include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-atomic-setbit.h>
---
Thanks,
Alexander
The following changes since commit c17b750b3ad9f45f2b6f7e6f7f4679844244f0b9:
Linux 6.17-rc2 (2025-08-17 15:22:10 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-6.18-1
for you to fetch changes up to 088bb10e37252034ec58a6152f20bfdc8a837f54:
s390/mm: Add memory allocation profiling hooks (2025-09-25 14:28:58 +0200)
----------------------------------------------------------------
s390 updates for 6.18 merge window
- Refactor SCLP memory hotplug code
- Introduce common boot_panic() decompressor helper macro and
use it to get rid of nearly few identical implementations
- Take into account additional key generation flags and forward
it to the ep11 implementation. With that allow users to modify
the key generation process, e.g. provide valid combinations of
XCP_BLOB_* flags
- Replace kmalloc() + copy_from_user() with memdup_user_nul()
in s390 debug facility and HMC driver
- Add DAX support for DCSS memory block devices
- Make the compiler statement attribute "assume" available with
a new __assume macro
- Rework ffs() and fls() family bitops functions, including
source code improvements and generated code optimizations.
Use the newly introduced __assume macro for that
- Enable additional network features in default configurations
- Use __GFP_ACCOUNT flag for user page table allocations to add
missing kmemcg accounting
- Add WQ_PERCPU flag to explicitly request the use of the per-CPU
workqueue for 3590 tape driver
- Switch power reading to the per-CPU and the Hiperdispatch to the
default workqueue
- Add memory allocation profiling hooks to allow better profiling
data and the /proc/allocinfo output similar to other architectures
----------------------------------------------------------------
Gerald Schaefer (1):
s390/dcssblk: Add DAX support
Harald Freudenberger (1):
s390/pkey: Forward keygenflags to ep11_unwrapkey
Heiko Carstens (10):
s390/bitops: Slightly optimize ffs() and fls64()
s390/boot: Add common boot_panic() code
s390/bitops: Limit return value range of __flogr()
compiler_types: Add __assume macro
s390/bitops: Use __assume() for __flogr() inline assembly return value
s390/bitops: Cleanup __flogr()
s390/mm: Use __GFP_ACCOUNT for user page table allocations
s390/bitops: Switch to generic fls(), fls64(), etc.
s390/bitops: Switch to generic ffs() if supported by compiler
s390/mm: Add memory allocation profiling hooks
Hendrik Brueckner (1):
s390/configs: Enable additional network features
Juergen Christ (1):
s390/bitops: Optimize inlining
Marco Crivellari (3):
s390/tape: Add WQ_PERCPU to alloc_workqueue users
s390/diag324: Replace use of system_wq with system_percpu_wq
s390: Replace use of system_wq with system_dfl_wq
Sumanth Korikkar (2):
s390/sclp: Refactor sclp_cmd.c
s390/sclp: Move memory hotplug code for better modularity
Thorsten Blum (2):
s390/debug: Replace kmalloc() + copy_from_user() with memdup_user_nul()
s390/hmcdrv: Replace kmalloc() + copy_from_user() with memdup_user_nul()
arch/s390/Kconfig | 7 +
arch/s390/boot/boot.h | 8 +
arch/s390/boot/decompressor.c | 4 +-
arch/s390/boot/physmem_info.c | 4 +-
arch/s390/boot/startup.c | 13 +-
arch/s390/configs/debug_defconfig | 6 +
arch/s390/configs/defconfig | 6 +
arch/s390/include/asm/bitops.h | 88 ++-----
arch/s390/include/asm/pgalloc.h | 30 ++-
arch/s390/kernel/debug.c | 12 +-
arch/s390/kernel/diag/diag324.c | 4 +-
arch/s390/kernel/hiperdispatch.c | 2 +-
arch/s390/mm/pgalloc.c | 19 +-
drivers/s390/block/Kconfig | 12 +-
drivers/s390/block/dcssblk.c | 35 ++-
drivers/s390/char/Makefile | 1 +
drivers/s390/char/hmcdrv_dev.c | 19 +-
drivers/s390/char/sclp_cmd.c | 478 +++-------------------------------
drivers/s390/char/sclp_mem.c | 399 ++++++++++++++++++++++++++++
drivers/s390/char/tape_3590.c | 2 +-
drivers/s390/crypto/zcrypt_ep11misc.c | 4 +-
include/linux/compiler_types.h | 23 ++
init/Kconfig | 10 +
23 files changed, 611 insertions(+), 575 deletions(-)
create mode 100644 drivers/s390/char/sclp_mem.c
Powered by blists - more mailing lists