net/core: Add support for getting VF GUIDs (30aad417) · Commits · 戴 / test

Introduce a new ndo: ndo_get_vf_guid, to get from the net device the port and node GUID. New applications can choose to use this interface to show GUIDs with iproute2 with commands such as: - ip link show ib4 ib4: <BROADCAST,MULTICAST> mtu 4092 qdisc noop state DOWN mode DEFAULT group default qlen 256 link/infiniband 00:00:0a:2d:fe:80:00:00:00:00:00:00:ec:0d:9a:03:00:44:36:8d brd 00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff vf 0 link/infiniband 00:00:0a:2d:fe:80:00:00:00:00:00:00:ec:0d:9a:03:00:44:36:8d brd 00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff, spoof checking off, NODE_GUID 22:44:33:00:33:11:00:33, PORT_GUID 10:21:33:12:00:11:22:10, link-state disable, trust off, query_rss off Signed-off-by:

Danit Goldberg <danitg@mellanox.com> Acked-by:

David Ahern <dsahern@gmail.com> Signed-off-by:

Leon Romanovsky <leonro@mellanox.com>

include/linux/netdevice.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -1316,6 +1316,10 @@ struct net_device_ops {
		struct nlattr *port[]);
		int (ndo_get_vf_port)(struct net_device dev,
		int vf, struct sk_buff *skb);
		int (ndo_get_vf_guid)(struct net_device dev,
		int vf,
		struct ifla_vf_guid *node_guid,
		struct ifla_vf_guid *port_guid);
		int (ndo_set_vf_guid)(struct net_device dev,
		int vf, u64 guid,
		int guid_type);

net/core/rtnetlink.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -1204,6 +1204,8 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
		struct ifla_vf_mac vf_mac;
		struct ifla_vf_broadcast vf_broadcast;
		struct ifla_vf_info ivi;
		struct ifla_vf_guid node_guid;
		struct ifla_vf_guid port_guid;

		memset(&ivi, 0, sizeof(ivi));

		@@ -1270,6 +1272,18 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
		nla_put(skb, IFLA_VF_TRUST,
		sizeof(vf_trust), &vf_trust))
		goto nla_put_vf_failure;

		memset(&node_guid, 0, sizeof(node_guid));
		memset(&port_guid, 0, sizeof(port_guid));
		if (dev->netdev_ops->ndo_get_vf_guid &&
		!dev->netdev_ops->ndo_get_vf_guid(dev, vfs_num, &node_guid,
		&port_guid)) {
		if (nla_put(skb, IFLA_VF_IB_NODE_GUID, sizeof(node_guid),
		&node_guid) \|\|
		nla_put(skb, IFLA_VF_IB_PORT_GUID, sizeof(port_guid),
		&port_guid))
		goto nla_put_vf_failure;
		}
		vfvlanlist = nla_nest_start_noflag(skb, IFLA_VF_VLAN_LIST);
		if (!vfvlanlist)
		goto nla_put_vf_failure;

Admin message