# git rev-parse -q --verify 19d767f0429ab26cb3de6c1f7a805a973c5dbd26^{commit} 19d767f0429ab26cb3de6c1f7a805a973c5dbd26 already have revision, skipping fetch # git checkout -q -f -B kisskb 19d767f0429ab26cb3de6c1f7a805a973c5dbd26 # git clean -qxdf # < git log -1 # commit 19d767f0429ab26cb3de6c1f7a805a973c5dbd26 # Author: Michael Ellerman # Date: Mon Mar 1 14:32:14 2021 +1100 # # KVM: PPC: Book3S HV: Convert tbacct/stoltb_lock to raw spinlocks # # With CONFIG_PROVE_RAW_LOCK_NESTING=y we see lockdep splats when # running KVM: # # ============================= # [ BUG: Invalid wait context ] # 5.11.0-11811-gb49a419bbf28 #1 Not tainted # ----------------------------- # qemu-system-ppc/14068 is trying to lock: # c000000134282100 (&vcpu->arch.tbacct_lock){....}-{3:3}, at: kvmppc_core_vcpu_put_hv+0x44/0xd0 [kvm_hv] # other info that might help us debug this: # context-{5:5} # 2 locks held by qemu-system-ppc/14068: # #0: c0000001342800c8 (&vcpu->mutex){+.+.}-{4:4}, at: kvm_vcpu_ioctl+0xdc/0x8c0 [kvm] # #1: c000001e612cfa98 (&rq->lock){-.-.}-{2:2}, at: __schedule+0x1a4/0xdd0 # stack backtrace: # CPU: 10 PID: 14068 Comm: qemu-system-ppc Not tainted 5.11.0-11811-gb49a419bbf28 #1 # Call Trace: # dump_stack+0xec/0x144 (unreliable) # __lock_acquire+0xab0/0x2e70 # lock_acquire+0x128/0x600 # _raw_spin_lock_irqsave+0x6c/0xc0 # kvmppc_core_vcpu_put_hv+0x44/0xd0 [kvm_hv] # kvmppc_core_vcpu_put+0x34/0x50 [kvm] # kvm_arch_vcpu_put+0x20/0x40 [kvm] # kvm_sched_out+0x44/0x80 [kvm] # __schedule+0x684/0xdd0 # preempt_schedule_common+0x30/0x60 # __cond_resched+0x60/0x80 # kvmhv_run_single_vcpu+0xe2c/0x1220 [kvm_hv] # kvmppc_vcpu_run_hv+0x984/0xcd0 [kvm_hv] # kvmppc_vcpu_run+0x34/0x48 [kvm] # kvm_arch_vcpu_ioctl_run+0x340/0x450 [kvm] # kvm_vcpu_ioctl+0x2ac/0x8c0 [kvm] # sys_ioctl+0x300/0x1050 # system_call_exception+0x160/0x230 # system_call_common+0xec/0x278 # # Which is complaining that we're taking a regular # spinlock (tbacct_lock) while holding a raw spinlock (rq->lock). # # To fix it, convert tbacct_lock to a raw spinlock. # # We see a similar splat for stoltb_lock, the analysis & fix is the # same. # # Signed-off-by: Michael Ellerman # < /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 19d767f0429ab26cb3de6c1f7a805a973c5dbd26 # < make -s -j 120 ARCH=m68k O=/kisskb/build/powerpc-next_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- defconfig # < make -s -j 120 ARCH=m68k O=/kisskb/build/powerpc-next_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 120 ARCH=m68k O=/kisskb/build/powerpc-next_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 120 ARCH=m68k O=/kisskb/build/powerpc-next_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- /kisskb/src/arch/m68k/mvme147/config.c: In function 'mvme147_hwclk': /kisskb/src/arch/m68k/mvme147/config.c:172: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:437:2: warning: #warning check me! [-Wcpp] #warning check me! ^~~~~~~ In file included from /kisskb/src/drivers/net/ethernet/8390/xsurf100.c:48: /kisskb/src/drivers/net/ethernet/8390/lib8390.c:995: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:957: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:857: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:512: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:303: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:257: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:233: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:204:12: warning: '__ei_open' defined but not used [-Wunused-function] static int __ei_open(struct net_device *dev) ^~~~~~~~~ Completed OK # rm -rf /kisskb/build/powerpc-next_m68k-defconfig_m68k-gcc8 # Build took: 0:01:10.699504