On Wed, Dec 21, 2016 at 03:42:06AM -0800, Selvin Xavier wrote: > This patch implements events dispatching to the IB stack > based on NETDEV events received. > > v2: Removed cleanup of the resources during driver unload since > we are calling unregister_netdevice_notifier first in the exit. > > v3: Fixes cocci warnings and some sparse warnings > > Signed-off-by: Eddie Wai <[email protected]> > Signed-off-by: Devesh Sharma <[email protected]> > Signed-off-by: Somnath Kotur <[email protected]> > Signed-off-by: Sriharsha Basavapatna <[email protected]> > Signed-off-by: Selvin Xavier <[email protected]> > --- > drivers/infiniband/hw/bnxt_re/main.c | 65 > ++++++++++++++++++++++++++++++++++++ > 1 file changed, 65 insertions(+) > > diff --git a/drivers/infiniband/hw/bnxt_re/main.c > b/drivers/infiniband/hw/bnxt_re/main.c > index ab0b35a..bd13414 100644 > --- a/drivers/infiniband/hw/bnxt_re/main.c > +++ b/drivers/infiniband/hw/bnxt_re/main.c > @@ -729,6 +729,60 @@ static int bnxt_re_alloc_res(struct bnxt_re_dev *rdev) > return rc; > } > > +static void bnxt_re_dispatch_event(struct ib_device *ibdev, struct ib_qp *qp, > + u8 port_num, enum ib_event_type event) > +{ > + struct ib_event ib_event; > + > + ib_event.device = ibdev; > + if (qp) > + ib_event.element.qp = qp; > + else > + ib_event.element.port_num = port_num; > + ib_event.event = event; > + ib_dispatch_event(&ib_event); > +} > + > +static bool bnxt_re_is_qp1_or_shadow_qp(struct bnxt_re_dev *rdev, > + struct bnxt_re_qp *qp) > +{ > + return (qp->ib_qp.qp_type == IB_QPT_GSI) || (qp == rdev->qp1_sqp); > +} > + > +static void bnxt_re_dev_stop(struct bnxt_re_dev *rdev, bool qp_wait) > +{ > + int mask = IB_QP_STATE, qp_count, count = 1; > + struct ib_qp_attr qp_attr; > + struct bnxt_re_qp *qp; > + > + qp_attr.qp_state = IB_QPS_ERR; > + mutex_lock(&rdev->qp_lock); > + list_for_each_entry(qp, &rdev->qp_list, list) { > + /* Modify the state of all QPs except QP1/Shadow QP */ > + if (!bnxt_re_is_qp1_or_shadow_qp(rdev, qp)) { > + if (qp->qplib_qp.state != > + CMDQ_MODIFY_QP_NEW_STATE_RESET && > + qp->qplib_qp.state != > + CMDQ_MODIFY_QP_NEW_STATE_ERR) { > + bnxt_re_dispatch_event(&rdev->ibdev, &qp->ib_qp, > + 1, IB_EVENT_QP_FATAL); > + bnxt_re_modify_qp(&qp->ib_qp, &qp_attr, mask, > + NULL); > + } > + } > + } > + > + mutex_unlock(&rdev->qp_lock); > + if (qp_wait) {
All callers to this function in this patch set qp_wait to be false.
Do you have in following patches qp_wait == true?
I'm curious because of your msleep below.
> + /* Give the application some time to clean up */
> + do {
> + qp_count = atomic_read(&rdev->qp_count);
> + msleep(100);
> + } while ((qp_count != atomic_read(&rdev->qp_count)) &&
> + count--);
> + }
> +}
> +
> static void bnxt_re_ib_unreg(struct bnxt_re_dev *rdev, bool lock_wait)
> {
> int i, rc;
> @@ -888,6 +942,9 @@ static int bnxt_re_ib_reg(struct bnxt_re_dev *rdev)
> }
> }
> set_bit(BNXT_RE_FLAG_IBDEV_REGISTERED, &rdev->flags);
> + bnxt_re_dispatch_event(&rdev->ibdev, NULL, 1, IB_EVENT_PORT_ACTIVE);
> + bnxt_re_dispatch_event(&rdev->ibdev, NULL, 1, IB_EVENT_GID_CHANGE);
> +
> return 0;
> free_sctx:
> bnxt_re_net_stats_ctx_free(rdev, rdev->qplib_ctx.stats.fw_id, true);
> @@ -967,10 +1024,18 @@ static void bnxt_re_task(struct work_struct *work)
> "Failed to register with IB: %#x", rc);
> break;
> case NETDEV_UP:
> + bnxt_re_dispatch_event(&rdev->ibdev, NULL, 1,
> + IB_EVENT_PORT_ACTIVE);
> break;
> case NETDEV_DOWN:
> + bnxt_re_dev_stop(rdev, false);
> break;
> case NETDEV_CHANGE:
> + if (!netif_carrier_ok(rdev->netdev))
> + bnxt_re_dev_stop(rdev, false);
> + else if (netif_carrier_ok(rdev->netdev))
> + bnxt_re_dispatch_event(&rdev->ibdev, NULL, 1,
> + IB_EVENT_PORT_ACTIVE);
> break;
> default:
> break;
> --
> 2.5.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
signature.asc
Description: PGP signature
