[dpdk-dev] kni: fix compilation issue on kernel 3.19
Commit Message
Due to API changes in functions ndo_dflt_bridge_getlink
and igb_ndo_fdb_add in kernel 3.19, DPDK would not build.
This patch solves the problem, by checking the kernel version
and adding the necessary new parameters
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c | 7 +++++++
lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 3 +++
2 files changed, 10 insertions(+), 0 deletions(-)
Comments
Hi Pablo,
2015-03-12 17:24, Pablo de Lara:
> Due to API changes in functions ndo_dflt_bridge_getlink
> and igb_ndo_fdb_add in kernel 3.19, DPDK would not build.
Please provide the Linux commit id for this change.
> This patch solves the problem, by checking the kernel version
> and adding the necessary new parameters
>
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> ---
> lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c | 7 +++++++
> lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 3 +++
> 2 files changed, 10 insertions(+), 0 deletions(-)
>
> diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
> index a802a02..24b147d 100644
> --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
> +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
> @@ -2103,6 +2103,9 @@ static int igb_set_features(struct net_device *netdev,
> static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
> struct net_device *dev,
> const unsigned char *addr,
> +#ifdef HAVE_NDO_FDB_ADD_VID
> + u16 vid,
> +#endif
> u16 flags)
> #else
You should explain in commit message why the change is not needed in #else
(!USE_CONST_DEV_UC_CHAR for version < 3.7).
> static int igb_ndo_fdb_add(struct ndmsg *ndm,
> @@ -2259,7 +2262,11 @@ static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
> else
> mode = BRIDGE_MODE_VEPA;
>
> +#ifdef HAVE_NDO_FDB_ADD_VID
> + return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0);
> +#else
> return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode);
> +#endif /* HAVE_NDO_FDB_ADD_VID */
> }
> #endif /* HAVE_BRIDGE_ATTRIBS */
> #endif /* NTF_SELF */
> diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> index 1213cc6..5c799e9 100644
> --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> @@ -3881,4 +3881,7 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
> #define HAVE_VF_MIN_MAX_TXRATE 1
> #endif /* >= 3.16.0 */
>
> +#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) )
> +#define HAVE_NDO_FDB_ADD_VID
> +#endif /* >= 3.19.0 */
> #endif /* _KCOMPAT_H_ */
A blank line is missing here.
Are you sure there is no macro defined in the Linux changes which could be
checked instead of version number? I dislike version checks because of
backport problems.
Hi Thomas,
> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> Sent: Friday, March 20, 2015 9:23 PM
> To: De Lara Guarch, Pablo
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] kni: fix compilation issue on kernel 3.19
>
> Hi Pablo,
>
> 2015-03-12 17:24, Pablo de Lara:
> > Due to API changes in functions ndo_dflt_bridge_getlink
> > and igb_ndo_fdb_add in kernel 3.19, DPDK would not build.
>
> Please provide the Linux commit id for this change.
>
> > This patch solves the problem, by checking the kernel version
> > and adding the necessary new parameters
> >
> > Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> > ---
> > lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c | 7 +++++++
> > lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 3 +++
> > 2 files changed, 10 insertions(+), 0 deletions(-)
> >
> > diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
> b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
> > index a802a02..24b147d 100644
> > --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
> > +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
> > @@ -2103,6 +2103,9 @@ static int igb_set_features(struct net_device
> *netdev,
> > static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
> > struct net_device *dev,
> > const unsigned char *addr,
> > +#ifdef HAVE_NDO_FDB_ADD_VID
> > + u16 vid,
> > +#endif
> > u16 flags)
> > #else
>
> You should explain in commit message why the change is not needed in
> #else
> (!USE_CONST_DEV_UC_CHAR for version < 3.7).
>
> > static int igb_ndo_fdb_add(struct ndmsg *ndm,
> > @@ -2259,7 +2262,11 @@ static int igb_ndo_bridge_getlink(struct sk_buff
> *skb, u32 pid, u32 seq,
> > else
> > mode = BRIDGE_MODE_VEPA;
> >
> > +#ifdef HAVE_NDO_FDB_ADD_VID
> > + return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0);
> > +#else
> > return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode);
> > +#endif /* HAVE_NDO_FDB_ADD_VID */
> > }
> > #endif /* HAVE_BRIDGE_ATTRIBS */
> > #endif /* NTF_SELF */
> > diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> > index 1213cc6..5c799e9 100644
> > --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> > +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> > @@ -3881,4 +3881,7 @@ skb_set_hash(struct sk_buff *skb, __u32 hash,
> __always_unused int type)
> > #define HAVE_VF_MIN_MAX_TXRATE 1
> > #endif /* >= 3.16.0 */
> >
> > +#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) )
> > +#define HAVE_NDO_FDB_ADD_VID
> > +#endif /* >= 3.19.0 */
> > #endif /* _KCOMPAT_H_ */
>
> A blank line is missing here.
> Are you sure there is no macro defined in the Linux changes which could be
> checked instead of version number? I dislike version checks because of
> backport problems.
I am not aware of such macro in the kernel, unfortunately.
I just sent a v2.
Thanks,
Pablo
@@ -2103,6 +2103,9 @@ static int igb_set_features(struct net_device *netdev,
static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
struct net_device *dev,
const unsigned char *addr,
+#ifdef HAVE_NDO_FDB_ADD_VID
+ u16 vid,
+#endif
u16 flags)
#else
static int igb_ndo_fdb_add(struct ndmsg *ndm,
@@ -2259,7 +2262,11 @@ static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
else
mode = BRIDGE_MODE_VEPA;
+#ifdef HAVE_NDO_FDB_ADD_VID
+ return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0);
+#else
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode);
+#endif /* HAVE_NDO_FDB_ADD_VID */
}
#endif /* HAVE_BRIDGE_ATTRIBS */
#endif /* NTF_SELF */
@@ -3881,4 +3881,7 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
#define HAVE_VF_MIN_MAX_TXRATE 1
#endif /* >= 3.16.0 */
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) )
+#define HAVE_NDO_FDB_ADD_VID
+#endif /* >= 3.19.0 */
#endif /* _KCOMPAT_H_ */