From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 19FEC2B91 for ; Fri, 8 Mar 2019 18:48:48 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 8 Mar 2019 19:48:44 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x28HloAl002625; Fri, 8 Mar 2019 19:48:42 +0200 From: Yongseok Koh To: David Zeng Cc: Ferruh Yigit , dpdk stable Date: Fri, 8 Mar 2019 09:47:09 -0800 Message-Id: <20190308174749.30771-31-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190308174749.30771-1-yskoh@mellanox.com> References: <20190308174749.30771-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'kni: fix build on RHEL8 for arm and Power9' has been queued to LTS release 17.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Mar 2019 17:48:48 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 03/13/19. So please shout if anyone has objection. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From 183d0500e5d606951a4211429eaed4ca7774def1 Mon Sep 17 00:00:00 2001 From: David Zeng Date: Sat, 22 Dec 2018 00:27:33 +0800 Subject: [PATCH] kni: fix build on RHEL8 for arm and Power9 [ upstream commit 3d5501d568aacbcf71832691278f5656d3a9b649 ] Signed-off-by: David Zeng Acked-by: Ferruh Yigit --- lib/librte_eal/linuxapp/kni/compat.h | 8 +++++++- lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/linuxapp/kni/compat.h b/lib/librte_eal/linuxapp/kni/compat.h index 87d228e53..abd105bf4 100644 --- a/lib/librte_eal/linuxapp/kni/compat.h +++ b/lib/librte_eal/linuxapp/kni/compat.h @@ -101,9 +101,15 @@ #undef NET_NAME_UNKNOWN #endif +/* + * RHEL has two different version with different kernel version: + * 3.10 is for AMD, Intel, IBM POWER7 and POWER8; + * 4.14 is for ARM and IBM POWER9 + */ #if (defined(RHEL_RELEASE_CODE) && \ (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5)) && \ - (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8, 0))) + (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8, 0)) && \ + (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0))) #define ndo_change_mtu ndo_change_mtu_rh74 #endif diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index 214cc1531..60be8860d 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h @@ -3946,7 +3946,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type) #if (defined(RHEL_RELEASE_CODE) && \ (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5)) && \ - (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8, 0))) + (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8, 0)) && \ + (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0))) #define ndo_change_mtu ndo_change_mtu_rh74 #endif -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-03-08 09:46:41.844734167 -0800 +++ 0031-kni-fix-build-on-RHEL8-for-arm-and-Power9.patch 2019-03-08 09:46:40.135400000 -0800 @@ -1,20 +1,22 @@ -From 3d5501d568aacbcf71832691278f5656d3a9b649 Mon Sep 17 00:00:00 2001 +From 183d0500e5d606951a4211429eaed4ca7774def1 Mon Sep 17 00:00:00 2001 From: David Zeng Date: Sat, 22 Dec 2018 00:27:33 +0800 Subject: [PATCH] kni: fix build on RHEL8 for arm and Power9 +[ upstream commit 3d5501d568aacbcf71832691278f5656d3a9b649 ] + Signed-off-by: David Zeng Acked-by: Ferruh Yigit --- - kernel/linux/kni/compat.h | 8 +++++++- - kernel/linux/kni/ethtool/igb/kcompat.h | 3 ++- + lib/librte_eal/linuxapp/kni/compat.h | 8 +++++++- + lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) -diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h -index bc81d0c8d..3c575c70a 100644 ---- a/kernel/linux/kni/compat.h -+++ b/kernel/linux/kni/compat.h -@@ -102,9 +102,15 @@ +diff --git a/lib/librte_eal/linuxapp/kni/compat.h b/lib/librte_eal/linuxapp/kni/compat.h +index 87d228e53..abd105bf4 100644 +--- a/lib/librte_eal/linuxapp/kni/compat.h ++++ b/lib/librte_eal/linuxapp/kni/compat.h +@@ -101,9 +101,15 @@ #undef NET_NAME_UNKNOWN #endif @@ -31,11 +33,11 @@ #define ndo_change_mtu ndo_change_mtu_rh74 #endif -diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h -index 2681be684..430aabafe 100644 ---- a/kernel/linux/kni/ethtool/igb/kcompat.h -+++ b/kernel/linux/kni/ethtool/igb/kcompat.h -@@ -3931,7 +3931,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type) +diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +index 214cc1531..60be8860d 100644 +--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h ++++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +@@ -3946,7 +3946,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type) #if (defined(RHEL_RELEASE_CODE) && \ (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5)) && \