From: Joachim Fenkes <fenkes@de•ibm.com>
To: Johannes Berg <johannes@sipsolutions•net>,
LinuxPPC-Dev <linuxppc-dev@ozlabs•org>,
LKML <linux-kernel@vger•kernel.org>,
OF-General <general@lists•openfabrics.org>,
Roland Dreier <rolandd@cisco•com>,
OF-EWG <ewg@lists•openfabrics.org>
Cc: Alexander Schmidt <alexschm@de•ibm.com>,
Christoph Raisch <raisch@de•ibm.com>,
Stefan Roscher <stefan.roscher@de•ibm.com>
Subject: [PATCH] IB/ehca: Fix locking for shca_list_lock
Date: Fri, 21 Nov 2008 17:18:16 +0100 [thread overview]
Message-ID: <200811211718.17489.fenkes@de.ibm.com> (raw)
In-Reply-To: <1227283347.3599.8.camel@johannes.berg>
shca_list_lock is taken from softirq context in ehca_poll_eqs, so we need to
lock IRQ safe elsewhere.
Signed-off-by: Michael Ellerman <michael@ellerman•id.au>
Signed-off-by: Joachim Fenkes <fenkes@de•ibm.com>
---
On Friday 21 November 2008 17:02, Johannes Berg wrote:
> On Fri, 2008-11-21 at 16:37 +0100, Joachim Fenkes wrote:
>
> > + u64 flags;
>
> > - spin_lock(&shca_list_lock);
> > + spin_lock_irqsave(&shca_list_lock, flags);
>
> That's wrong and I think will give a warning on all machines where
> u64 != unsigned long. Might not particularly matter in this case.
Doesn't matter for a ppc64 only driver, but you're right nonetheless. Thanks.
> Also, generally it seems wrong to say "fix lockdep failure" when the
> patch really fixes a bug that lockdep happened to find.
Whatever -- changed.
Here's the updated patch.
Regards,
Joachim
drivers/infiniband/hw/ehca/ehca_main.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index bb02a86..169aa1a 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -717,6 +717,7 @@ static int __devinit ehca_probe(struct of_device *dev,
const u64 *handle;
struct ib_pd *ibpd;
int ret, i, eq_size;
+ unsigned long flags;
handle = of_get_property(dev->node, "ibm,hca-handle", NULL);
if (!handle) {
@@ -830,9 +831,9 @@ static int __devinit ehca_probe(struct of_device *dev,
ehca_err(&shca->ib_device,
"Cannot create device attributes ret=%d", ret);
- spin_lock(&shca_list_lock);
+ spin_lock_irqsave(&shca_list_lock, flags);
list_add(&shca->shca_list, &shca_list);
- spin_unlock(&shca_list_lock);
+ spin_unlock_irqrestore(&shca_list_lock, flags);
return 0;
@@ -878,6 +879,7 @@ probe1:
static int __devexit ehca_remove(struct of_device *dev)
{
struct ehca_shca *shca = dev->dev.driver_data;
+ unsigned long flags;
int ret;
sysfs_remove_group(&dev->dev.kobj, &ehca_dev_attr_grp);
@@ -915,9 +917,9 @@ static int __devexit ehca_remove(struct of_device *dev)
ib_dealloc_device(&shca->ib_device);
- spin_lock(&shca_list_lock);
+ spin_lock_irqsave(&shca_list_lock, flags);
list_del(&shca->shca_list);
- spin_unlock(&shca_list_lock);
+ spin_unlock_irqrestore(&shca_list_lock, flags);
return ret;
}
@@ -975,6 +977,7 @@ static int ehca_mem_notifier(struct notifier_block *nb,
unsigned long action, void *data)
{
static unsigned long ehca_dmem_warn_time;
+ unsigned long flags;
switch (action) {
case MEM_CANCEL_OFFLINE:
@@ -985,12 +988,12 @@ static int ehca_mem_notifier(struct notifier_block *nb,
case MEM_GOING_ONLINE:
case MEM_GOING_OFFLINE:
/* only ok if no hca is attached to the lpar */
- spin_lock(&shca_list_lock);
+ spin_lock_irqsave(&shca_list_lock, flags);
if (list_empty(&shca_list)) {
- spin_unlock(&shca_list_lock);
+ spin_unlock_irqrestore(&shca_list_lock, flags);
return NOTIFY_OK;
} else {
- spin_unlock(&shca_list_lock);
+ spin_unlock_irqrestore(&shca_list_lock, flags);
if (printk_timed_ratelimit(&ehca_dmem_warn_time,
30 * 1000))
ehca_gen_err("DMEM operations are not allowed"
--
1.5.5
next prev parent reply other threads:[~2008-11-21 16:18 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-06 16:35 IB/ehca: Reject send WRs only for RESET, INIT and RTR state Joachim Fenkes
2008-06-06 18:22 ` Roland Dreier
2008-06-06 20:20 ` [ofa-general] " Dotan Barak
2008-06-09 11:24 ` [PATCH] IB/ehca: Reject recv WRs if QP is in RESET state Joachim Fenkes
2008-06-20 17:26 ` Roland Dreier
2008-07-01 14:14 ` [PATCH] IB/ehca: Make device table externally visible Joachim Fenkes
2008-07-01 17:55 ` Roland Dreier
2008-11-07 16:42 ` [PATCH] IB/ehca: Fix suppression of port activation events Joachim Fenkes
2008-11-10 20:36 ` Roland Dreier
2008-11-11 9:04 ` Joachim Fenkes
2008-11-21 15:37 ` [PATCH] IB/ehca: Fix lockdep failures for shca_list_lock Joachim Fenkes
2008-11-21 16:02 ` Johannes Berg
2008-11-21 16:18 ` Joachim Fenkes [this message]
2008-11-21 18:28 ` [PATCH] IB/ehca: Fix locking " Roland Dreier
2008-11-22 3:41 ` [PATCH] IB/ehca: Fix lockdep failures " Michael Ellerman
2008-11-25 12:58 ` [PATCH] IB/ehca: Change misleading error message Joachim Fenkes
2008-11-25 23:13 ` Roland Dreier
2008-11-26 13:44 ` Joachim Fenkes
2009-06-03 14:28 ` [PATCH] IB/ehca: Remove superfluous bitmasks from QP control block Joachim Fenkes
2009-06-03 20:26 ` Roland Dreier
2009-09-01 11:55 ` [PATCH] IB/ehca: Fix CQE flags reporting Joachim Fenkes
2009-09-01 19:55 ` Roland Dreier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200811211718.17489.fenkes@de.ibm.com \
--to=fenkes@de$(echo .)ibm.com \
--cc=alexschm@de$(echo .)ibm.com \
--cc=ewg@lists$(echo .)openfabrics.org \
--cc=general@lists$(echo .)openfabrics.org \
--cc=johannes@sipsolutions$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=raisch@de$(echo .)ibm.com \
--cc=rolandd@cisco$(echo .)com \
--cc=stefan.roscher@de$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox