# git rev-parse -q --verify de927f6c0b07d9e698416c5b287c521b07694cac^{commit} de927f6c0b07d9e698416c5b287c521b07694cac already have revision, skipping fetch # git checkout -q -f -B kisskb de927f6c0b07d9e698416c5b287c521b07694cac # git clean -qxdf # < git log -1 # commit de927f6c0b07d9e698416c5b287c521b07694cac # Merge: c29901006179 b2b97a62f055 # Author: Linus Torvalds # Date: Wed Jan 10 18:18:20 2024 -0800 # # Merge tag 's390-6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux # # Pull s390 updates from Alexander Gordeev: # # - Add machine variable capacity information to /proc/sysinfo. # # - Limit the waste of page tables and always align vmalloc area size and # base address on segment boundary. # # - Fix a memory leak when an attempt to register interruption sub class # (ISC) for the adjunct-processor (AP) guest failed. # # - Reset response code AP_RESPONSE_INVALID_GISA to understandable by # guest AP_RESPONSE_INVALID_ADDRESS in response to a failed # interruption sub class (ISC) registration attempt. # # - Improve reaction to adjunct-processor (AP) # AP_RESPONSE_OTHERWISE_CHANGED response code when enabling interrupts # on behalf of a guest. # # - Fix incorrect sysfs 'status' attribute of adjunct-processor (AP) # queue device bound to the vfio_ap device driver when the mediated # device is attached to a guest, but the queue device is not passed # through. # # - Rework struct ap_card to hold the whole adjunct-processor (AP) card # hardware information. As result, all the ugly bit checks are replaced # by simple evaluations of the required bit fields. # # - Improve handling of some weird scenarios between service element (SE) # host and SE guest with adjunct-processor (AP) pass-through support. # # - Change local_ctl_set_bit() and local_ctl_clear_bit() so they return # the previous value of the to be changed control register. This is # useful if a bit is only changed temporarily and the previous content # needs to be restored. # # - The kernel starts with machine checks disabled and is expected to # enable it once trap_init() is called. However the implementation # allows machine checks early. Consistently enable it in trap_init() # only. # # - local_mcck_disable() and local_mcck_enable() assume that machine # checks are always enabled. Instead implement and use # local_mcck_save() and local_mcck_restore() to disable machine checks # and restore the previous state. # # - Modification of floating point control (FPC) register of a traced # process using ptrace interface may lead to corruption of the FPC # register of the tracing process. Fix this. # # - kvm_arch_vcpu_ioctl_set_fpu() allows to set the floating point # control (FPC) register in vCPU, but may lead to corruption of the FPC # register of the host process. Fix this. # # - Use READ_ONCE() to read a vCPU floating point register value from the # memory mapped area. This avoids that, depending on code generation, a # different value is tested for validity than the one that is used. # # - Get rid of test_fp_ctl(), since it is quite subtle to use it # correctly. Instead copy a new floating point control register value # into its save area and test the validity of the new value when # loading it. # # - Remove superfluous save_fpu_regs() call. # # - Remove s390 support for ARCH_WANTS_DYNAMIC_TASK_STRUCT. All machines # provide the vector facility since many years and the need to make the # task structure size dependent on the vector facility does not exist. # # - Remove the "novx" kernel command line option, as the vector code runs # without any problems since many years. # # - Add the vector facility to the z13 architecture level set (ALS). All # hypervisors support the vector facility since many years. This allows # compile time optimizations of the kernel. # # - Get rid of MACHINE_HAS_VX and replace it with cpu_has_vx(). As # result, the compiled code will have less runtime checks and less # code. # # - Convert pgste_get_lock() and pgste_set_unlock() ASM inlines to C. # # - Convert the struct subchannel spinlock from pointer to member. # # * tag 's390-6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (24 commits) # Revert "s390: update defconfigs" # s390/cio: make sch->lock spinlock pointer a member # s390: update defconfigs # s390/mm: convert pgste locking functions to C # s390/fpu: get rid of MACHINE_HAS_VX # s390/als: add vector facility to z13 architecture level set # s390/fpu: remove "novx" option # s390/fpu: remove ARCH_WANTS_DYNAMIC_TASK_STRUCT support # KVM: s390: remove superfluous save_fpu_regs() call # s390/fpu: get rid of test_fp_ctl() # KVM: s390: use READ_ONCE() to read fpc register value # KVM: s390: fix setting of fpc register # s390/ptrace: handle setting of fpc register correctly # s390/nmi: implement and use local_mcck_save() / local_mcck_restore() # s390/nmi: consistently enable machine checks in trap_init() # s390/ctlreg: return old register contents when changing bits # s390/ap: handle outband SE bind state change # s390/ap: store TAPQ hwinfo in struct ap_card # s390/vfio-ap: fix sysfs status attribute for AP queue devices # s390/vfio-ap: improve reaction to response code 07 from PQAP(AQIC) command # ... # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux-ld --version # < git log --format=%s --max-count=1 de927f6c0b07d9e698416c5b287c521b07694cac # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MODULE_SIG=n # < make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- help # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- olddefconfig # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] cc1: warning: unrecognized command line option '-Wno-shift-negative-value' /kisskb/src/arch/sparc/vdso/vma.c:246:12: error: no previous prototype for 'init_vdso_image' [-Werror=missing-prototypes] int __init init_vdso_image(const struct vdso_image *image, ^ /kisskb/src/arch/sparc/power/hibernate.c:22:5: error: no previous prototype for 'pfn_is_nosave' [-Werror=missing-prototypes] int pfn_is_nosave(unsigned long pfn) ^ /kisskb/src/arch/sparc/power/hibernate.c:30:6: error: no previous prototype for 'save_processor_state' [-Werror=missing-prototypes] void save_processor_state(void) ^ /kisskb/src/arch/sparc/power/hibernate.c:35:6: error: no previous prototype for 'restore_processor_state' [-Werror=missing-prototypes] void restore_processor_state(void) ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/power/hibernate.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:480: arch/sparc/power] Error 2 make[3]: *** Waiting for unfinished jobs.... cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/vdso/vma.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:480: arch/sparc/vdso] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/arch/sparc/kernel/traps_64.c:253:6: error: no previous prototype for 'is_no_fault_exception' [-Werror=missing-prototypes] bool is_no_fault_exception(struct pt_regs *regs) ^ /kisskb/src/arch/sparc/kernel/traps_64.c:2035:6: error: no previous prototype for 'do_mcd_err' [-Werror=missing-prototypes] void do_mcd_err(struct pt_regs *regs, struct sun4v_error_entry ent) ^ /kisskb/src/arch/sparc/kernel/traps_64.c:2153:6: error: no previous prototype for 'sun4v_nonresum_error_user_handled' [-Werror=missing-prototypes] bool sun4v_nonresum_error_user_handled(struct pt_regs *regs, ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/kernel/traps_64.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:480: arch/sparc/kernel] Error 2 /kisskb/src/arch/sparc/prom/misc_64.c:165:5: error: no previous prototype for 'prom_get_mmu_ihandle' [-Werror=missing-prototypes] int prom_get_mmu_ihandle(void) ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/prom/misc_64.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:480: arch/sparc/prom] Error 2 /kisskb/src/arch/sparc/mm/init_64.c:2644:6: error: no previous prototype for 'vmemmap_free' [-Werror=missing-prototypes] void vmemmap_free(unsigned long start, unsigned long end, ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/mm/init_64.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:480: arch/sparc/mm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:480: arch/sparc] Error 2 /kisskb/src/net/bpf/test_run.c:508:17: error: no previous prototype for 'bpf_fentry_test1' [-Werror=missing-prototypes] __bpf_kfunc int bpf_fentry_test1(int a) ^ /kisskb/src/net/bpf/test_run.c:514:14: error: no previous prototype for 'bpf_fentry_test2' [-Werror=missing-prototypes] int noinline bpf_fentry_test2(int a, u64 b) ^ /kisskb/src/net/bpf/test_run.c:519:14: error: no previous prototype for 'bpf_fentry_test3' [-Werror=missing-prototypes] int noinline bpf_fentry_test3(char a, int b, u64 c) ^ /kisskb/src/net/bpf/test_run.c:524:14: error: no previous prototype for 'bpf_fentry_test4' [-Werror=missing-prototypes] int noinline bpf_fentry_test4(void *a, char b, int c, u64 d) ^ /kisskb/src/net/bpf/test_run.c:529:14: error: no previous prototype for 'bpf_fentry_test5' [-Werror=missing-prototypes] int noinline bpf_fentry_test5(u64 a, void *b, short c, int d, u64 e) ^ /kisskb/src/net/bpf/test_run.c:534:14: error: no previous prototype for 'bpf_fentry_test6' [-Werror=missing-prototypes] int noinline bpf_fentry_test6(u64 a, void *b, short c, int d, void *e, u64 f) ^ /kisskb/src/net/bpf/test_run.c:543:14: error: no previous prototype for 'bpf_fentry_test7' [-Werror=missing-prototypes] int noinline bpf_fentry_test7(struct bpf_fentry_test_t *arg) ^ /kisskb/src/net/bpf/test_run.c:549:14: error: no previous prototype for 'bpf_fentry_test8' [-Werror=missing-prototypes] int noinline bpf_fentry_test8(struct bpf_fentry_test_t *arg) ^ /kisskb/src/net/bpf/test_run.c:554:17: error: no previous prototype for 'bpf_fentry_test9' [-Werror=missing-prototypes] __bpf_kfunc u32 bpf_fentry_test9(u32 *a) ^ /kisskb/src/net/bpf/test_run.c:559:15: error: no previous prototype for 'bpf_fentry_test_sinfo' [-Werror=missing-prototypes] void noinline bpf_fentry_test_sinfo(struct skb_shared_info *sinfo) ^ /kisskb/src/net/bpf/test_run.c:563:17: error: no previous prototype for 'bpf_modify_return_test' [-Werror=missing-prototypes] __bpf_kfunc int bpf_modify_return_test(int a, int *b) ^ /kisskb/src/net/bpf/test_run.c:569:17: error: no previous prototype for 'bpf_modify_return_test2' [-Werror=missing-prototypes] __bpf_kfunc int bpf_modify_return_test2(int a, int *b, short c, int d, ^ /kisskb/src/net/bpf/test_run.c:576:14: error: no previous prototype for 'bpf_fentry_shadow_test' [-Werror=missing-prototypes] int noinline bpf_fentry_shadow_test(int a) ^ /kisskb/src/net/bpf/test_run.c:598:18: error: no previous prototype for 'bpf_kfunc_call_test_release' [-Werror=missing-prototypes] __bpf_kfunc void bpf_kfunc_call_test_release(struct prog_test_ref_kfunc *p) ^ /kisskb/src/net/bpf/test_run.c:603:18: error: no previous prototype for 'bpf_kfunc_call_memb_release' [-Werror=missing-prototypes] __bpf_kfunc void bpf_kfunc_call_memb_release(struct prog_test_member *p) ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: net/bpf/test_run.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:480: net/bpf] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/net/core/filter.c:11799:17: error: no previous prototype for 'bpf_dynptr_from_skb' [-Werror=missing-prototypes] __bpf_kfunc int bpf_dynptr_from_skb(struct sk_buff *skb, u64 flags, ^ /kisskb/src/net/core/filter.c:11812:17: error: no previous prototype for 'bpf_dynptr_from_xdp' [-Werror=missing-prototypes] __bpf_kfunc int bpf_dynptr_from_xdp(struct xdp_buff *xdp, u64 flags, ^ /kisskb/src/net/core/filter.c:11825:17: error: no previous prototype for 'bpf_sock_addr_set_sun_path' [-Werror=missing-prototypes] __bpf_kfunc int bpf_sock_addr_set_sun_path(struct bpf_sock_addr_kern *sa_kern, ^ /kisskb/src/net/core/filter.c:11926:17: error: no previous prototype for 'bpf_sock_destroy' [-Werror=missing-prototypes] __bpf_kfunc int bpf_sock_destroy(struct sock_common *sock) ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: net/core/filter.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:480: net/core] Error 2 /kisskb/src/kernel/cgroup/rstat.c:218:22: error: no previous prototype for 'bpf_rstat_flush' [-Werror=missing-prototypes] __weak noinline void bpf_rstat_flush(struct cgroup *cgrp, ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: kernel/cgroup/rstat.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:480: kernel/cgroup] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:480: kernel] Error 2 In file included from /kisskb/src/arch/sparc/include/asm/floppy.h:5:0, from /kisskb/src/drivers/block/floppy.c:250: /kisskb/src/arch/sparc/include/asm/floppy_64.h:200:13: error: no previous prototype for 'sparc_floppy_irq' [-Werror=missing-prototypes] irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie) ^ In file included from /kisskb/src/arch/sparc/include/asm/floppy.h:5:0, from /kisskb/src/drivers/block/floppy.c:250: /kisskb/src/arch/sparc/include/asm/floppy_64.h:437:6: error: no previous prototype for 'sun_pci_fd_dma_callback' [-Werror=missing-prototypes] void sun_pci_fd_dma_callback(struct ebus_dma_info *p, int event, void *cookie) ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: drivers/block/floppy.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:480: net] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:480: drivers/block] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:480: drivers] Error 2 make[2]: *** [/kisskb/src/Makefile:1912: .] Error 2 make[1]: *** [/kisskb/src/Makefile:234: __sub-make] Error 2 make: *** [Makefile:234: __sub-make] Error 2 Command 'make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_sparc64-gcc5 # Build took: 0:03:14.122207