niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

RDMA/ipoib: Set rtnl_link_ops for ipoib interfaces

Browse source 
Report the "ipoib pkey", "mode" and "umcast" netlink attributes for every
IPoiB interface type, not just children created with 'ip link add'.

After setting the rtnl_link_ops for the parent interface, implement the
dellink() callback to block users from trying to remove it.

Fixes: 862096a8bb ("IB/ipoib: Add more rtnl_link_ops callbacks")
Link: https://lore.kernel.org/r/20201004132948.26669-1-kamalheib1@gmail.com
Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
This commit is contained in:
Kamal Heib 2020-10-04 16:29:48 +03:00 • committed by Jason Gunthorpe
parent 9f85cbe50a
commit 5ce2dced8e
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/infiniband/ulp/ipoib/ipoib_main.c
View file

@ -2477,6 +2477,8 @@ static struct net_device *ipoib_add_port(const char *format,
/* call event handler to ensure pkey in sync */ /* call event handler to ensure pkey in sync */
queue_work(ipoib_workqueue, &priv->flush_heavy); queue_work(ipoib_workqueue, &priv->flush_heavy);
ndev->rtnl_link_ops = ipoib_get_link_ops();
result = register_netdev(ndev); result = register_netdev(ndev);
if (result) { if (result) {
pr_warn("%s: couldn't register ipoib port %d; error %d\n", pr_warn("%s: couldn't register ipoib port %d; error %d\n",

11
drivers/infiniband/ulp/ipoib/ipoib_netlink.c
View file

@ -144,6 +144,16 @@ static int ipoib_new_child_link(struct net *src_net, struct net_device *dev,
return 0; return 0;
} }
static void ipoib_del_child_link(struct net_device *dev, struct list_head *head)
{
struct ipoib_dev_priv *priv = ipoib_priv(dev);
if (!priv->parent)
return;
unregister_netdevice_queue(dev, head);
}
static size_t ipoib_get_size(const struct net_device *dev) static size_t ipoib_get_size(const struct net_device *dev)
{ {
return nla_total_size(2) + /* IFLA_IPOIB_PKEY */ return nla_total_size(2) + /* IFLA_IPOIB_PKEY */
@ -158,6 +168,7 @@ static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
.priv_size = sizeof(struct ipoib_dev_priv), .priv_size = sizeof(struct ipoib_dev_priv),
.setup = ipoib_setup_common, .setup = ipoib_setup_common,
.newlink = ipoib_new_child_link, .newlink = ipoib_new_child_link,
.dellink = ipoib_del_child_link,
.changelink = ipoib_changelink, .changelink = ipoib_changelink,
.get_size = ipoib_get_size, .get_size = ipoib_get_size,
.fill_info = ipoib_fill_info, .fill_info = ipoib_fill_info,

2
drivers/infiniband/ulp/ipoib/ipoib_vlan.c
View file

@ -195,6 +195,8 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
} }
priv = ipoib_priv(ndev); priv = ipoib_priv(ndev);
ndev->rtnl_link_ops = ipoib_get_link_ops();
result = __ipoib_vlan_add(ppriv, priv, pkey, IPOIB_LEGACY_CHILD); result = __ipoib_vlan_add(ppriv, priv, pkey, IPOIB_LEGACY_CHILD);
if (result && ndev->reg_state == NETREG_UNINITIALIZED) if (result && ndev->reg_state == NETREG_UNINITIALIZED)