Commit 05f1e35a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mlx5-updates-2021-09-30' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 

Saeed Mahameed says:

====================
mlx5-updates-2021-09-30

1) From Yevgeny Kliteynik:

This patch series deals with vport handling in SW steering.

For every vport, SW steering queries FW for this vport's properties,
such as RX/TX ICM addresses to be able to add this vport as dest action.
The following patches rework vport capabilities managements and add support
for Scalable Functions (SFs).

 - Patch 1 fixes the vport number data type all over the DR code to 16 bits
   in accordance with HW spec.
 - Patch 2 replaces local SW steering WIRE_PORT macro with the existing
   mlx5 define.
 - Patch 3 adds missing query for vport 0 and and handles eswitch manager
   capabilities for ECPF (BlueField in embedded CPU mode).
 - Patch 4 fixes error messages for failure to obtain vport caps from
   different locations in the code to have the same verbosity level and
   similar wording.
 - Patch 5 adds support for csum recalculation flow tables on SFs: it
   implements these FTs management in XArray instead of the fixed size array,
   thus adding support for csum recalculation table for any valid vport.
 - Patch 6 is the main patch of this whole series: it refactors vports
   capabilities handling and adds SFs support.

2) Minor and trivial updates and cleanups

* tag 'mlx5-updates-2021-09-30' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5e: Use array_size() helper
  net/mlx5: Use struct_size() helper in kvzalloc()
  net/mlx5: Use kvcalloc() instead of kvzalloc()
  net/mlx5: Tolerate failures in debug features while driver load
  net/mlx5: Warn for devlink reload when there are VFs alive
  net/mlx5: DR, Add missing string for action type SAMPLER
  net/mlx5: DR, init_next_match only if needed
  net/mlx5: DR, Fix typo 'offeset' to 'offset'
  net/mlx5: DR, Increase supported num of actions to 32
  net/mlx5: DR, Add support for SF vports
  net/mlx5: DR, Support csum recalculation flow table on SFs
  net/mlx5: DR, Align error messages for failure to obtain vport caps
  net/mlx5: DR, Add missing query for vport 0
  net/mlx5: DR, Replace local WIRE_PORT macro with the existing MLX5_VPORT_UPLINK
  net/mlx5: DR, Fix vport number data type to u16
====================

Link: https://lore.kernel.org/r/20210930232050.41779-1-saeed@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 10d48705 51984c9e

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

+1 −1
Original line number Diff line number Diff line
@@ -2058,7 +2058,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) 
		return -EINVAL;

	}



	cmd->stats = kvzalloc(MLX5_CMD_OP_MAX * sizeof(*cmd->stats), GFP_KERNEL);

	cmd->stats = kvcalloc(MLX5_CMD_OP_MAX, sizeof(*cmd->stats), GFP_KERNEL);

	if (!cmd->stats)

		return -ENOMEM;

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

+5 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ static int mlx5_devlink_reload_down(struct devlink *devlink, bool netns_change, 
				    struct netlink_ext_ack *extack)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	struct pci_dev *pdev = dev->pdev;

	bool sf_dev_allocated;



	sf_dev_allocated = mlx5_sf_dev_allocated(dev);
@@ -153,6 +154,10 @@ static int mlx5_devlink_reload_down(struct devlink *devlink, bool netns_change, 
		return -EOPNOTSUPP;

	}



	if (pci_num_vf(pdev)) {

		NL_SET_ERR_MSG_MOD(extack, "reload while VFs are present is unfavorable");

	}



	switch (action) {

	case DEVLINK_RELOAD_ACTION_DRIVER_REINIT:

		mlx5_unload_one(dev);

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

+6 −4
Original line number Diff line number Diff line
@@ -930,9 +930,10 @@ static int mlx5e_alloc_xdpsq_fifo(struct mlx5e_xdpsq *sq, int numa) 
	struct mlx5e_xdp_info_fifo *xdpi_fifo = &sq->db.xdpi_fifo;

	int wq_sz        = mlx5_wq_cyc_get_size(&sq->wq);

	int dsegs_per_wq = wq_sz * MLX5_SEND_WQEBB_NUM_DS;

	size_t size;



	xdpi_fifo->xi = kvzalloc_node(sizeof(*xdpi_fifo->xi) * dsegs_per_wq,

				      GFP_KERNEL, numa);

	size = array_size(sizeof(*xdpi_fifo->xi), dsegs_per_wq);

	xdpi_fifo->xi = kvzalloc_node(size, GFP_KERNEL, numa);

	if (!xdpi_fifo->xi)

		return -ENOMEM;
@@ -946,10 +947,11 @@ static int mlx5e_alloc_xdpsq_fifo(struct mlx5e_xdpsq *sq, int numa) 
static int mlx5e_alloc_xdpsq_db(struct mlx5e_xdpsq *sq, int numa)

{

	int wq_sz = mlx5_wq_cyc_get_size(&sq->wq);

	size_t size;

	int err;



	sq->db.wqe_info = kvzalloc_node(sizeof(*sq->db.wqe_info) * wq_sz,

					GFP_KERNEL, numa);

	size = array_size(sizeof(*sq->db.wqe_info), wq_sz);

	sq->db.wqe_info = kvzalloc_node(size, GFP_KERNEL, numa);

	if (!sq->db.wqe_info)

		return -ENOMEM;

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

+2 −2
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ mlx5_eswitch_add_send_to_vport_meta_rules(struct mlx5_eswitch *esw) 
	u16 vport_num;



	num_vfs = esw->esw_funcs.num_vfs;

	flows = kvzalloc(num_vfs * sizeof(*flows), GFP_KERNEL);

	flows = kvcalloc(num_vfs, sizeof(*flows), GFP_KERNEL);

	if (!flows)

		return -ENOMEM;
@@ -1188,7 +1188,7 @@ static int esw_add_fdb_peer_miss_rules(struct mlx5_eswitch *esw, 


	peer_miss_rules_setup(esw, peer_dev, spec, &dest);



	flows = kvzalloc(nvports * sizeof(*flows), GFP_KERNEL);

	flows = kvcalloc(nvports, sizeof(*flows), GFP_KERNEL);

	if (!flows) {

		err = -ENOMEM;

		goto alloc_flows_err;

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

+1 −2
Original line number Diff line number Diff line
@@ -497,8 +497,7 @@ static struct mlx5_fc_bulk *mlx5_fc_bulk_create(struct mlx5_core_dev *dev) 
	alloc_bitmask = MLX5_CAP_GEN(dev, flow_counter_bulk_alloc);

	bulk_len = alloc_bitmask > 0 ? MLX5_FC_BULK_NUM_FCS(alloc_bitmask) : 1;



	bulk = kvzalloc(sizeof(*bulk) + bulk_len * sizeof(struct mlx5_fc),

			GFP_KERNEL);

	bulk = kvzalloc(struct_size(bulk, fcs, bulk_len), GFP_KERNEL);

	if (!bulk)

		goto err_alloc_bulk;