Commit 990925fa authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-spectrum_buffers-Add-the-ability-to-query-the-CPU-ports-shared-buffer' 



Ido Schimmel says:

====================
mlxsw: spectrum_buffers: Add the ability to query the CPU port's shared buffer

Shalom says:

While debugging packet loss towards the CPU, it is useful to be able to
query the CPU port's shared buffer quotas and occupancy.

Patch #1 prevents changing the CPU port's threshold and binding.

Patch #2 registers the CPU port with devlink.

Patch #3 adds the ability to query the CPU port's shared buffer quotas and
occupancy.

v3:

Patch #2:
* Remove unnecessary wrapping

v2:

Patch #1:
* s/0/MLXSW_PORT_CPU_PORT/
* Assign "mlxsw_sp->ports[MLXSW_PORT_CPU_PORT]" at the end of
  mlxsw_sp_cpu_port_create() to avoid NULL assignment on error path
* Add common functions for mlxsw_core_port_init/fini()

Patch #2:
* Move "changing CPU port's threshold and binding" check to a separate
  patch
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b63e1a02 a759ab6d

drivers/net/ethernet/mellanox/mlxsw/core.c

+54 −9
Original line number Diff line number Diff line
@@ -1864,7 +1864,8 @@ u64 mlxsw_core_res_get(struct mlxsw_core *mlxsw_core, 
}

EXPORT_SYMBOL(mlxsw_core_res_get);



int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,

static int __mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,

				  enum devlink_port_flavour flavour,

				  u32 port_number, bool split,

				  u32 split_port_subnumber,

				  const unsigned char *switch_id,
@@ -1877,17 +1878,16 @@ int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port, 
	int err;



	mlxsw_core_port->local_port = local_port;

	devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,

			       port_number, split, split_port_subnumber,

	devlink_port_attrs_set(devlink_port, flavour, port_number,

			       split, split_port_subnumber,

			       switch_id, switch_id_len);

	err = devlink_port_register(devlink, devlink_port, local_port);

	if (err)

		memset(mlxsw_core_port, 0, sizeof(*mlxsw_core_port));

	return err;

}

EXPORT_SYMBOL(mlxsw_core_port_init);



void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port)

static void __mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port)

{

	struct mlxsw_core_port *mlxsw_core_port =

					&mlxsw_core->ports[local_port];
@@ -1896,8 +1896,53 @@ void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port) 
	devlink_port_unregister(devlink_port);

	memset(mlxsw_core_port, 0, sizeof(*mlxsw_core_port));

}



int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,

			 u32 port_number, bool split,

			 u32 split_port_subnumber,

			 const unsigned char *switch_id,

			 unsigned char switch_id_len)

{

	return __mlxsw_core_port_init(mlxsw_core, local_port,

				      DEVLINK_PORT_FLAVOUR_PHYSICAL,

				      port_number, split, split_port_subnumber,

				      switch_id, switch_id_len);

}

EXPORT_SYMBOL(mlxsw_core_port_init);



void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port)

{

	__mlxsw_core_port_fini(mlxsw_core, local_port);

}

EXPORT_SYMBOL(mlxsw_core_port_fini);



int mlxsw_core_cpu_port_init(struct mlxsw_core *mlxsw_core,

			     void *port_driver_priv,

			     const unsigned char *switch_id,

			     unsigned char switch_id_len)

{

	struct mlxsw_core_port *mlxsw_core_port =

				&mlxsw_core->ports[MLXSW_PORT_CPU_PORT];

	int err;



	err = __mlxsw_core_port_init(mlxsw_core, MLXSW_PORT_CPU_PORT,

				     DEVLINK_PORT_FLAVOUR_CPU,

				     0, false, 0,

				     switch_id, switch_id_len);

	if (err)

		return err;



	mlxsw_core_port->port_driver_priv = port_driver_priv;

	return 0;

}

EXPORT_SYMBOL(mlxsw_core_cpu_port_init);



void mlxsw_core_cpu_port_fini(struct mlxsw_core *mlxsw_core)

{

	__mlxsw_core_port_fini(mlxsw_core, MLXSW_PORT_CPU_PORT);

}

EXPORT_SYMBOL(mlxsw_core_cpu_port_fini);



void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port,

			     void *port_driver_priv, struct net_device *dev)

{

drivers/net/ethernet/mellanox/mlxsw/core.h

+5 −0
Original line number Diff line number Diff line
@@ -177,6 +177,11 @@ int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port, 
			 const unsigned char *switch_id,

			 unsigned char switch_id_len);

void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port);

int mlxsw_core_cpu_port_init(struct mlxsw_core *mlxsw_core,

			     void *port_driver_priv,

			     const unsigned char *switch_id,

			     unsigned char switch_id_len);

void mlxsw_core_cpu_port_fini(struct mlxsw_core *mlxsw_core);

void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port,

			     void *port_driver_priv, struct net_device *dev);

void mlxsw_core_port_ib_set(struct mlxsw_core *mlxsw_core, u8 local_port,

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+46 −0
Original line number Diff line number Diff line
@@ -3872,6 +3872,45 @@ static void mlxsw_sp_port_remove(struct mlxsw_sp *mlxsw_sp, u8 local_port) 
	mlxsw_core_port_fini(mlxsw_sp->core, local_port);

}



static int mlxsw_sp_cpu_port_create(struct mlxsw_sp *mlxsw_sp)

{

	struct mlxsw_sp_port *mlxsw_sp_port;

	int err;



	mlxsw_sp_port = kzalloc(sizeof(*mlxsw_sp_port), GFP_KERNEL);

	if (!mlxsw_sp_port)

		return -ENOMEM;



	mlxsw_sp_port->mlxsw_sp = mlxsw_sp;

	mlxsw_sp_port->local_port = MLXSW_PORT_CPU_PORT;



	err = mlxsw_core_cpu_port_init(mlxsw_sp->core,

				       mlxsw_sp_port,

				       mlxsw_sp->base_mac,

				       sizeof(mlxsw_sp->base_mac));

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize core CPU port\n");

		goto err_core_cpu_port_init;

	}



	mlxsw_sp->ports[MLXSW_PORT_CPU_PORT] = mlxsw_sp_port;

	return 0;



err_core_cpu_port_init:

	kfree(mlxsw_sp_port);

	return err;

}



static void mlxsw_sp_cpu_port_remove(struct mlxsw_sp *mlxsw_sp)

{

	struct mlxsw_sp_port *mlxsw_sp_port =

				mlxsw_sp->ports[MLXSW_PORT_CPU_PORT];



	mlxsw_core_cpu_port_fini(mlxsw_sp->core);

	mlxsw_sp->ports[MLXSW_PORT_CPU_PORT] = NULL;

	kfree(mlxsw_sp_port);

}



static bool mlxsw_sp_port_created(struct mlxsw_sp *mlxsw_sp, u8 local_port)

{

	return mlxsw_sp->ports[local_port] != NULL;
@@ -3884,6 +3923,7 @@ static void mlxsw_sp_ports_remove(struct mlxsw_sp *mlxsw_sp) 
	for (i = 1; i < mlxsw_core_max_ports(mlxsw_sp->core); i++)

		if (mlxsw_sp_port_created(mlxsw_sp, i))

			mlxsw_sp_port_remove(mlxsw_sp, i);

	mlxsw_sp_cpu_port_remove(mlxsw_sp);

	kfree(mlxsw_sp->port_to_module);

	kfree(mlxsw_sp->ports);

}
@@ -3908,6 +3948,10 @@ static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp) 
		goto err_port_to_module_alloc;

	}



	err = mlxsw_sp_cpu_port_create(mlxsw_sp);

	if (err)

		goto err_cpu_port_create;



	for (i = 1; i < max_ports; i++) {

		/* Mark as invalid */

		mlxsw_sp->port_to_module[i] = -1;
@@ -3931,6 +3975,8 @@ err_port_module_info_get: 
	for (i--; i >= 1; i--)

		if (mlxsw_sp_port_created(mlxsw_sp, i))

			mlxsw_sp_port_remove(mlxsw_sp, i);

	mlxsw_sp_cpu_port_remove(mlxsw_sp);

err_cpu_port_create:

	kfree(mlxsw_sp->port_to_module);

err_port_to_module_alloc:

	kfree(mlxsw_sp->ports);

drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c

+43 −8
Original line number Diff line number Diff line
@@ -250,6 +250,10 @@ static int mlxsw_sp_sb_pm_occ_clear(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
		&mlxsw_sp->sb_vals->pool_dess[pool_index];

	char sbpm_pl[MLXSW_REG_SBPM_LEN];



	if (local_port == MLXSW_PORT_CPU_PORT &&

	    des->dir == MLXSW_REG_SBXX_DIR_INGRESS)

		return 0;



	mlxsw_reg_sbpm_pack(sbpm_pl, local_port, des->pool, des->dir,

			    true, 0, 0);

	return mlxsw_reg_trans_query(mlxsw_sp->core, MLXSW_REG(sbpm), sbpm_pl,
@@ -273,6 +277,10 @@ static int mlxsw_sp_sb_pm_occ_query(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	char sbpm_pl[MLXSW_REG_SBPM_LEN];

	struct mlxsw_sp_sb_pm *pm;



	if (local_port == MLXSW_PORT_CPU_PORT &&

	    des->dir == MLXSW_REG_SBXX_DIR_INGRESS)

		return 0;



	pm = mlxsw_sp_sb_pm_get(mlxsw_sp, local_port, pool_index);

	mlxsw_reg_sbpm_pack(sbpm_pl, local_port, des->pool, des->dir,

			    false, 0, 0);
@@ -1085,6 +1093,11 @@ int mlxsw_sp_sb_port_pool_set(struct mlxsw_core_port *mlxsw_core_port, 
	u32 max_buff;

	int err;



	if (local_port == MLXSW_PORT_CPU_PORT) {

		NL_SET_ERR_MSG_MOD(extack, "Changing CPU port's threshold is forbidden");

		return -EINVAL;

	}



	err = mlxsw_sp_sb_threshold_in(mlxsw_sp, pool_index,

				       threshold, &max_buff, extack);

	if (err)
@@ -1130,6 +1143,11 @@ int mlxsw_sp_sb_tc_pool_bind_set(struct mlxsw_core_port *mlxsw_core_port, 
	u32 max_buff;

	int err;



	if (local_port == MLXSW_PORT_CPU_PORT) {

		NL_SET_ERR_MSG_MOD(extack, "Changing CPU port's binding is forbidden");

		return -EINVAL;

	}



	if (dir != mlxsw_sp->sb_vals->pool_dess[pool_index].dir) {

		NL_SET_ERR_MSG_MOD(extack, "Binding egress TC to ingress pool and vice versa is forbidden");

		return -EINVAL;
@@ -1187,6 +1205,11 @@ static void mlxsw_sp_sb_sr_occ_query_cb(struct mlxsw_core *mlxsw_core, 
	     local_port < mlxsw_core_max_ports(mlxsw_core); local_port++) {

		if (!mlxsw_sp->ports[local_port])

			continue;

		if (local_port == MLXSW_PORT_CPU_PORT) {

			/* Ingress quotas are not supported for the CPU port */

			masked_count++;

			continue;

		}

		for (i = 0; i < MLXSW_SP_SB_ING_TC_COUNT; i++) {

			cm = mlxsw_sp_sb_cm_get(mlxsw_sp, local_port, i,

						MLXSW_REG_SBXX_DIR_INGRESS);
@@ -1222,7 +1245,7 @@ int mlxsw_sp_sb_occ_snapshot(struct mlxsw_core *mlxsw_core, 
	char *sbsr_pl;

	u8 masked_count;

	u8 local_port_1;

	u8 local_port = 0;

	u8 local_port;

	int i;

	int err;

	int err2;
@@ -1231,8 +1254,8 @@ int mlxsw_sp_sb_occ_snapshot(struct mlxsw_core *mlxsw_core, 
	if (!sbsr_pl)

		return -ENOMEM;



	local_port = MLXSW_PORT_CPU_PORT;

next_batch:

	local_port++;

	local_port_1 = local_port;

	masked_count = 0;

	mlxsw_reg_sbsr_pack(sbsr_pl, false);
@@ -1243,7 +1266,11 @@ next_batch: 
	for (; local_port < mlxsw_core_max_ports(mlxsw_core); local_port++) {

		if (!mlxsw_sp->ports[local_port])

			continue;

		mlxsw_reg_sbsr_ingress_port_mask_set(sbsr_pl, local_port, 1);

		if (local_port != MLXSW_PORT_CPU_PORT) {

			/* Ingress quotas are not supported for the CPU port */

			mlxsw_reg_sbsr_ingress_port_mask_set(sbsr_pl,

							     local_port, 1);

		}

		mlxsw_reg_sbsr_egress_port_mask_set(sbsr_pl, local_port, 1);

		for (i = 0; i < mlxsw_sp->sb_vals->pool_count; i++) {

			err = mlxsw_sp_sb_pm_occ_query(mlxsw_sp, local_port, i,
@@ -1264,8 +1291,10 @@ do_query: 
				    cb_priv);

	if (err)

		goto out;

	if (local_port < mlxsw_core_max_ports(mlxsw_core))

	if (local_port < mlxsw_core_max_ports(mlxsw_core)) {

		local_port++;

		goto next_batch;

	}



out:

	err2 = mlxsw_reg_trans_bulk_wait(&bulk_list);
@@ -1282,7 +1311,7 @@ int mlxsw_sp_sb_occ_max_clear(struct mlxsw_core *mlxsw_core, 
	LIST_HEAD(bulk_list);

	char *sbsr_pl;

	unsigned int masked_count;

	u8 local_port = 0;

	u8 local_port;

	int i;

	int err;

	int err2;
@@ -1291,8 +1320,8 @@ int mlxsw_sp_sb_occ_max_clear(struct mlxsw_core *mlxsw_core, 
	if (!sbsr_pl)

		return -ENOMEM;



	local_port = MLXSW_PORT_CPU_PORT;

next_batch:

	local_port++;

	masked_count = 0;

	mlxsw_reg_sbsr_pack(sbsr_pl, true);

	for (i = 0; i < MLXSW_SP_SB_ING_TC_COUNT; i++)
@@ -1302,7 +1331,11 @@ next_batch: 
	for (; local_port < mlxsw_core_max_ports(mlxsw_core); local_port++) {

		if (!mlxsw_sp->ports[local_port])

			continue;

		mlxsw_reg_sbsr_ingress_port_mask_set(sbsr_pl, local_port, 1);

		if (local_port != MLXSW_PORT_CPU_PORT) {

			/* Ingress quotas are not supported for the CPU port */

			mlxsw_reg_sbsr_ingress_port_mask_set(sbsr_pl,

							     local_port, 1);

		}

		mlxsw_reg_sbsr_egress_port_mask_set(sbsr_pl, local_port, 1);

		for (i = 0; i < mlxsw_sp->sb_vals->pool_count; i++) {

			err = mlxsw_sp_sb_pm_occ_clear(mlxsw_sp, local_port, i,
@@ -1319,8 +1352,10 @@ do_query: 
				    &bulk_list, NULL, 0);

	if (err)

		goto out;

	if (local_port < mlxsw_core_max_ports(mlxsw_core))

	if (local_port < mlxsw_core_max_ports(mlxsw_core)) {

		local_port++;

		goto next_batch;

	}



out:

	err2 = mlxsw_reg_trans_bulk_wait(&bulk_list);

CRA Git | Maintained and supported by SUSTech CRA and CCSE