diff options
| author |   Naresh Gottumukkala <bgottumukkala@emulex.com> | 2013-09-06 15:02:47 +0530 |
|---|---|---|
| committer |   Roland Dreier <roland@purestorage.com> | 2013-11-08 14:43:06 -0800 |
| commit | 1852d1da3b4723d7db0d490f54c07442b3e1c452 (patch) | |
| tree | 431dbd1132b59578a8ea153ffb863fb22f30b3a9 /drivers/infiniband/hw/ocrdma/ocrdma_main.c | |
| parent | RDMA/ocrdma: Silence an integer underflow warning (diff) | |
| download | linux-dev-1852d1da3b4723d7db0d490f54c07442b3e1c452.tar.xz linux-dev-1852d1da3b4723d7db0d490f54c07442b3e1c452.zip | |
RDMA/ocrdma: Fix a crash in rmmod
1) ocrdma_remove_free() is called from a call_rcu callback funtion
context, which can be a bottom-half context. So the code in
ocrdma_remove_free should not sleep.
But ocrdma_cleanup_hw() can sleep, So move it ocrdma_remove()
instead of ocrdma_remove_free.
2) Fix a couple of kbuild test robot warnings.
Signed-off-by: Naresh Gottumukkala <bgottumukkala@emulex.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/hw/ocrdma/ocrdma_main.c')
| -rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c index 0ce7674621ea..91443bcb9e0e 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c @@ -452,9 +452,6 @@ static void ocrdma_remove_free(struct rcu_head *rcu) { struct ocrdma_dev *dev = container_of(rcu, struct ocrdma_dev, rcu); - ocrdma_free_resources(dev); - ocrdma_cleanup_hw(dev); - idr_remove(&ocrdma_dev_id, dev->id); kfree(dev->mbx_cmd); ib_dealloc_device(&dev->ibdev); @@ -470,6 +467,10 @@ static void ocrdma_remove(struct ocrdma_dev *dev) spin_lock(&ocrdma_devlist_lock); list_del_rcu(&dev->entry); spin_unlock(&ocrdma_devlist_lock); + + ocrdma_free_resources(dev); + ocrdma_cleanup_hw(dev); + call_rcu(&dev->rcu, ocrdma_remove_free); } |