Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756504AbcJNWxG (ORCPT ); Fri, 14 Oct 2016 18:53:06 -0400 Received: from mail-it0-f52.google.com ([209.85.214.52]:35257 "EHLO mail-it0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755886AbcJNWxF (ORCPT ); Fri, 14 Oct 2016 18:53:05 -0400 From: Hoan Tran To: "Rafael J. Wysocki" , Jassi Brar , Prakash Prashanth Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, lho@apm.com, Duc Dang , Hoan Tran Subject: [PATCH] mailbox: PCC: Fix lockdep warning when request PCC channel Date: Fri, 14 Oct 2016 15:52:21 -0700 Message-Id: <1476485541-7273-1-git-send-email-hotran@apm.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4398 Lines: 101 This patch fixes the lockdep warning below [ 7.229767] DEBUG_LOCKS_WARN_ON(irqs_disabled_flags(flags)) [ 7.229776] ------------[ cut here ]------------ [ 7.229787] WARNING: CPU: 1 PID: 1 at linux-next/kernel/locking/lockdep.c:2876 loc kdep_trace_alloc+0xe0/0xf0 [ 7.229790] Modules linked in: [ 7.229793] [ 7.229798] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 4.8.0-11756-g86c5152 #46 ... [ 7.229900] Call trace: [ 7.229903] Exception stack(0xffff8007da837890 to 0xffff8007da8379c0) [ 7.229906] 7880: ffff8007da834000 0001000000000000 [ 7.229909] 78a0: ffff8007da837a70 ffff0000081111a0 00000000600000c5 000000000000003d [ 7.229912] 78c0: 9374bc6a7f3c7832 0000000000381878 ffff000009db7ab8 000000000000002f [ 7.229915] 78e0: ffff00000811aabc ffff000008be2548 ffff8007da837990 ffff00000811adf8 [ 7.229918] 7900: ffff8007da834000 00000000024080c0 00000000000000c0 ffff000009021000 [ 7.229921] 7920: 0000000000000000 0000000000000000 ffff000008c8f7c8 ffff8007da579810 [ 7.229923] 7940: 000000000000002f ffff8007da858000 0000000000000000 0000000000000001 [ 7.229926] 7960: 0000000000000001 0000000000000000 ffff00000811a468 0000000000000002 [ 7.229929] 7980: 656c62617369645f 0000000000038187 00000000000000ee ffff8007da837850 [ 7.229932] 79a0: ffff000009db50c0 ffff000009db569d 0000000000000006 ffff000089db568f [ 7.229936] [] lockdep_trace_alloc+0xe0/0xf0 [ 7.229940] [] __kmalloc_track_caller+0x50/0x250 [ 7.229945] [] devres_alloc_node+0x28/0x60 [ 7.229949] [] devm_request_threaded_irq+0x50/0xe0 [ 7.229955] [] pcc_mbox_request_channel+0x110/0x170 [ 7.229960] [] acpi_cppc_processor_probe+0x264/0x414 [ 7.229963] [] __acpi_processor_start+0x28/0xa0 [ 7.229966] [] acpi_processor_start+0x44/0x54 [ 7.229970] [] driver_probe_device+0x1fc/0x2b0 [ 7.229974] [] __driver_attach+0xb4/0xc0 [ 7.229977] [] bus_for_each_dev+0x5c/0xa0 [ 7.229980] [] driver_attach+0x20/0x30 [ 7.229983] [] bus_add_driver+0x110/0x230 [ 7.229987] [] driver_register+0x60/0x100 [ 7.229991] [] acpi_processor_driver_init+0x2c/0xb0 [ 7.229996] [] do_one_initcall+0x38/0x130 [ 7.230000] [] kernel_init_freeable+0x210/0x2b4 [ 7.230004] [] kernel_init+0x10/0x110 [ 7.230007] [] ret_from_fork+0x10/0x50 It's because the spinlock inside pcc_mbox_request_channel() is kept too long. Adding a mutex to protect critical section of this function. Beside of that, spinlock is still used to protect the data of channel. Signed-off-by: Hoan Tran --- drivers/mailbox/pcc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index 08c87fa..b6cece0 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -81,6 +81,8 @@ static int *pcc_doorbell_irq; static struct mbox_controller pcc_mbox_ctrl = {}; +static DEFINE_MUTEX(pcc_con_mutex); + /** * get_pcc_channel - Given a PCC subspace idx, get * the respective mbox_channel. @@ -243,6 +245,7 @@ struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl, struct mbox_chan *chan; unsigned long flags; + mutex_lock(&pcc_con_mutex); /* * Each PCC Subspace is a Mailbox Channel. * The PCC Clients get their PCC Subspace ID @@ -254,6 +257,7 @@ struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl, if (IS_ERR(chan) || chan->cl) { dev_err(dev, "Channel not found for idx: %d\n", subspace_id); + mutex_unlock(&pcc_con_mutex); return ERR_PTR(-EBUSY); } @@ -267,6 +271,8 @@ struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl, if (chan->txdone_method == TXDONE_BY_POLL && cl->knows_txdone) chan->txdone_method |= TXDONE_BY_ACK; + spin_unlock_irqrestore(&chan->lock, flags); + if (pcc_doorbell_irq[subspace_id] > 0) { int rc; @@ -279,7 +285,7 @@ struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl, } } - spin_unlock_irqrestore(&chan->lock, flags); + mutex_unlock(&pcc_con_mutex); return chan; } -- 1.9.1