net/mlx5e: Avoid reset netdev stats on configuration changes (05909bab) · Commits · 戴 / test

drivers/net/ethernet/mellanox/mlx5/core/en.h

+11 −3

Original line number	Diff line number	Diff line
		@@ -358,7 +358,6 @@ struct mlx5e_txqsq {
		/* dirtied @xmit */
		u16 pc ____cacheline_aligned_in_smp;
		u32 dma_fifo_pc;
		struct mlx5e_sq_stats stats;

		struct mlx5e_cq cq;

		@@ -371,6 +370,7 @@ struct mlx5e_txqsq {
		/* read only */
		struct mlx5_wq_cyc wq;
		u32 dma_fifo_mask;
		struct mlx5e_sq_stats *stats;
		void __iomem *uar_map;
		struct netdev_queue *txq;
		u32 sqn;
		@@ -526,7 +526,7 @@ struct mlx5e_rq {
		struct mlx5e_channel *channel;
		struct device *pdev;
		struct net_device *netdev;
		struct mlx5e_rq_stats stats;
		struct mlx5e_rq_stats *stats;
		struct mlx5e_cq cq;
		struct mlx5e_page_cache page_cache;
		struct hwtstamp_config *tstamp;
		@@ -574,7 +574,7 @@ struct mlx5e_channel {

		/* data path - accessed per napi poll */
		struct irq_desc *irq_desc;
		struct mlx5e_ch_stats stats;
		struct mlx5e_ch_stats *stats;

		/* control */
		struct mlx5e_priv *priv;
		@@ -590,6 +590,12 @@ struct mlx5e_channels {
		struct mlx5e_params params;
		};

		struct mlx5e_channel_stats {
		struct mlx5e_ch_stats ch;
		struct mlx5e_sq_stats sq[MLX5E_MAX_NUM_TC];
		struct mlx5e_rq_stats rq;
		} ____cacheline_aligned_in_smp;

		enum mlx5e_traffic_types {
		MLX5E_TT_IPV4_TCP,
		MLX5E_TT_IPV6_TCP,
		@@ -793,6 +799,8 @@ struct mlx5e_priv {
		struct mlx5_core_dev *mdev;
		struct net_device *netdev;
		struct mlx5e_stats stats;
		struct mlx5e_channel_stats channel_stats[MLX5E_MAX_NUM_CHANNELS];
		u8 max_opened_tc;
		struct hwtstamp_config tstamp;
		u16 q_counter;
		u16 drop_rq_q_counter;

drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ mlx5e_tls_handle_ooo(struct mlx5e_tls_offload_context *context,
		int headln;
		int i;

		sq->stats.tls_ooo++;
		sq->stats->tls_ooo++;

		if (mlx5e_tls_get_sync_data(context, tcp_seq, &info)) {
		/* We might get here if a retransmission reaches the driver
		@@ -220,7 +220,7 @@ mlx5e_tls_handle_ooo(struct mlx5e_tls_offload_context *context,
		skb_shinfo(nskb)->nr_frags = info.nr_frags;
		nskb->data_len = info.sync_len;
		nskb->len += info.sync_len;
		sq->stats.tls_resync_bytes += nskb->len;
		sq->stats->tls_resync_bytes += nskb->len;
		mlx5e_tls_complete_sync_skb(skb, nskb, tcp_seq, headln,
		cpu_to_be64(info.rcd_sn));
		mlx5e_sq_xmit(sq, nskb, wqe, pi);

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+18 −10

Original line number	Diff line number	Diff line
		@@ -423,6 +423,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c,
		rq->ix = c->ix;
		rq->mdev = mdev;
		rq->hw_mtu = MLX5E_SW2HW_MTU(params, params->sw_mtu);
		rq->stats = &c->priv->channel_stats[c->ix].rq;

		rq->xdp_prog = params->xdp_prog ? bpf_prog_inc(params->xdp_prog) : NULL;
		if (IS_ERR(rq->xdp_prog)) {
		@@ -1003,7 +1004,8 @@ static int mlx5e_alloc_txqsq(struct mlx5e_channel *c,
		int txq_ix,
		struct mlx5e_params *params,
		struct mlx5e_sq_param *param,
		struct mlx5e_txqsq *sq)
		struct mlx5e_txqsq *sq,
		int tc)
		{
		void *sqc_wq = MLX5_ADDR_OF(sqc, param->sqc, wq);
		struct mlx5_core_dev *mdev = c->mdev;
		@@ -1018,6 +1020,7 @@ static int mlx5e_alloc_txqsq(struct mlx5e_channel *c,
		sq->txq_ix = txq_ix;
		sq->uar_map = mdev->mlx5e_res.bfreg.map;
		sq->min_inline_mode = params->tx_min_inline_mode;
		sq->stats = &c->priv->channel_stats[c->ix].sq[tc];
		INIT_WORK(&sq->recover.recover_work, mlx5e_sq_recover);
		if (MLX5_IPSEC_DEV(c->priv->mdev))
		set_bit(MLX5E_SQ_STATE_IPSEC, &sq->state);
		@@ -1176,13 +1179,14 @@ static int mlx5e_open_txqsq(struct mlx5e_channel *c,
		int txq_ix,
		struct mlx5e_params *params,
		struct mlx5e_sq_param *param,
		struct mlx5e_txqsq *sq)
		struct mlx5e_txqsq *sq,
		int tc)
		{
		struct mlx5e_create_sq_param csp = {};
		u32 tx_rate;
		int err;

		err = mlx5e_alloc_txqsq(c, txq_ix, params, param, sq);
		err = mlx5e_alloc_txqsq(c, txq_ix, params, param, sq, tc);
		if (err)
		return err;

		@@ -1370,7 +1374,7 @@ static void mlx5e_sq_recover(struct work_struct *work)
		return;

		mlx5e_reset_txqsq_cc_pc(sq);
		sq->stats.recover++;
		sq->stats->recover++;
		recover->last_recover = jiffies;
		mlx5e_activate_txqsq(sq);
		}
		@@ -1665,14 +1669,14 @@ static int mlx5e_open_sqs(struct mlx5e_channel *c,
		struct mlx5e_params *params,
		struct mlx5e_channel_param *cparam)
		{
		int err;
		int tc;
		struct mlx5e_priv *priv = c->priv;
		int err, tc, max_nch = priv->profile->max_nch(priv->mdev);

		for (tc = 0; tc < params->num_tc; tc++) {
		int txq_ix = c->ix + tc * params->num_channels;
		int txq_ix = c->ix + tc * max_nch;

		err = mlx5e_open_txqsq(c, c->priv->tisn[tc], txq_ix,
		params, &cparam->sq, &c->sq[tc]);
		params, &cparam->sq, &c->sq[tc], tc);
		if (err)
		goto err_close_sqs;
		}
		@@ -1802,6 +1806,7 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
		c->mkey_be = cpu_to_be32(priv->mdev->mlx5e_res.mkey.key);
		c->num_tc = params->num_tc;
		c->xdp = !!params->xdp_prog;
		c->stats = &priv->channel_stats[ix].ch;

		mlx5_vector2eqn(priv->mdev, ix, &eqn, &irq);
		c->irq_desc = irq_to_desc(irq);
		@@ -2634,7 +2639,7 @@ static void mlx5e_build_channels_tx_maps(struct mlx5e_priv *priv)
		struct mlx5e_txqsq *sq;
		int i, tc;

		for (i = 0; i < priv->channels.num; i++)
		for (i = 0; i < priv->profile->max_nch(priv->mdev); i++)
		for (tc = 0; tc < priv->profile->max_tc; tc++)
		priv->channel_tc2txq[i][tc] = i + tc * priv->channels.num;

		@@ -3139,6 +3144,8 @@ static int mlx5e_setup_tc_mqprio(struct net_device *netdev,
		if (err)
		goto out;

		priv->max_opened_tc = max_t(u8, priv->max_opened_tc,
		new_channels.params.num_tc);
		mlx5e_switch_priv_channels(priv, &new_channels, NULL);
		out:
		mutex_unlock(&priv->state_lock);
		@@ -3826,7 +3833,7 @@ static bool mlx5e_tx_timeout_eq_recover(struct net_device *dev,
		return false;

		netdev_err(dev, "Recover %d eqes on EQ 0x%x\n", eqe_count, eq->eqn);
		sq->channel->stats.eq_rearm++;
		sq->channel->stats->eq_rearm++;
		return true;
		}

		@@ -4250,6 +4257,7 @@ static void mlx5e_build_nic_netdev_priv(struct mlx5_core_dev *mdev,
		priv->profile = profile;
		priv->ppriv = ppriv;
		priv->msglevel = MLX5E_MSG_LEVEL;
		priv->max_opened_tc = 1;

		mlx5e_build_nic_params(mdev, &priv->channels.params,
		profile->max_nch(mdev), netdev->mtu);

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -138,13 +138,13 @@ static void mlx5e_rep_update_sw_counters(struct mlx5e_priv *priv)
		for (i = 0; i < priv->channels.num; i++) {
		struct mlx5e_channel *c = priv->channels.c[i];

		rq_stats = &c->rq.stats;
		rq_stats = c->rq.stats;

		s->rx_packets += rq_stats->packets;
		s->rx_bytes += rq_stats->bytes;

		for (j = 0; j < priv->channels.params.num_tc; j++) {
		sq_stats = &c->sq[j].stats;
		sq_stats = c->sq[j].stats;

		s->tx_packets += sq_stats->packets;
		s->tx_bytes += sq_stats->bytes;

drivers/net/ethernet/mellanox/mlx5/core/en_rx.c

+42 −33

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ static inline void mlx5e_read_title_slot(struct mlx5e_rq *rq,
		mlx5e_read_cqe_slot(cq, cqcc, &cq->title);
		cq->decmprs_left = be32_to_cpu(cq->title.byte_cnt);
		cq->decmprs_wqe_counter = be16_to_cpu(cq->title.wqe_counter);
		rq->stats.cqe_compress_blks++;
		rq->stats->cqe_compress_blks++;
		}

		static inline void mlx5e_read_mini_arr_slot(struct mlx5e_cq *cq, u32 cqcc)
		@@ -146,7 +146,7 @@ static inline u32 mlx5e_decompress_cqes_cont(struct mlx5e_rq *rq,
		mlx5e_cqes_update_owner(cq, cq->wq.cc, cqcc - cq->wq.cc);
		cq->wq.cc = cqcc;
		cq->decmprs_left -= cqe_count;
		rq->stats.cqe_compress_pkts += cqe_count;
		rq->stats->cqe_compress_pkts += cqe_count;

		return cqe_count;
		}
		@@ -176,14 +176,15 @@ static inline bool mlx5e_rx_cache_put(struct mlx5e_rq *rq,
		{
		struct mlx5e_page_cache *cache = &rq->page_cache;
		u32 tail_next = (cache->tail + 1) & (MLX5E_CACHE_SIZE - 1);
		struct mlx5e_rq_stats *stats = rq->stats;

		if (tail_next == cache->head) {
		rq->stats.cache_full++;
		stats->cache_full++;
		return false;
		}

		if (unlikely(mlx5e_page_is_reserved(dma_info->page))) {
		rq->stats.cache_waive++;
		stats->cache_waive++;
		return false;
		}

		@@ -196,20 +197,21 @@ static inline bool mlx5e_rx_cache_get(struct mlx5e_rq *rq,
		struct mlx5e_dma_info *dma_info)
		{
		struct mlx5e_page_cache *cache = &rq->page_cache;
		struct mlx5e_rq_stats *stats = rq->stats;

		if (unlikely(cache->head == cache->tail)) {
		rq->stats.cache_empty++;
		stats->cache_empty++;
		return false;
		}

		if (page_ref_count(cache->page_cache[cache->head].page) != 1) {
		rq->stats.cache_busy++;
		stats->cache_busy++;
		return false;
		}

		*dma_info = cache->page_cache[cache->head];
		cache->head = (cache->head + 1) & (MLX5E_CACHE_SIZE - 1);
		rq->stats.cache_reuse++;
		stats->cache_reuse++;

		dma_sync_single_for_device(rq->pdev, dma_info->addr,
		RQ_PAGE_SIZE(rq),
		@@ -294,7 +296,7 @@ static inline void mlx5e_free_rx_wqe_reuse(struct mlx5e_rq *rq,
		struct mlx5e_wqe_frag_info *wi)
		{
		if (mlx5e_page_reuse(rq, wi)) {
		rq->stats.page_reuse++;
		rq->stats->page_reuse++;
		return;
		}

		@@ -452,7 +454,7 @@ err_unmap:
		dma_info--;
		mlx5e_page_release(rq, dma_info, true);
		}
		rq->stats.buff_alloc_err++;
		rq->stats->buff_alloc_err++;

		return err;
		}
		@@ -480,7 +482,7 @@ bool mlx5e_post_rx_wqes(struct mlx5e_rq *rq)

		err = mlx5e_alloc_rx_wqe(rq, wqe, wq->head);
		if (unlikely(err)) {
		rq->stats.buff_alloc_err++;
		rq->stats->buff_alloc_err++;
		break;
		}

		@@ -652,6 +654,7 @@ static inline void mlx5e_handle_csum(struct net_device *netdev,
		struct sk_buff *skb,
		bool lro)
		{
		struct mlx5e_rq_stats *stats = rq->stats;
		int network_depth = 0;

		if (unlikely(!(netdev->features & NETIF_F_RXCSUM)))
		@@ -659,7 +662,7 @@ static inline void mlx5e_handle_csum(struct net_device *netdev,

		if (lro) {
		skb->ip_summed = CHECKSUM_UNNECESSARY;
		rq->stats.csum_unnecessary++;
		stats->csum_unnecessary++;
		return;
		}

		@@ -674,7 +677,7 @@ static inline void mlx5e_handle_csum(struct net_device *netdev,
		skb->csum = csum_partial(skb->data + ETH_HLEN,
		network_depth - ETH_HLEN,
		skb->csum);
		rq->stats.csum_complete++;
		stats->csum_complete++;
		return;
		}

		@@ -684,15 +687,15 @@ static inline void mlx5e_handle_csum(struct net_device *netdev,
		if (cqe_is_tunneled(cqe)) {
		skb->csum_level = 1;
		skb->encapsulation = 1;
		rq->stats.csum_unnecessary_inner++;
		stats->csum_unnecessary_inner++;
		return;
		}
		rq->stats.csum_unnecessary++;
		stats->csum_unnecessary++;
		return;
		}
		csum_none:
		skb->ip_summed = CHECKSUM_NONE;
		rq->stats.csum_none++;
		stats->csum_none++;
		}

		static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe,
		@@ -701,6 +704,7 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe,
		struct sk_buff *skb)
		{
		u8 lro_num_seg = be32_to_cpu(cqe->srqn) >> 24;
		struct mlx5e_rq_stats *stats = rq->stats;
		struct net_device *netdev = rq->netdev;

		skb->mac_len = ETH_HLEN;
		@@ -710,9 +714,9 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe,
		/* Subtract one since we already counted this as one
		* "regular" packet in mlx5e_complete_rx_cqe()
		*/
		rq->stats.packets += lro_num_seg - 1;
		rq->stats.lro_packets++;
		rq->stats.lro_bytes += cqe_bcnt;
		stats->packets += lro_num_seg - 1;
		stats->lro_packets++;
		stats->lro_bytes += cqe_bcnt;
		}

		if (unlikely(mlx5e_rx_hw_stamp(rq->tstamp)))
		@@ -727,7 +731,7 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe,
		if (cqe_has_vlan(cqe)) {
		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
		be16_to_cpu(cqe->vlan_info));
		rq->stats.removed_vlan_packets++;
		stats->removed_vlan_packets++;
		}

		skb->mark = be32_to_cpu(cqe->sop_drop_qpn) & MLX5E_TC_FLOW_ID_MASK;
		@@ -741,8 +745,10 @@ static inline void mlx5e_complete_rx_cqe(struct mlx5e_rq *rq,
		u32 cqe_bcnt,
		struct sk_buff *skb)
		{
		rq->stats.packets++;
		rq->stats.bytes += cqe_bcnt;
		struct mlx5e_rq_stats *stats = rq->stats;

		stats->packets++;
		stats->bytes += cqe_bcnt;
		mlx5e_build_rx_skb(cqe, cqe_bcnt, rq, skb);
		}

		@@ -774,10 +780,12 @@ static inline bool mlx5e_xmit_xdp_frame(struct mlx5e_rq *rq,
		dma_addr_t dma_addr = di->addr + data_offset;
		unsigned int dma_len = xdp->data_end - xdp->data;

		struct mlx5e_rq_stats *stats = rq->stats;

		prefetchw(wqe);

		if (unlikely(dma_len < MLX5E_XDP_MIN_INLINE \|\| rq->hw_mtu < dma_len)) {
		rq->stats.xdp_drop++;
		stats->xdp_drop++;
		return false;
		}

		@@ -787,7 +795,7 @@ static inline bool mlx5e_xmit_xdp_frame(struct mlx5e_rq *rq,
		mlx5e_xmit_xdp_doorbell(sq);
		sq->db.doorbell = false;
		}
		rq->stats.xdp_tx_full++;
		stats->xdp_tx_full++;
		return false;
		}

		@@ -821,7 +829,7 @@ static inline bool mlx5e_xmit_xdp_frame(struct mlx5e_rq *rq,

		sq->db.doorbell = true;

		rq->stats.xdp_tx++;
		stats->xdp_tx++;
		return true;
		}

		@@ -868,7 +876,7 @@ static inline bool mlx5e_xdp_handle(struct mlx5e_rq *rq,
		case XDP_ABORTED:
		trace_xdp_exception(rq->netdev, prog, act);
		case XDP_DROP:
		rq->stats.xdp_drop++;
		rq->stats->xdp_drop++;
		return true;
		}
		}
		@@ -881,7 +889,7 @@ struct sk_buff mlx5e_build_linear_skb(struct mlx5e_rq rq, void *va,
		struct sk_buff *skb = build_skb(va, frag_size);

		if (unlikely(!skb)) {
		rq->stats.buff_alloc_err++;
		rq->stats->buff_alloc_err++;
		return NULL;
		}

		@@ -913,7 +921,7 @@ struct sk_buff skb_from_cqe(struct mlx5e_rq rq, struct mlx5_cqe64 *cqe,
		wi->offset += frag_size;

		if (unlikely((cqe->op_own >> 4) != MLX5_CQE_RESP_SEND)) {
		rq->stats.wqe_err++;
		rq->stats->wqe_err++;
		return NULL;
		}

		@@ -1030,7 +1038,7 @@ mlx5e_skb_from_cqe_mpwrq_nonlinear(struct mlx5e_rq rq, struct mlx5e_mpw_info w
		skb = napi_alloc_skb(rq->cq.napi,
		ALIGN(MLX5_MPWRQ_SMALL_PACKET_THRESHOLD, sizeof(long)));
		if (unlikely(!skb)) {
		rq->stats.buff_alloc_err++;
		rq->stats->buff_alloc_err++;
		return NULL;
		}

		@@ -1116,12 +1124,12 @@ void mlx5e_handle_rx_cqe_mpwrq(struct mlx5e_rq rq, struct mlx5_cqe64 cqe)
		wi->consumed_strides += cstrides;

		if (unlikely((cqe->op_own >> 4) != MLX5_CQE_RESP_SEND)) {
		rq->stats.wqe_err++;
		rq->stats->wqe_err++;
		goto mpwrq_cqe_out;
		}

		if (unlikely(mpwrq_is_filler_cqe(cqe))) {
		rq->stats.mpwqe_filler++;
		rq->stats->mpwqe_filler++;
		goto mpwrq_cqe_out;
		}

		@@ -1276,6 +1284,7 @@ static inline void mlx5i_complete_rx_cqe(struct mlx5e_rq *rq,
		u32 cqe_bcnt,
		struct sk_buff *skb)
		{
		struct mlx5e_rq_stats *stats = rq->stats;
		struct hwtstamp_config *tstamp;
		struct net_device *netdev;
		struct mlx5e_priv *priv;
		@@ -1337,9 +1346,9 @@ static inline void mlx5i_complete_rx_cqe(struct mlx5e_rq *rq,

		skb->dev = netdev;

		rq->stats.csum_complete++;
		rq->stats.packets++;
		rq->stats.bytes += cqe_bcnt;
		stats->csum_complete++;
		stats->packets++;
		stats->bytes += cqe_bcnt;
		}

		void mlx5i_handle_rx_cqe(struct mlx5e_rq rq, struct mlx5_cqe64 cqe)

Admin message