| Message ID | 1298581410.8877.21.camel@lb-tlvb-shmulik.il.broadcom.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, 2011-02-24 at 23:03 +0200, Shmulik Ravid wrote: > These 2 patches add the support for retrieving the remote or peer DCBX > configuration via dcbnl for embedded DCBX stacks. The peer configuration > is part of the DCBX MIB and is useful for debugging and diagnostics of > the overall DCB configuration. The first patch add this support for IEEE > 802.1Qaz standard the second patch add the same support for the older > CEE standard. > > Signed-off-by: Shmulik Ravid <shmulikr@broadcom.com> > --- > include/linux/dcbnl.h | 38 ++++++++++++++++++++++++++ > include/net/dcbnl.h | 5 +++ > net/dcb/dcbnl.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 114 insertions(+), 0 deletions(-) > > diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h > index 4c5b26e..3102185 100644 > --- a/include/linux/dcbnl.h > +++ b/include/linux/dcbnl.h > @@ -110,6 +110,22 @@ struct dcb_app { > __u16 protocol; > }; > > +/* This structure contains the APP feature information sent by the peer. > + * It is used for both the IEEE 802.1Qaz and the CEE flavors. > + * > + * @willing: willing bit in the peer APP tlv > + * @error: error bit in the peer APP tlv > + * @app_count: The number of objects in the peer APP table. [...] It looks like this was supposed to be a kernel-doc comment, but it's not valid as such unless you start with: /** * struct dcb_peer_app_info - one-line description here Ben.
On 2/24/2011 1:03 PM, Shmulik Ravid wrote: > These 2 patches add the support for retrieving the remote or peer DCBX > configuration via dcbnl for embedded DCBX stacks. The peer configuration > is part of the DCBX MIB and is useful for debugging and diagnostics of > the overall DCB configuration. The first patch add this support for IEEE > 802.1Qaz standard the second patch add the same support for the older > CEE standard. > > Signed-off-by: Shmulik Ravid <shmulikr@broadcom.com> > --- > include/linux/dcbnl.h | 38 ++++++++++++++++++++++++++ > include/net/dcbnl.h | 5 +++ > net/dcb/dcbnl.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 114 insertions(+), 0 deletions(-) > > diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h > index 4c5b26e..3102185 100644 > --- a/include/linux/dcbnl.h > +++ b/include/linux/dcbnl.h > @@ -110,6 +110,22 @@ struct dcb_app { > __u16 protocol; > }; > > +/* This structure contains the APP feature information sent by the peer. > + * It is used for both the IEEE 802.1Qaz and the CEE flavors. > + * > + * @willing: willing bit in the peer APP tlv > + * @error: error bit in the peer APP tlv > + * @app_count: The number of objects in the peer APP table. > + * > + * In addition to this information the full peer APP tlv also contains > + * a table of 'app_count' APP objects defined above. > + */ > +struct dcb_peer_app_info { > + __u8 willing; > + __u8 error; > + __u16 app_count; > +}; > + The IEEE 802.1Qaz spec defines the APP TLV as informational so there are no willing or error bits in this case. See section D.2.12 of the 802.1Qaz draft. Can we drop these fields or do they have some other meaning here? Thanks, John. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> -----Original Message----- > From: John Fastabend [mailto:john.r.fastabend@intel.com] > Sent: Thursday, February 24, 2011 10:37 PM > To: Shmulik Ravid - Rabinovitz > Cc: davem@davemloft.net; Eilon Greenstein; netdev@vger.kernel.org > Subject: Re: [PATCH net-next-2.6 1/2] dcbnl: add support for retrieving > peer configuration - ieee > > On 2/24/2011 1:03 PM, Shmulik Ravid wrote: > > These 2 patches add the support for retrieving the remote or peer > DCBX > > configuration via dcbnl for embedded DCBX stacks. The peer > configuration > > is part of the DCBX MIB and is useful for debugging and diagnostics > of > > the overall DCB configuration. The first patch add this support for > IEEE > > 802.1Qaz standard the second patch add the same support for the older > > CEE standard. > > > > Signed-off-by: Shmulik Ravid <shmulikr@broadcom.com> > > --- > > include/linux/dcbnl.h | 38 ++++++++++++++++++++++++++ > > include/net/dcbnl.h | 5 +++ > > net/dcb/dcbnl.c | 71 > +++++++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 114 insertions(+), 0 deletions(-) > > > > diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h > > index 4c5b26e..3102185 100644 > > --- a/include/linux/dcbnl.h > > +++ b/include/linux/dcbnl.h > > @@ -110,6 +110,22 @@ struct dcb_app { > > __u16 protocol; > > }; > > > > +/* This structure contains the APP feature information sent by the > peer. > > + * It is used for both the IEEE 802.1Qaz and the CEE flavors. > > + * > > + * @willing: willing bit in the peer APP tlv > > + * @error: error bit in the peer APP tlv > > + * @app_count: The number of objects in the peer APP table. > > + * > > + * In addition to this information the full peer APP tlv also > contains > > + * a table of 'app_count' APP objects defined above. > > + */ > > +struct dcb_peer_app_info { > > + __u8 willing; > > + __u8 error; > > + __u16 app_count; > > +}; > > + > > The IEEE 802.1Qaz spec defines the APP TLV as informational > so there are no willing or error bits in this case. See > section D.2.12 of the 802.1Qaz draft. > > Can we drop these fields or do they have some other meaning > here? > OK, They are part of the CEE APP tlv though. I wanted to share this structure between the 802.1Qaz and CEE so I'll have a single driver handler that retrieve the number of peer apps. How about if we keep a single driver handler, but the APP info will be exposed to the user only with the CEE flavor. That is the PEER_APP attribute will be CEE specific ? Shmulik -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> -----Original Message----- > From: Ben Hutchings [mailto:bhutchings@solarflare.com] > Sent: Thursday, February 24, 2011 9:43 PM > To: Shmulik Ravid - Rabinovitz > Cc: davem@davemloft.net; John Fastabend; Eilon Greenstein; > netdev@vger.kernel.org > Subject: Re: [PATCH net-next-2.6 1/2] dcbnl: add support for retrieving > peer configuration - ieee > > On Thu, 2011-02-24 at 23:03 +0200, Shmulik Ravid wrote: > > These 2 patches add the support for retrieving the remote or peer > DCBX > > configuration via dcbnl for embedded DCBX stacks. The peer > configuration > > is part of the DCBX MIB and is useful for debugging and diagnostics > of > > the overall DCB configuration. The first patch add this support for > IEEE > > 802.1Qaz standard the second patch add the same support for the older > > CEE standard. > > > > Signed-off-by: Shmulik Ravid <shmulikr@broadcom.com> > > --- > > include/linux/dcbnl.h | 38 ++++++++++++++++++++++++++ > > include/net/dcbnl.h | 5 +++ > > net/dcb/dcbnl.c | 71 > +++++++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 114 insertions(+), 0 deletions(-) > > > > diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h > > index 4c5b26e..3102185 100644 > > --- a/include/linux/dcbnl.h > > +++ b/include/linux/dcbnl.h > > @@ -110,6 +110,22 @@ struct dcb_app { > > __u16 protocol; > > }; > > > > +/* This structure contains the APP feature information sent by the > peer. > > + * It is used for both the IEEE 802.1Qaz and the CEE flavors. > > + * > > + * @willing: willing bit in the peer APP tlv > > + * @error: error bit in the peer APP tlv > > + * @app_count: The number of objects in the peer APP table. > [...] > > It looks like this was supposed to be a kernel-doc comment, but it's > not > valid as such unless you start with: > > /** > * struct dcb_peer_app_info - one-line description here > > Ben. > OK thanks, I'll fix this Shmulik
On 2/24/2011 2:03 PM, Shmulik Ravid - Rabinovitz wrote: >> -----Original Message----- >> From: John Fastabend [mailto:john.r.fastabend@intel.com] >> Sent: Thursday, February 24, 2011 10:37 PM >> To: Shmulik Ravid - Rabinovitz >> Cc: davem@davemloft.net; Eilon Greenstein; netdev@vger.kernel.org >> Subject: Re: [PATCH net-next-2.6 1/2] dcbnl: add support for retrieving >> peer configuration - ieee >> >> On 2/24/2011 1:03 PM, Shmulik Ravid wrote: >>> These 2 patches add the support for retrieving the remote or peer >> DCBX >>> configuration via dcbnl for embedded DCBX stacks. The peer >> configuration >>> is part of the DCBX MIB and is useful for debugging and diagnostics >> of >>> the overall DCB configuration. The first patch add this support for >> IEEE >>> 802.1Qaz standard the second patch add the same support for the older >>> CEE standard. >>> >>> Signed-off-by: Shmulik Ravid <shmulikr@broadcom.com> >>> --- >>> include/linux/dcbnl.h | 38 ++++++++++++++++++++++++++ >>> include/net/dcbnl.h | 5 +++ >>> net/dcb/dcbnl.c | 71 >> +++++++++++++++++++++++++++++++++++++++++++++++++ >>> 3 files changed, 114 insertions(+), 0 deletions(-) >>> >>> diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h >>> index 4c5b26e..3102185 100644 >>> --- a/include/linux/dcbnl.h >>> +++ b/include/linux/dcbnl.h >>> @@ -110,6 +110,22 @@ struct dcb_app { >>> __u16 protocol; >>> }; >>> >>> +/* This structure contains the APP feature information sent by the >> peer. >>> + * It is used for both the IEEE 802.1Qaz and the CEE flavors. >>> + * >>> + * @willing: willing bit in the peer APP tlv >>> + * @error: error bit in the peer APP tlv >>> + * @app_count: The number of objects in the peer APP table. >>> + * >>> + * In addition to this information the full peer APP tlv also >> contains >>> + * a table of 'app_count' APP objects defined above. >>> + */ >>> +struct dcb_peer_app_info { >>> + __u8 willing; >>> + __u8 error; >>> + __u16 app_count; >>> +}; >>> + >> >> The IEEE 802.1Qaz spec defines the APP TLV as informational >> so there are no willing or error bits in this case. See >> section D.2.12 of the 802.1Qaz draft. >> >> Can we drop these fields or do they have some other meaning >> here? >> > OK, They are part of the CEE APP tlv though. > I wanted to share this structure between the 802.1Qaz and CEE so > I'll have a single driver handler that retrieve the number of > peer apps. How about if we keep a single driver handler, but the > APP info will be exposed to the user only with the CEE flavor. > That is the PEER_APP attribute will be CEE specific ? > > Shmulik > That seems fine to me. Either don't expose the struct as you suggested or zero the fields while in IEEE mode. John. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> -----Original Message----- > From: John Fastabend [mailto:john.r.fastabend@intel.com] > Sent: Friday, February 25, 2011 6:58 AM > To: Shmulik Ravid - Rabinovitz > Cc: davem@davemloft.net; Eilon Greenstein; netdev@vger.kernel.org > Subject: Re: [PATCH net-next-2.6 1/2] dcbnl: add support for retrieving > peer configuration - ieee > > On 2/24/2011 2:03 PM, Shmulik Ravid - Rabinovitz wrote: > >> -----Original Message----- > >> From: John Fastabend [mailto:john.r.fastabend@intel.com] > >> Sent: Thursday, February 24, 2011 10:37 PM > >> To: Shmulik Ravid - Rabinovitz > >> Cc: davem@davemloft.net; Eilon Greenstein; netdev@vger.kernel.org > >> Subject: Re: [PATCH net-next-2.6 1/2] dcbnl: add support for > retrieving > >> peer configuration - ieee > >> > >> On 2/24/2011 1:03 PM, Shmulik Ravid wrote: > >>> These 2 patches add the support for retrieving the remote or peer > >> DCBX > >>> configuration via dcbnl for embedded DCBX stacks. The peer > >> configuration > >>> is part of the DCBX MIB and is useful for debugging and diagnostics > >> of > >>> the overall DCB configuration. The first patch add this support for > >> IEEE > >>> 802.1Qaz standard the second patch add the same support for the > older > >>> CEE standard. > >>> > >>> Signed-off-by: Shmulik Ravid <shmulikr@broadcom.com> > >>> --- > >>> include/linux/dcbnl.h | 38 ++++++++++++++++++++++++++ > >>> include/net/dcbnl.h | 5 +++ > >>> net/dcb/dcbnl.c | 71 > >> +++++++++++++++++++++++++++++++++++++++++++++++++ > >>> 3 files changed, 114 insertions(+), 0 deletions(-) > >>> > >>> diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h > >>> index 4c5b26e..3102185 100644 > >>> --- a/include/linux/dcbnl.h > >>> +++ b/include/linux/dcbnl.h > >>> @@ -110,6 +110,22 @@ struct dcb_app { > >>> __u16 protocol; > >>> }; > >>> > >>> +/* This structure contains the APP feature information sent by the > >> peer. > >>> + * It is used for both the IEEE 802.1Qaz and the CEE flavors. > >>> + * > >>> + * @willing: willing bit in the peer APP tlv > >>> + * @error: error bit in the peer APP tlv > >>> + * @app_count: The number of objects in the peer APP table. > >>> + * > >>> + * In addition to this information the full peer APP tlv also > >> contains > >>> + * a table of 'app_count' APP objects defined above. > >>> + */ > >>> +struct dcb_peer_app_info { > >>> + __u8 willing; > >>> + __u8 error; > >>> + __u16 app_count; > >>> +}; > >>> + > >> > >> The IEEE 802.1Qaz spec defines the APP TLV as informational > >> so there are no willing or error bits in this case. See > >> section D.2.12 of the 802.1Qaz draft. > >> > >> Can we drop these fields or do they have some other meaning > >> here? > >> > > OK, They are part of the CEE APP tlv though. > > I wanted to share this structure between the 802.1Qaz and CEE so > > I'll have a single driver handler that retrieve the number of > > peer apps. How about if we keep a single driver handler, but the > > APP info will be exposed to the user only with the CEE flavor. > > That is the PEER_APP attribute will be CEE specific ? > > > > Shmulik > > > > That seems fine to me. Either don't expose the struct as you > suggested or zero the fields while in IEEE mode. I'll repost the patches making the app_info a CEE specific attribute, I'll also eliminate the app_count from the user interface because actually it's superfluous. Shmulik -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h index 4c5b26e..3102185 100644 --- a/include/linux/dcbnl.h +++ b/include/linux/dcbnl.h @@ -110,6 +110,22 @@ struct dcb_app { __u16 protocol; }; +/* This structure contains the APP feature information sent by the peer. + * It is used for both the IEEE 802.1Qaz and the CEE flavors. + * + * @willing: willing bit in the peer APP tlv + * @error: error bit in the peer APP tlv + * @app_count: The number of objects in the peer APP table. + * + * In addition to this information the full peer APP tlv also contains + * a table of 'app_count' APP objects defined above. + */ +struct dcb_peer_app_info { + __u8 willing; + __u8 error; + __u16 app_count; +}; + struct dcbmsg { __u8 dcb_family; __u8 cmd; @@ -235,11 +251,25 @@ enum dcbnl_attrs { DCB_ATTR_MAX = __DCB_ATTR_ENUM_MAX - 1, }; +/** + * enum ieee_attrs - IEEE 802.1Qaz get/set attributes + * + * @DCB_ATTR_IEEE_UNSPEC: unspecified + * @DCB_ATTR_IEEE_ETS: negotiated ETS configuration + * @DCB_ATTR_IEEE_PFC: negotiated PFC configuration + * @DCB_ATTR_IEEE_APP_TABLE: negotiated APP configuration + * @DCB_ATTR_IEEE_PEER_ETS: peer ETS configuration - get only + * @DCB_ATTR_IEEE_PEER_PFC: peer PFC configuration - get only + * @DCB_ATTR_IEEE_PEER_APP: peer APP tlv - get only + */ enum ieee_attrs { DCB_ATTR_IEEE_UNSPEC, DCB_ATTR_IEEE_ETS, DCB_ATTR_IEEE_PFC, DCB_ATTR_IEEE_APP_TABLE, + DCB_ATTR_IEEE_PEER_ETS, + DCB_ATTR_IEEE_PEER_PFC, + DCB_ATTR_IEEE_PEER_APP, __DCB_ATTR_IEEE_MAX }; #define DCB_ATTR_IEEE_MAX (__DCB_ATTR_IEEE_MAX - 1) @@ -251,6 +281,14 @@ enum ieee_attrs_app { }; #define DCB_ATTR_IEEE_APP_MAX (__DCB_ATTR_IEEE_APP_MAX - 1) +enum peer_app_attr { + DCB_ATTR_PEER_APP_UNSPEC, + DCB_ATTR_PEER_APP_INFO, + DCB_ATTR_PEER_APP, + __DCB_ATTR_PEER_APP_MAX +}; +#define DCB_ATTR_PEER_APP_MAX (__DCB_ATTR_PEER_APP_MAX - 1) + /** * enum dcbnl_pfc_attrs - DCB Priority Flow Control user priority nested attrs * diff --git a/include/net/dcbnl.h b/include/net/dcbnl.h index a8e7852..739feb4 100644 --- a/include/net/dcbnl.h +++ b/include/net/dcbnl.h @@ -43,6 +43,8 @@ struct dcbnl_rtnl_ops { int (*ieee_setpfc) (struct net_device *, struct ieee_pfc *); int (*ieee_getapp) (struct net_device *, struct dcb_app *); int (*ieee_setapp) (struct net_device *, struct dcb_app *); + int (*ieee_peer_getets) (struct net_device *, struct ieee_ets *); + int (*ieee_peer_getpfc) (struct net_device *, struct ieee_pfc *); /* CEE std */ u8 (*getstate)(struct net_device *); @@ -77,6 +79,9 @@ struct dcbnl_rtnl_ops { u8 (*getdcbx)(struct net_device *); u8 (*setdcbx)(struct net_device *, u8); + /* peer apps */ + int (*peer_getappinfo)(struct net_device *, struct dcb_peer_app_info *); + int (*peer_getapptable)(struct net_device *, struct dcb_app *); }; diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c index d5074a5..0eb7461 100644 --- a/net/dcb/dcbnl.c +++ b/net/dcb/dcbnl.c @@ -1224,6 +1224,56 @@ err: return err; } +static int dcbnl_build_peer_app(struct net_device *netdev, struct sk_buff* skb, + int attrtype) +{ + struct dcb_peer_app_info info; + struct dcb_app *table = NULL; + const struct dcbnl_rtnl_ops *ops = netdev->dcbnl_ops; + int err; + + /** + * retrieve the peer app configuration form the driver. If the driver + * handlers fail exit without doing anything + */ + err = ops->peer_getappinfo(netdev, &info); + if (!err && info.app_count) { + table = kmalloc(sizeof(struct dcb_app) * info.app_count, + GFP_KERNEL); + if (!table) + return -ENOMEM; + + err = ops->peer_getapptable(netdev, table); + } + + if (!err) { + u16 i; + struct nlattr *app; + + /** + * build the message, from here on the only possible failure + * is due to the skb size + */ + err = -EMSGSIZE; + + app = nla_nest_start(skb, attrtype); + if (!app) + goto nla_put_failure; + + NLA_PUT(skb, DCB_ATTR_PEER_APP_INFO, sizeof(info), &info); + + for (i = 0; i < info.app_count; i++) + NLA_PUT(skb, DCB_ATTR_PEER_APP, sizeof(struct dcb_app), + &table[i]); + + nla_nest_end(skb, app); + } + err = 0; + +nla_put_failure: + kfree(table); + return err; +} /* Handle IEEE 802.1Qaz GET commands. */ static int dcbnl_ieee_get(struct net_device *netdev, struct nlattr **tb, @@ -1288,6 +1338,27 @@ static int dcbnl_ieee_get(struct net_device *netdev, struct nlattr **tb, spin_unlock(&dcb_lock); nla_nest_end(skb, app); + /* get peer info if available */ + if (ops->ieee_peer_getets) { + struct ieee_ets ets; + err = ops->ieee_peer_getets(netdev, &ets); + if (!err) + NLA_PUT(skb, DCB_ATTR_IEEE_PEER_ETS, sizeof(ets), &ets); + } + + if (ops->ieee_peer_getpfc) { + struct ieee_pfc pfc; + err = ops->ieee_peer_getpfc(netdev, &pfc); + if (!err) + NLA_PUT(skb, DCB_ATTR_IEEE_PEER_PFC, sizeof(pfc), &pfc); + } + + if (ops->peer_getappinfo && ops->peer_getapptable) { + err = dcbnl_build_peer_app(netdev, skb, DCB_ATTR_IEEE_PEER_APP); + if (err) + goto nla_put_failure; + } + nla_nest_end(skb, ieee); nlmsg_end(skb, nlh);
These 2 patches add the support for retrieving the remote or peer DCBX configuration via dcbnl for embedded DCBX stacks. The peer configuration is part of the DCBX MIB and is useful for debugging and diagnostics of the overall DCB configuration. The first patch add this support for IEEE 802.1Qaz standard the second patch add the same support for the older CEE standard. Signed-off-by: Shmulik Ravid <shmulikr@broadcom.com> --- include/linux/dcbnl.h | 38 ++++++++++++++++++++++++++ include/net/dcbnl.h | 5 +++ net/dcb/dcbnl.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 0 deletions(-)