tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 's390-6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Alexander Gordeev:

- fix memcpy warning about field-spanning write in zcrypt driver

- minor updates to defconfigs

- remove CONFIG_DEBUG_INFO_BTF from all defconfigs and add btf.config
addon config file. It significantly decreases compile time and allows
quickly enabling that option into the current kernel config

- add kasan.config addon config file which allows to easily enable
KASAN into the current kernel config

- binutils commit 906f69cf65da ("IBM zSystems: Issue error for *DBL
relocs on misaligned symbols") caused several link errors. Always
build relocatable kernel to avoid this problem

- raise the minimum clang version to 15.0.0 to avoid silent generation
of a corrupted code

* tag 's390-6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
scripts/min-tool-version.sh: raise minimum clang version to 15.0.0 for s390
s390: always build relocatable kernel
s390/configs: add kasan.config addon config file
s390/configs: move CONFIG_DEBUG_INFO_BTF into btf.config addon config
s390: update defconfigs
s390/zcrypt: fix warning about field-spanning write

Linus Torvalds f5020a08 df65494f

+90 -84
+3 -3
arch/s390/Kconfig
··· 568 568 endchoice 569 569 570 570 config RELOCATABLE 571 - bool "Build a relocatable kernel" 572 - default y 571 + def_bool y 573 572 help 574 573 This builds a kernel image that retains relocation information 575 574 so it can be loaded at an arbitrary address. ··· 577 578 bootup process. 578 579 The relocations make the kernel image about 15% larger (compressed 579 580 10%), but are discarded at runtime. 581 + Note: this option exists only for documentation purposes, please do 582 + not remove it. 580 583 581 584 config RANDOMIZE_BASE 582 585 bool "Randomize the address of the kernel image (KASLR)" 583 - depends on RELOCATABLE 584 586 default y 585 587 help 586 588 In support of Kernel Address Space Layout Randomization (KASLR),
-2
arch/s390/Makefile
··· 14 14 KBUILD_CFLAGS_MODULE += -fPIC 15 15 KBUILD_AFLAGS += -m64 16 16 KBUILD_CFLAGS += -m64 17 - ifeq ($(CONFIG_RELOCATABLE),y) 18 17 KBUILD_CFLAGS += -fPIE 19 18 LDFLAGS_vmlinux := -pie 20 - endif 21 19 aflags_dwarf := -Wa,-gdwarf-2 22 20 KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__ 23 21 ifndef CONFIG_AS_IS_LLVM
+1 -2
arch/s390/boot/Makefile
··· 37 37 38 38 obj-y := head.o als.o startup.o mem_detect.o ipl_parm.o ipl_report.o 39 39 obj-y += string.o ebcdic.o sclp_early_core.o mem.o ipl_vmparm.o cmdline.o 40 - obj-y += version.o pgm_check_info.o ctype.o ipl_data.o 40 + obj-y += version.o pgm_check_info.o ctype.o ipl_data.o machine_kexec_reloc.o 41 41 obj-$(findstring y, $(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) $(CONFIG_PGSTE)) += uv.o 42 - obj-$(CONFIG_RELOCATABLE) += machine_kexec_reloc.o 43 42 obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o 44 43 obj-y += $(if $(CONFIG_KERNEL_UNCOMPRESSED),,decompressor.o) info.o 45 44 obj-$(CONFIG_KERNEL_ZSTD) += clz_ctz.o
+1 -2
arch/s390/boot/startup.c
··· 291 291 292 292 clear_bss_section(); 293 293 copy_bootdata(); 294 - if (IS_ENABLED(CONFIG_RELOCATABLE)) 295 - handle_relocs(__kaslr_offset); 294 + handle_relocs(__kaslr_offset); 296 295 297 296 if (__kaslr_offset) { 298 297 /*
+1
arch/s390/configs/btf.config
··· 1 + CONFIG_DEBUG_INFO_BTF=y
+32 -33
arch/s390/configs/debug_defconfig
··· 723 723 CONFIG_CRYPTO_ECRDSA=m 724 724 CONFIG_CRYPTO_SM2=m 725 725 CONFIG_CRYPTO_CURVE25519=m 726 - CONFIG_CRYPTO_GCM=y 727 - CONFIG_CRYPTO_CHACHA20POLY1305=m 728 - CONFIG_CRYPTO_AEGIS128=m 729 - CONFIG_CRYPTO_SEQIV=y 730 - CONFIG_CRYPTO_CFB=m 731 - CONFIG_CRYPTO_LRW=m 732 - CONFIG_CRYPTO_PCBC=m 733 - CONFIG_CRYPTO_KEYWRAP=m 734 - CONFIG_CRYPTO_ADIANTUM=m 735 - CONFIG_CRYPTO_HCTR2=m 736 - CONFIG_CRYPTO_XCBC=m 737 - CONFIG_CRYPTO_VMAC=m 738 - CONFIG_CRYPTO_CRC32=m 739 - CONFIG_CRYPTO_CRC32_S390=y 740 - CONFIG_CRYPTO_MD4=m 741 - CONFIG_CRYPTO_MD5=y 742 - CONFIG_CRYPTO_MICHAEL_MIC=m 743 - CONFIG_CRYPTO_RMD160=m 744 - CONFIG_CRYPTO_SHA512_S390=m 745 - CONFIG_CRYPTO_SHA1_S390=m 746 - CONFIG_CRYPTO_SHA256_S390=m 747 - CONFIG_CRYPTO_SHA3=m 748 - CONFIG_CRYPTO_SHA3_256_S390=m 749 - CONFIG_CRYPTO_SHA3_512_S390=m 750 - CONFIG_CRYPTO_SM3_GENERIC=m 751 - CONFIG_CRYPTO_WP512=m 752 - CONFIG_CRYPTO_GHASH_S390=m 753 726 CONFIG_CRYPTO_AES_TI=m 754 - CONFIG_CRYPTO_AES_S390=m 755 727 CONFIG_CRYPTO_ANUBIS=m 756 - CONFIG_CRYPTO_ARC4=m 728 + CONFIG_CRYPTO_ARIA=m 757 729 CONFIG_CRYPTO_BLOWFISH=m 758 730 CONFIG_CRYPTO_CAMELLIA=m 759 731 CONFIG_CRYPTO_CAST5=m 760 732 CONFIG_CRYPTO_CAST6=m 761 733 CONFIG_CRYPTO_DES=m 762 - CONFIG_CRYPTO_DES_S390=m 763 734 CONFIG_CRYPTO_FCRYPT=m 764 735 CONFIG_CRYPTO_KHAZAD=m 765 - CONFIG_CRYPTO_CHACHA_S390=m 766 736 CONFIG_CRYPTO_SEED=m 767 - CONFIG_CRYPTO_ARIA=m 768 737 CONFIG_CRYPTO_SERPENT=m 769 738 CONFIG_CRYPTO_SM4_GENERIC=m 770 739 CONFIG_CRYPTO_TEA=m 771 740 CONFIG_CRYPTO_TWOFISH=m 741 + CONFIG_CRYPTO_ADIANTUM=m 742 + CONFIG_CRYPTO_ARC4=m 743 + CONFIG_CRYPTO_CFB=m 744 + CONFIG_CRYPTO_HCTR2=m 745 + CONFIG_CRYPTO_KEYWRAP=m 746 + CONFIG_CRYPTO_LRW=m 747 + CONFIG_CRYPTO_PCBC=m 748 + CONFIG_CRYPTO_AEGIS128=m 749 + CONFIG_CRYPTO_CHACHA20POLY1305=m 750 + CONFIG_CRYPTO_GCM=y 751 + CONFIG_CRYPTO_SEQIV=y 752 + CONFIG_CRYPTO_MD4=m 753 + CONFIG_CRYPTO_MD5=y 754 + CONFIG_CRYPTO_MICHAEL_MIC=m 755 + CONFIG_CRYPTO_RMD160=m 756 + CONFIG_CRYPTO_SHA3=m 757 + CONFIG_CRYPTO_SM3_GENERIC=m 758 + CONFIG_CRYPTO_VMAC=m 759 + CONFIG_CRYPTO_WP512=m 760 + CONFIG_CRYPTO_XCBC=m 761 + CONFIG_CRYPTO_CRC32=m 772 762 CONFIG_CRYPTO_842=m 773 763 CONFIG_CRYPTO_LZ4=m 774 764 CONFIG_CRYPTO_LZ4HC=m ··· 769 779 CONFIG_CRYPTO_USER_API_RNG=m 770 780 CONFIG_CRYPTO_USER_API_AEAD=m 771 781 CONFIG_CRYPTO_STATS=y 782 + CONFIG_CRYPTO_CRC32_S390=y 783 + CONFIG_CRYPTO_SHA512_S390=m 784 + CONFIG_CRYPTO_SHA1_S390=m 785 + CONFIG_CRYPTO_SHA256_S390=m 786 + CONFIG_CRYPTO_SHA3_256_S390=m 787 + CONFIG_CRYPTO_SHA3_512_S390=m 788 + CONFIG_CRYPTO_GHASH_S390=m 789 + CONFIG_CRYPTO_AES_S390=m 790 + CONFIG_CRYPTO_DES_S390=m 791 + CONFIG_CRYPTO_CHACHA_S390=m 772 792 CONFIG_ZCRYPT=m 773 793 CONFIG_PKEY=m 774 794 CONFIG_CRYPTO_PAES_S390=m ··· 797 797 CONFIG_PRINTK_TIME=y 798 798 CONFIG_DYNAMIC_DEBUG=y 799 799 CONFIG_DEBUG_INFO_DWARF4=y 800 - CONFIG_DEBUG_INFO_BTF=y 801 800 CONFIG_GDB_SCRIPTS=y 802 801 CONFIG_HEADERS_INSTALL=y 803 802 CONFIG_DEBUG_SECTION_MISMATCH=y
+33 -34
arch/s390/configs/defconfig
··· 707 707 CONFIG_CRYPTO_ECRDSA=m 708 708 CONFIG_CRYPTO_SM2=m 709 709 CONFIG_CRYPTO_CURVE25519=m 710 - CONFIG_CRYPTO_GCM=y 711 - CONFIG_CRYPTO_CHACHA20POLY1305=m 712 - CONFIG_CRYPTO_AEGIS128=m 713 - CONFIG_CRYPTO_SEQIV=y 714 - CONFIG_CRYPTO_CFB=m 715 - CONFIG_CRYPTO_LRW=m 716 - CONFIG_CRYPTO_OFB=m 717 - CONFIG_CRYPTO_PCBC=m 718 - CONFIG_CRYPTO_KEYWRAP=m 719 - CONFIG_CRYPTO_ADIANTUM=m 720 - CONFIG_CRYPTO_HCTR2=m 721 - CONFIG_CRYPTO_XCBC=m 722 - CONFIG_CRYPTO_VMAC=m 723 - CONFIG_CRYPTO_CRC32=m 724 - CONFIG_CRYPTO_CRC32_S390=y 725 - CONFIG_CRYPTO_MD4=m 726 - CONFIG_CRYPTO_MD5=y 727 - CONFIG_CRYPTO_MICHAEL_MIC=m 728 - CONFIG_CRYPTO_RMD160=m 729 - CONFIG_CRYPTO_SHA512_S390=m 730 - CONFIG_CRYPTO_SHA1_S390=m 731 - CONFIG_CRYPTO_SHA256_S390=m 732 - CONFIG_CRYPTO_SHA3=m 733 - CONFIG_CRYPTO_SHA3_256_S390=m 734 - CONFIG_CRYPTO_SHA3_512_S390=m 735 - CONFIG_CRYPTO_SM3_GENERIC=m 736 - CONFIG_CRYPTO_WP512=m 737 - CONFIG_CRYPTO_GHASH_S390=m 738 710 CONFIG_CRYPTO_AES_TI=m 739 - CONFIG_CRYPTO_AES_S390=m 740 711 CONFIG_CRYPTO_ANUBIS=m 741 - CONFIG_CRYPTO_ARC4=m 712 + CONFIG_CRYPTO_ARIA=m 742 713 CONFIG_CRYPTO_BLOWFISH=m 743 714 CONFIG_CRYPTO_CAMELLIA=m 744 715 CONFIG_CRYPTO_CAST5=m 745 716 CONFIG_CRYPTO_CAST6=m 746 717 CONFIG_CRYPTO_DES=m 747 - CONFIG_CRYPTO_DES_S390=m 748 718 CONFIG_CRYPTO_FCRYPT=m 749 719 CONFIG_CRYPTO_KHAZAD=m 750 - CONFIG_CRYPTO_CHACHA_S390=m 751 720 CONFIG_CRYPTO_SEED=m 752 - CONFIG_CRYPTO_ARIA=m 753 721 CONFIG_CRYPTO_SERPENT=m 754 722 CONFIG_CRYPTO_SM4_GENERIC=m 755 723 CONFIG_CRYPTO_TEA=m 756 724 CONFIG_CRYPTO_TWOFISH=m 725 + CONFIG_CRYPTO_ADIANTUM=m 726 + CONFIG_CRYPTO_ARC4=m 727 + CONFIG_CRYPTO_CFB=m 728 + CONFIG_CRYPTO_HCTR2=m 729 + CONFIG_CRYPTO_KEYWRAP=m 730 + CONFIG_CRYPTO_LRW=m 731 + CONFIG_CRYPTO_OFB=m 732 + CONFIG_CRYPTO_PCBC=m 733 + CONFIG_CRYPTO_AEGIS128=m 734 + CONFIG_CRYPTO_CHACHA20POLY1305=m 735 + CONFIG_CRYPTO_GCM=y 736 + CONFIG_CRYPTO_SEQIV=y 737 + CONFIG_CRYPTO_MD4=m 738 + CONFIG_CRYPTO_MD5=y 739 + CONFIG_CRYPTO_MICHAEL_MIC=m 740 + CONFIG_CRYPTO_RMD160=m 741 + CONFIG_CRYPTO_SHA3=m 742 + CONFIG_CRYPTO_SM3_GENERIC=m 743 + CONFIG_CRYPTO_VMAC=m 744 + CONFIG_CRYPTO_WP512=m 745 + CONFIG_CRYPTO_XCBC=m 746 + CONFIG_CRYPTO_CRC32=m 757 747 CONFIG_CRYPTO_842=m 758 748 CONFIG_CRYPTO_LZ4=m 759 749 CONFIG_CRYPTO_LZ4HC=m ··· 754 764 CONFIG_CRYPTO_USER_API_RNG=m 755 765 CONFIG_CRYPTO_USER_API_AEAD=m 756 766 CONFIG_CRYPTO_STATS=y 767 + CONFIG_CRYPTO_CRC32_S390=y 768 + CONFIG_CRYPTO_SHA512_S390=m 769 + CONFIG_CRYPTO_SHA1_S390=m 770 + CONFIG_CRYPTO_SHA256_S390=m 771 + CONFIG_CRYPTO_SHA3_256_S390=m 772 + CONFIG_CRYPTO_SHA3_512_S390=m 773 + CONFIG_CRYPTO_GHASH_S390=m 774 + CONFIG_CRYPTO_AES_S390=m 775 + CONFIG_CRYPTO_DES_S390=m 776 + CONFIG_CRYPTO_CHACHA_S390=m 757 777 CONFIG_ZCRYPT=m 758 778 CONFIG_PKEY=m 759 779 CONFIG_CRYPTO_PAES_S390=m ··· 781 781 CONFIG_PRINTK_TIME=y 782 782 CONFIG_DYNAMIC_DEBUG=y 783 783 CONFIG_DEBUG_INFO_DWARF4=y 784 - CONFIG_DEBUG_INFO_BTF=y 785 784 CONFIG_GDB_SCRIPTS=y 786 785 CONFIG_DEBUG_SECTION_MISMATCH=y 787 786 CONFIG_MAGIC_SYSRQ=y
+3
arch/s390/configs/kasan.config
··· 1 + CONFIG_KASAN=y 2 + CONFIG_KASAN_INLINE=y 3 + CONFIG_KASAN_VMALLOC=y
-1
arch/s390/configs/zfcpdump_defconfig
··· 74 74 # CONFIG_SYMBOLIC_ERRNAME is not set 75 75 CONFIG_DEBUG_KERNEL=y 76 76 CONFIG_DEBUG_INFO_DWARF4=y 77 - CONFIG_DEBUG_INFO_BTF=y 78 77 CONFIG_DEBUG_FS=y 79 78 CONFIG_PANIC_ON_OOPS=y 80 79 # CONFIG_SCHED_DEBUG is not set
+15 -6
drivers/s390/crypto/zcrypt_msgtype6.c
··· 342 342 }; 343 343 struct { 344 344 struct type6_hdr hdr; 345 - struct CPRBX cprbx; 345 + union { 346 + struct CPRBX cprbx; 347 + DECLARE_FLEX_ARRAY(u8, userdata); 348 + }; 346 349 } __packed * msg = ap_msg->msg; 347 350 348 351 int rcblen = CEIL4(xcrb->request_control_blk_length); ··· 406 403 msg->hdr.fromcardlen2 = xcrb->reply_data_length; 407 404 408 405 /* prepare CPRB */ 409 - if (z_copy_from_user(userspace, &msg->cprbx, xcrb->request_control_blk_addr, 406 + if (z_copy_from_user(userspace, msg->userdata, 407 + xcrb->request_control_blk_addr, 410 408 xcrb->request_control_blk_length)) 411 409 return -EFAULT; 412 410 if (msg->cprbx.cprb_len + sizeof(msg->hdr.function_code) > ··· 473 469 474 470 struct { 475 471 struct type6_hdr hdr; 476 - struct ep11_cprb cprbx; 477 - unsigned char pld_tag; /* fixed value 0x30 */ 478 - unsigned char pld_lenfmt; /* payload length format */ 472 + union { 473 + struct { 474 + struct ep11_cprb cprbx; 475 + unsigned char pld_tag; /* fixed value 0x30 */ 476 + unsigned char pld_lenfmt; /* length format */ 477 + } __packed; 478 + DECLARE_FLEX_ARRAY(u8, userdata); 479 + }; 479 480 } __packed * msg = ap_msg->msg; 480 481 481 482 struct pld_hdr { ··· 509 500 msg->hdr.fromcardlen1 = xcrb->resp_len; 510 501 511 502 /* Import CPRB data from the ioctl input parameter */ 512 - if (z_copy_from_user(userspace, &msg->cprbx.cprb_len, 503 + if (z_copy_from_user(userspace, msg->userdata, 513 504 (char __force __user *)xcrb->req, xcrb->req_len)) { 514 505 return -EFAULT; 515 506 }
+1 -1
scripts/min-tool-version.sh
··· 25 25 ;; 26 26 llvm) 27 27 if [ "$SRCARCH" = s390 ]; then 28 - echo 14.0.0 28 + echo 15.0.0 29 29 else 30 30 echo 11.0.0 31 31 fi