67dffd3db9
Function hinic_get_stats64() will do two operations:
1. reads stats from every hinic_rxq/txq and accumulates them
2. calls hinic_rxq/txq_clean_stats() to clean every rxq/txq's stats
For hinic_get_stats64(), it could get right data, because it sums all
data to nic_dev->rx_stats/tx_stats.
But it is wrong for get_drv_queue_stats(), this function will read
hinic_rxq's stats, which have been cleared to zero by hinic_get_stats64().
I have observed hinic's cleanup operation by using such command:
> watch -n 1 "cat ethtool -S eth4 | tail -40"
Result before:
...
rxq7_pkts: 1
rxq7_bytes: 90
rxq7_errors: 0
rxq7_csum_errors: 0
rxq7_other_errors: 0
...
rxq9_pkts: 11
rxq9_bytes: 726
rxq9_errors: 0
rxq9_csum_errors: 0
rxq9_other_errors: 0
...
rxq11_pkts: 0
rxq11_bytes: 0
rxq11_errors: 0
rxq11_csum_errors: 0
rxq11_other_errors: 0
Result after a few seconds:
...
rxq7_pkts: 0
rxq7_bytes: 0
rxq7_errors: 0
rxq7_csum_errors: 0
rxq7_other_errors: 0
...
rxq9_pkts: 2
rxq9_bytes: 132
rxq9_errors: 0
rxq9_csum_errors: 0
rxq9_other_errors: 0
...
rxq11_pkts: 1
rxq11_bytes: 170
rxq11_errors: 0
rxq11_csum_errors: 0
rxq11_other_errors: 0
To solve this problem, we just keep every queue's total stats in their own
queue (aka hinic_{rxq|txq}), and simply sum all per-queue stats every time
calling hinic_get_stats64().
With that solution, there is no need to clean per-queue stats now,
and there is no need to maintain global hinic_dev.{tx|rx}_stats, too.
Fixes: edd384f682 ("net-next/hinic: Add ethtool and stats")
Signed-off-by: Qiao Ma <mqaio@linux.alibaba.com>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
129 lines
2.7 KiB
C
129 lines
2.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Huawei HiNIC PCI Express Linux driver
|
|
* Copyright(c) 2017 Huawei Technologies Co., Ltd
|
|
*/
|
|
|
|
#ifndef HINIC_DEV_H
|
|
#define HINIC_DEV_H
|
|
|
|
#include <linux/netdevice.h>
|
|
#include <linux/types.h>
|
|
#include <linux/semaphore.h>
|
|
#include <linux/workqueue.h>
|
|
#include <linux/bitops.h>
|
|
|
|
#include "hinic_hw_dev.h"
|
|
#include "hinic_tx.h"
|
|
#include "hinic_rx.h"
|
|
#include "hinic_sriov.h"
|
|
|
|
#define HINIC_DRV_NAME "hinic"
|
|
|
|
#define LP_PKT_CNT 64
|
|
|
|
enum hinic_flags {
|
|
HINIC_LINK_UP = BIT(0),
|
|
HINIC_INTF_UP = BIT(1),
|
|
HINIC_RSS_ENABLE = BIT(2),
|
|
HINIC_LINK_DOWN = BIT(3),
|
|
HINIC_LP_TEST = BIT(4),
|
|
};
|
|
|
|
struct hinic_rx_mode_work {
|
|
struct work_struct work;
|
|
u32 rx_mode;
|
|
};
|
|
|
|
struct hinic_rss_type {
|
|
u8 tcp_ipv6_ext;
|
|
u8 ipv6_ext;
|
|
u8 tcp_ipv6;
|
|
u8 ipv6;
|
|
u8 tcp_ipv4;
|
|
u8 ipv4;
|
|
u8 udp_ipv6;
|
|
u8 udp_ipv4;
|
|
};
|
|
|
|
enum hinic_rss_hash_type {
|
|
HINIC_RSS_HASH_ENGINE_TYPE_XOR,
|
|
HINIC_RSS_HASH_ENGINE_TYPE_TOEP,
|
|
HINIC_RSS_HASH_ENGINE_TYPE_MAX,
|
|
};
|
|
|
|
struct hinic_intr_coal_info {
|
|
u8 pending_limt;
|
|
u8 coalesce_timer_cfg;
|
|
u8 resend_timer_cfg;
|
|
};
|
|
|
|
enum hinic_dbg_type {
|
|
HINIC_DBG_SQ_INFO,
|
|
HINIC_DBG_RQ_INFO,
|
|
HINIC_DBG_FUNC_TABLE,
|
|
};
|
|
|
|
struct hinic_debug_priv {
|
|
struct hinic_dev *dev;
|
|
void *object;
|
|
enum hinic_dbg_type type;
|
|
struct dentry *root;
|
|
int field_id[64];
|
|
};
|
|
|
|
struct hinic_dev {
|
|
struct net_device *netdev;
|
|
struct hinic_hwdev *hwdev;
|
|
|
|
u32 msg_enable;
|
|
unsigned int tx_weight;
|
|
unsigned int rx_weight;
|
|
u16 num_qps;
|
|
u16 max_qps;
|
|
|
|
unsigned int flags;
|
|
|
|
struct semaphore mgmt_lock;
|
|
unsigned long *vlan_bitmap;
|
|
|
|
struct hinic_rx_mode_work rx_mode_work;
|
|
struct workqueue_struct *workq;
|
|
|
|
struct hinic_txq *txqs;
|
|
struct hinic_rxq *rxqs;
|
|
u16 sq_depth;
|
|
u16 rq_depth;
|
|
|
|
u8 rss_tmpl_idx;
|
|
u8 rss_hash_engine;
|
|
u16 num_rss;
|
|
u16 rss_limit;
|
|
struct hinic_rss_type rss_type;
|
|
u8 *rss_hkey_user;
|
|
s32 *rss_indir_user;
|
|
struct hinic_intr_coal_info *rx_intr_coalesce;
|
|
struct hinic_intr_coal_info *tx_intr_coalesce;
|
|
struct hinic_sriov_info sriov_info;
|
|
int lb_test_rx_idx;
|
|
int lb_pkt_len;
|
|
u8 *lb_test_rx_buf;
|
|
|
|
struct dentry *dbgfs_root;
|
|
struct dentry *sq_dbgfs;
|
|
struct dentry *rq_dbgfs;
|
|
struct dentry *func_tbl_dbgfs;
|
|
struct hinic_debug_priv *dbg;
|
|
struct devlink *devlink;
|
|
bool cable_unplugged;
|
|
bool module_unrecognized;
|
|
};
|
|
|
|
struct hinic_devlink_priv {
|
|
struct hinic_hwdev *hwdev;
|
|
struct devlink_health_reporter *hw_fault_reporter;
|
|
struct devlink_health_reporter *fw_fault_reporter;
|
|
};
|
|
|
|
#endif
|