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.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

Linus Torvalds 26a9a47c 80ae5fb2

+41 -21
+19 -9
arch/s390/configs/debug_defconfig
··· 38 38 CONFIG_CHECKPOINT_RESTORE=y 39 39 CONFIG_SCHED_AUTOGROUP=y 40 40 CONFIG_EXPERT=y 41 - # CONFIG_SYSFS_SYSCALL is not set 42 41 CONFIG_PROFILING=y 43 42 CONFIG_KEXEC=y 44 43 CONFIG_KEXEC_FILE=y ··· 91 92 CONFIG_IOSCHED_BFQ=y 92 93 CONFIG_BINFMT_MISC=m 93 94 CONFIG_ZSWAP=y 94 - CONFIG_ZSMALLOC=y 95 95 CONFIG_ZSMALLOC_STAT=y 96 96 CONFIG_SLAB_BUCKETS=y 97 97 CONFIG_SLUB_STATS=y ··· 393 395 CONFIG_NET_CLS_FLOW=m 394 396 CONFIG_NET_CLS_CGROUP=y 395 397 CONFIG_NET_CLS_BPF=m 398 + CONFIG_NET_CLS_FLOWER=m 399 + CONFIG_NET_CLS_MATCHALL=m 400 + CONFIG_NET_EMATCH=y 396 401 CONFIG_NET_CLS_ACT=y 397 402 CONFIG_NET_ACT_POLICE=m 398 403 CONFIG_NET_ACT_GACT=m ··· 406 405 CONFIG_NET_ACT_SIMP=m 407 406 CONFIG_NET_ACT_SKBEDIT=m 408 407 CONFIG_NET_ACT_CSUM=m 408 + CONFIG_NET_ACT_VLAN=m 409 + CONFIG_NET_ACT_TUNNEL_KEY=m 410 + CONFIG_NET_ACT_CT=m 409 411 CONFIG_NET_ACT_GATE=m 410 412 CONFIG_NET_TC_SKB_EXT=y 411 413 CONFIG_DNS_RESOLVER=y ··· 632 628 CONFIG_VIRTIO_BALLOON=m 633 629 CONFIG_VIRTIO_MEM=m 634 630 CONFIG_VIRTIO_INPUT=y 631 + CONFIG_VDPA=m 632 + CONFIG_VDPA_SIM=m 633 + CONFIG_VDPA_SIM_NET=m 634 + CONFIG_VDPA_SIM_BLOCK=m 635 + CONFIG_VDPA_USER=m 636 + CONFIG_MLX5_VDPA_NET=m 637 + CONFIG_VP_VDPA=m 635 638 CONFIG_VHOST_NET=m 636 639 CONFIG_VHOST_VSOCK=m 640 + CONFIG_VHOST_VDPA=m 637 641 CONFIG_EXT4_FS=y 638 642 CONFIG_EXT4_FS_POSIX_ACL=y 639 643 CONFIG_EXT4_FS_SECURITY=y ··· 666 654 CONFIG_BCACHEFS_FS=y 667 655 CONFIG_BCACHEFS_QUOTA=y 668 656 CONFIG_BCACHEFS_POSIX_ACL=y 669 - CONFIG_FS_DAX=y 670 657 CONFIG_EXPORTFS_BLOCK_OPS=y 671 658 CONFIG_FS_ENCRYPTION=y 672 659 CONFIG_FS_VERITY=y ··· 735 724 CONFIG_DLM=m 736 725 CONFIG_UNICODE=y 737 726 CONFIG_PERSISTENT_KEYRINGS=y 727 + CONFIG_BIG_KEYS=y 738 728 CONFIG_ENCRYPTED_KEYS=m 739 729 CONFIG_KEY_NOTIFICATIONS=y 740 730 CONFIG_SECURITY=y 741 - CONFIG_HARDENED_USERCOPY=y 742 - CONFIG_FORTIFY_SOURCE=y 743 731 CONFIG_SECURITY_SELINUX=y 744 732 CONFIG_SECURITY_SELINUX_BOOTPARAM=y 745 733 CONFIG_SECURITY_LOCKDOWN_LSM=y ··· 751 741 CONFIG_IMA_DEFAULT_HASH_SHA256=y 752 742 CONFIG_IMA_WRITE_POLICY=y 753 743 CONFIG_IMA_APPRAISE=y 744 + CONFIG_FORTIFY_SOURCE=y 745 + CONFIG_HARDENED_USERCOPY=y 754 746 CONFIG_BUG_ON_DATA_CORRUPTION=y 755 747 CONFIG_CRYPTO_USER=m 756 748 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set ··· 768 756 CONFIG_CRYPTO_ANUBIS=m 769 757 CONFIG_CRYPTO_ARIA=m 770 758 CONFIG_CRYPTO_BLOWFISH=m 771 - CONFIG_CRYPTO_CAMELLIA=m 772 759 CONFIG_CRYPTO_CAST5=m 773 760 CONFIG_CRYPTO_CAST6=m 774 761 CONFIG_CRYPTO_DES=m ··· 812 801 CONFIG_CRYPTO_GHASH_S390=m 813 802 CONFIG_CRYPTO_AES_S390=m 814 803 CONFIG_CRYPTO_DES_S390=m 815 - CONFIG_CRYPTO_CHACHA_S390=m 816 804 CONFIG_CRYPTO_HMAC_S390=m 817 805 CONFIG_ZCRYPT=m 818 806 CONFIG_PKEY=m ··· 822 812 CONFIG_CRYPTO_PAES_S390=m 823 813 CONFIG_CRYPTO_DEV_VIRTIO=m 824 814 CONFIG_SYSTEM_BLACKLIST_KEYRING=y 815 + CONFIG_CRYPTO_KRB5=m 816 + CONFIG_CRYPTO_KRB5_SELFTESTS=y 825 817 CONFIG_CORDIC=m 826 - CONFIG_CRYPTO_LIB_CURVE25519=m 827 - CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m 828 818 CONFIG_RANDOM32_SELFTEST=y 829 819 CONFIG_XZ_DEC_MICROLZMA=y 830 820 CONFIG_DMA_CMA=y
+17 -7
arch/s390/configs/defconfig
··· 36 36 CONFIG_CHECKPOINT_RESTORE=y 37 37 CONFIG_SCHED_AUTOGROUP=y 38 38 CONFIG_EXPERT=y 39 - # CONFIG_SYSFS_SYSCALL is not set 40 39 CONFIG_PROFILING=y 41 40 CONFIG_KEXEC=y 42 41 CONFIG_KEXEC_FILE=y ··· 85 86 CONFIG_IOSCHED_BFQ=y 86 87 CONFIG_BINFMT_MISC=m 87 88 CONFIG_ZSWAP=y 88 - CONFIG_ZSMALLOC=y 89 89 CONFIG_ZSMALLOC_STAT=y 90 90 CONFIG_SLAB_BUCKETS=y 91 91 # CONFIG_COMPAT_BRK is not set ··· 383 385 CONFIG_NET_CLS_FLOW=m 384 386 CONFIG_NET_CLS_CGROUP=y 385 387 CONFIG_NET_CLS_BPF=m 388 + CONFIG_NET_CLS_FLOWER=m 389 + CONFIG_NET_CLS_MATCHALL=m 390 + CONFIG_NET_EMATCH=y 386 391 CONFIG_NET_CLS_ACT=y 387 392 CONFIG_NET_ACT_POLICE=m 388 393 CONFIG_NET_ACT_GACT=m ··· 396 395 CONFIG_NET_ACT_SIMP=m 397 396 CONFIG_NET_ACT_SKBEDIT=m 398 397 CONFIG_NET_ACT_CSUM=m 398 + CONFIG_NET_ACT_VLAN=m 399 + CONFIG_NET_ACT_TUNNEL_KEY=m 400 + CONFIG_NET_ACT_CT=m 399 401 CONFIG_NET_ACT_GATE=m 400 402 CONFIG_NET_TC_SKB_EXT=y 401 403 CONFIG_DNS_RESOLVER=y ··· 622 618 CONFIG_VIRTIO_BALLOON=m 623 619 CONFIG_VIRTIO_MEM=m 624 620 CONFIG_VIRTIO_INPUT=y 621 + CONFIG_VDPA=m 622 + CONFIG_VDPA_SIM=m 623 + CONFIG_VDPA_SIM_NET=m 624 + CONFIG_VDPA_SIM_BLOCK=m 625 + CONFIG_VDPA_USER=m 626 + CONFIG_MLX5_VDPA_NET=m 627 + CONFIG_VP_VDPA=m 625 628 CONFIG_VHOST_NET=m 626 629 CONFIG_VHOST_VSOCK=m 630 + CONFIG_VHOST_VDPA=m 627 631 CONFIG_EXT4_FS=y 628 632 CONFIG_EXT4_FS_POSIX_ACL=y 629 633 CONFIG_EXT4_FS_SECURITY=y ··· 653 641 CONFIG_BCACHEFS_FS=m 654 642 CONFIG_BCACHEFS_QUOTA=y 655 643 CONFIG_BCACHEFS_POSIX_ACL=y 656 - CONFIG_FS_DAX=y 657 644 CONFIG_EXPORTFS_BLOCK_OPS=y 658 645 CONFIG_FS_ENCRYPTION=y 659 646 CONFIG_FS_VERITY=y ··· 722 711 CONFIG_DLM=m 723 712 CONFIG_UNICODE=y 724 713 CONFIG_PERSISTENT_KEYRINGS=y 714 + CONFIG_BIG_KEYS=y 725 715 CONFIG_ENCRYPTED_KEYS=m 726 716 CONFIG_KEY_NOTIFICATIONS=y 727 717 CONFIG_SECURITY=y ··· 754 742 CONFIG_CRYPTO_ANUBIS=m 755 743 CONFIG_CRYPTO_ARIA=m 756 744 CONFIG_CRYPTO_BLOWFISH=m 757 - CONFIG_CRYPTO_CAMELLIA=m 758 745 CONFIG_CRYPTO_CAST5=m 759 746 CONFIG_CRYPTO_CAST6=m 760 747 CONFIG_CRYPTO_DES=m ··· 799 788 CONFIG_CRYPTO_GHASH_S390=m 800 789 CONFIG_CRYPTO_AES_S390=m 801 790 CONFIG_CRYPTO_DES_S390=m 802 - CONFIG_CRYPTO_CHACHA_S390=m 803 791 CONFIG_CRYPTO_HMAC_S390=m 804 792 CONFIG_ZCRYPT=m 805 793 CONFIG_PKEY=m ··· 809 799 CONFIG_CRYPTO_PAES_S390=m 810 800 CONFIG_CRYPTO_DEV_VIRTIO=m 811 801 CONFIG_SYSTEM_BLACKLIST_KEYRING=y 802 + CONFIG_CRYPTO_KRB5=m 803 + CONFIG_CRYPTO_KRB5_SELFTESTS=y 812 804 CONFIG_CORDIC=m 813 805 CONFIG_PRIME_NUMBERS=m 814 - CONFIG_CRYPTO_LIB_CURVE25519=m 815 - CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m 816 806 CONFIG_XZ_DEC_MICROLZMA=y 817 807 CONFIG_DMA_CMA=y 818 808 CONFIG_CMA_SIZE_MBYTES=0
-1
arch/s390/configs/zfcpdump_defconfig
··· 70 70 CONFIG_DEBUG_INFO_DWARF4=y 71 71 CONFIG_DEBUG_FS=y 72 72 CONFIG_PANIC_ON_OOPS=y 73 - # CONFIG_SCHED_DEBUG is not set 74 73 CONFIG_RCU_CPU_STALL_TIMEOUT=60 75 74 # CONFIG_RCU_TRACE is not set 76 75 # CONFIG_FTRACE is not set
+2 -1
arch/s390/kernel/entry.S
··· 602 602 stmg %r0,%r7,__PT_R0(%r11) 603 603 stmg %r8,%r9,__PT_PSW(%r11) 604 604 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) 606 607 xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15) 607 608 lgr %r2,%r11 # pass pointer to pt_regs 608 609 jg kernel_stack_invalid
+2
arch/s390/pci/pci_clp.c
··· 428 428 return; 429 429 } 430 430 zdev = zpci_create_device(entry->fid, entry->fh, entry->config_state); 431 + if (IS_ERR(zdev)) 432 + return; 431 433 list_add_tail(&zdev->entry, scan_list); 432 434 } 433 435
-1
drivers/pci/hotplug/s390_pci_hpc.c
··· 59 59 60 60 pdev = pci_get_slot(zdev->zbus->bus, zdev->devfn); 61 61 if (pdev && pci_num_vf(pdev)) { 62 - pci_dev_put(pdev); 63 62 rc = -EBUSY; 64 63 goto out; 65 64 }
+1 -2
drivers/s390/block/Kconfig
··· 5 5 config DCSSBLK 6 6 def_tristate m 7 7 prompt "DCSSBLK support" 8 - depends on S390 && BLOCK 8 + depends on S390 && BLOCK && (DAX || DAX=n) 9 9 help 10 10 Support for dcss block device 11 11 ··· 14 14 depends on DCSSBLK 15 15 # requires S390 ZONE_DEVICE support 16 16 depends on BROKEN 17 - select DAX 18 17 prompt "DCSSBLK DAX support" 19 18 help 20 19 Enable DAX operation for the dcss block device