Skip to content

Commit 2ab99b0

Browse files
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky: - A fix for KVM to avoid kernel oopses in case of host protection faults due to runtime instrumentation - A fix for the AP bus to avoid dead devices after unbind / bind - A fix for a compile warning merged from the vfio_ccw tree - Updated default configurations * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390: update defconfig s390/zcrypt: Fix blocking queue device after unbind/bind. s390/vfio_ccw: make some symbols static s390/kvm: do not rely on the ILC on kvm host protection fauls
2 parents 32c1431 + 16ddcc3 commit 2ab99b0

File tree

10 files changed

+146
-49
lines changed

10 files changed

+146
-49
lines changed

arch/s390/configs/default_defconfig

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ CONFIG_USER_NS=y
3030
CONFIG_SCHED_AUTOGROUP=y
3131
CONFIG_BLK_DEV_INITRD=y
3232
CONFIG_EXPERT=y
33+
# CONFIG_SYSFS_SYSCALL is not set
3334
CONFIG_BPF_SYSCALL=y
3435
CONFIG_USERFAULTFD=y
3536
# CONFIG_COMPAT_BRK is not set
@@ -44,7 +45,10 @@ CONFIG_MODULE_UNLOAD=y
4445
CONFIG_MODULE_FORCE_UNLOAD=y
4546
CONFIG_MODVERSIONS=y
4647
CONFIG_MODULE_SRCVERSION_ALL=y
48+
CONFIG_BLK_DEV_INTEGRITY=y
4749
CONFIG_BLK_DEV_THROTTLING=y
50+
CONFIG_BLK_WBT=y
51+
CONFIG_BLK_WBT_SQ=y
4852
CONFIG_PARTITION_ADVANCED=y
4953
CONFIG_IBM_PARTITION=y
5054
CONFIG_BSD_DISKLABEL=y
@@ -90,6 +94,8 @@ CONFIG_UNIX=y
9094
CONFIG_UNIX_DIAG=m
9195
CONFIG_XFRM_USER=m
9296
CONFIG_NET_KEY=m
97+
CONFIG_SMC=m
98+
CONFIG_SMC_DIAG=m
9399
CONFIG_INET=y
94100
CONFIG_IP_MULTICAST=y
95101
CONFIG_IP_ADVANCED_ROUTER=y
@@ -359,6 +365,7 @@ CONFIG_NET_ACT_SIMP=m
359365
CONFIG_NET_ACT_SKBEDIT=m
360366
CONFIG_NET_ACT_CSUM=m
361367
CONFIG_DNS_RESOLVER=y
368+
CONFIG_NETLINK_DIAG=m
362369
CONFIG_CGROUP_NET_PRIO=y
363370
CONFIG_BPF_JIT=y
364371
CONFIG_NET_PKTGEN=m
@@ -367,16 +374,19 @@ CONFIG_DEVTMPFS=y
367374
CONFIG_DMA_CMA=y
368375
CONFIG_CMA_SIZE_MBYTES=0
369376
CONFIG_CONNECTOR=y
377+
CONFIG_ZRAM=m
370378
CONFIG_BLK_DEV_LOOP=m
371379
CONFIG_BLK_DEV_CRYPTOLOOP=m
380+
CONFIG_BLK_DEV_DRBD=m
372381
CONFIG_BLK_DEV_NBD=m
373382
CONFIG_BLK_DEV_OSD=m
374383
CONFIG_BLK_DEV_RAM=y
375384
CONFIG_BLK_DEV_RAM_SIZE=32768
376-
CONFIG_CDROM_PKTCDVD=m
377-
CONFIG_ATA_OVER_ETH=m
385+
CONFIG_BLK_DEV_RAM_DAX=y
378386
CONFIG_VIRTIO_BLK=y
387+
CONFIG_BLK_DEV_RBD=m
379388
CONFIG_ENCLOSURE_SERVICES=m
389+
CONFIG_GENWQE=m
380390
CONFIG_RAID_ATTRS=m
381391
CONFIG_SCSI=y
382392
CONFIG_BLK_DEV_SD=y
@@ -442,6 +452,8 @@ CONFIG_NLMON=m
442452
# CONFIG_NET_VENDOR_INTEL is not set
443453
# CONFIG_NET_VENDOR_MARVELL is not set
444454
CONFIG_MLX4_EN=m
455+
CONFIG_MLX5_CORE=m
456+
CONFIG_MLX5_CORE_EN=y
445457
# CONFIG_NET_VENDOR_NATSEMI is not set
446458
CONFIG_PPP=m
447459
CONFIG_PPP_BSDCOMP=m
@@ -452,7 +464,6 @@ CONFIG_PPTP=m
452464
CONFIG_PPPOL2TP=m
453465
CONFIG_PPP_ASYNC=m
454466
CONFIG_PPP_SYNC_TTY=m
455-
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
456467
# CONFIG_INPUT_KEYBOARD is not set
457468
# CONFIG_INPUT_MOUSE is not set
458469
# CONFIG_SERIO is not set
@@ -471,6 +482,7 @@ CONFIG_DIAG288_WATCHDOG=m
471482
CONFIG_INFINIBAND=m
472483
CONFIG_INFINIBAND_USER_ACCESS=m
473484
CONFIG_MLX4_INFINIBAND=m
485+
CONFIG_MLX5_INFINIBAND=m
474486
CONFIG_VIRTIO_BALLOON=m
475487
CONFIG_EXT4_FS=y
476488
CONFIG_EXT4_FS_POSIX_ACL=y
@@ -487,12 +499,18 @@ CONFIG_XFS_POSIX_ACL=y
487499
CONFIG_XFS_RT=y
488500
CONFIG_XFS_DEBUG=y
489501
CONFIG_GFS2_FS=m
502+
CONFIG_GFS2_FS_LOCKING_DLM=y
490503
CONFIG_OCFS2_FS=m
491504
CONFIG_BTRFS_FS=y
492505
CONFIG_BTRFS_FS_POSIX_ACL=y
506+
CONFIG_BTRFS_DEBUG=y
493507
CONFIG_NILFS2_FS=m
508+
CONFIG_FS_DAX=y
509+
CONFIG_EXPORTFS_BLOCK_OPS=y
494510
CONFIG_FANOTIFY=y
511+
CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
495512
CONFIG_QUOTA_NETLINK_INTERFACE=y
513+
CONFIG_QUOTA_DEBUG=y
496514
CONFIG_QFMT_V1=m
497515
CONFIG_QFMT_V2=m
498516
CONFIG_AUTOFS4_FS=m
@@ -558,6 +576,7 @@ CONFIG_HEADERS_CHECK=y
558576
CONFIG_DEBUG_SECTION_MISMATCH=y
559577
CONFIG_MAGIC_SYSRQ=y
560578
CONFIG_DEBUG_PAGEALLOC=y
579+
CONFIG_DEBUG_RODATA_TEST=y
561580
CONFIG_DEBUG_OBJECTS=y
562581
CONFIG_DEBUG_OBJECTS_SELFTEST=y
563582
CONFIG_DEBUG_OBJECTS_FREE=y
@@ -580,7 +599,6 @@ CONFIG_DETECT_HUNG_TASK=y
580599
CONFIG_WQ_WATCHDOG=y
581600
CONFIG_PANIC_ON_OOPS=y
582601
CONFIG_DEBUG_TIMEKEEPING=y
583-
CONFIG_TIMER_STATS=y
584602
CONFIG_DEBUG_RT_MUTEXES=y
585603
CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
586604
CONFIG_PROVE_LOCKING=y
@@ -595,6 +613,7 @@ CONFIG_RCU_TORTURE_TEST=m
595613
CONFIG_RCU_CPU_STALL_TIMEOUT=300
596614
CONFIG_NOTIFIER_ERROR_INJECTION=m
597615
CONFIG_PM_NOTIFIER_ERROR_INJECT=m
616+
CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m
598617
CONFIG_FAULT_INJECTION=y
599618
CONFIG_FAILSLAB=y
600619
CONFIG_FAIL_PAGE_ALLOC=y
@@ -616,20 +635,20 @@ CONFIG_HIST_TRIGGERS=y
616635
CONFIG_TRACE_ENUM_MAP_FILE=y
617636
CONFIG_LKDTM=m
618637
CONFIG_TEST_LIST_SORT=y
638+
CONFIG_TEST_SORT=y
619639
CONFIG_KPROBES_SANITY_TEST=y
620640
CONFIG_RBTREE_TEST=y
621641
CONFIG_INTERVAL_TREE_TEST=m
622642
CONFIG_PERCPU_TEST=m
623643
CONFIG_ATOMIC64_SELFTEST=y
624-
CONFIG_TEST_STRING_HELPERS=y
625-
CONFIG_TEST_KSTRTOX=y
626644
CONFIG_DMA_API_DEBUG=y
627645
CONFIG_TEST_BPF=m
628646
CONFIG_BUG_ON_DATA_CORRUPTION=y
629647
CONFIG_S390_PTDUMP=y
630648
CONFIG_ENCRYPTED_KEYS=m
631649
CONFIG_SECURITY=y
632650
CONFIG_SECURITY_NETWORK=y
651+
CONFIG_HARDENED_USERCOPY=y
633652
CONFIG_SECURITY_SELINUX=y
634653
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
635654
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
@@ -640,14 +659,17 @@ CONFIG_CRYPTO_RSA=m
640659
CONFIG_CRYPTO_DH=m
641660
CONFIG_CRYPTO_ECDH=m
642661
CONFIG_CRYPTO_USER=m
662+
CONFIG_CRYPTO_PCRYPT=m
643663
CONFIG_CRYPTO_CRYPTD=m
664+
CONFIG_CRYPTO_MCRYPTD=m
644665
CONFIG_CRYPTO_TEST=m
645666
CONFIG_CRYPTO_CCM=m
646667
CONFIG_CRYPTO_GCM=m
647668
CONFIG_CRYPTO_CHACHA20POLY1305=m
648669
CONFIG_CRYPTO_LRW=m
649670
CONFIG_CRYPTO_PCBC=m
650671
CONFIG_CRYPTO_KEYWRAP=m
672+
CONFIG_CRYPTO_CMAC=m
651673
CONFIG_CRYPTO_XCBC=m
652674
CONFIG_CRYPTO_VMAC=m
653675
CONFIG_CRYPTO_CRC32=m
@@ -657,8 +679,10 @@ CONFIG_CRYPTO_RMD160=m
657679
CONFIG_CRYPTO_RMD256=m
658680
CONFIG_CRYPTO_RMD320=m
659681
CONFIG_CRYPTO_SHA512=m
682+
CONFIG_CRYPTO_SHA3=m
660683
CONFIG_CRYPTO_TGR192=m
661684
CONFIG_CRYPTO_WP512=m
685+
CONFIG_CRYPTO_AES_TI=m
662686
CONFIG_CRYPTO_ANUBIS=m
663687
CONFIG_CRYPTO_BLOWFISH=m
664688
CONFIG_CRYPTO_CAMELLIA=m
@@ -674,6 +698,7 @@ CONFIG_CRYPTO_TWOFISH=m
674698
CONFIG_CRYPTO_842=m
675699
CONFIG_CRYPTO_LZ4=m
676700
CONFIG_CRYPTO_LZ4HC=m
701+
CONFIG_CRYPTO_ANSI_CPRNG=m
677702
CONFIG_CRYPTO_USER_API_HASH=m
678703
CONFIG_CRYPTO_USER_API_SKCIPHER=m
679704
CONFIG_CRYPTO_USER_API_RNG=m
@@ -685,13 +710,15 @@ CONFIG_CRYPTO_SHA256_S390=m
685710
CONFIG_CRYPTO_SHA512_S390=m
686711
CONFIG_CRYPTO_DES_S390=m
687712
CONFIG_CRYPTO_AES_S390=m
713+
CONFIG_CRYPTO_PAES_S390=m
688714
CONFIG_CRYPTO_GHASH_S390=m
689715
CONFIG_CRYPTO_CRC32_S390=y
690716
CONFIG_ASYMMETRIC_KEY_TYPE=y
691717
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
692718
CONFIG_X509_CERTIFICATE_PARSER=m
693719
CONFIG_CRC7=m
694720
CONFIG_CRC8=m
721+
CONFIG_RANDOM32_SELFTEST=y
695722
CONFIG_CORDIC=m
696723
CONFIG_CMM=m
697724
CONFIG_APPLDATA_BASE=y

arch/s390/configs/gcov_defconfig

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ CONFIG_USER_NS=y
3131
CONFIG_SCHED_AUTOGROUP=y
3232
CONFIG_BLK_DEV_INITRD=y
3333
CONFIG_EXPERT=y
34+
# CONFIG_SYSFS_SYSCALL is not set
3435
CONFIG_BPF_SYSCALL=y
3536
CONFIG_USERFAULTFD=y
3637
# CONFIG_COMPAT_BRK is not set
@@ -46,7 +47,10 @@ CONFIG_MODULE_UNLOAD=y
4647
CONFIG_MODULE_FORCE_UNLOAD=y
4748
CONFIG_MODVERSIONS=y
4849
CONFIG_MODULE_SRCVERSION_ALL=y
50+
CONFIG_BLK_DEV_INTEGRITY=y
4951
CONFIG_BLK_DEV_THROTTLING=y
52+
CONFIG_BLK_WBT=y
53+
CONFIG_BLK_WBT_SQ=y
5054
CONFIG_PARTITION_ADVANCED=y
5155
CONFIG_IBM_PARTITION=y
5256
CONFIG_BSD_DISKLABEL=y
@@ -88,6 +92,8 @@ CONFIG_UNIX=y
8892
CONFIG_UNIX_DIAG=m
8993
CONFIG_XFRM_USER=m
9094
CONFIG_NET_KEY=m
95+
CONFIG_SMC=m
96+
CONFIG_SMC_DIAG=m
9197
CONFIG_INET=y
9298
CONFIG_IP_MULTICAST=y
9399
CONFIG_IP_ADVANCED_ROUTER=y
@@ -356,6 +362,7 @@ CONFIG_NET_ACT_SIMP=m
356362
CONFIG_NET_ACT_SKBEDIT=m
357363
CONFIG_NET_ACT_CSUM=m
358364
CONFIG_DNS_RESOLVER=y
365+
CONFIG_NETLINK_DIAG=m
359366
CONFIG_CGROUP_NET_PRIO=y
360367
CONFIG_BPF_JIT=y
361368
CONFIG_NET_PKTGEN=m
@@ -364,16 +371,18 @@ CONFIG_DEVTMPFS=y
364371
CONFIG_DMA_CMA=y
365372
CONFIG_CMA_SIZE_MBYTES=0
366373
CONFIG_CONNECTOR=y
374+
CONFIG_ZRAM=m
367375
CONFIG_BLK_DEV_LOOP=m
368376
CONFIG_BLK_DEV_CRYPTOLOOP=m
377+
CONFIG_BLK_DEV_DRBD=m
369378
CONFIG_BLK_DEV_NBD=m
370379
CONFIG_BLK_DEV_OSD=m
371380
CONFIG_BLK_DEV_RAM=y
372381
CONFIG_BLK_DEV_RAM_SIZE=32768
373-
CONFIG_CDROM_PKTCDVD=m
374-
CONFIG_ATA_OVER_ETH=m
382+
CONFIG_BLK_DEV_RAM_DAX=y
375383
CONFIG_VIRTIO_BLK=y
376384
CONFIG_ENCLOSURE_SERVICES=m
385+
CONFIG_GENWQE=m
377386
CONFIG_RAID_ATTRS=m
378387
CONFIG_SCSI=y
379388
CONFIG_BLK_DEV_SD=y
@@ -439,6 +448,8 @@ CONFIG_NLMON=m
439448
# CONFIG_NET_VENDOR_INTEL is not set
440449
# CONFIG_NET_VENDOR_MARVELL is not set
441450
CONFIG_MLX4_EN=m
451+
CONFIG_MLX5_CORE=m
452+
CONFIG_MLX5_CORE_EN=y
442453
# CONFIG_NET_VENDOR_NATSEMI is not set
443454
CONFIG_PPP=m
444455
CONFIG_PPP_BSDCOMP=m
@@ -449,7 +460,6 @@ CONFIG_PPTP=m
449460
CONFIG_PPPOL2TP=m
450461
CONFIG_PPP_ASYNC=m
451462
CONFIG_PPP_SYNC_TTY=m
452-
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
453463
# CONFIG_INPUT_KEYBOARD is not set
454464
# CONFIG_INPUT_MOUSE is not set
455465
# CONFIG_SERIO is not set
@@ -468,6 +478,7 @@ CONFIG_DIAG288_WATCHDOG=m
468478
CONFIG_INFINIBAND=m
469479
CONFIG_INFINIBAND_USER_ACCESS=m
470480
CONFIG_MLX4_INFINIBAND=m
481+
CONFIG_MLX5_INFINIBAND=m
471482
CONFIG_VIRTIO_BALLOON=m
472483
CONFIG_EXT4_FS=y
473484
CONFIG_EXT4_FS_POSIX_ACL=y
@@ -483,11 +494,15 @@ CONFIG_XFS_QUOTA=y
483494
CONFIG_XFS_POSIX_ACL=y
484495
CONFIG_XFS_RT=y
485496
CONFIG_GFS2_FS=m
497+
CONFIG_GFS2_FS_LOCKING_DLM=y
486498
CONFIG_OCFS2_FS=m
487499
CONFIG_BTRFS_FS=y
488500
CONFIG_BTRFS_FS_POSIX_ACL=y
489501
CONFIG_NILFS2_FS=m
502+
CONFIG_FS_DAX=y
503+
CONFIG_EXPORTFS_BLOCK_OPS=y
490504
CONFIG_FANOTIFY=y
505+
CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
491506
CONFIG_QUOTA_NETLINK_INTERFACE=y
492507
CONFIG_QFMT_V1=m
493508
CONFIG_QFMT_V2=m
@@ -553,7 +568,6 @@ CONFIG_UNUSED_SYMBOLS=y
553568
CONFIG_MAGIC_SYSRQ=y
554569
CONFIG_DEBUG_MEMORY_INIT=y
555570
CONFIG_PANIC_ON_OOPS=y
556-
CONFIG_TIMER_STATS=y
557571
CONFIG_RCU_TORTURE_TEST=m
558572
CONFIG_RCU_CPU_STALL_TIMEOUT=60
559573
CONFIG_LATENCYTOP=y
@@ -576,6 +590,7 @@ CONFIG_BIG_KEYS=y
576590
CONFIG_ENCRYPTED_KEYS=m
577591
CONFIG_SECURITY=y
578592
CONFIG_SECURITY_NETWORK=y
593+
CONFIG_HARDENED_USERCOPY=y
579594
CONFIG_SECURITY_SELINUX=y
580595
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
581596
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
@@ -599,6 +614,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m
599614
CONFIG_CRYPTO_LRW=m
600615
CONFIG_CRYPTO_PCBC=m
601616
CONFIG_CRYPTO_KEYWRAP=m
617+
CONFIG_CRYPTO_CMAC=m
602618
CONFIG_CRYPTO_XCBC=m
603619
CONFIG_CRYPTO_VMAC=m
604620
CONFIG_CRYPTO_CRC32=m
@@ -611,6 +627,7 @@ CONFIG_CRYPTO_SHA512=m
611627
CONFIG_CRYPTO_SHA3=m
612628
CONFIG_CRYPTO_TGR192=m
613629
CONFIG_CRYPTO_WP512=m
630+
CONFIG_CRYPTO_AES_TI=m
614631
CONFIG_CRYPTO_ANUBIS=m
615632
CONFIG_CRYPTO_BLOWFISH=m
616633
CONFIG_CRYPTO_CAMELLIA=m
@@ -626,16 +643,19 @@ CONFIG_CRYPTO_TWOFISH=m
626643
CONFIG_CRYPTO_842=m
627644
CONFIG_CRYPTO_LZ4=m
628645
CONFIG_CRYPTO_LZ4HC=m
646+
CONFIG_CRYPTO_ANSI_CPRNG=m
629647
CONFIG_CRYPTO_USER_API_HASH=m
630648
CONFIG_CRYPTO_USER_API_SKCIPHER=m
631649
CONFIG_CRYPTO_USER_API_RNG=m
632650
CONFIG_CRYPTO_USER_API_AEAD=m
633651
CONFIG_ZCRYPT=m
652+
CONFIG_PKEY=m
634653
CONFIG_CRYPTO_SHA1_S390=m
635654
CONFIG_CRYPTO_SHA256_S390=m
636655
CONFIG_CRYPTO_SHA512_S390=m
637656
CONFIG_CRYPTO_DES_S390=m
638657
CONFIG_CRYPTO_AES_S390=m
658+
CONFIG_CRYPTO_PAES_S390=m
639659
CONFIG_CRYPTO_GHASH_S390=m
640660
CONFIG_CRYPTO_CRC32_S390=y
641661
CONFIG_CRC7=m

0 commit comments

Comments
 (0)