Commit 2d1c882d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mlx5-fixes-2023-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 

Saeed Mahameed says:

====================
mlx5 fixes 2023-10-12

This series provides bug fixes to mlx5 driver.

* tag 'mlx5-fixes-2023-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5e: Fix VF representors reporting zero counters to "ip -s" command
  net/mlx5e: Don't offload internal port if filter device is out device
  net/mlx5e: Take RTNL lock before triggering netdev notifiers
  net/mlx5e: XDP, Fix XDP_REDIRECT mpwqe page fragment leaks on shutdown
  net/mlx5e: RX, Fix page_pool allocation failure recovery for legacy rq
  net/mlx5e: RX, Fix page_pool allocation failure recovery for striding rq
  net/mlx5: Handle fw tracer change ownership event based on MTRC
  net/mlx5: Bridge, fix peer entry ageing in LAG mode
  net/mlx5: E-switch, register event handler before arming the event
  net/mlx5: Perform DMA operations in the right locations
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents aeae0ef0 80f12414

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

+28 −36
Original line number Diff line number Diff line
@@ -2186,52 +2186,23 @@ static u16 cmdif_rev(struct mlx5_core_dev *dev) 


int mlx5_cmd_init(struct mlx5_core_dev *dev)

{

	int size = sizeof(struct mlx5_cmd_prot_block);

	int align = roundup_pow_of_two(size);

	struct mlx5_cmd *cmd = &dev->cmd;

	u32 cmd_l;

	int err;



	cmd->pool = dma_pool_create("mlx5_cmd", mlx5_core_dma_dev(dev), size, align, 0);

	if (!cmd->pool)

		return -ENOMEM;



	err = alloc_cmd_page(dev, cmd);

	if (err)

		goto err_free_pool;



	cmd_l = (u32)(cmd->dma);

	if (cmd_l & 0xfff) {

		mlx5_core_err(dev, "invalid command queue address\n");

		err = -ENOMEM;

		goto err_cmd_page;

	}

	cmd->checksum_disabled = 1;



	spin_lock_init(&cmd->alloc_lock);

	spin_lock_init(&cmd->token_lock);



	create_msg_cache(dev);



	set_wqname(dev);

	cmd->wq = create_singlethread_workqueue(cmd->wq_name);

	if (!cmd->wq) {

		mlx5_core_err(dev, "failed to create command workqueue\n");

		err = -ENOMEM;

		goto err_cache;

		return -ENOMEM;

	}



	mlx5_cmdif_debugfs_init(dev);



	return 0;



err_cache:

	destroy_msg_cache(dev);

err_cmd_page:

	free_cmd_page(dev, cmd);

err_free_pool:

	dma_pool_destroy(cmd->pool);

	return err;

}



void mlx5_cmd_cleanup(struct mlx5_core_dev *dev)
@@ -2240,15 +2211,15 @@ void mlx5_cmd_cleanup(struct mlx5_core_dev *dev) 


	mlx5_cmdif_debugfs_cleanup(dev);

	destroy_workqueue(cmd->wq);

	destroy_msg_cache(dev);

	free_cmd_page(dev, cmd);

	dma_pool_destroy(cmd->pool);

}



int mlx5_cmd_enable(struct mlx5_core_dev *dev)

{

	int size = sizeof(struct mlx5_cmd_prot_block);

	int align = roundup_pow_of_two(size);

	struct mlx5_cmd *cmd = &dev->cmd;

	u32 cmd_h, cmd_l;

	int err;



	memset(&cmd->vars, 0, sizeof(cmd->vars));

	cmd->vars.cmdif_rev = cmdif_rev(dev);
@@ -2281,10 +2252,21 @@ int mlx5_cmd_enable(struct mlx5_core_dev *dev) 
	sema_init(&cmd->vars.pages_sem, 1);

	sema_init(&cmd->vars.throttle_sem, DIV_ROUND_UP(cmd->vars.max_reg_cmds, 2));



	cmd->pool = dma_pool_create("mlx5_cmd", mlx5_core_dma_dev(dev), size, align, 0);

	if (!cmd->pool)

		return -ENOMEM;



	err = alloc_cmd_page(dev, cmd);

	if (err)

		goto err_free_pool;



	cmd_h = (u32)((u64)(cmd->dma) >> 32);

	cmd_l = (u32)(cmd->dma);

	if (WARN_ON(cmd_l & 0xfff))

		return -EINVAL;

	if (cmd_l & 0xfff) {

		mlx5_core_err(dev, "invalid command queue address\n");

		err = -ENOMEM;

		goto err_cmd_page;

	}



	iowrite32be(cmd_h, &dev->iseg->cmdq_addr_h);

	iowrite32be(cmd_l, &dev->iseg->cmdq_addr_l_sz);
@@ -2297,17 +2279,27 @@ int mlx5_cmd_enable(struct mlx5_core_dev *dev) 
	cmd->mode = CMD_MODE_POLLING;

	cmd->allowed_opcode = CMD_ALLOWED_OPCODE_ALL;



	create_msg_cache(dev);

	create_debugfs_files(dev);



	return 0;



err_cmd_page:

	free_cmd_page(dev, cmd);

err_free_pool:

	dma_pool_destroy(cmd->pool);

	return err;

}



void mlx5_cmd_disable(struct mlx5_core_dev *dev)

{

	struct mlx5_cmd *cmd = &dev->cmd;



	clean_debug_files(dev);

	flush_workqueue(cmd->wq);

	clean_debug_files(dev);

	destroy_msg_cache(dev);

	free_cmd_page(dev, cmd);

	dma_pool_destroy(cmd->pool);

}



void mlx5_cmd_set_state(struct mlx5_core_dev *dev,

drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c

+1 −1
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ static void mlx5_fw_tracer_ownership_change(struct work_struct *work) 


	mlx5_core_dbg(tracer->dev, "FWTracer: ownership changed, current=(%d)\n", tracer->owner);

	if (tracer->owner) {

		tracer->owner = false;

		mlx5_fw_tracer_ownership_acquire(tracer);

		return;

	}

drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c

+11 −0
Original line number Diff line number Diff line
@@ -467,6 +467,17 @@ static int mlx5_esw_bridge_switchdev_event(struct notifier_block *nb, 
		/* only handle the event on peers */

		if (mlx5_esw_bridge_is_local(dev, rep, esw))

			break;



		fdb_info = container_of(info,

					struct switchdev_notifier_fdb_info,

					info);

		/* Mark for deletion to prevent the update wq task from

		 * spuriously refreshing the entry which would mark it again as

		 * offloaded in SW bridge. After this fallthrough to regular

		 * async delete code.

		 */

		mlx5_esw_bridge_fdb_mark_deleted(dev, vport_num, esw_owner_vhca_id, br_offloads,

						 fdb_info);

		fallthrough;

	case SWITCHDEV_FDB_ADD_TO_DEVICE:

	case SWITCHDEV_FDB_DEL_TO_DEVICE:

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

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ static int mlx5e_set_int_port_tunnel(struct mlx5e_priv *priv, 


	route_dev = dev_get_by_index(dev_net(e->out_dev), e->route_dev_ifindex);



	if (!route_dev || !netif_is_ovs_master(route_dev))

	if (!route_dev || !netif_is_ovs_master(route_dev) ||

	    attr->parse_attr->filter_dev == e->out_dev)

		goto out;



	err = mlx5e_set_fwd_to_int_port_actions(priv, attr, e->route_dev_ifindex,

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

+4 −4
Original line number Diff line number Diff line
@@ -874,11 +874,11 @@ int mlx5e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames, 
	}



out:

	if (flags & XDP_XMIT_FLUSH) {

	if (sq->mpwqe.wqe)

		mlx5e_xdp_mpwqe_complete(sq);



	if (flags & XDP_XMIT_FLUSH)

		mlx5e_xmit_xdp_doorbell(sq);

	}



	return nxmit;

}