Skip to content

Commit 0a43141

Browse files
msanallaSaeed Mahameed
authored andcommitted
Revert "net/mlx5: Expose vnic diagnostic counters for eswitch managed vports"
This reverts commit 606e6a72e29dff9e3341c4cc9b554420e4793f401 which exposes the vnic diagnostic counters via debugfs. Instead, The upcoming series will expose the same counters through devlink health reporter. Signed-off-by: Maher Sanalla <msanalla@nvidia.com> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
1 parent e267b8a commit 0a43141

5 files changed

Lines changed: 1 addition & 197 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ mlx5_core-$(CONFIG_MLX5_TC_SAMPLE) += en/tc/sample.o
6969
#
7070
mlx5_core-$(CONFIG_MLX5_ESWITCH) += eswitch.o eswitch_offloads.o eswitch_offloads_termtbl.o \
7171
ecpf.o rdma.o esw/legacy.o \
72-
esw/debugfs.o esw/devlink_port.o esw/vporttbl.o esw/qos.o
72+
esw/devlink_port.o esw/vporttbl.o esw/qos.o
7373

7474
mlx5_core-$(CONFIG_MLX5_ESWITCH) += esw/acl/helper.o \
7575
esw/acl/egress_lgcy.o esw/acl/egress_ofld.o \

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

Lines changed: 0 additions & 182 deletions
This file was deleted.

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include <linux/mlx5/vport.h>
3737
#include <linux/mlx5/fs.h>
3838
#include <linux/mlx5/mpfs.h>
39-
#include <linux/debugfs.h>
4039
#include "esw/acl/lgcy.h"
4140
#include "esw/legacy.h"
4241
#include "esw/qos.h"
@@ -1056,23 +1055,20 @@ int mlx5_eswitch_load_vport(struct mlx5_eswitch *esw, u16 vport_num,
10561055
if (err)
10571056
return err;
10581057

1059-
mlx5_esw_vport_debugfs_create(esw, vport_num, false, 0);
10601058
err = esw_offloads_load_rep(esw, vport_num);
10611059
if (err)
10621060
goto err_rep;
10631061

10641062
return err;
10651063

10661064
err_rep:
1067-
mlx5_esw_vport_debugfs_destroy(esw, vport_num);
10681065
mlx5_esw_vport_disable(esw, vport_num);
10691066
return err;
10701067
}
10711068

10721069
void mlx5_eswitch_unload_vport(struct mlx5_eswitch *esw, u16 vport_num)
10731070
{
10741071
esw_offloads_unload_rep(esw, vport_num);
1075-
mlx5_esw_vport_debugfs_destroy(esw, vport_num);
10761072
mlx5_esw_vport_disable(esw, vport_num);
10771073
}
10781074

@@ -1672,7 +1668,6 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev)
16721668
dev->priv.eswitch = esw;
16731669
BLOCKING_INIT_NOTIFIER_HEAD(&esw->n_head);
16741670

1675-
esw->dbgfs = debugfs_create_dir("esw", mlx5_debugfs_get_dev_root(esw->dev));
16761671
esw_info(dev,
16771672
"Total vports %d, per vport: max uc(%d) max mc(%d)\n",
16781673
esw->total_vports,
@@ -1696,7 +1691,6 @@ void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw)
16961691

16971692
esw_info(esw->dev, "cleanup\n");
16981693

1699-
debugfs_remove_recursive(esw->dbgfs);
17001694
esw->dev->priv.eswitch = NULL;
17011695
destroy_workqueue(esw->work_queue);
17021696
WARN_ON(refcount_read(&esw->qos.refcnt));

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ struct mlx5_vport {
195195
enum mlx5_eswitch_vport_event enabled_events;
196196
int index;
197197
struct devlink_port *dl_port;
198-
struct dentry *dbgfs;
199198
};
200199

201200
struct mlx5_esw_indir_table;
@@ -343,7 +342,6 @@ struct mlx5_eswitch {
343342
u32 large_group_num;
344343
} params;
345344
struct blocking_notifier_head n_head;
346-
struct dentry *dbgfs;
347345
};
348346

349347
void esw_offloads_disable(struct mlx5_eswitch *esw);
@@ -704,9 +702,6 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_
704702
void mlx5_esw_offloads_devlink_port_unregister(struct mlx5_eswitch *esw, u16 vport_num);
705703
struct devlink_port *mlx5_esw_offloads_devlink_port(struct mlx5_eswitch *esw, u16 vport_num);
706704

707-
void mlx5_esw_vport_debugfs_create(struct mlx5_eswitch *esw, u16 vport_num, bool is_sf, u16 sf_num);
708-
void mlx5_esw_vport_debugfs_destroy(struct mlx5_eswitch *esw, u16 vport_num);
709-
710705
int mlx5_esw_devlink_sf_port_register(struct mlx5_eswitch *esw, struct devlink_port *dl_port,
711706
u16 vport_num, u32 controller, u32 sfnum);
712707
void mlx5_esw_devlink_sf_port_unregister(struct mlx5_eswitch *esw, u16 vport_num);

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3828,14 +3828,12 @@ int mlx5_esw_offloads_sf_vport_enable(struct mlx5_eswitch *esw, struct devlink_p
38283828
if (err)
38293829
goto devlink_err;
38303830

3831-
mlx5_esw_vport_debugfs_create(esw, vport_num, true, sfnum);
38323831
err = mlx5_esw_offloads_rep_load(esw, vport_num);
38333832
if (err)
38343833
goto rep_err;
38353834
return 0;
38363835

38373836
rep_err:
3838-
mlx5_esw_vport_debugfs_destroy(esw, vport_num);
38393837
mlx5_esw_devlink_sf_port_unregister(esw, vport_num);
38403838
devlink_err:
38413839
mlx5_esw_vport_disable(esw, vport_num);
@@ -3845,7 +3843,6 @@ int mlx5_esw_offloads_sf_vport_enable(struct mlx5_eswitch *esw, struct devlink_p
38453843
void mlx5_esw_offloads_sf_vport_disable(struct mlx5_eswitch *esw, u16 vport_num)
38463844
{
38473845
mlx5_esw_offloads_rep_unload(esw, vport_num);
3848-
mlx5_esw_vport_debugfs_destroy(esw, vport_num);
38493846
mlx5_esw_devlink_sf_port_unregister(esw, vport_num);
38503847
mlx5_esw_vport_disable(esw, vport_num);
38513848
}

0 commit comments

Comments
 (0)