On Sun, Dec 31, 2017 at 01:16:23PM +0200, Denis Drozdov wrote:
> IPoIB netlink support was broken by commit cd565b4b51e5
> ("IB/IPoIB: Support acceleration options callbacks"),
> that added flow which allocates netdev rdma structures
> after netlink object is already created. Such situation leads
> to crash in __ipoib_device_add, once trying to reuse netlink
> device.
> This commit restores the netlink support.
>
> Fixes: cd565b4b51e5 ("IB/IPoIB: Support acceleration options callbacks")
> Reviewed-by: Erez Shitrit <ere...@mellanox.com>
> Reviewed-by: Leon Romanovsky <leo...@mellanox.com>
> Reviewed-by: Saeed Mahameed <sae...@mellanox.com>
> Signed-off-by: Denis Drozdov <den...@mellanox.com>
> drivers/infiniband/ulp/ipoib/ipoib.h | 2 ++
> drivers/infiniband/ulp/ipoib/ipoib_main.c | 23 +++++++++--------
> drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 38
> +++++++++++++++++++++++++---
> drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 20 ++++-----------
> 4 files changed, 54 insertions(+), 29 deletions(-)
I assume this is going through DaveM's tree? In which case for the
drivers/infiniband part:
Acked-by: Jason Gunthorpe <j...@mellanox.com>
> @@ -131,11 +157,15 @@ static int ipoib_new_child_link(struct net *src_net,
> struct net_device *dev,
> */
> child_pkey |= 0x8000;
>
> - err = __ipoib_vlan_add(ppriv, ipoib_priv(dev),
> - child_pkey, IPOIB_RTNL_CHILD);
> + down_write(&ppriv->vlan_rwsem);
> +
> + priv = ipoib_priv(dev);
> + err = __ipoib_vlan_add(ppriv, priv, child_pkey, IPOIB_RTNL_CHILD);
> + up_write(&ppriv->vlan_rwsem);
This looks like a necessary and correct change, but does it need to be
a seperate bug fix commit?
Jason
