!39 backport extend coalesce setting uAPI with CQE mode

From: @chengyechun 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot 2022-06-13 12:57:34 +00:00 committed by Gitee
commit b8b118ad15
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 55 additions and 1 deletions

View File

@ -0,0 +1,46 @@
From 09c9f89806878a4f4dc66c0a45130ca1a3e6f940 Mon Sep 17 00:00:00 2001
From: chengyechun <chengyechun1@huawei.com>
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 <moyufeng@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
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

View File

@ -9,7 +9,7 @@
Name: i40e Name: i40e
Summary: Intel(R) 40-10 Gigabit Ethernet Connection Network Driver Summary: Intel(R) 40-10 Gigabit Ethernet Connection Network Driver
Version: 2.14.13 Version: 2.14.13
Release: 7 Release: 8
Vendor: Intel Corporation Vendor: Intel Corporation
License: GPL-2.0 License: GPL-2.0
URL: http://support.intel.com 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 Patch0001: fix-gcc9-new-warning.patch
Patch6000: backport-extend-coalesce-setting-uAPI-with-CQE-mode.patch
Requires: kernel, findutils, gawk, bash, hwdata Requires: kernel, findutils, gawk, bash, hwdata
BuildRequires: kernel-devel hwdata elfutils-devel uname-build-checks gcc BuildRequires: kernel-devel hwdata elfutils-devel uname-build-checks gcc
@ -383,6 +385,12 @@ else
fi fi
%changelog %changelog
* Mon Jun 13 2022 chengyechun <chengyechun1@huawei.com> -2.14.13-8
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:extend coalesce setting uAPI with CQE mode
* Sat Oct 30 2021 Aichun Li <liaichun@huawei.com> - 2.14.13-7 * Sat Oct 30 2021 Aichun Li <liaichun@huawei.com> - 2.14.13-7
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA