# git rev-parse -q --verify cc43634c11b8ced6d99562d1e188e100c9e76e61^{commit} # git fetch -q -n -f git://gitlab.ozlabs.ibm.com/linuxppc/linux.git fixes-test warning: The last gc run reported the following. Please correct the root cause and remove .git/gc.log. Automatic cleanup will not be performed until the file is removed. warning: There are too many unreachable loose objects; run 'git prune' to remove them. # git rev-parse -q --verify cc43634c11b8ced6d99562d1e188e100c9e76e61^{commit} cc43634c11b8ced6d99562d1e188e100c9e76e61 # git checkout -q -f -B kisskb cc43634c11b8ced6d99562d1e188e100c9e76e61 # git clean -qxdf # < git log -1 # commit cc43634c11b8ced6d99562d1e188e100c9e76e61 # Author: Gustavo Luiz Duarte # Date: Tue Feb 11 00:38:29 2020 -0300 # # powerpc/tm: Fix clearing MSR[TS] in current when reclaiming on signal delivery # # After a treclaim, we expect to be in non-transactional state. If we # don't clear the current thread's MSR[TS] before we get preempted, then # tm_recheckpoint_new_task() will recheckpoint and we get rescheduled in # suspended transaction state. # # When handling a signal caught in transactional state, # handle_rt_signal64() calls get_tm_stackpointer() that treclaims the # transaction using tm_reclaim_current() but without clearing the # thread's MSR[TS]. This can cause the TM Bad Thing exception below if # later we pagefault and get preempted trying to access the user's # sigframe, using __put_user(). Afterwards, when we are rescheduled back # into do_page_fault() (but now in suspended state since the thread's # MSR[TS] was not cleared), upon executing 'rfid' after completion of # the page fault handling, the exception is raised because a transition # from suspended to non-transactional state is invalid. # # Unexpected TM Bad Thing exception at c00000000000de44 (msr 0x8000000302a03031) tm_scratch=800000010280b033 # Oops: Unrecoverable exception, sig: 6 [#1] # LE PAGE_SIZE=64K MMU=Hash SMP NR_CPUS=2048 NUMA pSeries # Modules linked in: nft_chain_nat nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 ip6_tables ip_tables nft_compat ip_set nf_tables nfnetlink xts vmx_crypto sg virtio_balloon # r_mod cdrom virtio_net net_failover virtio_blk virtio_scsi failover dm_mirror dm_region_hash dm_log dm_mod # CPU: 25 PID: 15547 Comm: a.out Not tainted 5.4.0-rc2 #32 # NIP: c00000000000de44 LR: c000000000034728 CTR: 0000000000000000 # REGS: c00000003fe7bd70 TRAP: 0700 Not tainted (5.4.0-rc2) # MSR: 8000000302a03031 CR: 44000884 XER: 00000000 # CFAR: c00000000000dda4 IRQMASK: 0 # PACATMSCRATCH: 800000010280b033 # GPR00: c000000000034728 c000000f65a17c80 c000000001662800 00007fffacf3fd78 # GPR04: 0000000000001000 0000000000001000 0000000000000000 c000000f611f8af0 # GPR08: 0000000000000000 0000000078006001 0000000000000000 000c000000000000 # GPR12: c000000f611f84b0 c00000003ffcb200 0000000000000000 0000000000000000 # GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 # GPR20: 0000000000000000 0000000000000000 0000000000000000 c000000f611f8140 # GPR24: 0000000000000000 00007fffacf3fd68 c000000f65a17d90 c000000f611f7800 # GPR28: c000000f65a17e90 c000000f65a17e90 c000000001685e18 00007fffacf3f000 # NIP [c00000000000de44] fast_exception_return+0xf4/0x1b0 # LR [c000000000034728] handle_rt_signal64+0x78/0xc50 # Call Trace: # [c000000f65a17c80] [c000000000034710] handle_rt_signal64+0x60/0xc50 (unreliable) # [c000000f65a17d30] [c000000000023640] do_notify_resume+0x330/0x460 # [c000000f65a17e20] [c00000000000dcc4] ret_from_except_lite+0x70/0x74 # Instruction dump: # 7c4ff120 e8410170 7c5a03a6 38400000 f8410060 e8010070 e8410080 e8610088 # 60000000 60000000 e8810090 e8210078 <4c000024> 48000000 e8610178 88ed0989 # ---[ end trace 93094aa44b442f87 ]--- # # The simplified sequence of events that triggers the above exception is: # # ... # userspace in NON-TRANSACTIONAL state # tbegin # userspace in TRANSACTIONAL state # signal delivery # kernelspace in SUSPENDED state # handle_rt_signal64() # get_tm_stackpointer() # treclaim # kernelspace in NON-TRANSACTIONAL state # __put_user() # page fault happens. We will never get back here because of the TM Bad Thing exception. # # page fault handling kicks in and we voluntarily preempt ourselves # do_page_fault() # __schedule() # __switch_to(other_task) # # our task is rescheduled and we recheckpoint because the thread's MSR[TS] was not cleared # __switch_to(our_task) # switch_to_tm() # tm_recheckpoint_new_task() # trechkpt # kernelspace in SUSPENDED state # # The page fault handling resumes, but now we are in suspended transaction state # do_page_fault() completes # rfid <----- trying to get back where the page fault happened (we were non-transactional back then) # TM Bad Thing # illegal transition from suspended to non-transactional # # This patch fixes that issue by clearing the current thread's MSR[TS] # just after treclaim in get_tm_stackpointer() so that we stay in # non-transactional state in case we are preempted. In order to make # treclaim and clearing the thread's MSR[TS] atomic from a preemption # perspective when CONFIG_PREEMPT is set, preempt_disable/enable() is # used. It's also necessary to save the previous value of the thread's # MSR before get_tm_stackpointer() is called so that it can be exposed # to the signal handler later in setup_tm_sigcontexts() to inform the # userspace MSR at the moment of the signal delivery. # # Found with tm-signal-context-force-tm kernel selftest. # # Fixes: 2b0a576d15e0 ("powerpc: Add new transactional memory state to the signal context") # Cc: stable@vger.kernel.org # v3.9 # Signed-off-by: Gustavo Luiz Duarte # Acked-by: Michael Neuling # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/20200211033831.11165-1-gustavold@linux.ibm.com # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 cc43634c11b8ced6d99562d1e188e100c9e76e61 # < make -s -j 48 ARCH=m68k O=/kisskb/build/powerpc-fixes_m68k-defconfig_m68k CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- defconfig # make -s -j 48 ARCH=m68k O=/kisskb/build/powerpc-fixes_m68k-defconfig_m68k CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/arch/m68k/include/asm/amigayle.h:21, from /kisskb/src/arch/m68k/include/asm/io_mm.h:59, from /kisskb/src/arch/m68k/include/asm/io.h:8, from /kisskb/src/include/linux/clocksource.h:21, from /kisskb/src/arch/m68k/amiga/config.c:20: /kisskb/src/arch/m68k/amiga/config.c: In function 'amiga_identify': /kisskb/src/arch/m68k/include/asm/amigahw.h:42:50: warning: this statement may fall through [-Wimplicit-fallthrough=] #define AMIGAHW_SET(name) (amiga_hw_present.name = 1) ~~~~~~~~~~~~~~~~~~~~~~~^~~~ /kisskb/src/arch/m68k/amiga/config.c:223:3: note: in expansion of macro 'AMIGAHW_SET' AMIGAHW_SET(PCMCIA); ^~~~~~~~~~~ /kisskb/src/arch/m68k/amiga/config.c:224:2: note: here case AMI_500: ^~~~ /kisskb/src/arch/m68k/mvme147/config.c: In function 'mvme147_hwclk': /kisskb/src/arch/m68k/mvme147/config.c:175:2: warning: #warning check me! [-Wcpp] #warning check me! ^~~~~~~ /kisskb/src/arch/m68k/mvme16x/config.c: In function 'mvme16x_hwclk': /kisskb/src/arch/m68k/mvme16x/config.c:440:2: warning: #warning check me! [-Wcpp] #warning check me! ^~~~~~~ In file included from /kisskb/src/arch/m68k/include/asm/atomic.h:7, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/linux/spinlock.h:445, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/net/core/filter.c:20: /kisskb/src/net/core/filter.c: In function 'bpf_clear_redirect_map': /kisskb/src/arch/m68k/include/asm/cmpxchg.h:137:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\ ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (unsigned long)(n), sizeof(*(ptr)))) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/cmpxchg.h:106:28: note: in expansion of macro 'cmpxchg_local' #define cmpxchg(ptr, o, n) cmpxchg_local((ptr), (o), (n)) ^~~~~~~~~~~~~ /kisskb/src/net/core/filter.c:3516:4: note: in expansion of macro 'cmpxchg' cmpxchg(&ri->map, map, NULL); ^~~~~~~ In file included from /kisskb/src/arch/m68k/include/asm/atomic.h:7, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/linux/spinlock.h:445, from /kisskb/src/include/linux/mmzone.h:8, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/mm.h:10, from /kisskb/src/kernel/acct.c:47: /kisskb/src/kernel/acct.c: In function 'acct_pin_kill': /kisskb/src/arch/m68k/include/asm/cmpxchg.h:137:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\ ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (unsigned long)(n), sizeof(*(ptr)))) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/cmpxchg.h:106:28: note: in expansion of macro 'cmpxchg_local' #define cmpxchg(ptr, o, n) cmpxchg_local((ptr), (o), (n)) ^~~~~~~~~~~~~ /kisskb/src/kernel/acct.c:177:2: note: in expansion of macro 'cmpxchg' cmpxchg(&acct->ns->bacct, pin, NULL); ^~~~~~~ In file included from /kisskb/src/drivers/net/ethernet/8390/xsurf100.c:48: /kisskb/src/drivers/net/ethernet/8390/lib8390.c:988:27: warning: '____alloc_ei_netdev' defined but not used [-Wunused-function] static struct net_device *____alloc_ei_netdev(int size) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:950:13: warning: '__ei_set_multicast_list' defined but not used [-Wunused-function] static void __ei_set_multicast_list(struct net_device *dev) ^~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:850:33: warning: '__ei_get_stats' defined but not used [-Wunused-function] static struct net_device_stats *__ei_get_stats(struct net_device *dev) ^~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:509:13: warning: '__ei_poll' defined but not used [-Wunused-function] static void __ei_poll(struct net_device *dev) ^~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:300:20: warning: '__ei_start_xmit' defined but not used [-Wunused-function] static netdev_tx_t __ei_start_xmit(struct sk_buff *skb, ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:254:13: warning: '__ei_tx_timeout' defined but not used [-Wunused-function] static void __ei_tx_timeout(struct net_device *dev, unsigned int txqueue) ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:230:12: warning: '__ei_close' defined but not used [-Wunused-function] static int __ei_close(struct net_device *dev) ^~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:201:12: warning: '__ei_open' defined but not used [-Wunused-function] static int __ei_open(struct net_device *dev) ^~~~~~~~~ In file included from /kisskb/src/arch/m68k/include/asm/atomic.h:7, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/linux/spinlock.h:445, from /kisskb/src/include/linux/mmzone.h:8, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/slab.h:15, from /kisskb/src/fs/posix_acl.c:15: /kisskb/src/fs/posix_acl.c: In function 'get_acl': /kisskb/src/arch/m68k/include/asm/cmpxchg.h:137:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\ ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (unsigned long)(n), sizeof(*(ptr)))) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/cmpxchg.h:106:28: note: in expansion of macro 'cmpxchg_local' #define cmpxchg(ptr, o, n) cmpxchg_local((ptr), (o), (n)) ^~~~~~~~~~~~~ /kisskb/src/fs/posix_acl.c:148:3: note: in expansion of macro 'cmpxchg' cmpxchg(p, sentinel, ACL_NOT_CACHED); ^~~~~~~ In file included from /kisskb/src/arch/m68k/include/asm/atomic.h:7, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/linux/spinlock.h:445, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/ocfs2/file.c:13: /kisskb/src/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/arch/m68k/include/asm/cmpxchg.h:79:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/fs/ocfs2/file.c:2419:3: note: in expansion of macro 'xchg' xchg(&iocb->ki_complete, saved_ki_complete); ^~~~ Completed OK # rm -rf /kisskb/build/powerpc-fixes_m68k-defconfig_m68k # Build took: 0:02:35.251060