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 0000000000000000000000000000000000000000..82c147eca7f41c1f4971b687c4e30f8ea8117554 --- /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/i40e_ethtool.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/i40e_ethtool.c b/src/i40e_ethtool.c +index 456e59c..a892ae2 100644 +--- a/src/i40e_ethtool.c ++++ b/src/i40e_ethtool.c +@@ -3278,13 +3278,17 @@ static int __i40e_get_coalesce(struct net_device *netdev, + * i40e_get_coalesce - get a netdev's coalesce settings + * @netdev: the netdev to check + * @ec: ethtool coalesce data structure ++ * @kernel_coal: ethtool CQE mode setting structure ++ * @extack: extack for reporting error messages + * + * Gets the coalesce settings for a particular netdev. Note that if user has + * modified per-queue settings, this only guarantees to represent queue 0. See + * __i40e_get_coalesce for more details. + **/ + static int i40e_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 __i40e_get_coalesce(netdev, ec, -1); + } +@@ -3503,11 +3507,15 @@ static int __i40e_set_coalesce(struct net_device *netdev, + * i40e_set_coalesce - set coalesce settings for every queue on the netdev + * @netdev: the netdev to change + * @ec: ethtool coalesce settings ++ * @kernel_coal: ethtool CQE mode setting structure ++ * @extack: extack for reporting error messages + * + * This will set each queue to the same coalesce settings. + **/ + static int i40e_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 __i40e_set_coalesce(netdev, ec, -1); + } +-- +2.23.0 + diff --git a/i40e.spec b/i40e.spec index ec7030afade7e3376fb74504d1064dbcfaebb0ff..837422885c0968442d0c6673f68194c2ac05ae6d 100644 --- a/i40e.spec +++ b/i40e.spec @@ -9,7 +9,7 @@ Name: i40e Summary: Intel(R) 40-10 Gigabit Ethernet Connection Network Driver Version: 2.14.13 -Release: 5 +Release: 6 Vendor: Intel Corporation License: GPL-2.0 URL: http://support.intel.com @@ -17,6 +17,8 @@ Source0: https://downloadcenter.intel.com/download/24411/Intel-Network-Adapter-D Patch0001: fix-gcc9-new-warning.patch +Patch6000: backport-extend-coalesce-setting-uAPI-with-CQE-mode.patch + Requires: kernel, findutils, gawk, bash, hwdata BuildRequires: kernel-devel hwdata elfutils-devel uname-build-checks gcc @@ -383,6 +385,12 @@ else fi %changelog +* Thu Sep 16 2021 xihaochen - 2.14.13-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix i40e build failed + * Wed Jul 7 2021 gaihuiying - 2.14.13-5 - Type:bugfix - ID:NA