Merge tag 's390-6.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

+29 -24

arch/s390/configs/debug_defconfig

··· 40 40 CONFIG_SCHED_AUTOGROUP=y 41 41 CONFIG_EXPERT=y 42 42 # CONFIG_SYSFS_SYSCALL is not set 43 - CONFIG_USERFAULTFD=y 44 - # CONFIG_COMPAT_BRK is not set 45 43 CONFIG_PROFILING=y 46 44 CONFIG_LIVEPATCH=y 47 45 CONFIG_MARCH_ZEC12=y ··· 72 74 CONFIG_MODULE_FORCE_LOAD=y 73 75 CONFIG_MODULE_UNLOAD=y 74 76 CONFIG_MODULE_FORCE_UNLOAD=y 77 + CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y 75 78 CONFIG_MODVERSIONS=y 76 79 CONFIG_MODULE_SRCVERSION_ALL=y 77 80 CONFIG_MODULE_SIG_SHA256=y ··· 92 93 CONFIG_IOSCHED_BFQ=y 93 94 CONFIG_BFQ_GROUP_IOSCHED=y 94 95 CONFIG_BINFMT_MISC=m 96 + CONFIG_ZSWAP=y 97 + CONFIG_ZSMALLOC_STAT=y 98 + CONFIG_SLUB_STATS=y 99 + # CONFIG_COMPAT_BRK is not set 95 100 CONFIG_MEMORY_HOTPLUG=y 96 101 CONFIG_MEMORY_HOTREMOVE=y 97 102 CONFIG_KSM=y ··· 105 102 CONFIG_CMA_SYSFS=y 106 103 CONFIG_CMA_AREAS=7 107 104 CONFIG_MEM_SOFT_DIRTY=y 108 - CONFIG_ZSWAP=y 109 - CONFIG_ZSMALLOC=y 110 - CONFIG_ZSMALLOC_STAT=y 111 105 CONFIG_DEFERRED_STRUCT_PAGE_INIT=y 112 106 CONFIG_IDLE_PAGE_TRACKING=y 113 107 CONFIG_PERCPU_STATS=y 114 108 CONFIG_GUP_TEST=y 115 109 CONFIG_ANON_VMA_NAME=y 110 + CONFIG_USERFAULTFD=y 116 111 CONFIG_NET=y 117 112 CONFIG_PACKET=y 118 113 CONFIG_PACKET_DIAG=m ··· 168 167 CONFIG_NETFILTER_NETLINK_HOOK=m 169 168 CONFIG_NF_CONNTRACK=m 170 169 CONFIG_NF_CONNTRACK_SECMARK=y 170 + CONFIG_NF_CONNTRACK_PROCFS=y 171 171 CONFIG_NF_CONNTRACK_EVENTS=y 172 172 CONFIG_NF_CONNTRACK_TIMEOUT=y 173 173 CONFIG_NF_CONNTRACK_TIMESTAMP=y ··· 495 493 # CONFIG_NET_VENDOR_ASIX is not set 496 494 # CONFIG_NET_VENDOR_ATHEROS is not set 497 495 # CONFIG_NET_VENDOR_BROADCOM is not set 498 - # CONFIG_NET_VENDOR_BROCADE is not set 499 496 # CONFIG_NET_VENDOR_CADENCE is not set 500 497 # CONFIG_NET_VENDOR_CAVIUM is not set 501 498 # CONFIG_NET_VENDOR_CHELSIO is not set ··· 510 509 # CONFIG_NET_VENDOR_GOOGLE is not set 511 510 # CONFIG_NET_VENDOR_HUAWEI is not set 512 511 # CONFIG_NET_VENDOR_INTEL is not set 513 - # CONFIG_NET_VENDOR_MICROSOFT is not set 512 + # CONFIG_NET_VENDOR_WANGXUN is not set 514 513 # CONFIG_NET_VENDOR_LITEX is not set 515 514 # CONFIG_NET_VENDOR_MARVELL is not set 516 515 CONFIG_MLX4_EN=m ··· 519 518 # CONFIG_NET_VENDOR_MICREL is not set 520 519 # CONFIG_NET_VENDOR_MICROCHIP is not set 521 520 # CONFIG_NET_VENDOR_MICROSEMI is not set 521 + # CONFIG_NET_VENDOR_MICROSOFT is not set 522 522 # CONFIG_NET_VENDOR_MYRI is not set 523 + # CONFIG_NET_VENDOR_NI is not set 523 524 # CONFIG_NET_VENDOR_NATSEMI is not set 524 525 # CONFIG_NET_VENDOR_NETERION is not set 525 526 # CONFIG_NET_VENDOR_NETRONOME is not set 526 - # CONFIG_NET_VENDOR_NI is not set 527 527 # CONFIG_NET_VENDOR_NVIDIA is not set 528 528 # CONFIG_NET_VENDOR_OKI is not set 529 529 # CONFIG_NET_VENDOR_PACKET_ENGINES is not set 530 530 # CONFIG_NET_VENDOR_PENSANDO is not set 531 531 # CONFIG_NET_VENDOR_QLOGIC is not set 532 + # CONFIG_NET_VENDOR_BROCADE is not set 532 533 # CONFIG_NET_VENDOR_QUALCOMM is not set 533 534 # CONFIG_NET_VENDOR_RDC is not set 534 535 # CONFIG_NET_VENDOR_REALTEK is not set ··· 538 535 # CONFIG_NET_VENDOR_ROCKER is not set 539 536 # CONFIG_NET_VENDOR_SAMSUNG is not set 540 537 # CONFIG_NET_VENDOR_SEEQ is not set 541 - # CONFIG_NET_VENDOR_SOLARFLARE is not set 542 538 # CONFIG_NET_VENDOR_SILAN is not set 543 539 # CONFIG_NET_VENDOR_SIS is not set 540 + # CONFIG_NET_VENDOR_SOLARFLARE is not set 544 541 # CONFIG_NET_VENDOR_SMSC is not set 545 542 # CONFIG_NET_VENDOR_SOCIONEXT is not set 546 543 # CONFIG_NET_VENDOR_STMICRO is not set ··· 573 570 CONFIG_HW_RANDOM_VIRTIO=m 574 571 CONFIG_HANGCHECK_TIMER=m 575 572 CONFIG_TN3270_FS=y 573 + # CONFIG_RANDOM_TRUST_CPU is not set 574 + # CONFIG_RANDOM_TRUST_BOOTLOADER is not set 576 575 CONFIG_PPS=m 577 576 # CONFIG_PTP_1588_CLOCK is not set 578 577 # CONFIG_HWMON is not set ··· 732 727 CONFIG_CRYPTO_PCBC=m 733 728 CONFIG_CRYPTO_KEYWRAP=m 734 729 CONFIG_CRYPTO_ADIANTUM=m 730 + CONFIG_CRYPTO_HCTR2=m 735 731 CONFIG_CRYPTO_XCBC=m 736 732 CONFIG_CRYPTO_VMAC=m 737 733 CONFIG_CRYPTO_CRC32=m 738 - CONFIG_CRYPTO_BLAKE2S=m 734 + CONFIG_CRYPTO_CRC32_S390=y 739 735 CONFIG_CRYPTO_MD4=m 740 736 CONFIG_CRYPTO_MD5=y 741 737 CONFIG_CRYPTO_MICHAEL_MIC=m 742 738 CONFIG_CRYPTO_RMD160=m 739 + CONFIG_CRYPTO_SHA512_S390=m 740 + CONFIG_CRYPTO_SHA1_S390=m 741 + CONFIG_CRYPTO_SHA256_S390=m 743 742 CONFIG_CRYPTO_SHA3=m 744 - CONFIG_CRYPTO_SM3=m 743 + CONFIG_CRYPTO_SHA3_256_S390=m 744 + CONFIG_CRYPTO_SHA3_512_S390=m 745 + CONFIG_CRYPTO_SM3_GENERIC=m 745 746 CONFIG_CRYPTO_WP512=m 747 + CONFIG_CRYPTO_GHASH_S390=m 746 748 CONFIG_CRYPTO_AES_TI=m 749 + CONFIG_CRYPTO_AES_S390=m 747 750 CONFIG_CRYPTO_ANUBIS=m 748 751 CONFIG_CRYPTO_ARC4=m 749 752 CONFIG_CRYPTO_BLOWFISH=m ··· 759 746 CONFIG_CRYPTO_CAST5=m 760 747 CONFIG_CRYPTO_CAST6=m 761 748 CONFIG_CRYPTO_DES=m 749 + CONFIG_CRYPTO_DES_S390=m 762 750 CONFIG_CRYPTO_FCRYPT=m 763 751 CONFIG_CRYPTO_KHAZAD=m 752 + CONFIG_CRYPTO_CHACHA_S390=m 764 753 CONFIG_CRYPTO_SEED=m 754 + CONFIG_CRYPTO_ARIA=m 765 755 CONFIG_CRYPTO_SERPENT=m 766 - CONFIG_CRYPTO_SM4=m 756 + CONFIG_CRYPTO_SM4_GENERIC=m 767 757 CONFIG_CRYPTO_TEA=m 768 758 CONFIG_CRYPTO_TWOFISH=m 769 759 CONFIG_CRYPTO_842=m ··· 782 766 CONFIG_ZCRYPT=m 783 767 CONFIG_PKEY=m 784 768 CONFIG_CRYPTO_PAES_S390=m 785 - CONFIG_CRYPTO_SHA1_S390=m 786 - CONFIG_CRYPTO_SHA256_S390=m 787 - CONFIG_CRYPTO_SHA512_S390=m 788 - CONFIG_CRYPTO_SHA3_256_S390=m 789 - CONFIG_CRYPTO_SHA3_512_S390=m 790 - CONFIG_CRYPTO_DES_S390=m 791 - CONFIG_CRYPTO_AES_S390=m 792 - CONFIG_CRYPTO_CHACHA_S390=m 793 - CONFIG_CRYPTO_GHASH_S390=m 794 - CONFIG_CRYPTO_CRC32_S390=y 795 769 CONFIG_CRYPTO_DEV_VIRTIO=m 796 770 CONFIG_CORDIC=m 797 771 CONFIG_CRYPTO_LIB_CURVE25519=m ··· 803 797 CONFIG_DEBUG_SECTION_MISMATCH=y 804 798 CONFIG_MAGIC_SYSRQ=y 805 799 CONFIG_DEBUG_PAGEALLOC=y 800 + CONFIG_SLUB_DEBUG_ON=y 806 801 CONFIG_PAGE_OWNER=y 807 802 CONFIG_DEBUG_RODATA_TEST=y 808 803 CONFIG_DEBUG_WX=y ··· 815 808 CONFIG_DEBUG_OBJECTS_WORK=y 816 809 CONFIG_DEBUG_OBJECTS_RCU_HEAD=y 817 810 CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y 818 - CONFIG_SLUB_DEBUG_ON=y 819 - CONFIG_SLUB_STATS=y 820 811 CONFIG_DEBUG_STACK_USAGE=y 821 812 CONFIG_DEBUG_VM=y 822 813 CONFIG_DEBUG_VM_PGFLAGS=y

+27 -22

arch/s390/configs/defconfig

··· 38 38 CONFIG_SCHED_AUTOGROUP=y 39 39 CONFIG_EXPERT=y 40 40 # CONFIG_SYSFS_SYSCALL is not set 41 - CONFIG_USERFAULTFD=y 42 - # CONFIG_COMPAT_BRK is not set 43 41 CONFIG_PROFILING=y 44 42 CONFIG_LIVEPATCH=y 45 43 CONFIG_MARCH_ZEC12=y ··· 67 69 CONFIG_MODULE_FORCE_LOAD=y 68 70 CONFIG_MODULE_UNLOAD=y 69 71 CONFIG_MODULE_FORCE_UNLOAD=y 72 + CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y 70 73 CONFIG_MODVERSIONS=y 71 74 CONFIG_MODULE_SRCVERSION_ALL=y 72 75 CONFIG_MODULE_SIG_SHA256=y ··· 87 88 CONFIG_IOSCHED_BFQ=y 88 89 CONFIG_BFQ_GROUP_IOSCHED=y 89 90 CONFIG_BINFMT_MISC=m 91 + CONFIG_ZSWAP=y 92 + CONFIG_ZSMALLOC_STAT=y 93 + # CONFIG_COMPAT_BRK is not set 90 94 CONFIG_MEMORY_HOTPLUG=y 91 95 CONFIG_MEMORY_HOTREMOVE=y 92 96 CONFIG_KSM=y ··· 97 95 CONFIG_CMA_SYSFS=y 98 96 CONFIG_CMA_AREAS=7 99 97 CONFIG_MEM_SOFT_DIRTY=y 100 - CONFIG_ZSWAP=y 101 - CONFIG_ZSMALLOC=y 102 - CONFIG_ZSMALLOC_STAT=y 103 98 CONFIG_DEFERRED_STRUCT_PAGE_INIT=y 104 99 CONFIG_IDLE_PAGE_TRACKING=y 105 100 CONFIG_PERCPU_STATS=y 106 101 CONFIG_ANON_VMA_NAME=y 102 + CONFIG_USERFAULTFD=y 107 103 CONFIG_NET=y 108 104 CONFIG_PACKET=y 109 105 CONFIG_PACKET_DIAG=m ··· 159 159 CONFIG_NETFILTER_NETLINK_HOOK=m 160 160 CONFIG_NF_CONNTRACK=m 161 161 CONFIG_NF_CONNTRACK_SECMARK=y 162 + CONFIG_NF_CONNTRACK_PROCFS=y 162 163 CONFIG_NF_CONNTRACK_EVENTS=y 163 164 CONFIG_NF_CONNTRACK_TIMEOUT=y 164 165 CONFIG_NF_CONNTRACK_TIMESTAMP=y ··· 485 484 # CONFIG_NET_VENDOR_ASIX is not set 486 485 # CONFIG_NET_VENDOR_ATHEROS is not set 487 486 # CONFIG_NET_VENDOR_BROADCOM is not set 488 - # CONFIG_NET_VENDOR_BROCADE is not set 489 487 # CONFIG_NET_VENDOR_CADENCE is not set 490 488 # CONFIG_NET_VENDOR_CAVIUM is not set 491 489 # CONFIG_NET_VENDOR_CHELSIO is not set ··· 500 500 # CONFIG_NET_VENDOR_GOOGLE is not set 501 501 # CONFIG_NET_VENDOR_HUAWEI is not set 502 502 # CONFIG_NET_VENDOR_INTEL is not set 503 - # CONFIG_NET_VENDOR_MICROSOFT is not set 503 + # CONFIG_NET_VENDOR_WANGXUN is not set 504 504 # CONFIG_NET_VENDOR_LITEX is not set 505 505 # CONFIG_NET_VENDOR_MARVELL is not set 506 506 CONFIG_MLX4_EN=m ··· 509 509 # CONFIG_NET_VENDOR_MICREL is not set 510 510 # CONFIG_NET_VENDOR_MICROCHIP is not set 511 511 # CONFIG_NET_VENDOR_MICROSEMI is not set 512 + # CONFIG_NET_VENDOR_MICROSOFT is not set 512 513 # CONFIG_NET_VENDOR_MYRI is not set 514 + # CONFIG_NET_VENDOR_NI is not set 513 515 # CONFIG_NET_VENDOR_NATSEMI is not set 514 516 # CONFIG_NET_VENDOR_NETERION is not set 515 517 # CONFIG_NET_VENDOR_NETRONOME is not set 516 - # CONFIG_NET_VENDOR_NI is not set 517 518 # CONFIG_NET_VENDOR_NVIDIA is not set 518 519 # CONFIG_NET_VENDOR_OKI is not set 519 520 # CONFIG_NET_VENDOR_PACKET_ENGINES is not set 520 521 # CONFIG_NET_VENDOR_PENSANDO is not set 521 522 # CONFIG_NET_VENDOR_QLOGIC is not set 523 + # CONFIG_NET_VENDOR_BROCADE is not set 522 524 # CONFIG_NET_VENDOR_QUALCOMM is not set 523 525 # CONFIG_NET_VENDOR_RDC is not set 524 526 # CONFIG_NET_VENDOR_REALTEK is not set ··· 528 526 # CONFIG_NET_VENDOR_ROCKER is not set 529 527 # CONFIG_NET_VENDOR_SAMSUNG is not set 530 528 # CONFIG_NET_VENDOR_SEEQ is not set 531 - # CONFIG_NET_VENDOR_SOLARFLARE is not set 532 529 # CONFIG_NET_VENDOR_SILAN is not set 533 530 # CONFIG_NET_VENDOR_SIS is not set 531 + # CONFIG_NET_VENDOR_SOLARFLARE is not set 534 532 # CONFIG_NET_VENDOR_SMSC is not set 535 533 # CONFIG_NET_VENDOR_SOCIONEXT is not set 536 534 # CONFIG_NET_VENDOR_STMICRO is not set ··· 563 561 CONFIG_HW_RANDOM_VIRTIO=m 564 562 CONFIG_HANGCHECK_TIMER=m 565 563 CONFIG_TN3270_FS=y 564 + # CONFIG_RANDOM_TRUST_CPU is not set 565 + # CONFIG_RANDOM_TRUST_BOOTLOADER is not set 566 566 # CONFIG_PTP_1588_CLOCK is not set 567 567 # CONFIG_HWMON is not set 568 568 CONFIG_WATCHDOG=y ··· 717 713 CONFIG_CRYPTO_PCBC=m 718 714 CONFIG_CRYPTO_KEYWRAP=m 719 715 CONFIG_CRYPTO_ADIANTUM=m 716 + CONFIG_CRYPTO_HCTR2=m 720 717 CONFIG_CRYPTO_XCBC=m 721 718 CONFIG_CRYPTO_VMAC=m 722 719 CONFIG_CRYPTO_CRC32=m 723 - CONFIG_CRYPTO_BLAKE2S=m 720 + CONFIG_CRYPTO_CRC32_S390=y 724 721 CONFIG_CRYPTO_MD4=m 725 722 CONFIG_CRYPTO_MD5=y 726 723 CONFIG_CRYPTO_MICHAEL_MIC=m 727 724 CONFIG_CRYPTO_RMD160=m 725 + CONFIG_CRYPTO_SHA512_S390=m 726 + CONFIG_CRYPTO_SHA1_S390=m 727 + CONFIG_CRYPTO_SHA256_S390=m 728 728 CONFIG_CRYPTO_SHA3=m 729 - CONFIG_CRYPTO_SM3=m 729 + CONFIG_CRYPTO_SHA3_256_S390=m 730 + CONFIG_CRYPTO_SHA3_512_S390=m 731 + CONFIG_CRYPTO_SM3_GENERIC=m 730 732 CONFIG_CRYPTO_WP512=m 733 + CONFIG_CRYPTO_GHASH_S390=m 731 734 CONFIG_CRYPTO_AES_TI=m 735 + CONFIG_CRYPTO_AES_S390=m 732 736 CONFIG_CRYPTO_ANUBIS=m 733 737 CONFIG_CRYPTO_ARC4=m 734 738 CONFIG_CRYPTO_BLOWFISH=m ··· 744 732 CONFIG_CRYPTO_CAST5=m 745 733 CONFIG_CRYPTO_CAST6=m 746 734 CONFIG_CRYPTO_DES=m 735 + CONFIG_CRYPTO_DES_S390=m 747 736 CONFIG_CRYPTO_FCRYPT=m 748 737 CONFIG_CRYPTO_KHAZAD=m 738 + CONFIG_CRYPTO_CHACHA_S390=m 749 739 CONFIG_CRYPTO_SEED=m 740 + CONFIG_CRYPTO_ARIA=m 750 741 CONFIG_CRYPTO_SERPENT=m 751 - CONFIG_CRYPTO_SM4=m 742 + CONFIG_CRYPTO_SM4_GENERIC=m 752 743 CONFIG_CRYPTO_TEA=m 753 744 CONFIG_CRYPTO_TWOFISH=m 754 745 CONFIG_CRYPTO_842=m ··· 767 752 CONFIG_ZCRYPT=m 768 753 CONFIG_PKEY=m 769 754 CONFIG_CRYPTO_PAES_S390=m 770 - CONFIG_CRYPTO_SHA1_S390=m 771 - CONFIG_CRYPTO_SHA256_S390=m 772 - CONFIG_CRYPTO_SHA512_S390=m 773 - CONFIG_CRYPTO_SHA3_256_S390=m 774 - CONFIG_CRYPTO_SHA3_512_S390=m 775 - CONFIG_CRYPTO_DES_S390=m 776 - CONFIG_CRYPTO_AES_S390=m 777 - CONFIG_CRYPTO_CHACHA_S390=m 778 - CONFIG_CRYPTO_GHASH_S390=m 779 - CONFIG_CRYPTO_CRC32_S390=y 780 755 CONFIG_CRYPTO_DEV_VIRTIO=m 781 756 CONFIG_CORDIC=m 782 757 CONFIG_PRIME_NUMBERS=m

+4 -2

arch/s390/configs/zfcpdump_defconfig

··· 1 - # CONFIG_SWAP is not set 2 1 CONFIG_NO_HZ_IDLE=y 3 2 CONFIG_HIGH_RES_TIMERS=y 4 3 CONFIG_BPF_SYSCALL=y ··· 8 9 # CONFIG_NET_NS is not set 9 10 CONFIG_BLK_DEV_INITRD=y 10 11 CONFIG_CC_OPTIMIZE_FOR_SIZE=y 11 - # CONFIG_COMPAT_BRK is not set 12 12 CONFIG_MARCH_ZEC12=y 13 13 CONFIG_TUNE_ZEC12=y 14 14 # CONFIG_COMPAT is not set ··· 26 28 # CONFIG_BLOCK_LEGACY_AUTOLOAD is not set 27 29 CONFIG_PARTITION_ADVANCED=y 28 30 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 31 + # CONFIG_SWAP is not set 32 + # CONFIG_COMPAT_BRK is not set 29 33 # CONFIG_COMPACTION is not set 30 34 # CONFIG_MIGRATION is not set 31 35 CONFIG_NET=y ··· 53 53 # CONFIG_HVC_IUCV is not set 54 54 # CONFIG_HW_RANDOM_S390 is not set 55 55 # CONFIG_HMC_DRV is not set 56 + # CONFIG_S390_UV_UAPI is not set 56 57 # CONFIG_S390_TAPE is not set 57 58 # CONFIG_VMCP is not set 58 59 # CONFIG_MONWRITER is not set 59 60 # CONFIG_S390_VMUR is not set 61 + # CONFIG_RANDOM_TRUST_BOOTLOADER is not set 60 62 # CONFIG_HID is not set 61 63 # CONFIG_VIRTIO_MENU is not set 62 64 # CONFIG_VHOST_MENU is not set

+4 -2

arch/s390/include/asm/hugetlb.h

··· 28 28 static inline int prepare_hugepage_range(struct file *file, 29 29 unsigned long addr, unsigned long len) 30 30 { 31 - if (len & ~HPAGE_MASK) 31 + struct hstate *h = hstate_file(file); 32 + 33 + if (len & ~huge_page_mask(h)) 32 34 return -EINVAL; 33 - if (addr & ~HPAGE_MASK) 35 + if (addr & ~huge_page_mask(h)) 34 36 return -EINVAL; 35 37 return 0; 36 38 }

+1

arch/s390/kernel/vmlinux.lds.S

··· 131 131 /* 132 132 * Table with the patch locations to undo expolines 133 133 */ 134 + . = ALIGN(4); 134 135 .nospec_call_table : { 135 136 __nospec_call_start = . ; 136 137 *(.s390_indirect*)

-2

arch/s390/mm/fault.c

··· 421 421 if (unlikely(!(vma->vm_flags & access))) 422 422 goto out_up; 423 423 424 - if (is_vm_hugetlb_page(vma)) 425 - address &= HPAGE_MASK; 426 424 /* 427 425 * If for any reason at all we couldn't handle the fault, 428 426 * make sure we exit gracefully rather than endlessly redo

Configure Feed

Configure Feed