Skip to content

Commit 26a9a47

Browse files
torvaldstorvalds
committed
Merge tag 's390-6.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Heiko Carstens: - Fix potential use-after-free bug and missing error handling in PCI code - Fix dcssblk build error - Fix last breaking event handling in case of stack corruption to allow for better error reporting - Update defconfigs * tag 's390-6.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/pci: Fix duplicate pci_dev_put() in disable_slot() when PF has child VFs s390/pci: Fix missing check for zpci_create_device() error return s390: Update defconfigs s390/dcssblk: Fix build error with CONFIG_DAX=m and CONFIG_DCSSBLK=y s390/entry: Fix last breaking event handling in case of stack corruption s390/configs: Enable options required for TC flow offload s390/configs: Enable VDPA on Nvidia ConnectX-6 network card
2 parents 80ae5fb + 05a2538 commit 26a9a47

File tree

7 files changed

+41
-21
lines changed

7 files changed

+41
-21
lines changed

‎arch/s390/configs/debug_defconfig

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ CONFIG_USER_NS=y
3838
CONFIG_CHECKPOINT_RESTORE=y
3939
CONFIG_SCHED_AUTOGROUP=y
4040
CONFIG_EXPERT=y
41-
# CONFIG_SYSFS_SYSCALL is not set
4241
CONFIG_PROFILING=y
4342
CONFIG_KEXEC=y
4443
CONFIG_KEXEC_FILE=y
@@ -92,7 +91,6 @@ CONFIG_UNIXWARE_DISKLABEL=y
9291
CONFIG_IOSCHED_BFQ=y
9392
CONFIG_BINFMT_MISC=m
9493
CONFIG_ZSWAP=y
95-
CONFIG_ZSMALLOC=y
9694
CONFIG_ZSMALLOC_STAT=y
9795
CONFIG_SLAB_BUCKETS=y
9896
CONFIG_SLUB_STATS=y
@@ -395,6 +393,9 @@ CONFIG_CLS_U32_MARK=y
395393
CONFIG_NET_CLS_FLOW=m
396394
CONFIG_NET_CLS_CGROUP=y
397395
CONFIG_NET_CLS_BPF=m
396+
CONFIG_NET_CLS_FLOWER=m
397+
CONFIG_NET_CLS_MATCHALL=m
398+
CONFIG_NET_EMATCH=y
398399
CONFIG_NET_CLS_ACT=y
399400
CONFIG_NET_ACT_POLICE=m
400401
CONFIG_NET_ACT_GACT=m
@@ -405,6 +406,9 @@ CONFIG_NET_ACT_PEDIT=m
405406
CONFIG_NET_ACT_SIMP=m
406407
CONFIG_NET_ACT_SKBEDIT=m
407408
CONFIG_NET_ACT_CSUM=m
409+
CONFIG_NET_ACT_VLAN=m
410+
CONFIG_NET_ACT_TUNNEL_KEY=m
411+
CONFIG_NET_ACT_CT=m
408412
CONFIG_NET_ACT_GATE=m
409413
CONFIG_NET_TC_SKB_EXT=y
410414
CONFIG_DNS_RESOLVER=y
@@ -628,8 +632,16 @@ CONFIG_VIRTIO_PCI=m
628632
CONFIG_VIRTIO_BALLOON=m
629633
CONFIG_VIRTIO_MEM=m
630634
CONFIG_VIRTIO_INPUT=y
635+
CONFIG_VDPA=m
636+
CONFIG_VDPA_SIM=m
637+
CONFIG_VDPA_SIM_NET=m
638+
CONFIG_VDPA_SIM_BLOCK=m
639+
CONFIG_VDPA_USER=m
640+
CONFIG_MLX5_VDPA_NET=m
641+
CONFIG_VP_VDPA=m
631642
CONFIG_VHOST_NET=m
632643
CONFIG_VHOST_VSOCK=m
644+
CONFIG_VHOST_VDPA=m
633645
CONFIG_EXT4_FS=y
634646
CONFIG_EXT4_FS_POSIX_ACL=y
635647
CONFIG_EXT4_FS_SECURITY=y
@@ -654,7 +666,6 @@ CONFIG_NILFS2_FS=m
654666
CONFIG_BCACHEFS_FS=y
655667
CONFIG_BCACHEFS_QUOTA=y
656668
CONFIG_BCACHEFS_POSIX_ACL=y
657-
CONFIG_FS_DAX=y
658669
CONFIG_EXPORTFS_BLOCK_OPS=y
659670
CONFIG_FS_ENCRYPTION=y
660671
CONFIG_FS_VERITY=y
@@ -724,11 +735,10 @@ CONFIG_NLS_UTF8=m
724735
CONFIG_DLM=m
725736
CONFIG_UNICODE=y
726737
CONFIG_PERSISTENT_KEYRINGS=y
738+
CONFIG_BIG_KEYS=y
727739
CONFIG_ENCRYPTED_KEYS=m
728740
CONFIG_KEY_NOTIFICATIONS=y
729741
CONFIG_SECURITY=y
730-
CONFIG_HARDENED_USERCOPY=y
731-
CONFIG_FORTIFY_SOURCE=y
732742
CONFIG_SECURITY_SELINUX=y
733743
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
734744
CONFIG_SECURITY_LOCKDOWN_LSM=y
@@ -741,6 +751,8 @@ CONFIG_IMA=y
741751
CONFIG_IMA_DEFAULT_HASH_SHA256=y
742752
CONFIG_IMA_WRITE_POLICY=y
743753
CONFIG_IMA_APPRAISE=y
754+
CONFIG_FORTIFY_SOURCE=y
755+
CONFIG_HARDENED_USERCOPY=y
744756
CONFIG_BUG_ON_DATA_CORRUPTION=y
745757
CONFIG_CRYPTO_USER=m
746758
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
@@ -756,7 +768,6 @@ CONFIG_CRYPTO_AES_TI=m
756768
CONFIG_CRYPTO_ANUBIS=m
757769
CONFIG_CRYPTO_ARIA=m
758770
CONFIG_CRYPTO_BLOWFISH=m
759-
CONFIG_CRYPTO_CAMELLIA=m
760771
CONFIG_CRYPTO_CAST5=m
761772
CONFIG_CRYPTO_CAST6=m
762773
CONFIG_CRYPTO_DES=m
@@ -801,7 +812,6 @@ CONFIG_CRYPTO_SHA3_512_S390=m
801812
CONFIG_CRYPTO_GHASH_S390=m
802813
CONFIG_CRYPTO_AES_S390=m
803814
CONFIG_CRYPTO_DES_S390=m
804-
CONFIG_CRYPTO_CHACHA_S390=m
805815
CONFIG_CRYPTO_HMAC_S390=m
806816
CONFIG_ZCRYPT=m
807817
CONFIG_PKEY=m
@@ -812,9 +822,9 @@ CONFIG_PKEY_UV=m
812822
CONFIG_CRYPTO_PAES_S390=m
813823
CONFIG_CRYPTO_DEV_VIRTIO=m
814824
CONFIG_SYSTEM_BLACKLIST_KEYRING=y
825+
CONFIG_CRYPTO_KRB5=m
826+
CONFIG_CRYPTO_KRB5_SELFTESTS=y
815827
CONFIG_CORDIC=m
816-
CONFIG_CRYPTO_LIB_CURVE25519=m
817-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
818828
CONFIG_RANDOM32_SELFTEST=y
819829
CONFIG_XZ_DEC_MICROLZMA=y
820830
CONFIG_DMA_CMA=y

‎arch/s390/configs/defconfig

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ CONFIG_USER_NS=y
3636
CONFIG_CHECKPOINT_RESTORE=y
3737
CONFIG_SCHED_AUTOGROUP=y
3838
CONFIG_EXPERT=y
39-
# CONFIG_SYSFS_SYSCALL is not set
4039
CONFIG_PROFILING=y
4140
CONFIG_KEXEC=y
4241
CONFIG_KEXEC_FILE=y
@@ -86,7 +85,6 @@ CONFIG_UNIXWARE_DISKLABEL=y
8685
CONFIG_IOSCHED_BFQ=y
8786
CONFIG_BINFMT_MISC=m
8887
CONFIG_ZSWAP=y
89-
CONFIG_ZSMALLOC=y
9088
CONFIG_ZSMALLOC_STAT=y
9189
CONFIG_SLAB_BUCKETS=y
9290
# CONFIG_COMPAT_BRK is not set
@@ -385,6 +383,9 @@ CONFIG_CLS_U32_MARK=y
385383
CONFIG_NET_CLS_FLOW=m
386384
CONFIG_NET_CLS_CGROUP=y
387385
CONFIG_NET_CLS_BPF=m
386+
CONFIG_NET_CLS_FLOWER=m
387+
CONFIG_NET_CLS_MATCHALL=m
388+
CONFIG_NET_EMATCH=y
388389
CONFIG_NET_CLS_ACT=y
389390
CONFIG_NET_ACT_POLICE=m
390391
CONFIG_NET_ACT_GACT=m
@@ -395,6 +396,9 @@ CONFIG_NET_ACT_PEDIT=m
395396
CONFIG_NET_ACT_SIMP=m
396397
CONFIG_NET_ACT_SKBEDIT=m
397398
CONFIG_NET_ACT_CSUM=m
399+
CONFIG_NET_ACT_VLAN=m
400+
CONFIG_NET_ACT_TUNNEL_KEY=m
401+
CONFIG_NET_ACT_CT=m
398402
CONFIG_NET_ACT_GATE=m
399403
CONFIG_NET_TC_SKB_EXT=y
400404
CONFIG_DNS_RESOLVER=y
@@ -618,8 +622,16 @@ CONFIG_VIRTIO_PCI=m
618622
CONFIG_VIRTIO_BALLOON=m
619623
CONFIG_VIRTIO_MEM=m
620624
CONFIG_VIRTIO_INPUT=y
625+
CONFIG_VDPA=m
626+
CONFIG_VDPA_SIM=m
627+
CONFIG_VDPA_SIM_NET=m
628+
CONFIG_VDPA_SIM_BLOCK=m
629+
CONFIG_VDPA_USER=m
630+
CONFIG_MLX5_VDPA_NET=m
631+
CONFIG_VP_VDPA=m
621632
CONFIG_VHOST_NET=m
622633
CONFIG_VHOST_VSOCK=m
634+
CONFIG_VHOST_VDPA=m
623635
CONFIG_EXT4_FS=y
624636
CONFIG_EXT4_FS_POSIX_ACL=y
625637
CONFIG_EXT4_FS_SECURITY=y
@@ -641,7 +653,6 @@ CONFIG_NILFS2_FS=m
641653
CONFIG_BCACHEFS_FS=m
642654
CONFIG_BCACHEFS_QUOTA=y
643655
CONFIG_BCACHEFS_POSIX_ACL=y
644-
CONFIG_FS_DAX=y
645656
CONFIG_EXPORTFS_BLOCK_OPS=y
646657
CONFIG_FS_ENCRYPTION=y
647658
CONFIG_FS_VERITY=y
@@ -711,6 +722,7 @@ CONFIG_NLS_UTF8=m
711722
CONFIG_DLM=m
712723
CONFIG_UNICODE=y
713724
CONFIG_PERSISTENT_KEYRINGS=y
725+
CONFIG_BIG_KEYS=y
714726
CONFIG_ENCRYPTED_KEYS=m
715727
CONFIG_KEY_NOTIFICATIONS=y
716728
CONFIG_SECURITY=y
@@ -742,7 +754,6 @@ CONFIG_CRYPTO_AES_TI=m
742754
CONFIG_CRYPTO_ANUBIS=m
743755
CONFIG_CRYPTO_ARIA=m
744756
CONFIG_CRYPTO_BLOWFISH=m
745-
CONFIG_CRYPTO_CAMELLIA=m
746757
CONFIG_CRYPTO_CAST5=m
747758
CONFIG_CRYPTO_CAST6=m
748759
CONFIG_CRYPTO_DES=m
@@ -788,7 +799,6 @@ CONFIG_CRYPTO_SHA3_512_S390=m
788799
CONFIG_CRYPTO_GHASH_S390=m
789800
CONFIG_CRYPTO_AES_S390=m
790801
CONFIG_CRYPTO_DES_S390=m
791-
CONFIG_CRYPTO_CHACHA_S390=m
792802
CONFIG_CRYPTO_HMAC_S390=m
793803
CONFIG_ZCRYPT=m
794804
CONFIG_PKEY=m
@@ -799,10 +809,10 @@ CONFIG_PKEY_UV=m
799809
CONFIG_CRYPTO_PAES_S390=m
800810
CONFIG_CRYPTO_DEV_VIRTIO=m
801811
CONFIG_SYSTEM_BLACKLIST_KEYRING=y
812+
CONFIG_CRYPTO_KRB5=m
813+
CONFIG_CRYPTO_KRB5_SELFTESTS=y
802814
CONFIG_CORDIC=m
803815
CONFIG_PRIME_NUMBERS=m
804-
CONFIG_CRYPTO_LIB_CURVE25519=m
805-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
806816
CONFIG_XZ_DEC_MICROLZMA=y
807817
CONFIG_DMA_CMA=y
808818
CONFIG_CMA_SIZE_MBYTES=0

‎arch/s390/configs/zfcpdump_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ CONFIG_DEBUG_KERNEL=y
7070
CONFIG_DEBUG_INFO_DWARF4=y
7171
CONFIG_DEBUG_FS=y
7272
CONFIG_PANIC_ON_OOPS=y
73-
# CONFIG_SCHED_DEBUG is not set
7473
CONFIG_RCU_CPU_STALL_TIMEOUT=60
7574
# CONFIG_RCU_TRACE is not set
7675
# CONFIG_FTRACE is not set

‎arch/s390/kernel/entry.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,8 @@ SYM_CODE_START(stack_invalid)
602602
stmg %r0,%r7,__PT_R0(%r11)
603603
stmg %r8,%r9,__PT_PSW(%r11)
604604
mvc __PT_R8(64,%r11),0(%r14)
605-
stg %r10,__PT_ORIG_GPR2(%r11) # store last break to orig_gpr2
605+
GET_LC %r2
606+
mvc __PT_ORIG_GPR2(8,%r11),__LC_PGM_LAST_BREAK(%r2)
606607
xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
607608
lgr %r2,%r11 # pass pointer to pt_regs
608609
jg kernel_stack_invalid

‎arch/s390/pci/pci_clp.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,8 @@ static void __clp_add(struct clp_fh_list_entry *entry, void *data)
428428
return;
429429
}
430430
zdev = zpci_create_device(entry->fid, entry->fh, entry->config_state);
431+
if (IS_ERR(zdev))
432+
return;
431433
list_add_tail(&zdev->entry, scan_list);
432434
}
433435

‎drivers/pci/hotplug/s390_pci_hpc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
5959

6060
pdev = pci_get_slot(zdev->zbus->bus, zdev->devfn);
6161
if (pdev && pci_num_vf(pdev)) {
62-
pci_dev_put(pdev);
6362
rc = -EBUSY;
6463
goto out;
6564
}

‎drivers/s390/block/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ comment "S/390 block device drivers"
55
config DCSSBLK
66
def_tristate m
77
prompt "DCSSBLK support"
8-
depends on S390 && BLOCK
8+
depends on S390 && BLOCK && (DAX || DAX=n)
99
help
1010
Support for dcss block device
1111

@@ -14,7 +14,6 @@ config DCSSBLK_DAX
1414
depends on DCSSBLK
1515
# requires S390 ZONE_DEVICE support
1616
depends on BROKEN
17-
select DAX
1817
prompt "DCSSBLK DAX support"
1918
help
2019
Enable DAX operation for the dcss block device

0 commit comments

Comments
 (0)