| Message ID | 1456842290-7844-9-git-send-email-amir@vadai.me |
|---|---|
| State | Rejected, archived |
| Delegated to: | David Miller |
| Headers | show |
Tue, Mar 01, 2016 at 03:24:50PM CET, amir@vadai.me wrote: >Introduce offloading of skbedit mark action. > >For example, to mark with 0x1234, all TCP (ip_proto 6) packets arriving >to interface ens9: > > # tc qdisc add dev ens9 ingress > # tc filter add dev ens9 protocol ip parent ffff: \ > flower ip_proto 6 \ > indev ens9 \ > action skbedit mark 0x1234 > <snip> >@@ -287,6 +288,21 @@ static int parse_tc_actions(struct mlx5e_priv *priv, struct tcf_exts *exts, > continue; > } > >+ if (is_tcf_skbedit_mark(a)) { >+ u32 mark = tcf_skbedit_mark(a); >+ >+ if (mark & ~MLX5E_TC_FLOW_ID_MASK) { >+ netdev_warn(priv->netdev, >+ "Bad flow mark - only 16 bit is supported: 0x%x\n", You can start printk string on the first line.
On Tue, Mar 01, 2016 at 03:58:10PM +0100, Jiri Pirko wrote: > Tue, Mar 01, 2016 at 03:24:50PM CET, amir@vadai.me wrote: > >Introduce offloading of skbedit mark action. > > > >For example, to mark with 0x1234, all TCP (ip_proto 6) packets arriving > >to interface ens9: > > > > # tc qdisc add dev ens9 ingress > > # tc filter add dev ens9 protocol ip parent ffff: \ > > flower ip_proto 6 \ > > indev ens9 \ > > action skbedit mark 0x1234 > > > > <snip> > > >@@ -287,6 +288,21 @@ static int parse_tc_actions(struct mlx5e_priv *priv, struct tcf_exts *exts, > > continue; > > } > > > >+ if (is_tcf_skbedit_mark(a)) { > >+ u32 mark = tcf_skbedit_mark(a); > >+ > >+ if (mark & ~MLX5E_TC_FLOW_ID_MASK) { > >+ netdev_warn(priv->netdev, > >+ "Bad flow mark - only 16 bit is supported: 0x%x\n", > > You can start printk string on the first line. ack
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c index 519a07f..f293afe 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c @@ -35,6 +35,7 @@ #include <linux/tcp.h> #include <net/busy_poll.h> #include "en.h" +#include "en_tc.h" static inline bool mlx5e_rx_hw_stamp(struct mlx5e_tstamp *tstamp) { @@ -224,6 +225,8 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe, if (cqe_has_vlan(cqe)) __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), be16_to_cpu(cqe->vlan_info)); + + skb->mark = be32_to_cpu(cqe->sop_drop_qpn) & MLX5E_TC_FLOW_ID_MASK; } int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index 8fee983..22ab439 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -33,6 +33,7 @@ #include <net/flow_dissector.h> #include <net/pkt_cls.h> #include <net/tc_act/tc_gact.h> +#include <net/tc_act/tc_skbedit.h> #include <linux/mlx5/fs.h> #include <linux/mlx5/device.h> #include <linux/rhashtable.h> @@ -287,6 +288,21 @@ static int parse_tc_actions(struct mlx5e_priv *priv, struct tcf_exts *exts, continue; } + if (is_tcf_skbedit_mark(a)) { + u32 mark = tcf_skbedit_mark(a); + + if (mark & ~MLX5E_TC_FLOW_ID_MASK) { + netdev_warn(priv->netdev, + "Bad flow mark - only 16 bit is supported: 0x%x\n", + mark); + return -EINVAL; + } + + *flow_tag = mark; + *action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST; + continue; + } + return -EINVAL; } diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h index f1e7180..155e9bd 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h @@ -33,6 +33,8 @@ #ifndef __MLX5_EN_TC_H__ #define __MLX5_EN_TC_H__ +#define MLX5E_TC_FLOW_ID_MASK 0x0000ffff + void mlx5e_tc_init(struct mlx5e_priv *priv); void mlx5e_tc_cleanup(struct mlx5e_priv *priv);
Introduce offloading of skbedit mark action. For example, to mark with 0x1234, all TCP (ip_proto 6) packets arriving to interface ens9: # tc qdisc add dev ens9 ingress # tc filter add dev ens9 protocol ip parent ffff: \ flower ip_proto 6 \ indev ens9 \ action skbedit mark 0x1234 Signed-off-by: Amir Vadai <amir@vadai.me> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> --- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 3 +++ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 16 ++++++++++++++++ drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 2 ++ 3 files changed, 21 insertions(+)