[dpdk-dev] [PATCH] kni: compatibility with RHEL 7

DPDK patches and discussions
 help / color / mirror / Atom feed

* [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
@ 2014-06-12  8:09 Hiroshi Shimamoto
  2014-06-12  9:18 ` Cao, Waterman
  2014-07-01 22:03 ` Thomas Monjalon
  0 siblings, 2 replies; 12+ messages in thread
From: Hiroshi Shimamoto @ 2014-06-12  8:09 UTC (permalink / raw)
  To: dev; +Cc: Hayato Momma

From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>

Compilation in RHEL7 is failed. This fixes the build issue.

RHEL7 has skb_set_hash, the kernel version is 3.10 though.
Don't define skb_set_hash for RHEL7.

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Reviewed-by: Hayato Momma <h-momma@ce.jp.nec.com>
---
 lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
index 4c27d5d..b4de6e2 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
@@ -3843,6 +3843,9 @@ static inline struct sk_buff *__kc__vlan_hwaccel_put_tag(struct sk_buff *skb,
 #endif /* >= 3.10.0 */
 
 #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
+
+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7,0)))
+
 #ifdef NETIF_F_RXHASH
 #define PKT_HASH_TYPE_L3 0
 static inline void
@@ -3851,6 +3854,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
 	skb->rxhash = hash;
 }
 #endif /* NETIF_F_RXHASH */
+#endif /* < RHEL7 */
+
 #endif /* < 3.14.0 */
 
 #endif /* _KCOMPAT_H_ */
-- 
1.9.1

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
  2014-06-12  8:09 [dpdk-dev] [PATCH] kni: compatibility with RHEL 7 Hiroshi Shimamoto
@ 2014-06-12  9:18 ` Cao, Waterman
  2014-06-12  9:35   ` Hiroshi Shimamoto
  2014-07-01 22:03 ` Thomas Monjalon
  1 sibling, 1 reply; 12+ messages in thread
From: Cao, Waterman @ 2014-06-12  9:18 UTC (permalink / raw)
  To: Hiroshi Shimamoto, dev; +Cc: Hayato Momma

Hi Shimamoto,

  Can you give details about Linux Kernel version and complier version?
  Because we tried to build code in the Redhat 7.0 before, but we don't meet this issue.
  Please see information as the following:
  Linux kernel 3.10.0-54.0.1.el7.x86_64
  RHEL70BETA_64	GCC 4.8.2  ICC: 14.0.0

Thanks

Waterman 
 
-----Original Message-----
>From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Hiroshi Shimamoto
>Sent: Thursday, June 12, 2014 4:10 PM
>To: dev@dpdk.org
>Cc: Hayato Momma
>Subject: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
>
>From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
>
>Compilation in RHEL7 is failed. This fixes the build issue.
>
>RHEL7 has skb_set_hash, the kernel version is 3.10 though.
>Don't define skb_set_hash for RHEL7.
>
>Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
>Reviewed-by: Hayato Momma <h-momma@ce.jp.nec.com>
>---
> lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>index 4c27d5d..b4de6e2 100644
>--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>@@ -3843,6 +3843,9 @@ static inline struct sk_buff *__kc__vlan_hwaccel_put_tag(struct sk_buff *skb,  #endif /* >= 3.10.0 */
> 
> #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
>+
>+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 
>+RHEL_RELEASE_VERSION(7,0)))
>+
> #ifdef NETIF_F_RXHASH
> #define PKT_HASH_TYPE_L3 0
> static inline void
>@@ -3851,6 +3854,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
> 	skb->rxhash = hash;
> }
> #endif /* NETIF_F_RXHASH */
>+#endif /* < RHEL7 */
>+
> #endif /* < 3.14.0 */
> 
> #endif /* _KCOMPAT_H_ */
>--
>1.9.1
>

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
  2014-06-12  9:18 ` Cao, Waterman
@ 2014-06-12  9:35   ` Hiroshi Shimamoto
  2014-06-25 10:05     ` Thomas Monjalon
  0 siblings, 1 reply; 12+ messages in thread
From: Hiroshi Shimamoto @ 2014-06-12  9:35 UTC (permalink / raw)
  To: Cao, Waterman, dev; +Cc: Hayato Momma

Hi,

> Subject: RE: [PATCH] kni: compatibility with RHEL 7
> 
> Hi Shimamoto,
> 
>   Can you give details about Linux Kernel version and complier version?
>   Because we tried to build code in the Redhat 7.0 before, but we don't meet this issue.
>   Please see information as the following:
>   Linux kernel 3.10.0-54.0.1.el7.x86_64
>   RHEL70BETA_64	GCC 4.8.2  ICC: 14.0.0

Yes,

Linux REHEL7RC-1 3.10.0-121.el7.x86_64 #1 SMP Tue Apr 8 10:48:19 EDT 2014 x86_64 x86_64 x86_64 GNU/Linux
gcc version 4.8.2 20140120 (Red Hat 4.8.2-16) (GCC)

I got the below error;
/path/to/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3851:1: error: conflicting types for ‘skb_set_hash’
 skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)

/usr/src/kernels/3.10.0-121.el7.x86_64/include/linux/skbuff.h:762:1: note: previous definition of ‘skb_set_hash’ was here
 skb_set_hash(struct sk_buff *skb, __u32 hash, enum pkt_hash_types type)


thanks,
Hiroshi

> 
> Thanks
> 
> Waterman
> 
> -----Original Message-----
> >From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Hiroshi Shimamoto
> >Sent: Thursday, June 12, 2014 4:10 PM
> >To: dev@dpdk.org
> >Cc: Hayato Momma
> >Subject: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
> >
> >From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
> >
> >Compilation in RHEL7 is failed. This fixes the build issue.
> >
> >RHEL7 has skb_set_hash, the kernel version is 3.10 though.
> >Don't define skb_set_hash for RHEL7.
> >
> >Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
> >Reviewed-by: Hayato Momma <h-momma@ce.jp.nec.com>
> >---
> > lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 5 +++++
> > 1 file changed, 5 insertions(+)
> >
> >diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> >index 4c27d5d..b4de6e2 100644
> >--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> >+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> >@@ -3843,6 +3843,9 @@ static inline struct sk_buff *__kc__vlan_hwaccel_put_tag(struct sk_buff *skb,  #endif /* >= 3.10.0
> */
> >
> > #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
> >+
> >+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >=
> >+RHEL_RELEASE_VERSION(7,0)))
> >+
> > #ifdef NETIF_F_RXHASH
> > #define PKT_HASH_TYPE_L3 0
> > static inline void
> >@@ -3851,6 +3854,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
> > 	skb->rxhash = hash;
> > }
> > #endif /* NETIF_F_RXHASH */
> >+#endif /* < RHEL7 */
> >+
> > #endif /* < 3.14.0 */
> >
> > #endif /* _KCOMPAT_H_ */
> >--
> >1.9.1
> >

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
  2014-06-12  9:35   ` Hiroshi Shimamoto
@ 2014-06-25 10:05     ` Thomas Monjalon
  2014-06-25 13:39       ` Cao, Waterman
                         ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Thomas Monjalon @ 2014-06-25 10:05 UTC (permalink / raw)
  To: Cao, Waterman; +Cc: dev, Hayato Momma

Hi Waterman,

2014-06-12 09:35, Hiroshi Shimamoto:
> 2014-06-12 09:18, Cao, Waterman:
> >   Can you give details about Linux Kernel version and complier version?
> >   Because we tried to build code in the Redhat 7.0 before, but we don't
> >   meet this issue. Please see information as the following:
> >   Linux kernel 3.10.0-54.0.1.el7.x86_64
> >   RHEL70BETA_64	GCC 4.8.2  ICC: 14.0.0
> 
> Yes,
> 
> Linux REHEL7RC-1 3.10.0-121.el7.x86_64 #1 SMP Tue Apr 8 10:48:19 EDT 2014
> x86_64 x86_64 x86_64 GNU/Linux gcc version 4.8.2 20140120 (Red Hat
> 4.8.2-16) (GCC)
> 
> I got the below error;
> /path/to/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3851:1: error:
> conflicting types for ‘skb_set_hash’ skb_set_hash(struct sk_buff *skb,
> __u32 hash, __always_unused int type)
> 
> /usr/src/kernels/3.10.0-121.el7.x86_64/include/linux/skbuff.h:762:1: note:
> previous definition of ‘skb_set_hash’ was here skb_set_hash(struct sk_buff
> *skb, __u32 hash, enum pkt_hash_types type)

Could you confirm this fix is needed and acknowledge it?
Thanks


> > -----Original Message-----
> > 
> > >From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Hiroshi Shimamoto
> > >Sent: Thursday, June 12, 2014 4:10 PM
> > >To: dev@dpdk.org
> > >Cc: Hayato Momma
> > >Subject: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
> > >
> > >From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
> > >
> > >Compilation in RHEL7 is failed. This fixes the build issue.
> > >
> > >RHEL7 has skb_set_hash, the kernel version is 3.10 though.
> > >Don't define skb_set_hash for RHEL7.
> > >
> > >Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
> > >Reviewed-by: Hayato Momma <h-momma@ce.jp.nec.com>
> > >---
> > >
> > > lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 5 +++++
> > > 1 file changed, 5 insertions(+)
> > >
> > >diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> > >b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index
> > >4c27d5d..b4de6e2 100644
> > >--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> > >+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> > >@@ -3843,6 +3843,9 @@ static inline struct sk_buff
> > >*__kc__vlan_hwaccel_put_tag(struct sk_buff *skb,  #endif /* >= 3.10.0> 
> > */
> > 
> > > #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
> > >
> > >+
> > >+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >=
> > >+RHEL_RELEASE_VERSION(7,0)))
> > >+
> > >
> > > #ifdef NETIF_F_RXHASH
> > > #define PKT_HASH_TYPE_L3 0
> > > static inline void
> > >
> > >@@ -3851,6 +3854,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash,
> > >__always_unused int type)> >
> > > 	skb->rxhash = hash;
> > > 
> > > }
> > > #endif /* NETIF_F_RXHASH */
> > >
> > >+#endif /* < RHEL7 */
> > >+
> > >
> > > #endif /* < 3.14.0 */
> > > 
> > > #endif /* _KCOMPAT_H_ */
> > >
> > >--
> > >1.9.1


-- 
Thomas

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
  2014-06-25 10:05     ` Thomas Monjalon
@ 2014-06-25 13:39       ` Cao, Waterman
  2014-06-26 11:22       ` Cao, Waterman
  2014-06-30  8:36       ` Cao, Waterman
  2 siblings, 0 replies; 12+ messages in thread
From: Cao, Waterman @ 2014-06-25 13:39 UTC (permalink / raw)
  To: Thomas Monjalon; +Cc: dev, Hayato Momma

Hi Thomas,

OK, we will verify this patch tomorrow.

Waterman 
>
>-----Original Message-----
>From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com] 
>Sent: Wednesday, June 25, 2014 6:05 PM
>To: Cao, Waterman
>Cc: dev@dpdk.org; Hiroshi Shimamoto; Hayato Momma
>Subject: Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
>
>Hi Waterman,
>
>2014-06-12 09:35, Hiroshi Shimamoto:
>> 2014-06-12 09:18, Cao, Waterman:
>> >   Can you give details about Linux Kernel version and complier version?
>> >   Because we tried to build code in the Redhat 7.0 before, but we don't
>> >   meet this issue. Please see information as the following:
>> >   Linux kernel 3.10.0-54.0.1.el7.x86_64
>> >   RHEL70BETA_64	GCC 4.8.2  ICC: 14.0.0
>> 
>> Yes,
>> 
>> Linux REHEL7RC-1 3.10.0-121.el7.x86_64 #1 SMP Tue Apr 8 10:48:19 EDT 
>> 2014
>> x86_64 x86_64 x86_64 GNU/Linux gcc version 4.8.2 20140120 (Red Hat
>> 4.8.2-16) (GCC)
>> 
>> I got the below error;
>> /path/to/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3851:1: error:
>> conflicting types for ‘skb_set_hash’ skb_set_hash(struct sk_buff *skb,
>> __u32 hash, __always_unused int type)
>> 
>> /usr/src/kernels/3.10.0-121.el7.x86_64/include/linux/skbuff.h:762:1: note:
>> previous definition of ‘skb_set_hash’ was here skb_set_hash(struct 
>> sk_buff *skb, __u32 hash, enum pkt_hash_types type)
>
>Could you confirm this fix is needed and acknowledge it?
>Thanks
>
>
>> > -----Original Message-----
>> > 
>> > >From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Hiroshi 
>> > >Shimamoto
>> > >Sent: Thursday, June 12, 2014 4:10 PM
>> > >To: dev@dpdk.org
>> > >Cc: Hayato Momma
>> > >Subject: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
>> > >
>> > >From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
>> > >
>> > >Compilation in RHEL7 is failed. This fixes the build issue.
>> > >
>> > >RHEL7 has skb_set_hash, the kernel version is 3.10 though.
>> > >Don't define skb_set_hash for RHEL7.
>> > >
>> > >Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
>> > >Reviewed-by: Hayato Momma <h-momma@ce.jp.nec.com>
>> > >---
>> > >
>> > > lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 5 +++++
>> > > 1 file changed, 5 insertions(+)
>> > >
>> > >diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> > >b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index
>> > >4c27d5d..b4de6e2 100644
>> > >--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> > >+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> > >@@ -3843,6 +3843,9 @@ static inline struct sk_buff 
>> > >*__kc__vlan_hwaccel_put_tag(struct sk_buff *skb,  #endif /* >= 
>> > >3.10.0>
>> > */
>> > 
>> > > #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
>> > >
>> > >+
>> > >+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >=
>> > >+RHEL_RELEASE_VERSION(7,0)))
>> > >+
>> > >
>> > > #ifdef NETIF_F_RXHASH
>> > > #define PKT_HASH_TYPE_L3 0
>> > > static inline void
>> > >
>> > >@@ -3851,6 +3854,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, 
>> > >__always_unused int type)> >
>> > > 	skb->rxhash = hash;
>> > > 
>> > > }
>> > > #endif /* NETIF_F_RXHASH */
>> > >
>> > >+#endif /* < RHEL7 */
>> > >+
>> > >
>> > > #endif /* < 3.14.0 */
>> > > 
>> > > #endif /* _KCOMPAT_H_ */
>> > >
>> > >--
>> > >1.9.1
>
>
>--
>Thomas
>

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
  2014-06-25 10:05     ` Thomas Monjalon
  2014-06-25 13:39       ` Cao, Waterman
@ 2014-06-26 11:22       ` Cao, Waterman
  2014-06-26 11:38         ` Hiroshi Shimamoto
  2014-06-30  8:36       ` Cao, Waterman
  2 siblings, 1 reply; 12+ messages in thread
From: Cao, Waterman @ 2014-06-26 11:22 UTC (permalink / raw)
  To: Thomas Monjalon, dev, Hayato Momma, Hiroshi Shimamoto

Hi Hiroshi,

  Helin submitted one patch to fix compilation error in the redhat 6.4 and 6.5.
  Patch title is [dpdk-dev] [PATCH] kni: fix compile errors on Oracle Linux6.4 and RHEL6.5
  With this patch, we don't meet this compilation error in latest RHEL 7.0 
  Can you download latest DPDK code, and try to compile with this patch in RHEL 7.0 again?
  
Thanks
Waterman 
 

>-----Original Message-----
>From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com] 
>Sent: Wednesday, June 25, 2014 6:05 PM
>To: Cao, Waterman
>Cc: dev@dpdk.org; Hiroshi Shimamoto; Hayato Momma
>Subject: Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
>
>Hi Waterman,
>
>2014-06-12 09:35, Hiroshi Shimamoto:
>> 2014-06-12 09:18, Cao, Waterman:
>> >   Can you give details about Linux Kernel version and complier version?
>> >   Because we tried to build code in the Redhat 7.0 before, but we don't
>> >   meet this issue. Please see information as the following:
>> >   Linux kernel 3.10.0-54.0.1.el7.x86_64
>> >   RHEL70BETA_64	GCC 4.8.2  ICC: 14.0.0
>> 
>> Yes,
>> 
>> Linux REHEL7RC-1 3.10.0-121.el7.x86_64 #1 SMP Tue Apr 8 10:48:19 EDT 
>> 2014
>> x86_64 x86_64 x86_64 GNU/Linux gcc version 4.8.2 20140120 (Red Hat
>> 4.8.2-16) (GCC)
>> 
>> I got the below error;
>> /path/to/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3851:1: error:
>> conflicting types for ‘skb_set_hash’ skb_set_hash(struct sk_buff *skb,
>> __u32 hash, __always_unused int type)
>> 
>> /usr/src/kernels/3.10.0-121.el7.x86_64/include/linux/skbuff.h:762:1: note:
>> previous definition of ‘skb_set_hash’ was here skb_set_hash(struct 
>> sk_buff *skb, __u32 hash, enum pkt_hash_types type)
>
>Could you confirm this fix is needed and acknowledge it?
>Thanks
>
>
>> > -----Original Message-----
>> > 
>> > >From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Hiroshi 
>> > >Shimamoto
>> > >Sent: Thursday, June 12, 2014 4:10 PM
>> > >To: dev@dpdk.org
>> > >Cc: Hayato Momma
>> > >Subject: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
>> > >
>> > >From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
>> > >
>> > >Compilation in RHEL7 is failed. This fixes the build issue.
>> > >
>> > >RHEL7 has skb_set_hash, the kernel version is 3.10 though.
>> > >Don't define skb_set_hash for RHEL7.
>> > >
>> > >Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
>> > >Reviewed-by: Hayato Momma <h-momma@ce.jp.nec.com>
>> > >---
>> > >
>> > > lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 5 +++++
>> > > 1 file changed, 5 insertions(+)
>> > >
>> > >diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> > >b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index
>> > >4c27d5d..b4de6e2 100644
>> > >--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> > >+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> > >@@ -3843,6 +3843,9 @@ static inline struct sk_buff 
>> > >*__kc__vlan_hwaccel_put_tag(struct sk_buff *skb,  #endif /* >= 
>> > >3.10.0>
>> > */
>> > 
>> > > #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
>> > >
>> > >+
>> > >+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >=
>> > >+RHEL_RELEASE_VERSION(7,0)))
>> > >+
>> > >
>> > > #ifdef NETIF_F_RXHASH
>> > > #define PKT_HASH_TYPE_L3 0
>> > > static inline void
>> > >
>> > >@@ -3851,6 +3854,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, 
>> > >__always_unused int type)> >
>> > > 	skb->rxhash = hash;
>> > > 
>> > > }
>> > > #endif /* NETIF_F_RXHASH */
>> > >
>> > >+#endif /* < RHEL7 */
>> > >+
>> > >
>> > > #endif /* < 3.14.0 */
>> > > 
>> > > #endif /* _KCOMPAT_H_ */
>> > >
>> > >--
>> > >1.9.1
>
>
>--
>Thomas

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
  2014-06-26 11:22       ` Cao, Waterman
@ 2014-06-26 11:38         ` Hiroshi Shimamoto
  2014-06-30  4:45           ` Hiroshi Shimamoto
  0 siblings, 1 reply; 12+ messages in thread
From: Hiroshi Shimamoto @ 2014-06-26 11:38 UTC (permalink / raw)
  To: Cao, Waterman, Thomas Monjalon, dev, Hayato Momma

Hi,

> Subject: RE: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
> 
> Hi Hiroshi,
> 
>   Helin submitted one patch to fix compilation error in the redhat 6.4 and 6.5.
>   Patch title is [dpdk-dev] [PATCH] kni: fix compile errors on Oracle Linux6.4 and RHEL6.5
>   With this patch, we don't meet this compilation error in latest RHEL 7.0
>   Can you download latest DPDK code, and try to compile with this patch in RHEL 7.0 again?

okay, I will try the latest code.

thanks,
Hiroshi

> 
> Thanks
> Waterman
> 
> 
> >-----Original Message-----
> >From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> >Sent: Wednesday, June 25, 2014 6:05 PM
> >To: Cao, Waterman
> >Cc: dev@dpdk.org; Hiroshi Shimamoto; Hayato Momma
> >Subject: Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
> >
> >Hi Waterman,
> >
> >2014-06-12 09:35, Hiroshi Shimamoto:
> >> 2014-06-12 09:18, Cao, Waterman:
> >> >   Can you give details about Linux Kernel version and complier version?
> >> >   Because we tried to build code in the Redhat 7.0 before, but we don't
> >> >   meet this issue. Please see information as the following:
> >> >   Linux kernel 3.10.0-54.0.1.el7.x86_64
> >> >   RHEL70BETA_64	GCC 4.8.2  ICC: 14.0.0
> >>
> >> Yes,
> >>
> >> Linux REHEL7RC-1 3.10.0-121.el7.x86_64 #1 SMP Tue Apr 8 10:48:19 EDT
> >> 2014
> >> x86_64 x86_64 x86_64 GNU/Linux gcc version 4.8.2 20140120 (Red Hat
> >> 4.8.2-16) (GCC)
> >>
> >> I got the below error;
> >> /path/to/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3851:1: error:
> >> conflicting types for ‘skb_set_hash’ skb_set_hash(struct sk_buff *skb,
> >> __u32 hash, __always_unused int type)
> >>
> >> /usr/src/kernels/3.10.0-121.el7.x86_64/include/linux/skbuff.h:762:1: note:
> >> previous definition of ‘skb_set_hash’ was here skb_set_hash(struct
> >> sk_buff *skb, __u32 hash, enum pkt_hash_types type)
> >
> >Could you confirm this fix is needed and acknowledge it?
> >Thanks
> >
> >
> >> > -----Original Message-----
> >> >
> >> > >From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Hiroshi
> >> > >Shimamoto
> >> > >Sent: Thursday, June 12, 2014 4:10 PM
> >> > >To: dev@dpdk.org
> >> > >Cc: Hayato Momma
> >> > >Subject: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
> >> > >
> >> > >From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
> >> > >
> >> > >Compilation in RHEL7 is failed. This fixes the build issue.
> >> > >
> >> > >RHEL7 has skb_set_hash, the kernel version is 3.10 though.
> >> > >Don't define skb_set_hash for RHEL7.
> >> > >
> >> > >Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
> >> > >Reviewed-by: Hayato Momma <h-momma@ce.jp.nec.com>
> >> > >---
> >> > >
> >> > > lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 5 +++++
> >> > > 1 file changed, 5 insertions(+)
> >> > >
> >> > >diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> >> > >b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index
> >> > >4c27d5d..b4de6e2 100644
> >> > >--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> >> > >+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> >> > >@@ -3843,6 +3843,9 @@ static inline struct sk_buff
> >> > >*__kc__vlan_hwaccel_put_tag(struct sk_buff *skb,  #endif /* >=
> >> > >3.10.0>
> >> > */
> >> >
> >> > > #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
> >> > >
> >> > >+
> >> > >+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >=
> >> > >+RHEL_RELEASE_VERSION(7,0)))
> >> > >+
> >> > >
> >> > > #ifdef NETIF_F_RXHASH
> >> > > #define PKT_HASH_TYPE_L3 0
> >> > > static inline void
> >> > >
> >> > >@@ -3851,6 +3854,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash,
> >> > >__always_unused int type)> >
> >> > > 	skb->rxhash = hash;
> >> > >
> >> > > }
> >> > > #endif /* NETIF_F_RXHASH */
> >> > >
> >> > >+#endif /* < RHEL7 */
> >> > >+
> >> > >
> >> > > #endif /* < 3.14.0 */
> >> > >
> >> > > #endif /* _KCOMPAT_H_ */
> >> > >
> >> > >--
> >> > >1.9.1
> >
> >
> >--
> >Thomas

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
  2014-06-26 11:38         ` Hiroshi Shimamoto
@ 2014-06-30  4:45           ` Hiroshi Shimamoto
  2014-06-30  6:40             ` Cao, Waterman
  0 siblings, 1 reply; 12+ messages in thread
From: Hiroshi Shimamoto @ 2014-06-30  4:45 UTC (permalink / raw)
  To: Hiroshi Shimamoto, Cao, Waterman, Thomas Monjalon, dev, Hayato Momma

Hi,

> Subject: Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
> 
> Hi,
> 
> > Subject: RE: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
> >
> > Hi Hiroshi,
> >
> >   Helin submitted one patch to fix compilation error in the redhat 6.4 and 6.5.
> >   Patch title is [dpdk-dev] [PATCH] kni: fix compile errors on Oracle Linux6.4 and RHEL6.5
> >   With this patch, we don't meet this compilation error in latest RHEL 7.0
> >   Can you download latest DPDK code, and try to compile with this patch in RHEL 7.0 again?
> 
> okay, I will try the latest code.

I still see the same error with the latest code, which includes

commit f35fb0cfef52318f8ef53b1d6f562e8ba4034d10
Author: Helin Zhang <helin.zhang@intel.com>
Date:   Wed Jun 11 21:43:38 2014 +0800

    kni: fix build on Oracle Linux 6.4 and RHEL 6.5


$ git branch -v
* master 6e81eb5 version: 1.7.0-rc2

$ uname -a
Linux RHEL7-1 3.10.0-123.el7.x86_64 #1 SMP Mon May 5 11:16:57 EDT 2014 x86_64 x86_64 x86_64 GNU/Linux
$ gcc -v
gcc version 4.8.2 20140120 (Red Hat 4.8.2-16) (GCC)

$ make install -j 8 T=x86_64-ivshmem-linuxapp-gcc
	:
/path/to/dpdk/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3852:1: error: conflicting types for ‘skb_set_hash’
 skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)

thanks,
Hiroshi

> 
> thanks,
> Hiroshi
> 
> >
> > Thanks
> > Waterman
> >
> >
> > >-----Original Message-----
> > >From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> > >Sent: Wednesday, June 25, 2014 6:05 PM
> > >To: Cao, Waterman
> > >Cc: dev@dpdk.org; Hiroshi Shimamoto; Hayato Momma
> > >Subject: Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
> > >
> > >Hi Waterman,
> > >
> > >2014-06-12 09:35, Hiroshi Shimamoto:
> > >> 2014-06-12 09:18, Cao, Waterman:
> > >> >   Can you give details about Linux Kernel version and complier version?
> > >> >   Because we tried to build code in the Redhat 7.0 before, but we don't
> > >> >   meet this issue. Please see information as the following:
> > >> >   Linux kernel 3.10.0-54.0.1.el7.x86_64
> > >> >   RHEL70BETA_64	GCC 4.8.2  ICC: 14.0.0
> > >>
> > >> Yes,
> > >>
> > >> Linux REHEL7RC-1 3.10.0-121.el7.x86_64 #1 SMP Tue Apr 8 10:48:19 EDT
> > >> 2014
> > >> x86_64 x86_64 x86_64 GNU/Linux gcc version 4.8.2 20140120 (Red Hat
> > >> 4.8.2-16) (GCC)
> > >>
> > >> I got the below error;
> > >> /path/to/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3851:1: error:
> > >> conflicting types for ‘skb_set_hash’ skb_set_hash(struct sk_buff *skb,
> > >> __u32 hash, __always_unused int type)
> > >>
> > >> /usr/src/kernels/3.10.0-121.el7.x86_64/include/linux/skbuff.h:762:1: note:
> > >> previous definition of ‘skb_set_hash’ was here skb_set_hash(struct
> > >> sk_buff *skb, __u32 hash, enum pkt_hash_types type)
> > >
> > >Could you confirm this fix is needed and acknowledge it?
> > >Thanks
> > >
> > >
> > >> > -----Original Message-----
> > >> >
> > >> > >From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Hiroshi
> > >> > >Shimamoto
> > >> > >Sent: Thursday, June 12, 2014 4:10 PM
> > >> > >To: dev@dpdk.org
> > >> > >Cc: Hayato Momma
> > >> > >Subject: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
> > >> > >
> > >> > >From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
> > >> > >
> > >> > >Compilation in RHEL7 is failed. This fixes the build issue.
> > >> > >
> > >> > >RHEL7 has skb_set_hash, the kernel version is 3.10 though.
> > >> > >Don't define skb_set_hash for RHEL7.
> > >> > >
> > >> > >Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
> > >> > >Reviewed-by: Hayato Momma <h-momma@ce.jp.nec.com>
> > >> > >---
> > >> > >
> > >> > > lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 5 +++++
> > >> > > 1 file changed, 5 insertions(+)
> > >> > >
> > >> > >diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> > >> > >b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index
> > >> > >4c27d5d..b4de6e2 100644
> > >> > >--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> > >> > >+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> > >> > >@@ -3843,6 +3843,9 @@ static inline struct sk_buff
> > >> > >*__kc__vlan_hwaccel_put_tag(struct sk_buff *skb,  #endif /* >=
> > >> > >3.10.0>
> > >> > */
> > >> >
> > >> > > #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
> > >> > >
> > >> > >+
> > >> > >+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >=
> > >> > >+RHEL_RELEASE_VERSION(7,0)))
> > >> > >+
> > >> > >
> > >> > > #ifdef NETIF_F_RXHASH
> > >> > > #define PKT_HASH_TYPE_L3 0
> > >> > > static inline void
> > >> > >
> > >> > >@@ -3851,6 +3854,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash,
> > >> > >__always_unused int type)> >
> > >> > > 	skb->rxhash = hash;
> > >> > >
> > >> > > }
> > >> > > #endif /* NETIF_F_RXHASH */
> > >> > >
> > >> > >+#endif /* < RHEL7 */
> > >> > >+
> > >> > >
> > >> > > #endif /* < 3.14.0 */
> > >> > >
> > >> > > #endif /* _KCOMPAT_H_ */
> > >> > >
> > >> > >--
> > >> > >1.9.1
> > >
> > >
> > >--
> > >Thomas

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
  2014-06-30  4:45           ` Hiroshi Shimamoto
@ 2014-06-30  6:40             ` Cao, Waterman
  0 siblings, 0 replies; 12+ messages in thread
From: Cao, Waterman @ 2014-06-30  6:40 UTC (permalink / raw)
  To: Hiroshi Shimamoto, Thomas Monjalon, dev, Hayato Momma

Hi Hiroshi,

We found that there is a little difference between your environment and ours.
Our Env:
Linux RHEL-7.0-64 3.10.0-54.0.1.el7.x86_64 #1 SMP Tue Nov 26 16:51:22 EST 2013 x86_64 x86_64 x86_64 GNU/Linux gcc : gcc version 4.8.2 20131106 (Red Hat 4.8.2-3) (GCC)
Your Env:
Linux RHEL7-1 3.10.0-123.el7.x86_64 #1 SMP Mon May 5 11:16:57 EDT 2014 x86_64 x86_64 x86_64 GNU/Linux $ gcc -v gcc version 4.8.2 20140120 (Red Hat 4.8.2-16) (GCC)

We verified RHEL7 beta version already, and will download latest RHEL7 and try it again.

Waterman 

-----Original Message-----
>From: Hiroshi Shimamoto [mailto:h-shimamoto@ct.jp.nec.com] 
>Sent: Monday, June 30, 2014 12:46 PM
>To: Hiroshi Shimamoto; Cao, Waterman; Thomas Monjalon; dev@dpdk.org; Hayato Momma
>Subject: RE: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
>
>Hi,
>
>> Subject: Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
>> 
>> Hi,
>> 
>> > Subject: RE: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
>> >
>> > Hi Hiroshi,
>> >
>> >   Helin submitted one patch to fix compilation error in the redhat 6.4 and 6.5.
>> >   Patch title is [dpdk-dev] [PATCH] kni: fix compile errors on Oracle Linux6.4 and RHEL6.5
>> >   With this patch, we don't meet this compilation error in latest RHEL 7.0
>> >   Can you download latest DPDK code, and try to compile with this patch in RHEL 7.0 again?
>> 
>> okay, I will try the latest code.
>
>I still see the same error with the latest code, which includes
>
>commit f35fb0cfef52318f8ef53b1d6f562e8ba4034d10
>Author: Helin Zhang <helin.zhang@intel.com>
>Date:   Wed Jun 11 21:43:38 2014 +0800
>
>    kni: fix build on Oracle Linux 6.4 and RHEL 6.5
>
>
>$ git branch -v
>* master 6e81eb5 version: 1.7.0-rc2
>
>$ uname -a
>Linux RHEL7-1 3.10.0-123.el7.x86_64 #1 SMP Mon May 5 11:16:57 EDT 2014 x86_64 x86_64 x86_64 GNU/Linux $ gcc -v gcc version 4.8.2 20140120 (Red Hat 4.8.2-16) (GCC)
>
>$ make install -j 8 T=x86_64-ivshmem-linuxapp-gcc
>	:
>/path/to/dpdk/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3852:1: error: conflicting types for ‘skb_set_hash’
> skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
>
>thanks,
>Hiroshi
>
>> 
>> thanks,
>> Hiroshi
>> 
>> >
>> > Thanks
>> > Waterman
>> >
>> >
>> > >-----Original Message-----
>> > >From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
>> > >Sent: Wednesday, June 25, 2014 6:05 PM
>> > >To: Cao, Waterman
>> > >Cc: dev@dpdk.org; Hiroshi Shimamoto; Hayato Momma
>> > >Subject: Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
>> > >
>> > >Hi Waterman,
>> > >
>> > >2014-06-12 09:35, Hiroshi Shimamoto:
>> > >> 2014-06-12 09:18, Cao, Waterman:
>> > >> >   Can you give details about Linux Kernel version and complier version?
>> > >> >   Because we tried to build code in the Redhat 7.0 before, but we don't
>> > >> >   meet this issue. Please see information as the following:
>> > >> >   Linux kernel 3.10.0-54.0.1.el7.x86_64
>> > >> >   RHEL70BETA_64	GCC 4.8.2  ICC: 14.0.0
>> > >>
>> > >> Yes,
>> > >>
>> > >> Linux REHEL7RC-1 3.10.0-121.el7.x86_64 #1 SMP Tue Apr 8 10:48:19 
>> > >> EDT
>> > >> 2014
>> > >> x86_64 x86_64 x86_64 GNU/Linux gcc version 4.8.2 20140120 (Red 
>> > >> Hat
>> > >> 4.8.2-16) (GCC)
>> > >>
>> > >> I got the below error;
>> > >> /path/to/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3851:1: error:
>> > >> conflicting types for ‘skb_set_hash’ skb_set_hash(struct sk_buff 
>> > >> *skb,
>> > >> __u32 hash, __always_unused int type)
>> > >>
>> > >> /usr/src/kernels/3.10.0-121.el7.x86_64/include/linux/skbuff.h:762:1: note:
>> > >> previous definition of ‘skb_set_hash’ was here 
>> > >> skb_set_hash(struct sk_buff *skb, __u32 hash, enum pkt_hash_types 
>> > >> type)
>> > >
>> > >Could you confirm this fix is needed and acknowledge it?
>> > >Thanks
>> > >
>> > >
>> > >> > -----Original Message-----
>> > >> >
>> > >> > >From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Hiroshi 
>> > >> > >Shimamoto
>> > >> > >Sent: Thursday, June 12, 2014 4:10 PM
>> > >> > >To: dev@dpdk.org
>> > >> > >Cc: Hayato Momma
>> > >> > >Subject: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
>> > >> > >
>> > >> > >From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
>> > >> > >
>> > >> > >Compilation in RHEL7 is failed. This fixes the build issue.
>> > >> > >
>> > >> > >RHEL7 has skb_set_hash, the kernel version is 3.10 though.
>> > >> > >Don't define skb_set_hash for RHEL7.
>> > >> > >
>> > >> > >Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
>> > >> > >Reviewed-by: Hayato Momma <h-momma@ce.jp.nec.com>
>> > >> > >---
>> > >> > >
>> > >> > > lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 5 +++++
>> > >> > > 1 file changed, 5 insertions(+)
>> > >> > >
>> > >> > >diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> > >> > >b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index
>> > >> > >4c27d5d..b4de6e2 100644
>> > >> > >--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> > >> > >+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> > >> > >@@ -3843,6 +3843,9 @@ static inline struct sk_buff 
>> > >> > >*__kc__vlan_hwaccel_put_tag(struct sk_buff *skb,  #endif /* >= 
>> > >> > >3.10.0>
>> > >> > */
>> > >> >
>> > >> > > #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
>> > >> > >
>> > >> > >+
>> > >> > >+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >=
>> > >> > >+RHEL_RELEASE_VERSION(7,0)))
>> > >> > >+
>> > >> > >
>> > >> > > #ifdef NETIF_F_RXHASH
>> > >> > > #define PKT_HASH_TYPE_L3 0
>> > >> > > static inline void
>> > >> > >
>> > >> > >@@ -3851,6 +3854,8 @@ skb_set_hash(struct sk_buff *skb, __u32 
>> > >> > >hash, __always_unused int type)> >
>> > >> > > 	skb->rxhash = hash;
>> > >> > >
>> > >> > > }
>> > >> > > #endif /* NETIF_F_RXHASH */
>> > >> > >
>> > >> > >+#endif /* < RHEL7 */
>> > >> > >+
>> > >> > >
>> > >> > > #endif /* < 3.14.0 */
>> > >> > >
>> > >> > > #endif /* _KCOMPAT_H_ */
>> > >> > >
>> > >> > >--
>> > >> > >1.9.1
>> > >
>> > >
>> > >--
>>>Thomas

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
  2014-06-25 10:05     ` Thomas Monjalon
  2014-06-25 13:39       ` Cao, Waterman
  2014-06-26 11:22       ` Cao, Waterman
@ 2014-06-30  8:36       ` Cao, Waterman
  2014-06-30  8:43         ` Thomas Monjalon
  2 siblings, 1 reply; 12+ messages in thread
From: Cao, Waterman @ 2014-06-30  8:36 UTC (permalink / raw)
  To: Thomas Monjalon, Hiroshi Shimamoto; +Cc: dev, Hayato Momma

Hi Thomas,

 We tested this patch with latest RHEL 7. (3.10.0-123) on RC2.
 It fixed compilation error in KNI.
 Please merge this patch in the RC3.
 Although We don't meet this compilation in RHEL 7 beta version, but Hiroshi caught it in latest version.
 It seems that there are a difference between Kernel 3.10.0-54 and 3.10.0-123

Thanks

Waterman 

-----Original Message-----
>From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com] 
>Sent: Wednesday, June 25, 2014 6:05 PM
>To: Cao, Waterman
>Cc: dev@dpdk.org; Hiroshi Shimamoto; Hayato Momma
>Subject: Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
>
>Hi Waterman,
>
>2014-06-12 09:35, Hiroshi Shimamoto:
>> 2014-06-12 09:18, Cao, Waterman:
>> >   Can you give details about Linux Kernel version and complier version?
>> >   Because we tried to build code in the Redhat 7.0 before, but we don't
>> >   meet this issue. Please see information as the following:
>> >   Linux kernel 3.10.0-54.0.1.el7.x86_64
>> >   RHEL70BETA_64	GCC 4.8.2  ICC: 14.0.0
>> 
>> Yes,
>> 
>> Linux REHEL7RC-1 3.10.0-121.el7.x86_64 #1 SMP Tue Apr 8 10:48:19 EDT 
>> 2014
>> x86_64 x86_64 x86_64 GNU/Linux gcc version 4.8.2 20140120 (Red Hat
>> 4.8.2-16) (GCC)
>> 
>> I got the below error;
>> /path/to/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3851:1: error:
>> conflicting types for ‘skb_set_hash’ skb_set_hash(struct sk_buff *skb,
>> __u32 hash, __always_unused int type)
>> 
>> /usr/src/kernels/3.10.0-121.el7.x86_64/include/linux/skbuff.h:762:1: note:
>> previous definition of ‘skb_set_hash’ was here skb_set_hash(struct 
>> sk_buff *skb, __u32 hash, enum pkt_hash_types type)
>
>Could you confirm this fix is needed and acknowledge it?
>Thanks
>
>
>> > -----Original Message-----
>> > 
>> > >From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Hiroshi 
>> > >Shimamoto
>> > >Sent: Thursday, June 12, 2014 4:10 PM
>> > >To: dev@dpdk.org
>> > >Cc: Hayato Momma
>> > >Subject: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
>> > >
>> > >From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
>> > >
>> > >Compilation in RHEL7 is failed. This fixes the build issue.
>> > >
>> > >RHEL7 has skb_set_hash, the kernel version is 3.10 though.
>> > >Don't define skb_set_hash for RHEL7.
>> > >
>> > >Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
>> > >Reviewed-by: Hayato Momma <h-momma@ce.jp.nec.com>
>> > >---
>> > >
>> > > lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 5 +++++
>> > > 1 file changed, 5 insertions(+)
>> > >
>> > >diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> > >b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index
>> > >4c27d5d..b4de6e2 100644
>> > >--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> > >+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
>> > >@@ -3843,6 +3843,9 @@ static inline struct sk_buff 
>> > >*__kc__vlan_hwaccel_put_tag(struct sk_buff *skb,  #endif /* >= 
>> > >3.10.0>
>> > */
>> > 
>> > > #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
>> > >
>> > >+
>> > >+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >=
>> > >+RHEL_RELEASE_VERSION(7,0)))
>> > >+
>> > >
>> > > #ifdef NETIF_F_RXHASH
>> > > #define PKT_HASH_TYPE_L3 0
>> > > static inline void
>> > >
>> > >@@ -3851,6 +3854,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, 
>> > >__always_unused int type)> >
>> > > 	skb->rxhash = hash;
>> > > 
>> > > }
>> > > #endif /* NETIF_F_RXHASH */
>> > >
>> > >+#endif /* < RHEL7 */
>> > >+
>> > >
>> > > #endif /* < 3.14.0 */
>> > > 
>> > > #endif /* _KCOMPAT_H_ */
>> > >
>> > >--
>> > >1.9.1
>
>
>--
>Thomas

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
  2014-06-30  8:36       ` Cao, Waterman
@ 2014-06-30  8:43         ` Thomas Monjalon
  0 siblings, 0 replies; 12+ messages in thread
From: Thomas Monjalon @ 2014-06-30  8:43 UTC (permalink / raw)
  To: Cao, Waterman; +Cc: dev, Hayato Momma

Hi,

2014-06-30 08:36, Cao, Waterman:
>  We tested this patch with latest RHEL 7. (3.10.0-123) on RC2.
>  It fixed compilation error in KNI.
>  Please merge this patch in the RC3.
>  Although We don't meet this compilation in RHEL 7 beta version, but Hiroshi
> caught it in latest version.
> It seems that there are a difference between
> Kernel 3.10.0-54 and 3.10.0-123 

OK, thanks for testing.

-- 
Thomas

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
  2014-06-12  8:09 [dpdk-dev] [PATCH] kni: compatibility with RHEL 7 Hiroshi Shimamoto
  2014-06-12  9:18 ` Cao, Waterman
@ 2014-07-01 22:03 ` Thomas Monjalon
  1 sibling, 0 replies; 12+ messages in thread
From: Thomas Monjalon @ 2014-07-01 22:03 UTC (permalink / raw)
  To: Hiroshi Shimamoto; +Cc: dev, Hayato Momma

> Compilation in RHEL7 is failed. This fixes the build issue.
> 
> RHEL7 has skb_set_hash, the kernel version is 3.10 though.
> Don't define skb_set_hash for RHEL7.
> 
> Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
> Reviewed-by: Hayato Momma <h-momma@ce.jp.nec.com>

Applied for version 1.7.0.

Thanks
-- 
Thomas

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2014-07-01 22:03 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-12  8:09 [dpdk-dev] [PATCH] kni: compatibility with RHEL 7 Hiroshi Shimamoto
2014-06-12  9:18 ` Cao, Waterman
2014-06-12  9:35   ` Hiroshi Shimamoto
2014-06-25 10:05     ` Thomas Monjalon
2014-06-25 13:39       ` Cao, Waterman
2014-06-26 11:22       ` Cao, Waterman
2014-06-26 11:38         ` Hiroshi Shimamoto
2014-06-30  4:45           ` Hiroshi Shimamoto
2014-06-30  6:40             ` Cao, Waterman
2014-06-30  8:36       ` Cao, Waterman
2014-06-30  8:43         ` Thomas Monjalon
2014-07-01 22:03 ` Thomas Monjalon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).