From 8f29896ccde2be6bf384b40080db471f88df558f Mon Sep 17 00:00:00 2001 From: haochenstar Date: Thu, 16 Sep 2021 14:09:24 +0800 Subject: [PATCH] fix iavf build failed --- ...-coalesce-setting-uAPI-with-CQE-mode.patch | 60 +++++++++++++++++++ iavf.spec | 11 +++- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 backport-extend-coalesce-setting-uAPI-with-CQE-mode.patch diff --git a/backport-extend-coalesce-setting-uAPI-with-CQE-mode.patch b/backport-extend-coalesce-setting-uAPI-with-CQE-mode.patch new file mode 100644 index 0000000..f16476c --- /dev/null +++ b/backport-extend-coalesce-setting-uAPI-with-CQE-mode.patch @@ -0,0 +1,60 @@ +From f3ccfda1931977b80267ba54070a1aeafa18f6ca Mon Sep 17 00:00:00 2001 +From: Yufeng Mo +Date: Fri, 20 Aug 2021 15:35:18 +0800 +Subject: [PATCH] ethtool: extend coalesce setting uAPI with CQE mode + +In order to support more coalesce parameters through netlink, +add two new parameter kernel_coal and extack for .set_coalesce +and .get_coalesce, then some extra info can return to user with +the netlink API. + +Signed-off-by: Yufeng Mo +Signed-off-by: Huazhong Tan +Signed-off-by: Jakub Kicinski +--- + src/iavf_ethtool.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/iavf_ethtool.c b/src/iavf_ethtool.c +index 3f7d427..4b60027 100644 +--- a/src/iavf_ethtool.c ++++ b/src/iavf_ethtool.c +@@ -753,6 +753,8 @@ static int __iavf_get_coalesce(struct net_device *netdev, + * iavf_get_coalesce - Get interrupt coalescing settings + * @netdev: network interface device structure + * @ec: ethtool coalesce structure ++ * @kernel_coal: ethtool CQE mode setting structure ++ * @extack: extack for reporting error messages + * + * Returns current coalescing settings. This is referred to elsewhere in the + * driver as Interrupt Throttle Rate, as this is how the hardware describes +@@ -760,7 +762,9 @@ static int __iavf_get_coalesce(struct net_device *netdev, + * only represents the settings of queue 0. + **/ + static int iavf_get_coalesce(struct net_device *netdev, +- struct ethtool_coalesce *ec) ++ struct ethtool_coalesce *ec, ++ struct kernel_ethtool_coalesce *kernel_coal, ++ struct netlink_ext_ack *extack) + { + return __iavf_get_coalesce(netdev, ec, -1); + } +@@ -898,11 +902,15 @@ static int __iavf_set_coalesce(struct net_device *netdev, + * iavf_set_coalesce - Set interrupt coalescing settings + * @netdev: network interface device structure + * @ec: ethtool coalesce structure ++ * @kernel_coal: ethtool CQE mode setting structure ++ * @extack: extack for reporting error messages + * + * Change current coalescing settings for every queue. + **/ + static int iavf_set_coalesce(struct net_device *netdev, +- struct ethtool_coalesce *ec) ++ struct ethtool_coalesce *ec, ++ struct kernel_ethtool_coalesce *kernel_coal, ++ struct netlink_ext_ack *extack) + { + return __iavf_set_coalesce(netdev, ec, -1); + } +-- +2.30.0 diff --git a/iavf.spec b/iavf.spec index 56165f2..a1644c9 100644 --- a/iavf.spec +++ b/iavf.spec @@ -9,7 +9,7 @@ Name: iavf Summary: Intel(R) Ethernet Adaptive Virtual Function Driver Version: 4.0.1 -Release: 5 +Release: 6 Vendor: Intel Corporation License: GPL-2.0 URL: http://support.intel.com @@ -21,12 +21,15 @@ BuildRequires: kernel-devel hwdata uname-build-checks gcc Patch0: fix-build-error-with-Linux-5.10.patch +Patch6000: backport-extend-coalesce-setting-uAPI-with-CQE-mode.patch + %description This package contains the Intel(R) Ethernet Adaptive Virtual Function Driver. %prep %setup %patch0 -p1 +%patch6000 -p1 %build make -C src clean @@ -385,6 +388,12 @@ else fi %changelog +* Thu Sep 16 2021 xihaochen - 4.0.1-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix iavf build failed + * Wed Jul 7 2021 gaihuiying - 4.0.1-5 - Type:bugfix - ID:NA -- Gitee