net/sched: tc_mirred: Rename public predicates 'is_tcf_mirred_redirect' and 'is_tcf_mirred_mirror'
These accessors are used in various drivers that support tc offloading, to detect properties of a given 'tc_action'. 'is_tcf_mirred_redirect' tests that the action is TCA_EGRESS_REDIR. 'is_tcf_mirred_mirror' tests that the action is TCA_EGRESS_MIRROR. As a prep towards supporting INGRESS redir/mirror, rename these predicates to reflect their true meaning: s/is_tcf_mirred_redirect/is_tcf_mirred_egress_redirect/ s/is_tcf_mirred_mirror/is_tcf_mirred_egress_mirror/ Signed-off-by: Shmulik Ladkani <shmulik.ladkani@gmail.com> Cc: Hariprasad S <hariprasad@chelsio.com> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Cc: Saeed Mahameed <saeedm@mellanox.com> Cc: Jiri Pirko <jiri@mellanox.com> Cc: Ido Schimmel <idosch@mellanox.com> Cc: Jakub Kicinski <jakub.kicinski@netronome.com> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
dcf800344a
commit
5724b8b569
|
@ -113,7 +113,7 @@ static int fill_action_fields(struct adapter *adap,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Re-direct to specified port in hardware. */
|
/* Re-direct to specified port in hardware. */
|
||||||
if (is_tcf_mirred_redirect(a)) {
|
if (is_tcf_mirred_egress_redirect(a)) {
|
||||||
struct net_device *n_dev;
|
struct net_device *n_dev;
|
||||||
unsigned int i, index;
|
unsigned int i, index;
|
||||||
bool found = false;
|
bool found = false;
|
||||||
|
|
|
@ -8410,7 +8410,7 @@ static int parse_tc_actions(struct ixgbe_adapter *adapter,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Redirect to a VF or a offloaded macvlan */
|
/* Redirect to a VF or a offloaded macvlan */
|
||||||
if (is_tcf_mirred_redirect(a)) {
|
if (is_tcf_mirred_egress_redirect(a)) {
|
||||||
int ifindex = tcf_mirred_ifindex(a);
|
int ifindex = tcf_mirred_ifindex(a);
|
||||||
|
|
||||||
err = handle_redirect_action(adapter, ifindex, queue,
|
err = handle_redirect_action(adapter, ifindex, queue,
|
||||||
|
|
|
@ -404,7 +404,7 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, struct tcf_exts *exts,
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_tcf_mirred_redirect(a)) {
|
if (is_tcf_mirred_egress_redirect(a)) {
|
||||||
int ifindex = tcf_mirred_ifindex(a);
|
int ifindex = tcf_mirred_ifindex(a);
|
||||||
struct net_device *out_dev;
|
struct net_device *out_dev;
|
||||||
struct mlx5e_priv *out_priv;
|
struct mlx5e_priv *out_priv;
|
||||||
|
|
|
@ -1237,8 +1237,10 @@ static int mlxsw_sp_port_add_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,
|
||||||
|
|
||||||
tcf_exts_to_list(cls->exts, &actions);
|
tcf_exts_to_list(cls->exts, &actions);
|
||||||
list_for_each_entry(a, &actions, list) {
|
list_for_each_entry(a, &actions, list) {
|
||||||
if (!is_tcf_mirred_mirror(a) || protocol != htons(ETH_P_ALL))
|
if (!is_tcf_mirred_egress_mirror(a) ||
|
||||||
|
protocol != htons(ETH_P_ALL)) {
|
||||||
return -ENOTSUPP;
|
return -ENOTSUPP;
|
||||||
|
}
|
||||||
|
|
||||||
err = mlxsw_sp_port_add_cls_matchall_mirror(mlxsw_sp_port, cls,
|
err = mlxsw_sp_port_add_cls_matchall_mirror(mlxsw_sp_port, cls,
|
||||||
a, ingress);
|
a, ingress);
|
||||||
|
|
|
@ -128,7 +128,7 @@ nfp_net_bpf_get_act(struct nfp_net *nn, struct tc_cls_bpf_offload *cls_bpf)
|
||||||
if (is_tcf_gact_shot(a))
|
if (is_tcf_gact_shot(a))
|
||||||
return NN_ACT_TC_DROP;
|
return NN_ACT_TC_DROP;
|
||||||
|
|
||||||
if (is_tcf_mirred_redirect(a) &&
|
if (is_tcf_mirred_egress_redirect(a) &&
|
||||||
tcf_mirred_ifindex(a) == nn->netdev->ifindex)
|
tcf_mirred_ifindex(a) == nn->netdev->ifindex)
|
||||||
return NN_ACT_TC_REDIR;
|
return NN_ACT_TC_REDIR;
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ struct tcf_mirred {
|
||||||
};
|
};
|
||||||
#define to_mirred(a) ((struct tcf_mirred *)a)
|
#define to_mirred(a) ((struct tcf_mirred *)a)
|
||||||
|
|
||||||
static inline bool is_tcf_mirred_redirect(const struct tc_action *a)
|
static inline bool is_tcf_mirred_egress_redirect(const struct tc_action *a)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_NET_CLS_ACT
|
#ifdef CONFIG_NET_CLS_ACT
|
||||||
if (a->ops && a->ops->type == TCA_ACT_MIRRED)
|
if (a->ops && a->ops->type == TCA_ACT_MIRRED)
|
||||||
|
@ -23,7 +23,7 @@ static inline bool is_tcf_mirred_redirect(const struct tc_action *a)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool is_tcf_mirred_mirror(const struct tc_action *a)
|
static inline bool is_tcf_mirred_egress_mirror(const struct tc_action *a)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_NET_CLS_ACT
|
#ifdef CONFIG_NET_CLS_ACT
|
||||||
if (a->ops && a->ops->type == TCA_ACT_MIRRED)
|
if (a->ops && a->ops->type == TCA_ACT_MIRRED)
|
||||||
|
|
Loading…
Reference in New Issue