IB/usnic: Change WARN_ON to lockdep_assert_held
usNIC calls WARN_ON(spin_is_locked..) at few places. In some of these
instances, the call is made while holding a spinlock. Change
all WARN_ON(spin_is_locked...) calls in usNIC to
lockdep_assert_held to make it fool-proof bc the latter can be
called while holding a spinlock and unlike spin_is_locked,
lockdep_assert_held also works correctly on UP.
Signed-off-by: Upinder Malhi <umalhi@cisco.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
index ca5fa6a..5a873f5 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
@@ -82,7 +82,7 @@
struct usnic_vnic_res_chunk *chunk;
int rq_idx;
- WARN_ON(!spin_is_locked(&qp_grp->lock));
+ lockdep_assert_held(&qp_grp->lock);
chunk = usnic_ib_qp_grp_get_chunk(qp_grp, USNIC_VNIC_RES_TYPE_RQ);
if (IS_ERR_OR_NULL(chunk) || chunk->cnt < 1) {
@@ -119,7 +119,7 @@
int err, status;
struct usnic_fwd_filter_hndl *filter_hndl, *tmp;
- WARN_ON(!spin_is_locked(&qp_grp->lock));
+ lockdep_assert_held(&qp_grp->lock);
status = 0;
@@ -145,7 +145,7 @@
struct usnic_vnic_res_chunk *res_chunk;
struct usnic_vnic_res *res;
- WARN_ON(!spin_is_locked(&qp_grp->lock));
+ lockdep_assert_held(&qp_grp->lock);
vnic_idx = usnic_vnic_get_index(qp_grp->vf->vnic);
@@ -189,7 +189,7 @@
struct usnic_vnic_res *res;
int status = 0;
- WARN_ON(!spin_is_locked(&qp_grp->lock));
+ lockdep_assert_held(&qp_grp->lock);
vnic_idx = usnic_vnic_get_index(qp_grp->vf->vnic);
res_chunk = usnic_ib_qp_grp_get_chunk(qp_grp, USNIC_VNIC_RES_TYPE_RQ);
@@ -392,7 +392,7 @@
int err;
struct pci_dev *pdev;
- WARN_ON(!spin_is_locked(&vf->lock));
+ lockdep_assert_held(&vf->lock);
pdev = usnic_vnic_get_pdev(vf->vnic);
if (vf->qp_grp_ref_cnt == 0) {
@@ -417,7 +417,7 @@
struct pci_dev *pdev;
struct usnic_ib_pd *pd;
- WARN_ON(!spin_is_locked(&qp_grp->vf->lock));
+ lockdep_assert_held(&qp_grp->vf->lock);
pd = qp_grp->vf->pd;
pdev = usnic_vnic_get_pdev(qp_grp->vf->vnic);
@@ -446,7 +446,7 @@
u16 port_num;
int err;
- WARN_ON(!spin_is_locked(&vf->lock));
+ lockdep_assert_held(&vf->lock);
err = usnic_vnic_res_spec_satisfied(&min_transport_spec[transport],
res_spec);
@@ -514,7 +514,7 @@
enum usnic_transport_type transport;
WARN_ON(qp_grp->state != IB_QPS_RESET);
- WARN_ON(!spin_is_locked(&qp_grp->vf->lock));
+ lockdep_assert_held(&qp_grp->vf->lock);
transport = qp_grp->filters[DFLT_FILTER_IDX].transport;
default_port_num = qp_grp->filters[DFLT_FILTER_IDX].port_num;