Add virtual port netlink support
Subsystems (2)
v7 cover Add virtual port netlink support
[resend with fixes for these items from Patrick McHardy: 1) add #define to ignore VF num, 2) whitespace cleanup of IFLA_VF_PORT policy list, 3) clean up err handling for ndo_get_vf_port call]
The following series adds virtual port netlink support and adds an implementation to Cisco's enic netdev driver:
1/2: Adds virtual netlink RTM_SETLINK/RTM_GETLINK support, and
adds matching netdev ops net_{set|get}_vf_port.
2/2: Adds enic support for net_{set|get}_vf_port for enic
dynamic devices.
PATCH v7 1/2 Add netlink support for virtual port management (was iovnl)
From: Scott Feldman <[email protected]>
Add new netdev ops ndo_{set|get}_vf_port to allow setting of port-profile on a netdev interface. Extends netlink socket RTM_SETLINK/ RTM_GETLINK with new sub cmd called IFLA_VF_PORT (added to end of IFLA_cmd list).
A port-profile is used to configure/enable the external switch virtual port backing the netdev interface, not to configure the host-facing side of the netdev. A port-profile is an identifier known to the switch. How port- profiles are installed on the switch or how available port-profiles are made know to the host is outside the scope of this patch.
There are two types of port-profiles specs in the netlink msg. The first spec is for 802.1Qbg (pre-)standard, VDP protocol. The second spec is for devices that run a similar protocol as VDP but in firmware, thus hiding the protocol details. In either case, the specs have much in common and makes sense to define the netlink msg as the union of the two specs. For example, both specs have a notition of associating/deassociating a port-profile. And both specs require some information from the hypervisor manager, such as client port instance ID.
The general flow is the port-profile is applied to a host netdev interface using RTM_SETLINK, the receiver of the RTM_SETLINK msg communicates with the switch, and the switch virtual port backing the host netdev interface is configured/enabled based on the settings defined by the port-profile. What those settings comprise, and how those settings are managed is again outside the scope of this patch, since this patch only deals with the first step in the flow.
There is a RTM_GETLINK cmd to to return port-profile setting of an interface and to also return the status of the last port-profile association.
IFLA_VF_PORT is modeled after the existing IFLA_VF_* cmd where a VF number is passed in to identify the virtual function (VF) of an SR-IOV- capable device. In this case, the target of IFLA_VF_PORT msg is the netdev physical function (PF) device. The PF will apply the port-profile to the VF. IFLA_VF_PORT can also be used for devices that don't adhere to SR-IOV and can apply the port-profile directly to the netdev target. In this case, the VF number is ignored.
Passing in a NULL port-profile is used to delete the port-profile association.
--- include/linux/if_link.h | 53 +++++++++++++++++++++ include/linux/netdevice.h | 10 ++++ net/core/rtnetlink.c | 116 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 178 insertions(+), 1 deletions(-)
include/linux/if_link.h +53 -0
@@ -116,6 +116,7 @@ enum {IFLA_VF_TX_RATE ,/* TX Bandwidth Allocation */ IFLA_VFINFO ,IFLA_STATS64 , +IFLA_VF_PORT , __IFLA_MAX };
@@ -259,4 +260,56 @@ struct ifla_vf_info {__u32 qos; __u32 tx_rate; }; + +/* VF Port management section */ + +enum { +IFLA_VF_PORT_UNSPEC , +IFLA_VF_PORT_VF ,/* __u32 */ +IFLA_VF_PORT_PROFILE ,/* string */ +IFLA_VF_PORT_VSI_TYPE ,/* 802.1Qbg (pre-)standard VDP */ +IFLA_VF_PORT_INSTANCE_UUID ,/* binary UUID */ +IFLA_VF_PORT_HOST_UUID ,/* binary UUID */ +IFLA_VF_PORT_REQUEST ,/* __u8 */ +IFLA_VF_PORT_RESPONSE ,/* __u16, output only */ + __IFLA_VF_PORT_MAX, +}; + +#define IFLA_VF_PORT_MAX (__IFLA_VF_PORT_MAX - 1) + +#define VF_PORT_PROFILE_MAX 40 +#define VF_PORT_UUID_MAX 16 +#define VF_PORT_VF_NOT_USED -1 + +enum { +VF_PORT_REQUEST_PREASSOCIATE =0 , +VF_PORT_REQUEST_PREASSOCIATE_RR , +VF_PORT_REQUEST_ASSOCIATE , +VF_PORT_REQUEST_DISASSOCIATE , +}; + +enum { +VF_PORT_VDP_RESPONSE_SUCCESS =0 , +VF_PORT_VDP_RESPONSE_INVALID_FORMAT , +VF_PORT_VDP_RESPONSE_INSUFFICIENT_RESOURCES , +VF_PORT_VDP_RESPONSE_UNUSED_VTID , +VF_PORT_VDP_RESPONSE_VTID_VIOLATION , +VF_PORT_VDP_RESPONSE_VTID_VERSION_VIOALTION , +VF_PORT_VDP_RESPONSE_OUT_OF_SYNC , +/* 0x08-0xFF reserved for future VDP use */ +VF_PORT_PROFILE_RESPONSE_SUCCESS =0x100 , +VF_PORT_PROFILE_RESPONSE_INPROGRESS , +VF_PORT_PROFILE_RESPONSE_INVALID , +VF_PORT_PROFILE_RESPONSE_BADSTATE , +VF_PORT_PROFILE_RESPONSE_INSUFFICIENT_RESOURCES , +VF_PORT_PROFILE_RESPONSE_ERROR , +}; + +struct ifla_vf_port_vsi { +__u8 vsi_mgr_id; +__u8 vsi_type_id[3 ]; +__u8 vsi_type_version; +__u8 pad[3 ]; +}; +#endif /* _LINUX_IF_LINK_H */
include/linux/netdevice.h +10 -0
@@ -686,6 +686,10 @@ struct netdev_rx_queue {* int (*ndo_set_vf_tx_rate)(struct net_device *dev, int vf, int rate); * int (*ndo_get_vf_config)(struct net_device *dev, * int vf, struct ifla_vf_info *ivf); +* int (*ndo_set_vf_port)(struct net_device *dev, int vf, +* struct nlattr *vf_port[]); +* int (*ndo_get_vf_port)(struct net_device *dev, int vf, +* struct sk_buff *skb); */ #define HAVE_NET_DEVICE_OPS struct net_device_ops {
@@ -735,6 +739,12 @@ struct net_device_ops {int (*ndo_get_vf_config)(struct net_device *dev,int vf,struct ifla_vf_info *ivf); +int (*ndo_set_vf_port)(struct net_device *dev, +int vf, +struct nlattr *vf_port[]); +int (*ndo_get_vf_port)(struct net_device *dev, +int vf, +struct sk_buff *skb);#if defined(CONFIG_FCOE ) || defined(CONFIG_FCOE_MODULE )int (*ndo_fcoe_enable)(struct net_device *dev);int (*ndo_fcoe_disable)(struct net_device *dev);
net/core/rtnetlink.c +115 -1
165 lines not on this page · raw message
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Quoted 6 lines · Scott Feldman
net/core/rtnetlink.c +0
-0@@ -653,6 +653,26 @@ static inline int rtnl_vfinfo_size(const struct net_device *dev)return 0 ; }
net/core/rtnetlink.c static inline int rtnl_vfinfo_size(const struct net_device *dev) · line 665
Quoted 10 lines
net/core/rtnetlink.c +10
-0+static size_t rtnl_vf_port_size (const struct net_device *dev) +{ +size_t vf_port_size =nla_total_size (sizeof (struct nlattr )) +/* VF_PORT_VF */ + +nla_total_size (VF_PORT_PROFILE_MAX )/* VF_PORT_PROFILE */ + +nla_total_size (sizeof (struct ifla_vf_port_vsi )) +/* VF_PORT_VSI_TYPE */ + +nla_total_size (VF_PORT_UUID_MAX )/* VF_PORT_VSI_INSTANCE */ + +nla_total_size (VF_PORT_UUID_MAX )/* VF_PORT_HOST_UUID */ + +nla_total_size (1 )/* VF_PROT_VDP_REQUEST */
Do messages generated by the kernel really contain a request?
Quoted 9 lines
net/core/rtnetlink.c +9
-0+ +nla_total_size (2 );/* VF_PORT_VDP_RESPONSE */ + +if (!dev->netdev_ops->ndo_get_vf_port || !dev->dev.parent) +return 0 ; +if (dev_num_vf (dev->dev.parent)) +return vf_port_size *dev_num_vf (dev->dev.parent); +else +return vf_port_size; +}
net/core/rtnetlink.c static inline int rtnl_vfinfo_size(const struct net_device *dev)
Quoted 10 lines
net/core/rtnetlink.c +8
-0+ +static int rtnl_vf_port_fill_nest (struct sk_buff *skb,struct net_device *dev, +int vf) +{ +struct nlattr *data; +int err; + + data =nla_nest_start (skb,IFLA_VF_PORT );
We usually use a top-level attribute to encapsulate lists of identical attributes. The other iflink attributes may only occur once and are usually parsed using nla_parse_nested(), which will parse all IFLA_VF_PORT attributes, but only return the last one.
Something like:
iflink message:
...
[IFLA_VF_PORTS]
[IFLA_VF_PORT]
[IFLA_VF_PORT_*], ...
[IFLA_VF_PORT]
[IFLA_VF_PORT_*], ......
net/core/rtnetlink.c static inline size_t if_nlmsg_size(const struct net_device *dev) · line 711
Quoted 5 lines
net/core/rtnetlink.c +5
-0+if (!data) +return -EMSGSIZE ; + +if (vf !=VF_PORT_VF_NOT_USED ) +nla_put_u32 (skb,IFLA_VF_PORT_VF , vf);
This should be checking for errors or use NLA_PUT_U32.
Quoted 17 lines
net/core/rtnetlink.c +12
-0+ + err = dev->netdev_ops->ndo_get_vf_port (dev, vf, skb); +if (err) { +nla_nest_cancel (skb, data); +return err; + } + +nla_nest_end (skb, data); + +return 0 ; +} +static int rtnl_fill_ifinfo (struct sk_buff *skb,struct net_device *dev,int type,u32 pid,u32 seq,u32 change,unsigned int flags)
net/core/rtnetlink.c static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, · line 823
Quoted 5 lines
net/core/rtnetlink.c +2
-0@@ -747,17 +819,23 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, goto nla_put_failure;copy_rtnl_link_stats64 (nla_data (attr), stats); +if (dev->dev.parent) +NLA_PUT_U32 (skb,IFLA_NUM_VF ,dev_num_vf (dev->dev.parent));
Just wondering, is the only case where dev.parent is non-NULL really when virtual ports are present?
Quoted 77 lines
net/core/rtnetlink.c +41
-1+if (dev->netdev_ops->ndo_get_vf_config && dev->dev.parent) {int i;struct ifla_vf_info ivi; -NLA_PUT_U32 (skb,IFLA_NUM_VF ,dev_num_vf (dev->dev.parent));for (i =0 ; i <dev_num_vf (dev->dev.parent); i++) {if (dev->netdev_ops->ndo_get_vf_config (dev, i, &ivi))break ;NLA_PUT (skb,IFLA_VFINFO ,sizeof (ivi), &ivi); } } + +if (rtnl_vf_port_fill (skb, dev)) + goto nla_put_failure; +if (dev->rtnl_link_ops) {if (rtnl_link_fill (skb, dev) <0 ) goto nla_put_failure;@@ -824,6 +902,7 @@ const struct nla_policy ifla_policy[IFLA_MAX+1] = { .len = sizeof(struct ifla_vf_vlan) }, [IFLA_VF_TX_RATE] = { .type = NLA_BINARY, .len = sizeof(struct ifla_vf_tx_rate) }, + [IFLA_VF_PORT] = { .type = NLA_NESTED }, };EXPORT_SYMBOL (ifla_policy);@@ -832,6 +911,20 @@ static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = { [IFLA_INFO_DATA] = { .type = NLA_NESTED }, }; +static const struct nla_policy ifla_vf_port_policy[IFLA_VF_PORT_MAX +1 ] = { + [IFLA_VF_PORT_VF ] = { .type =NLA_U32 }, + [IFLA_VF_PORT_PROFILE ] = { .type =NLA_STRING , + .len =VF_PORT_PROFILE_MAX }, + [IFLA_VF_PORT_VSI_TYPE ] = { .type =NLA_BINARY , + .len =sizeof (struct ifla_vf_port_vsi )}, + [IFLA_VF_PORT_INSTANCE_UUID ]= { .type =NLA_BINARY , + .len =VF_PORT_UUID_MAX }, + [IFLA_VF_PORT_HOST_UUID ] = { .type =NLA_STRING , + .len =VF_PORT_UUID_MAX }, + [IFLA_VF_PORT_REQUEST ] = { .type =NLA_U8 , }, + [IFLA_VF_PORT_RESPONSE ] = { .type =NLA_U16 , }, +}; +struct net *rtnl_link_get_net (struct net *src_net,struct nlattr *tb[]) {struct net *net;@@ -1028,6 +1121,27 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm, } err =0 ; +if (tb[IFLA_VF_PORT ]) { +struct nlattr *vf_port[IFLA_VF_PORT_MAX +1 ]; +int vf =VF_PORT_VF_NOT_USED ; + + err =nla_parse_nested (vf_port,IFLA_VF_PORT_MAX , + tb[IFLA_VF_PORT ], ifla_vf_port_policy); +if (err <0 ) + goto errout; + +if (vf_port[IFLA_VF_PORT_VF ]) + vf =nla_get_u32 (vf_port[IFLA_VF_PORT_VF ]); + + err = -EOPNOTSUPP ; +if (ops->ndo_set_vf_port) + err = ops->ndo_set_vf_port (dev, vf, vf_port); +if (err <0 ) + goto errout; + modified =1 ; + } + err =0 ; + errout:if (err <0 && modified &&net_ratelimit ()) printk(KERN_WARNING "A link change request failed with "
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Quoted 7 lines · Patrick McHardy
Quoted 6 lines · Scott Feldman
net/core/rtnetlink.c +0
-0@@ -653,6 +653,26 @@ static inline int rtnl_vfinfo_size(const struct net_device *dev)return 0 ; }
Quoted 12 lines
net/core/rtnetlink.c static inline int rtnl_vfinfo_size(const struct net_device *dev) · line 665
Quoted 10 lines
net/core/rtnetlink.c +10
-0+static size_t rtnl_vf_port_size (const struct net_device *dev) +{ +size_t vf_port_size =nla_total_size (sizeof (struct nlattr )) +/* VF_PORT_VF */ + +nla_total_size (VF_PORT_PROFILE_MAX )/* VF_PORT_PROFILE */ + +nla_total_size (sizeof (struct ifla_vf_port_vsi )) +/* VF_PORT_VSI_TYPE */ + +nla_total_size (VF_PORT_UUID_MAX )/* VF_PORT_VSI_INSTANCE */ + +nla_total_size (VF_PORT_UUID_MAX )/* VF_PORT_HOST_UUID */ + +nla_total_size (1 )/* VF_PROT_VDP_REQUEST */ Do messages generated by the kernel really contain a request?
Yes, the request field of the VDP message shows the status (e.g. associated or disassociated).
Quoted 15 lines
net/core/rtnetlink.c static inline size_t if_nlmsg_size(const struct net_device *dev) · line 706
Quoted 7 lines
net/core/rtnetlink.c +7
-0+static int rtnl_vf_port_fill_nest (struct sk_buff *skb,struct net_device *dev, +int vf) +{ +struct nlattr *data; +int err; + + data =nla_nest_start (skb,IFLA_VF_PORT );We usually use a top-level attribute to encapsulate lists of identical attributes. The other iflink attributes may only occur once and are usually parsed using
nla_parse_nested(), which will parse allIFLA_VF_PORTattributes, but only return the last one.Something like:
Quoted 8 lines
iflink message:
...
[IFLA_VF_PORTS]
[IFLA_VF_PORT][IFLA_VF_PORT_*], ... [IFLA_VF_PORT] [IFLA_VF_PORT_*], ......
Ah, I was wondering about this already. Does this mean that IFLA_VFINFO does this incorrectly as well?
Quoted 7 lines
Quoted 7 lines
static int rtnl_fill_ifinfo(struct
sk_buff*skb, structnet_device*dev,net/core/rtnetlink.c +0
-0int type, u32 pid, u32 seq, u32 change, unsigned int flags)@@ -747,17 +819,23 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, goto nla_put_failure;copy_rtnl_link_stats64 (nla_data (attr), stats);
Quoted 5 lines
net/core/rtnetlink.c static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, · line 823
Quoted 2 lines
net/core/rtnetlink.c +2
-0+if (dev->dev.parent) +NLA_PUT_U32 (skb,IFLA_NUM_VF ,dev_num_vf (dev->dev.parent));Just wondering, is the only case where dev.parent is non-NULL really when virtual ports are present?
No, but if parent is NULL, we must not call dev_num_vf(). The way that enic needs the attributes, they can be either for the VF of dev->dev.parent (the PCI PF), or for the PF itself, even if it does not have VFs, in which case it would be interesting to have IFLA_NUM_VF = 0 in the output.
Maybe a better structure would be to separate the two cases, also allowing a port profile to be associated with both the PF and with each of its VFs?
Something like this:
[IFLA_NUM_VF]
[IFLA_VF_PORTS]
[IFLA_VF_PORT]
[IFLA_VF_PORT_*], ...
[IFLA_VF_PORT]
[IFLA_VF_PORT_*], ...[IFLA_PORT_SELF]
[IFLA_VF_PORT_*], ...
Arnd
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Quoted 24 lines · Arnd Bergmann
Quoted 14 lines · Patrick McHardy
net/core/rtnetlink.c static inline size_t if_nlmsg_size(const struct net_device *dev) · line 706
Quoted 7 lines
net/core/rtnetlink.c +7
-0+static int rtnl_vf_port_fill_nest (struct sk_buff *skb,struct net_device *dev, +int vf) +{ +struct nlattr *data; +int err; + + data =nla_nest_start (skb,IFLA_VF_PORT );We usually use a top-level attribute to encapsulate lists of identical attributes. The other iflink attributes may only occur once and are usually parsed using
nla_parse_nested(), which will parse allIFLA_VF_PORTattributes, but only return the last one.Something like:
Quoted 8 lines
iflink message:
...
[IFLA_VF_PORTS]
[IFLA_VF_PORT][IFLA_VF_PORT_*], ... [IFLA_VF_PORT] [IFLA_VF_PORT_*], ......
Quoted 2 lines
Ah, I was wondering about this already. Does this mean that
IFLA_VFINFOdoes this incorrectly as well?
Yes.
Quoted 12 lines
Quoted 11 lines
net/core/rtnetlink.c static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, · line 823
Quoted 9 lines
static int rtnl_fill_ifinfo(struct
sk_buff*skb, structnet_device*dev,net/core/rtnetlink.c +2
-0int type, u32 pid, u32 seq, u32 change, unsigned int flags)@@ -747,17 +819,23 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, goto nla_put_failure;copy_rtnl_link_stats64 (nla_data (attr), stats); +if (dev->dev.parent) +NLA_PUT_U32 (skb,IFLA_NUM_VF ,dev_num_vf (dev->dev.parent));Just wondering, is the only case where dev.parent is non-NULL really when virtual ports are present?
Quoted 4 lines
No, but if parent is NULL, we must not call
dev_num_vf(). The way that enic needs the attributes, they can be either for the VF ofdev->dev.parent(the PCI PF), or for the PF itself, even if it does not have VFs, in which case it would be interesting to haveIFLA_NUM_VF= 0 in the output.
I see. I was mainly wondering about completely different types of devices.
Quoted 5 lines
Maybe a better structure would be to separate the two cases, also allowing a port profile to be associated with both the PF and with each of its VFs?
Something like this:
Quoted 8 lines
[
IFLA_NUM_VF]
[IFLA_VF_PORTS]
[IFLA_VF_PORT][IFLA_VF_PORT_*], ... [IFLA_VF_PORT] [IFLA_VF_PORT_*], ...[
IFLA_PORT_SELF]
[IFLA_VF_PORT_*], ...
That would also be fine.
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Quoted 15 lines · Patrick McHardy
Quoted 5 lines · Arnd Bergmann
Maybe a better structure would be to separate the two cases, also allowing a port profile to be associated with both the PF and with each of its VFs?
Something like this:
Quoted 8 lines
[
IFLA_NUM_VF]
[IFLA_VF_PORTS]
[IFLA_VF_PORT][IFLA_VF_PORT_*], ... [IFLA_VF_PORT] [IFLA_VF_PORT_*], ...[
IFLA_PORT_SELF]
[IFLA_VF_PORT_*], ...
Quoted 1 line
That would also be fine.
I want to make sure I've got this right before starting on ver8 of patch:
- we'll use the layout listed above
- RTM_SETLINK msg includes the full nested layout
- contains IFLA_VF_PORTs for all VFs of a PF
- OR, contains IFLA_PORT_SELF if PF is it's own VF
- it's up to the receiver to compare for changes for each VF
- RTM_GETLINK msg includes the full nested layout
- same rules as RTM_SETLINK above
I think we should redo the other IFLA_VF_xxx msgs in the same style. I'm not going to tackle that for IFLA_VF_PORTS patch, but it would be a good followup patch.
Do we have a plan?
-scott
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Quoted 29 lines · Scott Feldman
Quoted 14 lines · Patrick McHardy
Quoted 5 lines · Arnd Bergmann
Maybe a better structure would be to separate the two cases, also allowing a port profile to be associated with both the PF and with each of its VFs?
Something like this:
Quoted 8 lines
[
IFLA_NUM_VF]
[IFLA_VF_PORTS]
[IFLA_VF_PORT][IFLA_VF_PORT_*], ... [IFLA_VF_PORT] [IFLA_VF_PORT_*], ...[
IFLA_PORT_SELF]
[IFLA_VF_PORT_*], ...Quoted 1 line
That would also be fine.
I want to make sure I've got this right before starting on ver8 of patch:
- we'll use the layout listed above
-
RTM_SETLINKmsg includes the full nested layout- contains
IFLA_VF_PORTsfor all VFs of a PF
- OR, containsIFLA_PORT_SELFif PF is it's own VF- it's up to the receiver to compare for changes for each VF
Quoted 7 lines
-
RTM_GETLINKmsg includes the full nested layout- same rules as
RTM_SETLINKaboveI think we should redo the other
IFLA_VF_xxxmsgs in the same style. I'm not going to tackle that forIFLA_VF_PORTSpatch, but it would be a good followup patch.
Agreed.
Quoted 1 line
Do we have a plan?
That sounds good to me. If you have any netlink related questions, just let me know.
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
In reply to Scott FeldmanQuoted 6 lines · On Friday 14 May 2010 19:19:00 Scott Feldman wrote:
I want to make sure I've got this right before starting on ver8 of patch:
- we'll use the layout listed above
-
RTM_SETLINKmsg includes the full nested layout
Quoted 8 lines
- contains
IFLA_VF_PORTsfor all VFs of a PF
- OR, containsIFLA_PORT_SELFif PF is it's own VF- it's up to the receiver to compare for changes for each VF
-
RTM_GETLINKmsg includes the full nested layout- same rules as
RTM_SETLINKabove
I was thinking that a device could have both IFLA_VF_PORTS and IFLA_PORT_SELF, but you know more about the IOV specifics. If an adapter having multiple VFs always gets configured as VF 0 itself, that would be fine as well, otherwise we could have an extra argument to the two device driver callbacks to differentiate VF/SELF. As long as this does not impact the user ABI, we could do either.
Quoted 3 lines
I think we should redo the other
IFLA_VF_xxxmsgs in the same style. I'm not going to tackle that forIFLA_VF_PORTSpatch, but it would be a good followup patch.
I fear it's too late for that now. While we have not yet released 2.6.34 and 2.6.33 does not contain the broken message, it's extremely late in the stabilization phase of v2.6.34, so I doubt that there is still a chance for that at this point.
Arnd
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Quoted 16 lines · Arnd Bergmann
Quoted 6 lines · On Friday 14 May 2010 19:19:00 Scott Feldman wrote:
I want to make sure I've got this right before starting on ver8 of patch:
- we'll use the layout listed above
-
RTM_SETLINKmsg includes the full nested layoutQuoted 8 lines
- contains
IFLA_VF_PORTsfor all VFs of a PF
- OR, containsIFLA_PORT_SELFif PF is it's own VF- it's up to the receiver to compare for changes for each VF
-
RTM_GETLINKmsg includes the full nested layout- same rules as
RTM_SETLINKabove
Quoted 7 lines
I was thinking that a device could have both
IFLA_VF_PORTSandIFLA_PORT_SELF, but you know more about the IOV specifics. If an adapter having multiple VFs always gets configured as VF 0 itself, that would be fine as well, otherwise
we could have an extra argument to the two device driver callbacks to differentiate VF/SELF. As long as this does not impact the user ABI, we could do either.
I think you're right. I should have said AND/OR. I would rather not have an extra argument to the driver callbacks.
Quoted 8 lines
Quoted 3 lines
I think we should redo the other
IFLA_VF_xxxmsgs in the same style. I'm not going to tackle that forIFLA_VF_PORTSpatch, but it would be a good followup patch.I fear it's too late for that now. While we have not yet released 2.6.34 and 2.6.33 does not contain the broken message, it's extremely late in the stabilization phase of v2.6.34, so I doubt that there is still a chance for that at this point.
That's too bad. I wish Patrick's objections were honored and then we wouldn't have followed that broken model! Can the broken msgs be disabled somehow for 2.6.34? Keep the definitions in if_link.h but fail the SET/GET actions in rtnetlink.c?
-scott
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Quoted 21 lines · Scott Feldman
Quoted 7 lines · Arnd Bergmann
I was thinking that a device could have both
IFLA_VF_PORTSandIFLA_PORT_SELF, but you know more about the IOV specifics. If an adapter having multiple VFs always gets configured as VF 0 itself, that would be fine as well, otherwise
we could have an extra argument to the two device driver callbacks to differentiate VF/SELF. As long as this does not impact the user ABI, we could do either.I think you're right. I should have said AND/OR. I would rather not have an extra argument to the driver callbacks.
Quoted 7 lines
Quoted 3 lines
I think we should redo the other
IFLA_VF_xxxmsgs in the same style. I'm not going to tackle that forIFLA_VF_PORTSpatch, but it would be a good followup patch.I fear it's too late for that now. While we have not yet released 2.6.34 and 2.6.33 does not contain the broken message, it's extremely late in the stabilization phase of v2.6.34, so I doubt that there is still a chance for that at this point.
Quoted 4 lines
That's too bad. I wish Patrick's objections were honored and then we wouldn't have followed that broken model! Can the broken msgs be disabled somehow for 2.6.34? Keep the definitions in
if_link.hbut fail the SET/GET actions inrtnetlink.c?
That would be a possibility. Unfortunately I don't think we can fix this in a backwards compatible way.
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Quoted 22 lines · * Patrick McHardy ([email protected]) wrote:
Quoted 21 lines · Scott Feldman
Quoted 7 lines · Arnd Bergmann
I was thinking that a device could have both
IFLA_VF_PORTSandIFLA_PORT_SELF, but you know more about the IOV specifics. If an adapter having multiple VFs always gets configured as VF 0 itself, that would be fine as well, otherwise
we could have an extra argument to the two device driver callbacks to differentiate VF/SELF. As long as this does not impact the user ABI, we could do either.I think you're right. I should have said AND/OR. I would rather not have an extra argument to the driver callbacks.
Quoted 7 lines
Quoted 3 lines
I think we should redo the other
IFLA_VF_xxxmsgs in the same style. I'm not going to tackle that forIFLA_VF_PORTSpatch, but it would be a good followup patch.I fear it's too late for that now. While we have not yet released 2.6.34 and 2.6.33 does not contain the broken message, it's extremely late in the stabilization phase of v2.6.34, so I doubt that there is still a chance for that at this point.
Quoted 7 lines
Quoted 4 lines
That's too bad. I wish Patrick's objections were honored and then we wouldn't have followed that broken model! Can the broken msgs be disabled somehow for 2.6.34? Keep the definitions in
if_link.hbut fail the SET/GET actions inrtnetlink.c?That would be a possibility. Unfortunately I don't think we can fix this in a backwards compatible way.
$ git describe --contains ebc08a6f47ee76ecad8e9f26c26e6ec9b46ca659 v2.6.34-rc1~233^2~336
It's not released yet?
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Quoted 15 lines · Chris Wright
Quoted 14 lines · * Patrick McHardy ([email protected]) wrote:
Quoted 13 lines · Scott Feldman
Quoted 7 lines · Arnd Bergmann
Quoted 3 lines
I think we should redo the other
IFLA_VF_xxxmsgs in the same style. I'm not going to tackle that forIFLA_VF_PORTSpatch, but it would be a good followup patch.I fear it's too late for that now. While we have not yet released 2.6.34 and 2.6.33 does not contain the broken message, it's extremely late in the stabilization phase of v2.6.34, so I doubt that there is still a chance for that at this point.
That's too bad. I wish Patrick's objections were honored and then we wouldn't have followed that broken model! Can the broken msgs be disabled somehow for 2.6.34? Keep the definitions in
if_link.hbut fail the SET/GET actions inrtnetlink.c?
Quoted 7 lines
Quoted 2 lines
That would be a possibility. Unfortunately I don't think we can fix this in a backwards compatible way.
$ git describe --contains ebc08a6f47ee76ecad8e9f26c26e6ec9b46ca659 v2.6.34-rc1~233^2~336It's not released yet?
Correct, it was added in 2.6.34-rc.
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Quoted 19 lines · * Patrick McHardy ([email protected]) wrote:
Quoted 18 lines · Chris Wright
Quoted 16 lines · * Patrick McHardy ([email protected]) wrote:
Quoted 5 lines · Scott Feldman
Quoted 3 lines · Arnd Bergmann
Quoted 3 lines
I think we should redo the other
IFLA_VF_xxxmsgs in the same style. I'm not going to tackle that forIFLA_VF_PORTSpatch, but it would be a good followup patch.Quoted 8 lines
Quoted 4 lines
I fear it's too late for that now. While we have not yet released 2.6.34 and 2.6.33 does not contain the broken message, it's extremely late in the stabilization phase of v2.6.34, so I doubt that there is still a chance for that at this point.
That's too bad. I wish Patrick's objections were honored and then we wouldn't have followed that broken model! Can the broken msgs be disabled somehow for 2.6.34? Keep the definitions in
if_link.hbut fail the SET/GET actions inrtnetlink.c?That would be a possibility. Unfortunately I don't think we can fix this in a backwards compatible way.
Quoted 6 lines
Quoted 4 lines
$ git describe --contains ebc08a6f47ee76ecad8e9f26c26e6ec9b46ca659 v2.6.34-rc1~233^2~336It's not released yet?
Correct, it was added in 2.6.34-rc.
AFAICT iproute2 hasn't been released either w/ that support. So, I'll prepare patches to fix it (or disable as Scott mentioned). What do you think?
thanks,
-chris
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Quoted 22 lines · Chris Wright
Quoted 21 lines · * Patrick McHardy ([email protected]) wrote:
Quoted 20 lines · Chris Wright
Quoted 10 lines · * Patrick McHardy ([email protected]) wrote:
Quoted 9 lines · Scott Feldman
Quoted 7 lines · Arnd Bergmann
Quoted 3 lines
I think we should redo the other
IFLA_VF_xxxmsgs in the same style. I'm not going to tackle that forIFLA_VF_PORTSpatch, but it would be a good followup patch.I fear it's too late for that now. While we have not yet released 2.6.34 and 2.6.33 does not contain the broken message, it's extremely late in the stabilization phase of v2.6.34, so I doubt that there is still a chance for that at this point.
Quoted 6 lines
Quoted 4 lines
That's too bad. I wish Patrick's objections were honored and then we wouldn't have followed that broken model! Can the broken msgs be disabled somehow for 2.6.34? Keep the definitions in
if_link.hbut fail the SET/GET actions inrtnetlink.c?That would be a possibility. Unfortunately I don't think we can fix this in a backwards compatible way.
$ git describe --contains ebc08a6f47ee76ecad8e9f26c26e6ec9b46ca659 v2.6.34-rc1~233^2~336
Quoted 6 lines
Quoted 2 lines
Quoted 1 line
It's not released yet?
Correct, it was added in 2.6.34-rc.
AFAICT iproute2 hasn't been released either w/ that support. So, I'll prepare patches to fix it (or disable as Scott mentioned). What do you think?
That would be great, otherwise we'll probably have to support it forever.
RE: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Quoted 43 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Patrick McHardy
Sent: Friday, May 14, 2010 11:50 AM
To: Chris Wright
Cc: Scott Feldman; Arnd Bergmann; [email protected]; [email protected]; [email protected]
Subject: Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)Quoted 7 lines · Chris Wright
Quoted 6 lines · * Patrick McHardy ([email protected]) wrote:
Quoted 5 lines · Chris Wright
Quoted 4 lines · * Patrick McHardy ([email protected]) wrote:
Quoted 3 lines · Scott Feldman
Quoted 1 line · Arnd Bergmann
Quoted 1 line
I think we should redo the other
IFLA_VF_xxxmsgs in the samestyle. I'm
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
not going to tackle that for
IFLA_VF_PORTSpatch, but it would bea good
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
followup patch.
I fear it's too late for that now. While we have not yet released
2.6.34
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
and 2.6.33 does not contain the broken message, it's extremely
late in the
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
stabilization phase of v2.6.34, so I doubt that there is still a
chance for
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
that at this point.
That's too bad. I wish Patrick's objections were honored and then
we
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
wouldn't have followed that broken model! Can the broken msgs be
disabled
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
somehow for 2.6.34? Keep the definitions in
if_link.hbut fail theSET/GET
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
actions in
rtnetlink.c?That would be a possibility. Unfortunately I don't think we can fix this in a backwards compatible way.
$ git describe --contains ebc08a6f47ee76ecad8e9f26c26e6ec9b46ca659 v2.6.34-rc1~233^2~336It's not released yet?
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Correct, it was added in 2.6.34-rc.
AFAICT iproute2 hasn't been released either w/ that support. So, I'll prepare patches to fix it (or disable as Scott mentioned). What do you think?
That would be great, otherwise we'll probably have to support it forever.
I'd really like to find a way to fix this, instead of having the functionality disabled.
I know Patrick had objections to how the data structures were set up, but I figured that was something we'd tackle later, especially since the series got merged after Patrick's email, and with no further objection. At that point, things got quiet, I got shuffled onto another project, and we all thought things were OK.
At this point, Scott's work depends on what I did, so it's probably more work to unwind my stuff and respin his, than to just fix mine.
Can we quickly respin the kernel side to take care of Patrick's objections, and work the userspace side over the next week or so? The userspace side is where the real fiddly bits will be. I'll drop what I'm working on and get this taken care of as quickly as I can.
Sorry for the confusion - I thought we were OK, until yesterday.
-Mitch
Quoted 4 lines
--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Hi Mitch,
Quoted 1 line · * Williams, Mitch A ([email protected]) wrote:
I'd really like to find a way to fix this, instead of having the functionality disabled.
I've got some patches that are close to complete. I'll post them shortly. I'm able to query link from ip at this point.
thanks,
-chris
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
In reply to Scott FeldmanQuoted 30 lines · * Scott Feldman ([email protected]) wrote:
Quoted 15 lines · Patrick McHardy
Quoted 5 lines · Arnd Bergmann
Maybe a better structure would be to separate the two cases, also allowing a port profile to be associated with both the PF and with each of its VFs?
Something like this:
Quoted 8 lines
[
IFLA_NUM_VF]
[IFLA_VF_PORTS]
[IFLA_VF_PORT][IFLA_VF_PORT_*], ... [IFLA_VF_PORT] [IFLA_VF_PORT_*], ...[
IFLA_PORT_SELF]
[IFLA_VF_PORT_*], ...Quoted 1 line
That would also be fine.
I want to make sure I've got this right before starting on ver8 of patch:
- we'll use the layout listed above
-
RTM_SETLINKmsg includes the full nested layout- contains
IFLA_VF_PORTsfor all VFs of a PF
- OR, containsIFLA_PORT_SELFif PF is it's own VF- it's up to the receiver to compare for changes for each VF
Quoted 7 lines
-
RTM_GETLINKmsg includes the full nested layout- same rules as
RTM_SETLINKaboveI think we should redo the other
IFLA_VF_xxxmsgs in the same style. I'm not going to tackle that forIFLA_VF_PORTSpatch, but it would be a good followup patch.
Patrick layed out some nice details before. Here's the link:
http://thread.gmane.org/gmane.linux.network/151605/focus=151738
thanks,
-chris
Re: [net-next-2.6 V7 PATCH 1/2] Add netlink support for virtual port management (was iovnl)
Quoted 3 lines · Chris Wright
Patrick layed out some nice details before. Here's the link:
http://thread.gmane.org/gmane.linux.network/151605/focus=151738
Double drats, it looks like that one was caught too late. So we're collectively agreeing to let a known bad netlink msg in? I guess it can be fixed up later with a IFLA_VF_INFOS nest, and move away from the broken msgs.
-scott
PATCH v7 2/2 Add ndo_{set|get}_vf_port support for enic dynamic vnics
In reply to Scott FeldmanFrom: Scott Feldman <[email protected]>
Add enic ndo_{set|get}_vf_port ops to support setting/getting port-profile for enic dynamic devices. Enic dynamic devices are just like normal enic eth devices except dynamic enics require an extra configuration step to assign a port-profile identifier to the interface before the interface is useable. Once a port-profile is assigned, link comes up on the interface and is ready for I/O. The port-profile is used to configure the network port assigned to the interface. The network port configuration includes VLAN membership, QoS policies, and port security settings typical of a data center network.
A dynamic enic initially has a zero-mac address. Before a port-profile is assigned, a valid non-zero unicast mac address should be assign to the dynamic enic interface.
--- drivers/net/enic/Makefile | 2 drivers/net/enic/enic.h | 9 + drivers/net/enic/enic_main.c | 344 +++++++++++++++++++++++++++++++++++++++--- drivers/net/enic/enic_res.c | 5 - drivers/net/enic/enic_res.h | 1 drivers/net/enic/vnic_dev.c | 58 +++++++ drivers/net/enic/vnic_dev.h | 7 + drivers/net/enic/vnic_vic.c | 73 +++++++++ drivers/net/enic/vnic_vic.h | 59 +++++++ 9 files changed, 522 insertions(+), 36 deletions(-)
drivers/net/enic/Makefile +1 -1
@@ -1,5 +1,5 @@ obj-$(CONFIG_ENIC) := enic.o enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \ - enic_res.o vnic_dev.o vnic_rq.o + enic_res.o vnic_dev.o vnic_rq.o vnic_vic.o
drivers/net/enic/enic.h +8 -1
@@ -34,7 +34,7 @@#define DRV_NAME "enic"#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" -#define DRV_VERSION "1.3.1.1" +#define DRV_VERSION "1.3.1.1-pp"#define DRV_COPYRIGHT "Copyright 2008-2009 Cisco Systems, Inc"#define PFX DRV_NAME ": "
@@ -74,6 +74,12 @@ struct enic_msix_entry {void *devid; }; +struct enic_port_profile { +char name[VF_PORT_PROFILE_MAX ]; +u8 instance_uuid[VF_PORT_UUID_MAX ]; +u8 host_uuid[VF_PORT_UUID_MAX ]; +}; +/* Per-instance private data structure */ struct enic {struct net_device *netdev;
@@ -95,6 +101,7 @@ struct enic {u32 port_mtu;u32 rx_coalesce_usecs;u32 tx_coalesce_usecs; +struct enic_port_profile pp;/* work queue cache line section */ ____cacheline_aligned struct vnic_wq wq[ENIC_WQ_MAX ];
drivers/net/enic/enic_main.c +320 -24
422 lines not on this page · raw message
drivers/net/enic/enic_res.c +0 -5
@@ -103,11 +103,6 @@ int enic_get_vnic_config(struct enic *enic)return 0 ; } -void enic_add_station_addr (struct enic *enic) -{ -vnic_dev_add_addr (enic->vdev, enic->mac_addr); -} -void enic_add_multicast_addr (struct enic *enic,u8 *addr) {vnic_dev_add_addr (enic->vdev, addr);
drivers/net/enic/enic_res.h +0 -1
@@ -131,7 +131,6 @@ static inline void enic_queue_rq_desc(struct vnic_rq *rq,struct enic ;int enic_get_vnic_config (struct enic *); -void enic_add_station_addr (struct enic *enic);void enic_add_multicast_addr (struct enic *enic,u8 *addr);void enic_del_multicast_addr (struct enic *enic,u8 *addr);void enic_add_vlan (struct enic *enic,u16 vlanid);
drivers/net/enic/vnic_dev.c +56 -2
84 lines not on this page · raw message
drivers/net/enic/vnic_dev.h +5 -2
@@ -103,8 +103,8 @@ int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats);int vnic_dev_hang_notify (struct vnic_dev *vdev);void vnic_dev_packet_filter (struct vnic_dev *vdev,int directed,int multicast,int broadcast,int promisc,int allmulti); -void vnic_dev_add_addr (struct vnic_dev *vdev,u8 *addr); -void vnic_dev_del_addr (struct vnic_dev *vdev,u8 *addr); +int vnic_dev_add_addr (struct vnic_dev *vdev,u8 *addr); +int vnic_dev_del_addr (struct vnic_dev *vdev,u8 *addr);int vnic_dev_mac_addr (struct vnic_dev *vdev,u8 *mac_addr);int vnic_dev_raise_intr (struct vnic_dev *vdev,u16 intr); int vnic_dev_notify_setcmd(struct vnic_dev *vdev,
@@ -124,6 +124,9 @@ int vnic_dev_disable(struct vnic_dev *vdev);int vnic_dev_open (struct vnic_dev *vdev,int arg);int vnic_dev_open_done (struct vnic_dev *vdev,int *done);int vnic_dev_init (struct vnic_dev *vdev,int arg); +int vnic_dev_init_done (struct vnic_dev *vdev,int *done,int *err); +int vnic_dev_init_prov (struct vnic_dev *vdev,u8 *buf,u32 len); +int vnic_dev_deinit (struct vnic_dev *vdev);int vnic_dev_soft_reset (struct vnic_dev *vdev,int arg);int vnic_dev_soft_reset_done (struct vnic_dev *vdev,int *done); void vnic_dev_set_intr_mode(struct vnic_dev *vdev,
drivers/net/enic/vnic_vic.c new file +73 -0
73 lines not on this page · raw message
drivers/net/enic/vnic_vic.h new file +59 -0
59 lines not on this page · raw message