> -----Original Message----- > From: linux-rdma-owner@xxxxxxxxxxxxxxx [mailto:linux-rdma-owner@xxxxxxxxxxxxxxx] On > Behalf Of Doug Ledford > Sent: Tuesday, August 12, 2014 7:38 PM > To: linux-rdma@xxxxxxxxxxxxxxx; roland@xxxxxxxxxx > Cc: Doug Ledford > Subject: [PATCH 8/8] IPoIB: No longer use flush as a parameter > > Various places in the IPoIB code had a deadlock related to flushing the > ipoib workqueue. Now that we have per device workqueues and a specific > flush workqueue, there is no longer a deadlock issue with flushing the > device specific workqueues and we can do so unilaterally. > > Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx> Acked-by: Alex Estrin <alex.estrin@xxxxxxxxx> > --- > drivers/infiniband/ulp/ipoib/ipoib.h | 6 +++--- > drivers/infiniband/ulp/ipoib/ipoib_ib.c | 19 +++++++++---------- > drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 ++++---- > 3 files changed, 16 insertions(+), 17 deletions(-) > > diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h > b/drivers/infiniband/ulp/ipoib/ipoib.h > index 2e6c0d91d66..71b18883ffe 100644 > --- a/drivers/infiniband/ulp/ipoib/ipoib.h > +++ b/drivers/infiniband/ulp/ipoib/ipoib.h > @@ -478,10 +478,10 @@ void ipoib_ib_dev_flush_heavy(struct work_struct *work); > void ipoib_pkey_event(struct work_struct *work); > void ipoib_ib_dev_cleanup(struct net_device *dev); > > -int ipoib_ib_dev_open(struct net_device *dev, int flush); > +int ipoib_ib_dev_open(struct net_device *dev); > int ipoib_ib_dev_up(struct net_device *dev); > -int ipoib_ib_dev_down(struct net_device *dev, int flush); > -int ipoib_ib_dev_stop(struct net_device *dev, int flush); > +int ipoib_ib_dev_down(struct net_device *dev); > +int ipoib_ib_dev_stop(struct net_device *dev); > void ipoib_pkey_dev_check_presence(struct net_device *dev); > > int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port); > diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c > b/drivers/infiniband/ulp/ipoib/ipoib_ib.c > index 66096787119..fe65abb5150 100644 > --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c > +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c > @@ -664,7 +664,7 @@ static void ipoib_ib_tx_timer_func(unsigned long ctx) > drain_tx_cq((struct net_device *)ctx); > } > > -int ipoib_ib_dev_open(struct net_device *dev, int flush) > +int ipoib_ib_dev_open(struct net_device *dev) > { > struct ipoib_dev_priv *priv = netdev_priv(dev); > int ret; > @@ -706,7 +706,7 @@ int ipoib_ib_dev_open(struct net_device *dev, int flush) > dev_stop: > if (!test_and_set_bit(IPOIB_FLAG_INITIALIZED, &priv->flags)) > napi_enable(&priv->napi); > - ipoib_ib_dev_stop(dev, flush); > + ipoib_ib_dev_stop(dev); > return -1; > } > > @@ -738,7 +738,7 @@ int ipoib_ib_dev_up(struct net_device *dev) > return ipoib_mcast_start_thread(dev); > } > > -int ipoib_ib_dev_down(struct net_device *dev, int flush) > +int ipoib_ib_dev_down(struct net_device *dev) > { > struct ipoib_dev_priv *priv = netdev_priv(dev); > > @@ -807,7 +807,7 @@ void ipoib_drain_cq(struct net_device *dev) > local_bh_enable(); > } > > -int ipoib_ib_dev_stop(struct net_device *dev, int flush) > +int ipoib_ib_dev_stop(struct net_device *dev) > { > struct ipoib_dev_priv *priv = netdev_priv(dev); > struct ib_qp_attr qp_attr; > @@ -880,8 +880,7 @@ timeout: > /* Wait for all AHs to be reaped */ > set_bit(IPOIB_STOP_REAPER, &priv->flags); > cancel_delayed_work(&priv->ah_reap_task); > - if (flush) > - flush_workqueue(priv->wq); > + flush_workqueue(priv->wq); > > begin = jiffies; > > @@ -918,7 +917,7 @@ int ipoib_ib_dev_init(struct net_device *dev, struct ib_device > *ca, int port) > (unsigned long) dev); > > if (dev->flags & IFF_UP) { > - if (ipoib_ib_dev_open(dev, 1)) { > + if (ipoib_ib_dev_open(dev)) { > ipoib_transport_dev_cleanup(dev); > return -ENODEV; > } > @@ -1040,12 +1039,12 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv > *priv, > } > > if (level >= IPOIB_FLUSH_NORMAL) > - ipoib_ib_dev_down(dev, 0); > + ipoib_ib_dev_down(dev); > > if (level == IPOIB_FLUSH_HEAVY) { > if (test_bit(IPOIB_FLAG_INITIALIZED, &priv->flags)) > - ipoib_ib_dev_stop(dev, 0); > - if (ipoib_ib_dev_open(dev, 0) != 0) > + ipoib_ib_dev_stop(dev); > + if (ipoib_ib_dev_open(dev) != 0) > return; > if (netif_queue_stopped(dev)) > netif_start_queue(dev); > diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c > b/drivers/infiniband/ulp/ipoib/ipoib_main.c > index 255c8296566..4e4f6ec59e1 100644 > --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c > +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c > @@ -108,7 +108,7 @@ int ipoib_open(struct net_device *dev) > > set_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags); > > - if (ipoib_ib_dev_open(dev, 1)) { > + if (ipoib_ib_dev_open(dev)) { > if (!test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags)) > return 0; > goto err_disable; > @@ -139,7 +139,7 @@ int ipoib_open(struct net_device *dev) > return 0; > > err_stop: > - ipoib_ib_dev_stop(dev, 1); > + ipoib_ib_dev_stop(dev); > > err_disable: > clear_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags); > @@ -157,8 +157,8 @@ static int ipoib_stop(struct net_device *dev) > > netif_stop_queue(dev); > > - ipoib_ib_dev_down(dev, 1); > - ipoib_ib_dev_stop(dev, 0); > + ipoib_ib_dev_down(dev); > + ipoib_ib_dev_stop(dev); > > if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags)) { > struct ipoib_dev_priv *cpriv; > -- > 1.9.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
