Commit 95302c39 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5e-updates-2018-12-11' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5e-updates-2018-12-11

From Eli Britstein,
Patches 1-10 adds remote mirroring support.
Patches 1-4 refactor encap related code as pre-steps for using per
destination encapsulation properties.
Patches 5-7 use extended destination feature for single/multi
destination scenarios that have a single encap destination.
Patches 8-10 enable multiple encap destinations for a TC flow.

From, Daniel Jurgens,
Patch 11, Use CQE padding for Ethernet CQs, PPC showed up to a 24%
improvement in small packet throughput

From Eyal Davidovich,
patches 12-14, FW monitor counter support
FW monitor counters feature came to solve the delayed reporting of
FW stats in the atomic get_stats64 ndo, since we can't access the
FW at that stage, this feature will enable immediate FW stats updates
in the driver via fw events on specific stats updates.

Patch 12, cleanup to avoid querying a FW counter when it is not
supported
Patch 13, Monitor counters FW commands support
Patch 14, Use monitor counters in ethernet netdevice to update FW
stats reported in the atomic get_stats64 ndo.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 43d4b297 5c7e8bbb

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ mlx5_core-y := main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \ 
#

mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \

		en_tx.o en_rx.o en_dim.o en_txrx.o en/xdp.o en_stats.o \

		en_selftest.o en/port.o

		en_selftest.o en/port.o en/monitor_stats.o



#

# Netdev extra

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

+3 −0
Original line number Diff line number Diff line
@@ -685,6 +685,8 @@ struct mlx5e_priv { 
	struct work_struct         set_rx_mode_work;

	struct work_struct         tx_timeout_work;

	struct work_struct         update_stats_work;

	struct work_struct         monitor_counters_work;

	struct mlx5_nb             monitor_counters_nb;



	struct mlx5_core_dev      *mdev;

	struct net_device         *netdev;
@@ -940,6 +942,7 @@ int mlx5e_create_tises(struct mlx5e_priv *priv); 
void mlx5e_cleanup_nic_tx(struct mlx5e_priv *priv);

int mlx5e_close(struct net_device *netdev);

int mlx5e_open(struct net_device *netdev);

void mlx5e_update_ndo_stats(struct mlx5e_priv *priv);



void mlx5e_queue_update_stats(struct mlx5e_priv *priv);

int mlx5e_bits_invert(unsigned long a, int size);

drivers/net/ethernet/mellanox/mlx5/core/en/monitor_stats.c

0 → 100644
+169 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright (c) 2018 Mellanox Technologies. */



#include "en.h"

#include "monitor_stats.h"

#include "lib/eq.h"



/* Driver will set the following watch counters list:

 * Ppcnt.802_3:

 * a_in_range_length_errors      Type: 0x0, Counter:  0x0, group_id = N/A

 * a_out_of_range_length_field   Type: 0x0, Counter:  0x1, group_id = N/A

 * a_frame_too_long_errors       Type: 0x0, Counter:  0x2, group_id = N/A

 * a_frame_check_sequence_errors Type: 0x0, Counter:  0x3, group_id = N/A

 * a_alignment_errors            Type: 0x0, Counter:  0x4, group_id = N/A

 * if_out_discards               Type: 0x0, Counter:  0x5, group_id = N/A

 * Q_Counters:

 * Q[index].rx_out_of_buffer   Type: 0x1, Counter:  0x4, group_id = counter_ix

 */



#define NUM_REQ_PPCNT_COUNTER_S1 MLX5_CMD_SET_MONITOR_NUM_PPCNT_COUNTER_SET1

#define NUM_REQ_Q_COUNTERS_S1    MLX5_CMD_SET_MONITOR_NUM_Q_COUNTERS_SET1



int mlx5e_monitor_counter_supported(struct mlx5e_priv *priv)

{

	struct mlx5_core_dev *mdev = priv->mdev;



	if (!MLX5_CAP_GEN(mdev, max_num_of_monitor_counters))

		return false;

	if (MLX5_CAP_PCAM_REG(mdev, ppcnt) &&

	    MLX5_CAP_GEN(mdev, num_ppcnt_monitor_counters) <

	    NUM_REQ_PPCNT_COUNTER_S1)

		return false;

	if (MLX5_CAP_GEN(mdev, num_q_monitor_counters) <

	    NUM_REQ_Q_COUNTERS_S1)

		return false;

	return true;

}



void mlx5e_monitor_counter_arm(struct mlx5e_priv *priv)

{

	u32  in[MLX5_ST_SZ_DW(arm_monitor_counter_in)]  = {};

	u32 out[MLX5_ST_SZ_DW(arm_monitor_counter_out)] = {};



	MLX5_SET(arm_monitor_counter_in, in, opcode,

		 MLX5_CMD_OP_ARM_MONITOR_COUNTER);

	mlx5_cmd_exec(priv->mdev, in, sizeof(in), out, sizeof(out));

}



static void mlx5e_monitor_counters_work(struct work_struct *work)

{

	struct mlx5e_priv *priv = container_of(work, struct mlx5e_priv,

					       monitor_counters_work);



	mutex_lock(&priv->state_lock);

	mlx5e_update_ndo_stats(priv);

	mutex_unlock(&priv->state_lock);

	mlx5e_monitor_counter_arm(priv);

}



static int mlx5e_monitor_event_handler(struct notifier_block *nb,

				       unsigned long event, void *eqe)

{

	struct mlx5e_priv *priv = mlx5_nb_cof(nb, struct mlx5e_priv,

					      monitor_counters_nb);

	queue_work(priv->wq, &priv->monitor_counters_work);

	return NOTIFY_OK;

}



void mlx5e_monitor_counter_start(struct mlx5e_priv *priv)

{

	MLX5_NB_INIT(&priv->monitor_counters_nb, mlx5e_monitor_event_handler,

		     MONITOR_COUNTER);

	mlx5_eq_notifier_register(priv->mdev, &priv->monitor_counters_nb);

}



static void mlx5e_monitor_counter_stop(struct mlx5e_priv *priv)

{

	mlx5_eq_notifier_unregister(priv->mdev, &priv->monitor_counters_nb);

	cancel_work_sync(&priv->monitor_counters_work);

}



static int fill_monitor_counter_ppcnt_set1(int cnt, u32 *in)

{

	enum mlx5_monitor_counter_ppcnt ppcnt_cnt;



	for (ppcnt_cnt = 0;

	     ppcnt_cnt < NUM_REQ_PPCNT_COUNTER_S1;

	     ppcnt_cnt++, cnt++) {

		MLX5_SET(set_monitor_counter_in, in,

			 monitor_counter[cnt].type,

			 MLX5_QUERY_MONITOR_CNT_TYPE_PPCNT);

		MLX5_SET(set_monitor_counter_in, in,

			 monitor_counter[cnt].counter,

			 ppcnt_cnt);

	}

	return ppcnt_cnt;

}



static int fill_monitor_counter_q_counter_set1(int cnt, int q_counter, u32 *in)

{

	MLX5_SET(set_monitor_counter_in, in,

		 monitor_counter[cnt].type,

		 MLX5_QUERY_MONITOR_CNT_TYPE_Q_COUNTER);

	MLX5_SET(set_monitor_counter_in, in,

		 monitor_counter[cnt].counter,

		 MLX5_QUERY_MONITOR_Q_COUNTER_RX_OUT_OF_BUFFER);

	MLX5_SET(set_monitor_counter_in, in,

		 monitor_counter[cnt].counter_group_id,

		 q_counter);

	return 1;

}



/* check if mlx5e_monitor_counter_supported before calling this function*/

static void mlx5e_set_monitor_counter(struct mlx5e_priv *priv)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	int max_num_of_counters = MLX5_CAP_GEN(mdev, max_num_of_monitor_counters);

	int num_q_counters      = MLX5_CAP_GEN(mdev, num_q_monitor_counters);

	int num_ppcnt_counters  = !MLX5_CAP_PCAM_REG(mdev, ppcnt) ? 0 :

				  MLX5_CAP_GEN(mdev, num_ppcnt_monitor_counters);

	u32  in[MLX5_ST_SZ_DW(set_monitor_counter_in)]  = {};

	u32 out[MLX5_ST_SZ_DW(set_monitor_counter_out)] = {};

	int q_counter = priv->q_counter;

	int cnt	= 0;



	if (num_ppcnt_counters  >=  NUM_REQ_PPCNT_COUNTER_S1 &&

	    max_num_of_counters >= (NUM_REQ_PPCNT_COUNTER_S1 + cnt))

		cnt += fill_monitor_counter_ppcnt_set1(cnt, in);



	if (num_q_counters      >=  NUM_REQ_Q_COUNTERS_S1 &&

	    max_num_of_counters >= (NUM_REQ_Q_COUNTERS_S1 + cnt) &&

	    q_counter)

		cnt += fill_monitor_counter_q_counter_set1(cnt, q_counter, in);



	MLX5_SET(set_monitor_counter_in, in, num_of_counters, cnt);

	MLX5_SET(set_monitor_counter_in, in, opcode,

		 MLX5_CMD_OP_SET_MONITOR_COUNTER);



	mlx5_cmd_exec(mdev, in, sizeof(in), out, sizeof(out));

}



/* check if mlx5e_monitor_counter_supported before calling this function*/

void mlx5e_monitor_counter_init(struct mlx5e_priv *priv)

{

	INIT_WORK(&priv->monitor_counters_work, mlx5e_monitor_counters_work);

	mlx5e_monitor_counter_start(priv);

	mlx5e_set_monitor_counter(priv);

	mlx5e_monitor_counter_arm(priv);

	queue_work(priv->wq, &priv->update_stats_work);

}



static void mlx5e_monitor_counter_disable(struct mlx5e_priv *priv)

{

	u32  in[MLX5_ST_SZ_DW(set_monitor_counter_in)]  = {};

	u32 out[MLX5_ST_SZ_DW(set_monitor_counter_out)] = {};



	MLX5_SET(set_monitor_counter_in, in, num_of_counters, 0);

	MLX5_SET(set_monitor_counter_in, in, opcode,

		 MLX5_CMD_OP_SET_MONITOR_COUNTER);



	mlx5_cmd_exec(priv->mdev, in, sizeof(in), out, sizeof(out));

}



/* check if mlx5e_monitor_counter_supported before calling this function*/

void mlx5e_monitor_counter_cleanup(struct mlx5e_priv *priv)

{

	mlx5e_monitor_counter_disable(priv);

	mlx5e_monitor_counter_stop(priv);

}

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

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */

/* Copyright (c) 2018 Mellanox Technologies. */



#ifndef __MLX5_MONITOR_H__

#define __MLX5_MONITOR_H__



int  mlx5e_monitor_counter_supported(struct mlx5e_priv *priv);

void mlx5e_monitor_counter_init(struct mlx5e_priv *priv);

void mlx5e_monitor_counter_cleanup(struct mlx5e_priv *priv);

void mlx5e_monitor_counter_arm(struct mlx5e_priv *priv);



#endif /* __MLX5_MONITOR_H__ */

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

+13 −3
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "en/port.h"

#include "en/xdp.h"

#include "lib/eq.h"

#include "en/monitor_stats.h"



struct mlx5e_rq_param {

	u32			rqc[MLX5_ST_SZ_DW(rqc)];
@@ -263,7 +264,7 @@ void mlx5e_update_stats(struct mlx5e_priv *priv) 
			mlx5e_stats_grps[i].update_stats(priv);

}



static void mlx5e_update_ndo_stats(struct mlx5e_priv *priv)

void mlx5e_update_ndo_stats(struct mlx5e_priv *priv)

{

	int i;
@@ -2224,6 +2225,8 @@ static void mlx5e_build_common_cq_param(struct mlx5e_priv *priv, 
	void *cqc = param->cqc;



	MLX5_SET(cqc, cqc, uar_page, priv->mdev->priv.uar->index);

	if (MLX5_CAP_GEN(priv->mdev, cqe_128_always) && cache_line_size() >= 128)

		MLX5_SET(cqc, cqc, cqe_sz, CQE_STRIDE_128_PAD);

}



static void mlx5e_build_rx_cq_param(struct mlx5e_priv *priv,
@@ -3457,8 +3460,10 @@ mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats) 
	struct mlx5e_vport_stats *vstats = &priv->stats.vport;

	struct mlx5e_pport_stats *pstats = &priv->stats.pport;



	if (!mlx5e_monitor_counter_supported(priv)) {

		/* update HW stats in background for next time */

		mlx5e_queue_update_stats(priv);

	}



	if (mlx5e_is_uplink_rep(priv)) {

		stats->rx_packets = PPORT_802_3_GET(pstats, a_frames_received_ok);
@@ -4899,6 +4904,8 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv) 
	mlx5_lag_add(mdev, netdev);



	mlx5e_enable_async_events(priv);

	if (mlx5e_monitor_counter_supported(priv))

		mlx5e_monitor_counter_init(priv);



	if (MLX5_ESWITCH_MANAGER(priv->mdev))

		mlx5e_register_vport_reps(priv);
@@ -4938,6 +4945,9 @@ static void mlx5e_nic_disable(struct mlx5e_priv *priv) 
	if (MLX5_ESWITCH_MANAGER(priv->mdev))

		mlx5e_unregister_vport_reps(priv);



	if (mlx5e_monitor_counter_supported(priv))

		mlx5e_monitor_counter_cleanup(priv);



	mlx5e_disable_async_events(priv);

	mlx5_lag_remove(mdev);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE