net: hns3: There are some cleanup for the HNS3 ethernet driver
Subsystems (4)
v2 cover net: hns3: There are some cleanup for the HNS3 ethernet driver
There are some cleanup for the HNS3 ethernet driver.
Hao Chen (2):
net: hns3: fix hns3 driver header file not self-contained issue
net: hns3: fix strncpy() not using dest-buf length as length issue
Jian Shen (1):
net: hns3: refine the tcam key convert handle
Peiyang Wang (1):
net: hns3: clear hns unused parameter alarm
.../net/ethernet/hisilicon/hns3/hclge_mbx.h | 4 +- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3 +- .../hns3/hns3_common/hclge_comm_rss.c | 3 +- .../hns3/hns3_common/hclge_comm_rss.h | 3 +- .../hns3/hns3_common/hclge_comm_tqp_stats.h | 2 + .../ethernet/hisilicon/hns3/hns3_debugfs.c | 36 ++++++++++---- .../net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- .../net/ethernet/hisilicon/hns3/hns3_enet.h | 3 ++ .../ethernet/hisilicon/hns3/hns3_ethtool.c | 7 ++- .../hisilicon/hns3/hns3pf/hclge_debugfs.c | 29 ++++++++++-- .../hisilicon/hns3/hns3pf/hclge_main.c | 47 ++++++++----------- .../hisilicon/hns3/hns3pf/hclge_main.h | 11 ++--- .../hisilicon/hns3/hns3pf/hclge_ptp.h | 5 +- .../hisilicon/hns3/hns3vf/hclgevf_main.c | 14 ++---- 14 files changed, 96 insertions(+), 73 deletions(-)
Signature · 1 line
2.30.0
PATCH v2 1/4 net: hns3: refine the tcam key convert handle
From: Jian Shen <[email protected]>
The result of expression '(k ^ ~v) & k' is exactly the same with 'k & v', so simplify it.
(k ^ ~v) & k == k & v
The truth table (in non table form):
k == 0, v == 0:
(k ^ ~v) & k == (0 ^ ~0) & 0 == (0 ^ 1) & 0 == 1 & 0 == 0 k & v == 0 & 0 == 0
k == 0, v == 1:
(k ^ ~v) & k == (0 ^ ~1) & 0 == (0 ^ 0) & 0 == 1 & 0 == 0 k & v == 0 & 1 == 0
k == 1, v == 0:
(k ^ ~v) & k == (1 ^ ~0) & 1 == (1 ^ 1) & 1 == 0 & 1 == 0 k & v == 1 & 0 == 0
k == 1, v == 1:
(k ^ ~v) & k == (1 ^ ~1) & 1 == (1 ^ 0) & 1 == 1 & 1 == 1 k & v == 1 & 1 == 1
ChangeLog:v1->v2:
Fixed the comment description error and added the truth table in the comment.
suggested by Simon Horman.
--- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +3 -8
@@ -835,15 +835,10 @@ struct hclge_vf_vlan_cfg {* Then for input key(k) and mask(v), we can calculate the value by * the formulae: * x = (~k) & v -* y = (k ^ ~v) & k +* y = k & v */ -#define calc_x (x, k, v) (x = ~(k) & (v)) -#define calc_y (y, k, v) \ - do { \ - const typeof(k) _k_ = (k); \ - const typeof(v) _v_ = (v); \ - (y) = (_k_ ^ ~_v_) & (_k_); \ - } while (0) +#define calc_x (x, k, v) ((x) = ~(k) & (v)) +#define calc_y (y, k, v) ((y) = (k) & (v))#define HCLGE_MAC_STATS_FIELD_OFF (f) (offsetof(struct hclge_mac_stats, f))#define HCLGE_STATS_READ (p, offset) (*(u64 *)((u8 *)(p) + (offset)))
Signature · 1 line
2.30.0
Re: [PATCH net-next v2 1/4] net: hns3: refine the tcam key convert handle
Quoted 22 lines · Hao Lan
From: Jian Shen <[email protected]>
The result of expression '(k ^ ~v) & k' is exactly the same with 'k & v', so simplify it.
(k ^ ~v) & k == k & v
The truth table (in non table form):
k == 0, v == 0:
(k ^ ~v) & k == (0 ^ ~0) & 0 == (0 ^ 1) & 0 == 1 & 0 == 0 k & v == 0 & 0 == 0k == 0, v == 1:
(k ^ ~v) & k == (0 ^ ~1) & 0 == (0 ^ 0) & 0 == 1 & 0 == 0 k & v == 0 & 1 == 0k == 1, v == 0:
(k ^ ~v) & k == (1 ^ ~0) & 1 == (1 ^ 1) & 1 == 0 & 1 == 0 k & v == 1 & 0 == 0k == 1, v == 1:
(k ^ ~v) & k == (1 ^ ~1) & 1 == (1 ^ 0) & 1 == 1 & 1 == 1 k & v == 1 & 1 == 1
Quoted 8 lines
ChangeLog:
v1->v2:
Fixed the comment description error and added the truth table in the comment.
suggested by Simon Horman.Signed-off-by Jian Shen <[email protected]>Signed-off-by Hao Lan <[email protected]>
PATCH v2 2/4 net: hns3: fix hns3 driver header file not self-contained issue
In reply to Hao LanFrom: Hao Chen <[email protected]>
Hns3 driver header file uses the structure of other files, but does not include corresponding file, which causes a check warning that the header file is not self-contained by clang-tidy checker.
For example,
Use command clang-tidy -checks=-*,header-should-self-contain -p $build_dir $src_file
It reports:
Header file 'hclge_mbx.h' is not self contained.
It should include following headers: (1) 'hclgevf_main.h' due to symbols 'struct hclgevf_dev'. The main source file is hns3_enet.c
Therefore, the required header file is included in the header file, and the structure declaration is added to the header file to avoid cyclic dependency of the header file.
ChangeLog:v1->v2:
Add the clang-tidy command to be used in the comment suggested by Simon Horman.
--- drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 4 +++- .../hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.h | 2 ++ drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 3 +++ drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h | 5 ++++- 4 files changed, 12 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h +3 -1
@@ -7,6 +7,8 @@#include <linux/mutex.h> #include <linux/types.h> +struct hclgevf_dev ; +enum HCLGE_MBX_OPCODE {HCLGE_MBX_RESET =0x01 ,/* (VF -> PF) assert reset */ HCLGE_MBX_ASSERTING_RESET ,/* (PF -> VF) PF is asserting reset */
@@ -233,7 +235,7 @@ struct hclgevf_mbx_arq_ring {__le16 msg_q[HCLGE_MBX_MAX_ARQ_MSG_NUM ][HCLGE_MBX_MAX_ARQ_MSG_SIZE ]; }; -struct hclge_dev ; +struct hclge_vport ;#define HCLGE_MBX_OPCODE_MAX 256struct hclge_mbx_ops_param {
drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.h +2 -0
@@ -7,6 +7,8 @@#include <linux/etherdevice.h> #include "hnae3.h" +struct hclge_comm_hw ; +/* each tqp has TX & RX two queues */ #define HCLGE_COMM_QUEUE_PAIR_SIZE 2
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h +3 -0
@@ -13,6 +13,9 @@struct iphdr ;struct ipv6hdr ; +struct gre_base_hdr ; +struct tcphdr ; +struct udphdr ;enum hns3_nic_state {HNS3_NIC_STATE_TESTING ,
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h +4 -1
@@ -8,8 +8,11 @@#include <linux/net_tstamp.h> #include <linux/types.h> -struct hclge_dev ;struct ifreq ; +struct ethtool_ts_info ; + +struct hnae3_handle ; +struct hclge_dev ;#define HCLGE_PTP_REG_OFFSET 0x29000
Signature · 1 line
2.30.0
Re: [PATCH net-next v2 2/4] net: hns3: fix hns3 driver header file not self-contained issue
Quoted 10 lines · Hao Lan
From: Hao Chen <[email protected]>
Hns3 driver header file uses the structure of other files, but does not include corresponding file, which causes a check warning that the header file is not self-contained by clang-tidy checker.
For example,
Use command clang-tidy -checks=-*,header-should-self-contain -p $build_dir $src_file
Hi Hao Lan,
I tried this with clang-tidy-16 and src_file=".../hns3_enet.c" but i get an error:
Error: no checks enabled.
USAGE: clang-tidy-16 [options] <source0> [... <sourceN>]
I feel that I'm missing something obvious here.
...
Re: [PATCH net-next v2 2/4] net: hns3: fix hns3 driver header file not self-contained issue
Quoted 17 lines · Simon Horman
Quoted 10 lines · Hao Lan
From: Hao Chen <[email protected]>
Hns3 driver header file uses the structure of other files, but does not include corresponding file, which causes a check warning that the header file is not self-contained by clang-tidy checker.
For example,
Use command clang-tidy -checks=-*,header-should-self-contain -p $build_dir $src_file
Hi Hao Lan,
I tried this with clang-tidy-16 and src_file=".../hns3_enet.c" but i get an error:
Quoted 8 lines
Error: no checks enabled.
USAGE: clang-tidy-16 [options] <source0> [... <sourceN>]I feel that I'm missing something obvious here.
...
.
Hi Simon Horman,
This code is checked by our company's internal static check tool. CodeArts Check can be used outside of our company for this check.
You can use the link and you can find CodeArts Check.
In the ruleset codechecknew, you can find the CodeArts Check C recommendation ruleset, which the clangtidy G.INC.05 header should contain itself. You can sign up for a new account and have an one-year try free.
PATCH v2 3/4 net: hns3: fix strncpy() not using dest-buf length as length issue
In reply to Hao LanFrom: Hao Chen <[email protected]>
Now, strncpy() in hns3_dbg_fill_content() use src-length as copy-length, it may result in dest-buf overflow.
This patch is to fix intel compile warning for csky-linux-gcc (GCC) 12.1.0 compiler.
The warning reports as below:
hclge_debugfs.c:92:25: warning: 'strncpy' specified bound depends on the length of the source argument [-Wstringop-truncation]
strncpy(pos, items[i].name, strlen(items[i].name));
hclge_debugfs.c:90:25: warning: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Wstringop-truncation]
strncpy(pos, result[i], strlen(result[i]));
strncpy() use src-length as copy-length, it may result in dest-buf overflow.
So,this patch add some values check to avoid this issue.
ChangeLog:v1->v2:
Use strcpy substitutes for memcpy
suggested by Simon Horman.
--- .../ethernet/hisilicon/hns3/hns3_debugfs.c | 31 ++++++++++++++----- .../hisilicon/hns3/hns3pf/hclge_debugfs.c | 29 ++++++++++++++--- 2 files changed, 48 insertions(+), 12 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +24 -7
@@ -438,19 +438,36 @@ static void hns3_dbg_fill_content(char *content, u16 len,const struct hns3_dbg_item *items, const char **result, u16 size) { +#define HNS3_DBG_LINE_END_LEN 2 char *pos = content; +u16 item_len;u16 i; +if (!len) { +return ; + }else if (len <=HNS3_DBG_LINE_END_LEN ) { + *pos++ ='\0' ; +return ; + } +memset (content,' ' , len); -for (i =0 ; i < size; i++) { -if (result) -strncpy (pos, result[i],strlen (result[i])); -else -strncpy (pos, items[i].name,strlen (items[i].name)); + len -=HNS3_DBG_LINE_END_LEN ; - pos +=strlen (items[i].name) + items[i].interval; +for (i =0 ; i < size; i++) { + item_len =strlen (items[i].name) + items[i].interval; +if (len < item_len) +break ; + +if (result) { +if (item_len <strlen (result[i])) +break ; +strcpy (pos, result[i]); + }else { +strcpy (pos, items[i].name); + } + pos += item_len; + len -= item_len; } - *pos++ ='\n' ; *pos++ ='\0' ; }
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c +24 -5
@@ -88,16 +88,35 @@ static void hclge_dbg_fill_content(char *content, u16 len,const struct hclge_dbg_item *items, const char **result, u16 size) { +#define HCLGE_DBG_LINE_END_LEN 2 char *pos = content; +u16 item_len;u16 i; +if (!len) { +return ; + }else if (len <=HCLGE_DBG_LINE_END_LEN ) { + *pos++ ='\0' ; +return ; + } +memset (content,' ' , len); + len -=HCLGE_DBG_LINE_END_LEN ; +for (i =0 ; i < size; i++) { -if (result) -strncpy (pos, result[i],strlen (result[i])); -else -strncpy (pos, items[i].name,strlen (items[i].name)); - pos +=strlen (items[i].name) + items[i].interval; + item_len =strlen (items[i].name) + items[i].interval; +if (len < item_len) +break ; + +if (result) { +if (item_len <strlen (result[i])) +break ; +strcpy (pos, result[i]); + }else { +strcpy (pos, items[i].name); + } + pos += item_len; + len -= item_len; } *pos++ ='\n' ; *pos++ ='\0' ;
Signature · 1 line
2.30.0
Paolo Abeni
maintainerRe: [PATCH net-next v2 3/4] net: hns3: fix strncpy() not using dest-buf length as length issue
Quoted 45 lines · Hao Lan
From: Hao Chen <[email protected]>
Now,
strncpy()inhns3_dbg_fill_content()use src-length as copy-length, it may result in dest-buf overflow.This patch is to fix intel compile warning for csky-linux-gcc (GCC) 12.1.0 compiler.
The warning reports as below:
hclge_debugfs.c:92:25: warning: 'strncpy' specified bound depends on the length of the source argument [-Wstringop-truncation]
strncpy(pos, items[i].name, strlen(items[i].name));hclge_debugfs.c:90:25: warning: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Wstringop-truncation]
strncpy(pos, result[i], strlen(result[i]));
strncpy()use src-length as copy-length, it may result in dest-buf overflow.So,this patch add some values check to avoid this issue.
ChangeLog:
v1->v2:
Use strcpy substitutes for memcpy
suggested by Simon Horman.Signed-off-by Hao Chen <[email protected]>Reported-by kernel test robot <[email protected]>Signed-off-by Hao Lan <[email protected]>--- .../ethernet/hisilicon/hns3/hns3_debugfs.c | 31 ++++++++++++++----- .../hisilicon/hns3/hns3pf/hclge_debugfs.c | 29 ++++++++++++++--- 2 files changed, 48 insertions(+), 12 deletions(-)drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +0
-0
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c static void hns3_dbg_fill_content(char *content, u16 len, · line 441
Quoted 4 lines
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +1
-0@@ -438,19 +438,36 @@ static void hns3_dbg_fill_content(char *content, u16 len,const struct hns3_dbg_item *items, const char **result, u16 size) { +#define HNS3_DBG_LINE_END_LEN 2
IMHO this macro should be defined outside the function (just before) for better readability.
Quoted 24 lines
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +13
-6char *pos = content; +u16 item_len;u16 i; +if (!len) { +return ; + }else if (len <=HNS3_DBG_LINE_END_LEN ) { + *pos++ ='\0' ; +return ; + } +memset (content,' ' , len); -for (i =0 ; i < size; i++) { -if (result) -strncpy (pos, result[i],strlen (result[i])); -else -strncpy (pos, items[i].name,strlen (items[i].name)); + len -=HNS3_DBG_LINE_END_LEN ; - pos +=strlen (items[i].name) + items[i].interval; +for (i =0 ; i < size; i++) { + item_len =strlen (items[i].name) + items[i].interval; +if (len < item_len) +break ;
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c static void hns3_dbg_fill_content(char *content, u16 len, · line 469
Quoted 10 lines
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +10
-0+ +if (result) { +if (item_len <strlen (result[i])) +break ; +strcpy (pos, result[i]); + }else { +strcpy (pos, items[i].name); + } + pos += item_len; + len -= item_len;
I think it would be better using 'strscpy' instead of papering over more unsecure functions.
Thanks,
Paolo
Re: [PATCH net-next v2 3/4] net: hns3: fix strncpy() not using dest-buf length as length issue
Quoted 11 lines · Paolo Abeni
On Mon, 2023-06-12 at 20:23 +0800, Hao Lan wrote:
I think it would be better using 'strscpy' instead of papering over more unsecure functions.
Thanks,
Paolo
.
Hi Paolo Abeni,
We accept your suggestion,
thank you.
Re: [PATCH net-next v2 3/4] net: hns3: fix strncpy() not using dest-buf length as length issue
In reply to Paolo AbeniQuoted 16 lines · Paolo Abeni
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c static void hns3_dbg_fill_content(char *content, u16 len, · line 441
Quoted 11 lines · Hao Lan
From: Hao Chen <[email protected]>
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +1
-0@@ -438,19 +438,36 @@ static void hns3_dbg_fill_content(char *content, u16 len,const struct hns3_dbg_item *items, const char **result, u16 size) { +#define HNS3_DBG_LINE_END_LEN 2IMHO this macro should be defined outside the function (just before) for better readability.
Hi Paolo Abeni,
Thank you for your advice. We use this macro style elsewhere in our code. The style is consistent. Here we keep this macro style.
Yours,
Hao Lan
Paolo Abeni
maintainerRe: [PATCH net-next v2 3/4] net: hns3: fix strncpy() not using dest-buf length as length issue
In reply to Hao LanQuoted 24 lines · Hao Lan
From: Hao Chen <[email protected]>
Now,
strncpy()inhns3_dbg_fill_content()use src-length as copy-length, it may result in dest-buf overflow.This patch is to fix intel compile warning for csky-linux-gcc (GCC) 12.1.0 compiler.
The warning reports as below:
hclge_debugfs.c:92:25: warning: 'strncpy' specified bound depends on the length of the source argument [-Wstringop-truncation]
strncpy(pos, items[i].name, strlen(items[i].name));hclge_debugfs.c:90:25: warning: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Wstringop-truncation]
strncpy(pos, result[i], strlen(result[i]));
strncpy()use src-length as copy-length, it may result in dest-buf overflow.
Quoted 6 lines
So,this patch add some values check to avoid this issue.
ChangeLog:
v1->v2:
Use strcpy substitutes for memcpy
suggested by Simon Horman.
In the next revision, please move the changelog after the '---' separator below, so that it will no included into the actual commit message. (Applies to all the patch in the series)
Thanks!
Paolo
PATCH v2 4/4 net: hns3: clear hns unused parameter alarm
In reply to Hao LanFrom: Peiyang Wang <[email protected]>
Several functions in the hns3 driver have unused parameters. The compiler will warn about them when building with -Wunused-parameter option of hns3.
ChangeLog:v1->v2:
Delete topic-independent code
suggested by Simon Horman.
--- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3 +- .../hns3/hns3_common/hclge_comm_rss.c | 3 +- .../hns3/hns3_common/hclge_comm_rss.h | 3 +- .../ethernet/hisilicon/hns3/hns3_debugfs.c | 5 +- .../net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- .../ethernet/hisilicon/hns3/hns3_ethtool.c | 7 ++- .../hisilicon/hns3/hns3pf/hclge_main.c | 47 ++++++++----------- .../hisilicon/hns3/hns3vf/hclgevf_main.c | 14 ++---- 8 files changed, 33 insertions(+), 51 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hnae3.h +1 -2
@@ -647,8 +647,7 @@ struct hnae3_ae_ops {int (*rm_mc_addr)(struct hnae3_handle *handle,const unsigned char *addr);void (*set_tso_stats)(struct hnae3_handle *handle,int enable); -void (*update_stats)(struct hnae3_handle *handle, -struct net_device_stats *net_stats); +void (*update_stats)(struct hnae3_handle *handle);void (*get_stats)(struct hnae3_handle *handle,u64 *data);void (*get_mac_stats)(struct hnae3_handle *handle,struct hns3_mac_stats *mac_stats);
drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c +1 -2
@@ -305,8 +305,7 @@ int hclge_comm_set_rss_indir_table(struct hnae3_ae_dev *ae_dev,return 0 ; } -int hclge_comm_set_rss_input_tuple (struct hnae3_handle *nic, -struct hclge_comm_hw *hw,bool is_pf, +int hclge_comm_set_rss_input_tuple (struct hclge_comm_hw *hw,struct hclge_comm_rss_cfg *rss_cfg) {struct hclge_comm_rss_input_tuple_cmd *req;
drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.h +1 -2
@@ -112,8 +112,7 @@ int hclge_comm_init_rss_tuple_cmd(struct hclge_comm_rss_cfg *rss_cfg,struct hnae3_ae_dev *ae_dev, struct hclge_comm_rss_input_tuple_cmd *req);u64 hclge_comm_convert_rss_tuple (u8 tuple_sets); -int hclge_comm_set_rss_input_tuple (struct hnae3_handle *nic, -struct hclge_comm_hw *hw,bool is_pf, +int hclge_comm_set_rss_input_tuple (struct hclge_comm_hw *hw,struct hclge_comm_rss_cfg *rss_cfg);int hclge_comm_set_rss_indir_table (struct hnae3_ae_dev *ae_dev,struct hclge_comm_hw *hw,const u16 *indir);
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +2 -3
@@ -958,8 +958,7 @@ static const struct hns3_dbg_item tx_bd_info_items[] = { { "MSS_HW_CSUM", 0 }, }; -static void hns3_dump_tx_bd_info (struct hns3_nic_priv *priv, -struct hns3_desc *desc,char **result,int idx) +static void hns3_dump_tx_bd_info (struct hns3_desc *desc,char **result,int idx) {unsigned int j =0 ;
@@ -1008,7 +1007,7 @@ static int hns3_dbg_tx_bd_info(struct hns3_dbg_data *d, char *buf, int len)for (i =0 ; i < ring->desc_num; i++) { desc = &ring->desc[i]; -hns3_dump_tx_bd_info (priv, desc, result, i); +hns3_dump_tx_bd_info (desc, result, i);hns3_dbg_fill_content (content,sizeof (content), tx_bd_info_items, (const char **)result,ARRAY_SIZE (tx_bd_info_items));
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +1 -1
@@ -2538,7 +2538,7 @@ static void hns3_nic_get_stats64(struct net_device *netdev,if (test_bit (HNS3_NIC_STATE_DOWN , &priv->state))return ; - handle->ae_algo->ops->update_stats (handle, &netdev->stats); + handle->ae_algo->ops->update_stats (handle);memset (&ring_total_stats,0 ,sizeof (ring_total_stats));for (idx =0 ; idx < queue_num; idx++) {
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +3 -4
@@ -228,7 +228,7 @@ static u32 hns3_lb_check_rx_ring(struct hns3_nic_priv *priv, u32 budget) }static void hns3_lb_clear_tx_ring (struct hns3_nic_priv *priv,u32 start_ringid, -u32 end_ringid,u32 budget) +u32 end_ringid) {u32 i;
@@ -295,8 +295,7 @@ static int hns3_lp_run_test(struct net_device *ndev, enum hnae3_loop mode) out:hns3_lb_clear_tx_ring (priv,HNS3_NIC_LB_TEST_RING_ID , -HNS3_NIC_LB_TEST_RING_ID , -HNS3_NIC_LB_TEST_PKT_NUM ); +HNS3_NIC_LB_TEST_RING_ID );kfree_skb (skb);return ret_val;
@@ -618,7 +617,7 @@ static void hns3_get_stats(struct net_device *netdev,return ; } - h->ae_algo->ops->update_stats (h, &netdev->stats); + h->ae_algo->ops->update_stats (h);/* get per-queue stats */ p =hns3_get_stats_tqps (h, p);
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +19 -28
129 lines not on this page · raw message
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +5 -9
@@ -121,8 +121,7 @@ static struct hclgevf_dev *hclgevf_ae_get_hdev(struct hnae3_handle *handle) return container_of(handle, struct hclgevf_dev, nic); } -static void hclgevf_update_stats (struct hnae3_handle *handle, -struct net_device_stats *net_stats) +static void hclgevf_update_stats (struct hnae3_handle *handle) {struct hclgevf_dev *hdev =hclgevf_ae_get_hdev (handle);int status;
@@ -1645,8 +1644,7 @@ static void hclgevf_reset(struct hclgevf_dev *hdev)hclgevf_reset_err_handle (hdev); } -static enum hnae3_reset_type hclgevf_get_reset_level (struct hclgevf_dev *hdev, -unsigned long *addr) +static enum hnae3_reset_type hclgevf_get_reset_level (unsigned long *addr) {enum hnae3_reset_type rst_level =HNAE3_NONE_RESET ;
@@ -1685,8 +1683,7 @@ static void hclgevf_reset_event(struct pci_dev *pdev,if (hdev->default_reset_request) hdev->reset_level = -hclgevf_get_reset_level (hdev, - &hdev->default_reset_request); +hclgevf_get_reset_level (&hdev->default_reset_request);else hdev->reset_level =HNAE3_VF_FUNC_RESET ;
@@ -1828,7 +1825,7 @@ static void hclgevf_reset_service_task(struct hclgevf_dev *hdev) hdev->last_reset_time = jiffies; hdev->reset_type = -hclgevf_get_reset_level (hdev, &hdev->reset_pending); +hclgevf_get_reset_level (&hdev->reset_pending);if (hdev->reset_type !=HNAE3_NONE_RESET )hclgevf_reset (hdev); } else if (test_and_clear_bit(HCLGEVF_RESET_REQUESTED,
@@ -2160,8 +2157,7 @@ static int hclgevf_rss_init_hw(struct hclgevf_dev *hdev)if (ret)return ret; - ret =hclge_comm_set_rss_input_tuple (&hdev->nic, &hdev->hw.hw, - false, rss_cfg); + ret =hclge_comm_set_rss_input_tuple (&hdev->hw.hw, rss_cfg);if (ret)return ret; }
Signature · 1 line
2.30.0