Commit ff8ced4e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Saeed Mahameed says:

====================
mlx5 fixes 2023-02-07

This series provides bug fixes to mlx5 driver.

* tag 'mlx5-fixes-2023-02-07' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5: Serialize module cleanup with reload and remove
  net/mlx5: fw_tracer, Zero consumer index when reloading the tracer
  net/mlx5: fw_tracer, Clear load bit when freeing string DBs buffers
  net/mlx5: Expose SF firmware pages counter
  net/mlx5: Store page counters in a single array
  net/mlx5e: IPoIB, Show unknown speed instead of error
  net/mlx5e: Fix crash unsetting rx-vlan-filter in switchdev mode
  net/mlx5: Bridge, fix ageing of peer FDB entries
  net/mlx5: DR, Fix potential race in dr_rule_create_rule_nic
  net/mlx5e: Update rx ring hw mtu upon each rx-fcs flag change
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b963d9d5 8f0d1451

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

+3 −2
Original line number Diff line number Diff line
@@ -245,8 +245,9 @@ void mlx5_pages_debugfs_init(struct mlx5_core_dev *dev) 
	pages = dev->priv.dbg.pages_debugfs;



	debugfs_create_u32("fw_pages_total", 0400, pages, &dev->priv.fw_pages);

	debugfs_create_u32("fw_pages_vfs", 0400, pages, &dev->priv.vfs_pages);

	debugfs_create_u32("fw_pages_host_pf", 0400, pages, &dev->priv.host_pf_pages);

	debugfs_create_u32("fw_pages_vfs", 0400, pages, &dev->priv.page_counters[MLX5_VF]);

	debugfs_create_u32("fw_pages_sfs", 0400, pages, &dev->priv.page_counters[MLX5_SF]);

	debugfs_create_u32("fw_pages_host_pf", 0400, pages, &dev->priv.page_counters[MLX5_HOST_PF]);

	debugfs_create_u32("fw_pages_alloc_failed", 0400, pages, &dev->priv.fw_pages_alloc_failed);

	debugfs_create_u32("fw_pages_give_dropped", 0400, pages, &dev->priv.give_pages_dropped);

	debugfs_create_u32("fw_pages_reclaim_discard", 0400, pages,

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

+2 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ static int mlx5_query_mtrc_caps(struct mlx5_fw_tracer *tracer) 
			MLX5_GET(mtrc_cap, out, num_string_trace);

	tracer->str_db.num_string_db = MLX5_GET(mtrc_cap, out, num_string_db);

	tracer->owner = !!MLX5_GET(mtrc_cap, out, trace_owner);

	tracer->str_db.loaded = false;



	for (i = 0; i < tracer->str_db.num_string_db; i++) {

		mtrc_cap_sp = MLX5_ADDR_OF(mtrc_cap, out, string_db_param[i]);
@@ -756,6 +757,7 @@ static int mlx5_fw_tracer_set_mtrc_conf(struct mlx5_fw_tracer *tracer) 
	if (err)

		mlx5_core_warn(dev, "FWTracer: Failed to set tracer configurations %d\n", err);



	tracer->buff.consumer_index = 0;

	return err;

}
@@ -820,7 +822,6 @@ 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;

		tracer->buff.consumer_index = 0;

		return;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void mlx5_ec_cleanup(struct mlx5_core_dev *dev) 


	mlx5_host_pf_cleanup(dev);



	err = mlx5_wait_for_pages(dev, &dev->priv.host_pf_pages);

	err = mlx5_wait_for_pages(dev, &dev->priv.page_counters[MLX5_HOST_PF]);

	if (err)

		mlx5_core_warn(dev, "Timeout reclaiming external host PF pages err(%d)\n", err);

}

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

+0 −4
Original line number Diff line number Diff line
@@ -438,10 +438,6 @@ static int mlx5_esw_bridge_switchdev_event(struct notifier_block *nb, 


	switch (event) {

	case SWITCHDEV_FDB_ADD_TO_BRIDGE:

		/* only handle the event on native eswtich of representor */

		if (!mlx5_esw_bridge_is_local(dev, rep, esw))

			break;



		fdb_info = container_of(info,

					struct switchdev_notifier_fdb_info,

					info);

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

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ void mlx5e_enable_cvlan_filter(struct mlx5e_flow_steering *fs, bool promisc) 


void mlx5e_disable_cvlan_filter(struct mlx5e_flow_steering *fs, bool promisc)

{

	if (fs->vlan->cvlan_filter_disabled)

	if (!fs->vlan || fs->vlan->cvlan_filter_disabled)

		return;



	fs->vlan->cvlan_filter_disabled = true;