Skip to content

Commit 3d5895c

Browse files
torvaldstorvalds
committed
Merge tag 's390-5.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Heiko Carstens: - fix / add expoline usage in "DMA" code - fix compat vdso Makefile to avoid permanent rebuild - fix ftrace_update_ftrace_func to avoid NULL pointer dereference - update defconfigs - trivial coding style fix * tag 's390-5.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390: update defconfigs s390/cpumf: fix semicolon.cocci warnings s390/boot: fix use of expolines in the DMA code s390/ftrace: fix ftrace_update_ftrace_func implementation s390/defconfig: allow early device mapper disks s390/vdso32: add vdso32.lds to targets
2 parents 7b6ae47 + 0cde560 commit 3d5895c

File tree

9 files changed

+49
-37
lines changed

9 files changed

+49
-37
lines changed

‎arch/s390/boot/text_dma.S

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,6 @@
99
#include <asm/errno.h>
1010
#include <asm/sigp.h>
1111

12-
#ifdef CC_USING_EXPOLINE
13-
.pushsection .dma.text.__s390_indirect_jump_r14,"axG"
14-
__dma__s390_indirect_jump_r14:
15-
larl %r1,0f
16-
ex 0,0(%r1)
17-
j .
18-
0: br %r14
19-
.popsection
20-
#endif
21-
2212
.section .dma.text,"ax"
2313
/*
2414
* Simplified version of expoline thunk. The normal thunks can not be used here,
@@ -27,11 +17,10 @@ __dma__s390_indirect_jump_r14:
2717
* affects a few functions that are not performance-relevant.
2818
*/
2919
.macro BR_EX_DMA_r14
30-
#ifdef CC_USING_EXPOLINE
31-
jg __dma__s390_indirect_jump_r14
32-
#else
33-
br %r14
34-
#endif
20+
larl %r1,0f
21+
ex 0,0(%r1)
22+
j .
23+
0: br %r14
3524
.endm
3625

3726
/*

‎arch/s390/configs/debug_defconfig

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ CONFIG_WATCH_QUEUE=y
55
CONFIG_AUDIT=y
66
CONFIG_NO_HZ_IDLE=y
77
CONFIG_HIGH_RES_TIMERS=y
8+
CONFIG_BPF_SYSCALL=y
9+
CONFIG_BPF_JIT=y
10+
CONFIG_BPF_JIT_ALWAYS_ON=y
11+
CONFIG_BPF_LSM=y
812
CONFIG_PREEMPT=y
13+
CONFIG_SCHED_CORE=y
914
CONFIG_BSD_PROCESS_ACCT=y
1015
CONFIG_BSD_PROCESS_ACCT_V3=y
1116
CONFIG_TASKSTATS=y
@@ -28,14 +33,13 @@ CONFIG_CGROUP_DEVICE=y
2833
CONFIG_CGROUP_CPUACCT=y
2934
CONFIG_CGROUP_PERF=y
3035
CONFIG_CGROUP_BPF=y
36+
CONFIG_CGROUP_MISC=y
3137
CONFIG_NAMESPACES=y
3238
CONFIG_USER_NS=y
3339
CONFIG_CHECKPOINT_RESTORE=y
3440
CONFIG_SCHED_AUTOGROUP=y
3541
CONFIG_EXPERT=y
3642
# CONFIG_SYSFS_SYSCALL is not set
37-
CONFIG_BPF_LSM=y
38-
CONFIG_BPF_SYSCALL=y
3943
CONFIG_USERFAULTFD=y
4044
# CONFIG_COMPAT_BRK is not set
4145
CONFIG_PROFILING=y
@@ -76,6 +80,7 @@ CONFIG_BLK_DEV_THROTTLING=y
7680
CONFIG_BLK_WBT=y
7781
CONFIG_BLK_CGROUP_IOLATENCY=y
7882
CONFIG_BLK_CGROUP_IOCOST=y
83+
CONFIG_BLK_CGROUP_IOPRIO=y
7984
CONFIG_BLK_INLINE_ENCRYPTION=y
8085
CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
8186
CONFIG_PARTITION_ADVANCED=y
@@ -95,6 +100,7 @@ CONFIG_CLEANCACHE=y
95100
CONFIG_FRONTSWAP=y
96101
CONFIG_CMA_DEBUG=y
97102
CONFIG_CMA_DEBUGFS=y
103+
CONFIG_CMA_SYSFS=y
98104
CONFIG_CMA_AREAS=7
99105
CONFIG_MEM_SOFT_DIRTY=y
100106
CONFIG_ZSWAP=y
@@ -158,6 +164,7 @@ CONFIG_IPV6_RPL_LWTUNNEL=y
158164
CONFIG_MPTCP=y
159165
CONFIG_NETFILTER=y
160166
CONFIG_BRIDGE_NETFILTER=m
167+
CONFIG_NETFILTER_NETLINK_HOOK=m
161168
CONFIG_NF_CONNTRACK=m
162169
CONFIG_NF_CONNTRACK_SECMARK=y
163170
CONFIG_NF_CONNTRACK_EVENTS=y
@@ -280,6 +287,7 @@ CONFIG_IP_VS_FTP=m
280287
CONFIG_IP_VS_PE_SIP=m
281288
CONFIG_NFT_FIB_IPV4=m
282289
CONFIG_NF_TABLES_ARP=y
290+
CONFIG_NF_LOG_IPV4=m
283291
CONFIG_IP_NF_IPTABLES=m
284292
CONFIG_IP_NF_MATCH_AH=m
285293
CONFIG_IP_NF_MATCH_ECN=m
@@ -384,12 +392,11 @@ CONFIG_VSOCKETS=m
384392
CONFIG_VIRTIO_VSOCKETS=m
385393
CONFIG_NETLINK_DIAG=m
386394
CONFIG_CGROUP_NET_PRIO=y
387-
CONFIG_BPF_JIT=y
388395
CONFIG_NET_PKTGEN=m
389396
CONFIG_PCI=y
390-
CONFIG_PCI_IOV=y
391397
# CONFIG_PCIEASPM is not set
392398
CONFIG_PCI_DEBUG=y
399+
CONFIG_PCI_IOV=y
393400
CONFIG_HOTPLUG_PCI=y
394401
CONFIG_HOTPLUG_PCI_S390=y
395402
CONFIG_DEVTMPFS=y
@@ -436,7 +443,7 @@ CONFIG_MD_MULTIPATH=m
436443
CONFIG_MD_FAULTY=m
437444
CONFIG_MD_CLUSTER=m
438445
CONFIG_BCACHE=m
439-
CONFIG_BLK_DEV_DM=m
446+
CONFIG_BLK_DEV_DM=y
440447
CONFIG_DM_UNSTRIPED=m
441448
CONFIG_DM_CRYPT=m
442449
CONFIG_DM_SNAPSHOT=m
@@ -453,6 +460,7 @@ CONFIG_DM_MULTIPATH_ST=m
453460
CONFIG_DM_MULTIPATH_HST=m
454461
CONFIG_DM_MULTIPATH_IOA=m
455462
CONFIG_DM_DELAY=m
463+
CONFIG_DM_INIT=y
456464
CONFIG_DM_UEVENT=y
457465
CONFIG_DM_FLAKEY=m
458466
CONFIG_DM_VERITY=m
@@ -495,6 +503,7 @@ CONFIG_NLMON=m
495503
# CONFIG_NET_VENDOR_GOOGLE is not set
496504
# CONFIG_NET_VENDOR_HUAWEI is not set
497505
# CONFIG_NET_VENDOR_INTEL is not set
506+
# CONFIG_NET_VENDOR_MICROSOFT is not set
498507
# CONFIG_NET_VENDOR_MARVELL is not set
499508
CONFIG_MLX4_EN=m
500509
CONFIG_MLX5_CORE=m
@@ -551,7 +560,6 @@ CONFIG_INPUT_EVDEV=y
551560
CONFIG_LEGACY_PTY_COUNT=0
552561
CONFIG_VIRTIO_CONSOLE=m
553562
CONFIG_HW_RANDOM_VIRTIO=m
554-
CONFIG_RAW_DRIVER=m
555563
CONFIG_HANGCHECK_TIMER=m
556564
CONFIG_TN3270_FS=y
557565
CONFIG_PPS=m
@@ -574,7 +582,6 @@ CONFIG_SYNC_FILE=y
574582
CONFIG_VFIO=m
575583
CONFIG_VFIO_PCI=m
576584
CONFIG_VFIO_MDEV=m
577-
CONFIG_VFIO_MDEV_DEVICE=m
578585
CONFIG_VIRTIO_PCI=m
579586
CONFIG_VIRTIO_BALLOON=m
580587
CONFIG_VIRTIO_INPUT=y
@@ -619,6 +626,7 @@ CONFIG_FUSE_FS=y
619626
CONFIG_CUSE=m
620627
CONFIG_VIRTIO_FS=m
621628
CONFIG_OVERLAY_FS=m
629+
CONFIG_NETFS_STATS=y
622630
CONFIG_FSCACHE=m
623631
CONFIG_CACHEFILES=m
624632
CONFIG_ISO9660_FS=y
@@ -654,7 +662,6 @@ CONFIG_NFSD_V3_ACL=y
654662
CONFIG_NFSD_V4=y
655663
CONFIG_NFSD_V4_SECURITY_LABEL=y
656664
CONFIG_CIFS=m
657-
CONFIG_CIFS_STATS2=y
658665
CONFIG_CIFS_WEAK_PW_HASH=y
659666
CONFIG_CIFS_UPCALL=y
660667
CONFIG_CIFS_XATTR=y
@@ -682,6 +689,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM=y
682689
CONFIG_SECURITY_SELINUX_DISABLE=y
683690
CONFIG_SECURITY_LOCKDOWN_LSM=y
684691
CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
692+
CONFIG_SECURITY_LANDLOCK=y
685693
CONFIG_INTEGRITY_SIGNATURE=y
686694
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
687695
CONFIG_IMA=y
@@ -696,6 +704,7 @@ CONFIG_CRYPTO_CRYPTD=m
696704
CONFIG_CRYPTO_TEST=m
697705
CONFIG_CRYPTO_DH=m
698706
CONFIG_CRYPTO_ECDH=m
707+
CONFIG_CRYPTO_ECDSA=m
699708
CONFIG_CRYPTO_ECRDSA=m
700709
CONFIG_CRYPTO_SM2=m
701710
CONFIG_CRYPTO_CURVE25519=m
@@ -843,7 +852,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
843852
CONFIG_FAIL_FUNCTION=y
844853
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
845854
CONFIG_LKDTM=m
846-
CONFIG_TEST_LIST_SORT=y
847855
CONFIG_TEST_MIN_HEAP=y
848856
CONFIG_TEST_SORT=y
849857
CONFIG_KPROBES_SANITY_TEST=y
@@ -853,3 +861,4 @@ CONFIG_PERCPU_TEST=m
853861
CONFIG_ATOMIC64_SELFTEST=y
854862
CONFIG_TEST_BITOPS=m
855863
CONFIG_TEST_BPF=m
864+
CONFIG_TEST_LIVEPATCH=m

‎arch/s390/configs/defconfig

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ CONFIG_WATCH_QUEUE=y
44
CONFIG_AUDIT=y
55
CONFIG_NO_HZ_IDLE=y
66
CONFIG_HIGH_RES_TIMERS=y
7+
CONFIG_BPF_SYSCALL=y
8+
CONFIG_BPF_JIT=y
9+
CONFIG_BPF_JIT_ALWAYS_ON=y
10+
CONFIG_BPF_LSM=y
11+
CONFIG_SCHED_CORE=y
712
CONFIG_BSD_PROCESS_ACCT=y
813
CONFIG_BSD_PROCESS_ACCT_V3=y
914
CONFIG_TASKSTATS=y
@@ -26,14 +31,13 @@ CONFIG_CGROUP_DEVICE=y
2631
CONFIG_CGROUP_CPUACCT=y
2732
CONFIG_CGROUP_PERF=y
2833
CONFIG_CGROUP_BPF=y
34+
CONFIG_CGROUP_MISC=y
2935
CONFIG_NAMESPACES=y
3036
CONFIG_USER_NS=y
3137
CONFIG_CHECKPOINT_RESTORE=y
3238
CONFIG_SCHED_AUTOGROUP=y
3339
CONFIG_EXPERT=y
3440
# CONFIG_SYSFS_SYSCALL is not set
35-
CONFIG_BPF_LSM=y
36-
CONFIG_BPF_SYSCALL=y
3741
CONFIG_USERFAULTFD=y
3842
# CONFIG_COMPAT_BRK is not set
3943
CONFIG_PROFILING=y
@@ -70,6 +74,7 @@ CONFIG_BLK_DEV_THROTTLING=y
7074
CONFIG_BLK_WBT=y
7175
CONFIG_BLK_CGROUP_IOLATENCY=y
7276
CONFIG_BLK_CGROUP_IOCOST=y
77+
CONFIG_BLK_CGROUP_IOPRIO=y
7378
CONFIG_BLK_INLINE_ENCRYPTION=y
7479
CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
7580
CONFIG_PARTITION_ADVANCED=y
@@ -87,6 +92,7 @@ CONFIG_KSM=y
8792
CONFIG_TRANSPARENT_HUGEPAGE=y
8893
CONFIG_CLEANCACHE=y
8994
CONFIG_FRONTSWAP=y
95+
CONFIG_CMA_SYSFS=y
9096
CONFIG_CMA_AREAS=7
9197
CONFIG_MEM_SOFT_DIRTY=y
9298
CONFIG_ZSWAP=y
@@ -149,6 +155,7 @@ CONFIG_IPV6_RPL_LWTUNNEL=y
149155
CONFIG_MPTCP=y
150156
CONFIG_NETFILTER=y
151157
CONFIG_BRIDGE_NETFILTER=m
158+
CONFIG_NETFILTER_NETLINK_HOOK=m
152159
CONFIG_NF_CONNTRACK=m
153160
CONFIG_NF_CONNTRACK_SECMARK=y
154161
CONFIG_NF_CONNTRACK_EVENTS=y
@@ -271,6 +278,7 @@ CONFIG_IP_VS_FTP=m
271278
CONFIG_IP_VS_PE_SIP=m
272279
CONFIG_NFT_FIB_IPV4=m
273280
CONFIG_NF_TABLES_ARP=y
281+
CONFIG_NF_LOG_IPV4=m
274282
CONFIG_IP_NF_IPTABLES=m
275283
CONFIG_IP_NF_MATCH_AH=m
276284
CONFIG_IP_NF_MATCH_ECN=m
@@ -374,11 +382,10 @@ CONFIG_VSOCKETS=m
374382
CONFIG_VIRTIO_VSOCKETS=m
375383
CONFIG_NETLINK_DIAG=m
376384
CONFIG_CGROUP_NET_PRIO=y
377-
CONFIG_BPF_JIT=y
378385
CONFIG_NET_PKTGEN=m
379386
CONFIG_PCI=y
380-
CONFIG_PCI_IOV=y
381387
# CONFIG_PCIEASPM is not set
388+
CONFIG_PCI_IOV=y
382389
CONFIG_HOTPLUG_PCI=y
383390
CONFIG_HOTPLUG_PCI_S390=y
384391
CONFIG_UEVENT_HELPER=y
@@ -427,7 +434,7 @@ CONFIG_MD_MULTIPATH=m
427434
CONFIG_MD_FAULTY=m
428435
CONFIG_MD_CLUSTER=m
429436
CONFIG_BCACHE=m
430-
CONFIG_BLK_DEV_DM=m
437+
CONFIG_BLK_DEV_DM=y
431438
CONFIG_DM_UNSTRIPED=m
432439
CONFIG_DM_CRYPT=m
433440
CONFIG_DM_SNAPSHOT=m
@@ -444,6 +451,7 @@ CONFIG_DM_MULTIPATH_ST=m
444451
CONFIG_DM_MULTIPATH_HST=m
445452
CONFIG_DM_MULTIPATH_IOA=m
446453
CONFIG_DM_DELAY=m
454+
CONFIG_DM_INIT=y
447455
CONFIG_DM_UEVENT=y
448456
CONFIG_DM_FLAKEY=m
449457
CONFIG_DM_VERITY=m
@@ -487,6 +495,7 @@ CONFIG_NLMON=m
487495
# CONFIG_NET_VENDOR_GOOGLE is not set
488496
# CONFIG_NET_VENDOR_HUAWEI is not set
489497
# CONFIG_NET_VENDOR_INTEL is not set
498+
# CONFIG_NET_VENDOR_MICROSOFT is not set
490499
# CONFIG_NET_VENDOR_MARVELL is not set
491500
CONFIG_MLX4_EN=m
492501
CONFIG_MLX5_CORE=m
@@ -543,7 +552,6 @@ CONFIG_INPUT_EVDEV=y
543552
CONFIG_LEGACY_PTY_COUNT=0
544553
CONFIG_VIRTIO_CONSOLE=m
545554
CONFIG_HW_RANDOM_VIRTIO=m
546-
CONFIG_RAW_DRIVER=m
547555
CONFIG_HANGCHECK_TIMER=m
548556
CONFIG_TN3270_FS=y
549557
# CONFIG_PTP_1588_CLOCK is not set
@@ -566,7 +574,6 @@ CONFIG_SYNC_FILE=y
566574
CONFIG_VFIO=m
567575
CONFIG_VFIO_PCI=m
568576
CONFIG_VFIO_MDEV=m
569-
CONFIG_VFIO_MDEV_DEVICE=m
570577
CONFIG_VIRTIO_PCI=m
571578
CONFIG_VIRTIO_BALLOON=m
572579
CONFIG_VIRTIO_INPUT=y
@@ -607,6 +614,7 @@ CONFIG_FUSE_FS=y
607614
CONFIG_CUSE=m
608615
CONFIG_VIRTIO_FS=m
609616
CONFIG_OVERLAY_FS=m
617+
CONFIG_NETFS_STATS=y
610618
CONFIG_FSCACHE=m
611619
CONFIG_CACHEFILES=m
612620
CONFIG_ISO9660_FS=y
@@ -642,7 +650,6 @@ CONFIG_NFSD_V3_ACL=y
642650
CONFIG_NFSD_V4=y
643651
CONFIG_NFSD_V4_SECURITY_LABEL=y
644652
CONFIG_CIFS=m
645-
CONFIG_CIFS_STATS2=y
646653
CONFIG_CIFS_WEAK_PW_HASH=y
647654
CONFIG_CIFS_UPCALL=y
648655
CONFIG_CIFS_XATTR=y
@@ -669,6 +676,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM=y
669676
CONFIG_SECURITY_SELINUX_DISABLE=y
670677
CONFIG_SECURITY_LOCKDOWN_LSM=y
671678
CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
679+
CONFIG_SECURITY_LANDLOCK=y
672680
CONFIG_INTEGRITY_SIGNATURE=y
673681
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
674682
CONFIG_IMA=y
@@ -684,6 +692,7 @@ CONFIG_CRYPTO_CRYPTD=m
684692
CONFIG_CRYPTO_TEST=m
685693
CONFIG_CRYPTO_DH=m
686694
CONFIG_CRYPTO_ECDH=m
695+
CONFIG_CRYPTO_ECDSA=m
687696
CONFIG_CRYPTO_ECRDSA=m
688697
CONFIG_CRYPTO_SM2=m
689698
CONFIG_CRYPTO_CURVE25519=m
@@ -754,6 +763,7 @@ CONFIG_CRC8=m
754763
CONFIG_DMA_CMA=y
755764
CONFIG_CMA_SIZE_MBYTES=0
756765
CONFIG_PRINTK_TIME=y
766+
CONFIG_DYNAMIC_DEBUG=y
757767
CONFIG_DEBUG_INFO=y
758768
CONFIG_DEBUG_INFO_DWARF4=y
759769
CONFIG_GDB_SCRIPTS=y
@@ -781,3 +791,4 @@ CONFIG_LKDTM=m
781791
CONFIG_PERCPU_TEST=m
782792
CONFIG_ATOMIC64_SELFTEST=y
783793
CONFIG_TEST_BPF=m
794+
CONFIG_TEST_LIVEPATCH=m

‎arch/s390/configs/zfcpdump_defconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ CONFIG_PARTITION_ADVANCED=y
2929
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
3030
# CONFIG_COMPACTION is not set
3131
# CONFIG_MIGRATION is not set
32-
# CONFIG_BOUNCE is not set
3332
CONFIG_NET=y
3433
# CONFIG_IUCV is not set
34+
# CONFIG_PCPU_DEV_REFCNT is not set
3535
# CONFIG_ETHTOOL_NETLINK is not set
3636
CONFIG_DEVTMPFS=y
3737
CONFIG_BLK_DEV_RAM=y
@@ -51,7 +51,6 @@ CONFIG_ZFCP=y
5151
# CONFIG_SERIO is not set
5252
# CONFIG_HVC_IUCV is not set
5353
# CONFIG_HW_RANDOM_S390 is not set
54-
CONFIG_RAW_DRIVER=y
5554
# CONFIG_HMC_DRV is not set
5655
# CONFIG_S390_TAPE is not set
5756
# CONFIG_VMCP is not set

‎arch/s390/include/asm/ftrace.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ void ftrace_caller(void);
1919

2020
extern char ftrace_graph_caller_end;
2121
extern unsigned long ftrace_plt;
22+
extern void *ftrace_func;
2223

2324
struct dyn_arch_ftrace { };
2425

‎arch/s390/kernel/ftrace.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
* trampoline (ftrace_plt), which clobbers also r1.
4141
*/
4242

43+
void *ftrace_func __read_mostly = ftrace_stub;
4344
unsigned long ftrace_plt;
4445

4546
int ftrace_modify_call(struct dyn_ftrace *rec, unsigned long old_addr,
@@ -85,6 +86,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
8586

8687
int ftrace_update_ftrace_func(ftrace_func_t func)
8788
{
89+
ftrace_func = func;
8890
return 0;
8991
}
9092

0 commit comments

Comments
 (0)