From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZr08I4985KlgbHszjym+iXC1hxN+h6/lfIfBkV4ZoVrh73XL9+wpcXWwlraJYmX+Q3wtqD9 ARC-Seal: i=1; a=rsa-sha256; t=1525769717; cv=none; d=google.com; s=arc-20160816; b=fnV6CivkJpAOa/FLoFyPqFFq29S/kGvunCKAk4biCHnxugAi+pd6bWshpKmffvQPGx fTPACaVBdkcnzkyFtEJvslYylhWiA5ccaGyKdyi6ahQoNHU9Bgpm+/s8WU1zDA9YZd4+ rn02zhbqFkZul12z7ea19nMdWvmN5uNSf8ReM1uPB3H3ZdG2J6+GpEYHW8TYJNipIIH4 TvXp146Wc86LzWM/iFmE4umjOkAlhcx0O4gB57WQgVyBgEgxyMV1vIZpMQSj5dgGaiHa aHrekvr1mZlh2/PWnB8I3fVXpL7KWhLZH/wkZ6nxQ8pXL8kYsdzmquZXeoL+MpdynjdV AJNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=Xb8uCgalpYkz2uo7gGPODUBgz8fRsA+uaQaQBDd0dQQ=; b=q7gYTTsrIzbb/T62RyLcP77dSMQNEvsAeoc7tS/waRZI5cZyvSNzgf8OD621Vel8qv 57Pyy38xSPgCxi2t4If4Y2yuRuvifgbVZfl5dDs7ikE9CZ65//77Qi1+OENHjxWn74QQ Fd0JPVBcuvC3cyDdjgYSK6x61qSKV4yz8VuT7oTOgo1zAODPYeV36pBMSSexw0dFz2Pu bF8Jms/rLfo1upW+SZiA7mk+x50ZrUFHnpJCR7Nd7QZZKZ0fX/jo9cbs0pi8gHV2F8L1 VK10JjEpFGcvO44UfYA0cYChMk8invZ3sOUod6j3z6QctC3XldovGPRGi1wK2SUWEwvJ JQMw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of wagi@monom.org designates 188.138.9.77 as permitted sender) smtp.mailfrom=wagi@monom.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=monom.org Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of wagi@monom.org designates 188.138.9.77 as permitted sender) smtp.mailfrom=wagi@monom.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=monom.org From: Daniel Wagner To: linux-kernel@vger.kernel.org Cc: linux-rt-users@vger.kernel.org, linux-serial@vger.kernel.org, linux-sh@vger.kernel.org, gregkh@linuxfoundation.org, Daniel Wagner , Geert Uytterhoeven , Sebastian Andrzej Siewior Subject: [PATCH v3] serial: sh-sci: Use spin_{try}lock_irqsave instead of open coding version Date: Tue, 8 May 2018 10:55:09 +0200 Message-Id: <20180508085509.31384-1-wagi@monom.org> X-Mailer: git-send-email 2.14.3 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1599885506771266945?= X-GMAIL-MSGID: =?utf-8?q?1599885506771266945?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Daniel Wagner Commit 40f70c03e33a ("serial: sh-sci: add locking to console write function to avoid SMP lockup") copied the strategy to avoid locking problems in conjuncture with the console from the UART8250 driver. Instead using directly spin_{try}lock_irqsave(), local_irq_save() followed by spin_{try}lock() was used. While this is correct on mainline, for -rt it is a problem. spin_{try}lock() will check if it is running in a valid context. Since the local_irq_save() has already been executed, the context has changed and spin_{try}lock() will complain. The reason why spin_{try}lock() complains is that on -rt the spin locks are turned into mutexes and therefore can sleep. Sleeping with interrupts disabled is not valid. BUG: sleeping function called from invalid context at /home/wagi/work/rt/v4.4-cip-rt/kernel/locking/rtmutex.c:995 in_atomic(): 0, irqs_disabled(): 128, pid: 778, name: irq/76-eth0 CPU: 0 PID: 778 Comm: irq/76-eth0 Not tainted 4.4.126-test-cip22-rt14-00403-gcd03665c8318 #12 Hardware name: Generic RZ/G1 (Flattened Device Tree) Backtrace: [] (dump_backtrace) from [] (show_stack+0x18/0x1c) r7:c06b01f0 r6:60010193 r5:00000000 r4:c06b01f0 [] (show_stack) from [] (dump_stack+0x78/0x94) [] (dump_stack) from [] (___might_sleep+0x134/0x194) r7:60010113 r6:c06d3559 r5:00000000 r4:ffffe000 [] (___might_sleep) from [] (rt_spin_lock+0x20/0x74) r5:c06f4d60 r4:c06f4d60 [] (rt_spin_lock) from [] (serial_console_write+0x100/0x118) r5:c06f4d60 r4:c06f4d60 [] (serial_console_write) from [] (call_console_drivers.constprop.15+0x10c/0x124) r10:c06d2894 r9:c04e18b0 r8:00000028 r7:00000000 r6:c06d3559 r5:c06d2798 r4:c06b9914 r3:c02576e4 [] (call_console_drivers.constprop.15) from [] (console_unlock+0x32c/0x430) r10:c06d30d8 r9:00000028 r8:c06dd518 r7:00000005 r6:00000000 r5:c06d2798 r4:c06d2798 r3:00000028 [] (console_unlock) from [] (vprintk_emit+0x394/0x4f0) r10:c06d2798 r9:c06d30ee r8:00000006 r7:00000005 r6:c06a78fc r5:00000027 r4:00000003 [] (vprintk_emit) from [] (vprintk+0x28/0x30) r10:c060bd46 r9:00001000 r8:c06b9a90 r7:c06b9a90 r6:c06b994c r5:c06b9a3c r4:c0062fa8 [] (vprintk) from [] (vprintk_default+0x10/0x14) [] (vprintk_default) from [] (printk+0x78/0x84) [] (printk) from [] (credit_entropy_bits+0x17c/0x2cc) r3:00000001 r2:decade60 r1:c061a5ee r0:c061a523 r4:00000006 [] (credit_entropy_bits) from [] (add_interrupt_randomness+0x160/0x178) r10:466e7196 r9:1f536000 r8:fffeef74 r7:00000000 r6:c06b9a60 r5:c06b9a3c r4:dfbcf680 [] (add_interrupt_randomness) from [] (irq_thread+0x1e8/0x248) r10:c006537c r9:c06cdf21 r8:c0064fcc r7:df791c24 r6:df791c00 r5:ffffe000 r4:df525180 [] (irq_thread) from [] (kthread+0x108/0x11c) r10:00000000 r9:00000000 r8:c0065184 r7:df791c00 r6:00000000 r5:df791d00 r4:decac000 [] (kthread) from [] (ret_from_fork+0x14/0x3c) r8:00000000 r7:00000000 r6:00000000 r5:c003fa9c r4:df791d00 Cc: Sebastian Andrzej Siewior Signed-off-by: Daniel Wagner Reviewed-by: Geert Uytterhoeven --- changes since v2: - dropped the local_irq_save() it's wrong as Sebastian pointed out changes since v1: - Ported to current mainline (initial version was against v4.4.y) - Left local_irq_save() in place when spinlocks are not used as suggested by Geert. drivers/tty/serial/sh-sci.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index fdbbff547106..8c8dcced1c25 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -2890,16 +2890,15 @@ static void serial_console_write(struct console *co, const char *s, unsigned long flags; int locked = 1; - local_irq_save(flags); #if defined(SUPPORT_SYSRQ) if (port->sysrq) locked = 0; else #endif if (oops_in_progress) - locked = spin_trylock(&port->lock); + locked = spin_trylock_irqsave(&port->lock, flags); else - spin_lock(&port->lock); + spin_lock_irqsave(&port->lock, flags); /* first save SCSCR then disable interrupts, keep clock source */ ctrl = serial_port_in(port, SCSCR); @@ -2919,8 +2918,7 @@ static void serial_console_write(struct console *co, const char *s, serial_port_out(port, SCSCR, ctrl); if (locked) - spin_unlock(&port->lock); - local_irq_restore(flags); + spin_unlock_irqrestore(&port->lock, flags); } static int serial_console_setup(struct console *co, char *options) -- 2.14.3