Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757199AbbDPO1J (ORCPT ); Thu, 16 Apr 2015 10:27:09 -0400 Received: from www.linutronix.de ([62.245.132.108]:44239 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753303AbbDPO1A (ORCPT ); Thu, 16 Apr 2015 10:27:00 -0400 Message-ID: <552FC6B1.1040000@linutronix.de> Date: Thu, 16 Apr 2015 16:26:57 +0200 From: Sebastian Andrzej Siewior User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.5.0 MIME-Version: 1.0 To: Jan Kiszka , RT CC: Linux Kernel Mailing List , Steven Rostedt Subject: Re: [PATCH RT 3.18] ring-buffer: Mark irq_work as HARD_IRQ to prevent deadlocks References: <552FC1FE.4020406@siemens.com> In-Reply-To: <552FC1FE.4020406@siemens.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001,URIBL_BLOCKED=0.001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1818 Lines: 46 On 04/16/2015 04:06 PM, Jan Kiszka wrote: > ftrace may trigger rb_wakeups while holding pi_lock which will also be > requested via trace_...->...->ring_buffer_unlock_commit->...-> > irq_work_queue->raise_softirq->try_to_wake_up. This quickly causes > deadlocks when trying to use ftrace under -rt. > > Resolve this by marking the ring buffer's irq_work as HARD_IRQ. > > Signed-off-by: Jan Kiszka > --- > > I'm not yet sure if this doesn't push work into hard-irq context that > is better not done there on -rt. everything should be done in the soft-irq. > > I'm also not sure if there aren't more such cases, given that -rt turns > the default irq_work wakeup policy around. But maybe we are lucky. The only thing that is getting done in the hardirq is the FULL_NO_HZ thingy. I would be _very_ glad if we could keep it that way. > kernel/trace/ring_buffer.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c > index f4fbbfc..6a1939e 100644 > --- a/kernel/trace/ring_buffer.c > +++ b/kernel/trace/ring_buffer.c > @@ -1252,6 +1252,7 @@ rb_allocate_cpu_buffer(struct ring_buffer *buffer, int nr_pages, int cpu) > init_irq_work(&cpu_buffer->irq_work.work, rb_wake_up_waiters); > init_waitqueue_head(&cpu_buffer->irq_work.waiters); > init_waitqueue_head(&cpu_buffer->irq_work.full_waiters); > + cpu_buffer->irq_work.work.flags = IRQ_WORK_HARD_IRQ; > > bpage = kzalloc_node(ALIGN(sizeof(*bpage), cache_line_size()), > GFP_KERNEL, cpu_to_node(cpu)); > Sebastian -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/