From 0bf6693fee8e73e31a8c3818878322819aa5aa71 Mon Sep 17 00:00:00 2001 From: chengyechun Date: Mon, 13 Jun 2022 20:34:00 +0800 Subject: [PATCH] backport extend coalesce setting -uAPI with CQE mode --- ...-coalesce-setting-uAPI-with-CQE-mode.patch | 46 +++++++++++++++++++ i40e.spec | 10 +++- 2 files changed, 55 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..afe32ad --- /dev/null +++ b/backport-extend-coalesce-setting-uAPI-with-CQE-mode.patch @@ -0,0 +1,46 @@ +From 09c9f89806878a4f4dc66c0a45130ca1a3e6f940 Mon Sep 17 00:00:00 2001 +From: chengyechun +Date: Mon, 13 Jun 2022 20:29:03 +0800 +Subject: [PATCH] backport 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 | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/i40e_ethtool.c b/src/i40e_ethtool.c +index 456e59c..3ae5d2e 100644 +--- a/src/i40e_ethtool.c ++++ b/src/i40e_ethtool.c +@@ -3284,7 +3284,9 @@ static int __i40e_get_coalesce(struct net_device *netdev, + * __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); + } +@@ -3507,7 +3509,9 @@ static int __i40e_set_coalesce(struct net_device *netdev, + * 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); + } +-- +1.8.3.1 + diff --git a/i40e.spec b/i40e.spec index d22b823..477e2fd 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: 7 +Release: 8 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 +* Mon Jun 13 2022 chengyechun -2.14.13-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:extend coalesce setting uAPI with CQE mode + * Sat Oct 30 2021 Aichun Li - 2.14.13-7 - Type:bugfix - ID:NA -- Gitee