Commit 0a9e2307 authored by Chris Mi's avatar Chris Mi Committed by Saeed Mahameed

net/mlx5: E-switch, Rename functions to follow naming convention.

Public api starts with mlx5 and remove mlx5 for non-public api.
Signed-off-by: default avatarChris Mi <cmi@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 4c7f4028
...@@ -66,7 +66,7 @@ esw_vport_tbl_lookup(struct mlx5_eswitch *esw, struct mlx5_vport_key *skey, u32 ...@@ -66,7 +66,7 @@ esw_vport_tbl_lookup(struct mlx5_eswitch *esw, struct mlx5_vport_key *skey, u32
} }
struct mlx5_flow_table * struct mlx5_flow_table *
esw_vport_tbl_get(struct mlx5_eswitch *esw, struct mlx5_vport_tbl_attr *attr) mlx5_esw_vporttbl_get(struct mlx5_eswitch *esw, struct mlx5_vport_tbl_attr *attr)
{ {
struct mlx5_core_dev *dev = esw->dev; struct mlx5_core_dev *dev = esw->dev;
struct mlx5_flow_namespace *ns; struct mlx5_flow_namespace *ns;
...@@ -116,7 +116,7 @@ esw_vport_tbl_get(struct mlx5_eswitch *esw, struct mlx5_vport_tbl_attr *attr) ...@@ -116,7 +116,7 @@ esw_vport_tbl_get(struct mlx5_eswitch *esw, struct mlx5_vport_tbl_attr *attr)
} }
void void
esw_vport_tbl_put(struct mlx5_eswitch *esw, struct mlx5_vport_tbl_attr *attr) mlx5_esw_vporttbl_put(struct mlx5_eswitch *esw, struct mlx5_vport_tbl_attr *attr)
{ {
struct mlx5_vport_table *e; struct mlx5_vport_table *e;
struct mlx5_vport_key key; struct mlx5_vport_key key;
......
...@@ -720,9 +720,9 @@ struct mlx5_vport_tbl_attr { ...@@ -720,9 +720,9 @@ struct mlx5_vport_tbl_attr {
}; };
struct mlx5_flow_table * struct mlx5_flow_table *
esw_vport_tbl_get(struct mlx5_eswitch *esw, struct mlx5_vport_tbl_attr *attr); mlx5_esw_vporttbl_get(struct mlx5_eswitch *esw, struct mlx5_vport_tbl_attr *attr);
void void
esw_vport_tbl_put(struct mlx5_eswitch *esw, struct mlx5_vport_tbl_attr *attr); mlx5_esw_vporttbl_put(struct mlx5_eswitch *esw, struct mlx5_vport_tbl_attr *attr);
struct mlx5_flow_handle * struct mlx5_flow_handle *
esw_add_restore_rule(struct mlx5_eswitch *esw, u32 tag); esw_add_restore_rule(struct mlx5_eswitch *esw, u32 tag);
......
...@@ -483,7 +483,7 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw, ...@@ -483,7 +483,7 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw,
fwd_attr.prio = attr->prio; fwd_attr.prio = attr->prio;
fwd_attr.vport = esw_attr->in_rep->vport; fwd_attr.vport = esw_attr->in_rep->vport;
fdb = esw_vport_tbl_get(esw, &fwd_attr); fdb = mlx5_esw_vporttbl_get(esw, &fwd_attr);
} else { } else {
if (attr->chain || attr->prio) if (attr->chain || attr->prio)
fdb = mlx5_chains_get_table(chains, attr->chain, fdb = mlx5_chains_get_table(chains, attr->chain,
...@@ -515,7 +515,7 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw, ...@@ -515,7 +515,7 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw,
err_add_rule: err_add_rule:
if (split) if (split)
esw_vport_tbl_put(esw, &fwd_attr); mlx5_esw_vporttbl_put(esw, &fwd_attr);
else if (attr->chain || attr->prio) else if (attr->chain || attr->prio)
mlx5_chains_put_table(chains, attr->chain, attr->prio, 0); mlx5_chains_put_table(chains, attr->chain, attr->prio, 0);
err_esw_get: err_esw_get:
...@@ -548,7 +548,7 @@ mlx5_eswitch_add_fwd_rule(struct mlx5_eswitch *esw, ...@@ -548,7 +548,7 @@ mlx5_eswitch_add_fwd_rule(struct mlx5_eswitch *esw,
fwd_attr.chain = attr->chain; fwd_attr.chain = attr->chain;
fwd_attr.prio = attr->prio; fwd_attr.prio = attr->prio;
fwd_attr.vport = esw_attr->in_rep->vport; fwd_attr.vport = esw_attr->in_rep->vport;
fwd_fdb = esw_vport_tbl_get(esw, &fwd_attr); fwd_fdb = mlx5_esw_vporttbl_get(esw, &fwd_attr);
if (IS_ERR(fwd_fdb)) { if (IS_ERR(fwd_fdb)) {
rule = ERR_CAST(fwd_fdb); rule = ERR_CAST(fwd_fdb);
goto err_get_fwd; goto err_get_fwd;
...@@ -593,7 +593,7 @@ mlx5_eswitch_add_fwd_rule(struct mlx5_eswitch *esw, ...@@ -593,7 +593,7 @@ mlx5_eswitch_add_fwd_rule(struct mlx5_eswitch *esw,
return rule; return rule;
err_chain_src_rewrite: err_chain_src_rewrite:
esw_put_dest_tables_loop(esw, attr, 0, i); esw_put_dest_tables_loop(esw, attr, 0, i);
esw_vport_tbl_put(esw, &fwd_attr); mlx5_esw_vporttbl_put(esw, &fwd_attr);
err_get_fwd: err_get_fwd:
mlx5_chains_put_table(chains, attr->chain, attr->prio, 0); mlx5_chains_put_table(chains, attr->chain, attr->prio, 0);
err_get_fast: err_get_fast:
...@@ -631,12 +631,12 @@ __mlx5_eswitch_del_rule(struct mlx5_eswitch *esw, ...@@ -631,12 +631,12 @@ __mlx5_eswitch_del_rule(struct mlx5_eswitch *esw,
} }
if (fwd_rule) { if (fwd_rule) {
esw_vport_tbl_put(esw, &fwd_attr); mlx5_esw_vporttbl_put(esw, &fwd_attr);
mlx5_chains_put_table(chains, attr->chain, attr->prio, 0); mlx5_chains_put_table(chains, attr->chain, attr->prio, 0);
esw_put_dest_tables_loop(esw, attr, 0, esw_attr->split_count); esw_put_dest_tables_loop(esw, attr, 0, esw_attr->split_count);
} else { } else {
if (split) if (split)
esw_vport_tbl_put(esw, &fwd_attr); mlx5_esw_vporttbl_put(esw, &fwd_attr);
else if (attr->chain || attr->prio) else if (attr->chain || attr->prio)
mlx5_chains_put_table(chains, attr->chain, attr->prio, 0); mlx5_chains_put_table(chains, attr->chain, attr->prio, 0);
esw_cleanup_dests(esw, attr); esw_cleanup_dests(esw, attr);
...@@ -1335,7 +1335,7 @@ static void esw_set_flow_group_source_port(struct mlx5_eswitch *esw, ...@@ -1335,7 +1335,7 @@ static void esw_set_flow_group_source_port(struct mlx5_eswitch *esw,
} }
#if IS_ENABLED(CONFIG_MLX5_CLS_ACT) #if IS_ENABLED(CONFIG_MLX5_CLS_ACT)
static void mlx5_esw_vport_tbl_put(struct mlx5_eswitch *esw) static void esw_vport_tbl_put(struct mlx5_eswitch *esw)
{ {
struct mlx5_vport_tbl_attr attr; struct mlx5_vport_tbl_attr attr;
struct mlx5_vport *vport; struct mlx5_vport *vport;
...@@ -1345,11 +1345,11 @@ static void mlx5_esw_vport_tbl_put(struct mlx5_eswitch *esw) ...@@ -1345,11 +1345,11 @@ static void mlx5_esw_vport_tbl_put(struct mlx5_eswitch *esw)
attr.prio = 1; attr.prio = 1;
mlx5_esw_for_all_vports(esw, i, vport) { mlx5_esw_for_all_vports(esw, i, vport) {
attr.vport = vport->vport; attr.vport = vport->vport;
esw_vport_tbl_put(esw, &attr); mlx5_esw_vporttbl_put(esw, &attr);
} }
} }
static int mlx5_esw_vport_tbl_get(struct mlx5_eswitch *esw) static int esw_vport_tbl_get(struct mlx5_eswitch *esw)
{ {
struct mlx5_vport_tbl_attr attr; struct mlx5_vport_tbl_attr attr;
struct mlx5_flow_table *fdb; struct mlx5_flow_table *fdb;
...@@ -1360,14 +1360,14 @@ static int mlx5_esw_vport_tbl_get(struct mlx5_eswitch *esw) ...@@ -1360,14 +1360,14 @@ static int mlx5_esw_vport_tbl_get(struct mlx5_eswitch *esw)
attr.prio = 1; attr.prio = 1;
mlx5_esw_for_all_vports(esw, i, vport) { mlx5_esw_for_all_vports(esw, i, vport) {
attr.vport = vport->vport; attr.vport = vport->vport;
fdb = esw_vport_tbl_get(esw, &attr); fdb = mlx5_esw_vporttbl_get(esw, &attr);
if (IS_ERR(fdb)) if (IS_ERR(fdb))
goto out; goto out;
} }
return 0; return 0;
out: out:
mlx5_esw_vport_tbl_put(esw); esw_vport_tbl_put(esw);
return PTR_ERR(fdb); return PTR_ERR(fdb);
} }
...@@ -1448,7 +1448,7 @@ esw_chains_create(struct mlx5_eswitch *esw, struct mlx5_flow_table *miss_fdb) ...@@ -1448,7 +1448,7 @@ esw_chains_create(struct mlx5_eswitch *esw, struct mlx5_flow_table *miss_fdb)
/* Open level 1 for split fdb rules now if prios isn't supported */ /* Open level 1 for split fdb rules now if prios isn't supported */
if (!mlx5_chains_prios_supported(chains)) { if (!mlx5_chains_prios_supported(chains)) {
err = mlx5_esw_vport_tbl_get(esw); err = esw_vport_tbl_get(esw);
if (err) if (err)
goto level_1_err; goto level_1_err;
} }
...@@ -1472,7 +1472,7 @@ static void ...@@ -1472,7 +1472,7 @@ static void
esw_chains_destroy(struct mlx5_eswitch *esw, struct mlx5_fs_chains *chains) esw_chains_destroy(struct mlx5_eswitch *esw, struct mlx5_fs_chains *chains)
{ {
if (!mlx5_chains_prios_supported(chains)) if (!mlx5_chains_prios_supported(chains))
mlx5_esw_vport_tbl_put(esw); esw_vport_tbl_put(esw);
mlx5_chains_put_table(chains, 0, 1, 0); mlx5_chains_put_table(chains, 0, 1, 0);
mlx5_chains_put_table(chains, mlx5_chains_get_nf_ft_chain(chains), 1, 0); mlx5_chains_put_table(chains, mlx5_chains_get_nf_ft_chain(chains), 1, 0);
mlx5_chains_destroy(chains); mlx5_chains_destroy(chains);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment