Mellanox, mlx5 fixes 2019-02-05
Hi Dave,
This series introduces some fixes to mlx5 driver.
Please pull and let me know if there is any problem.
For -stable v4.19
('net/mlx5e: FPGA, fix Innova IPsec TX offload data path performance')
For -stable v4.20
('net/mlx5e: Use the inner headers to determine tc/pedit offload limitation on decap flows')
Thanks,
Saeed.
---
The following changes since commit f09bef61f1ed72869b231e5cff16e73a06505cfb:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf (2019-02-05 11:23:23 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-fixes-2019-02-05
for you to fetch changes up to 1651925d403e077e3fc86f961905e27c6810e132:
net/mlx5e: Use the inner headers to determine tc/pedit offload limitation on decap flows (2019-02-05 12:10:19 -0800)
----------------------------------------------------------------
mlx5-fixes-2019-02-05
----------------------------------------------------------------
Guy Shattah (1):
net/mlx5e: Use the inner headers to determine tc/pedit offload limitation on decap flows
Or Gerlitz (1):
net/mlx5e: Properly set steering match levels for offloaded TC decap rules
Raed Salem (1):
net/mlx5e: FPGA, fix Innova IPsec TX offload data path performance
.../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 4 +++- .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 27 ++++++++++++++-------- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 +++++ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 1 + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 17 +++++++------- 6 files changed, 37 insertions(+), 20 deletions(-)
PATCH 1/3 net/mlx5e: FPGA, fix Innova IPsec TX offload data path performance
From: Raed Salem <[email protected]>
At Innova IPsec TX offload data path a special software parser metadata is used to pass some packet attributes to the hardware, this metadata is passed using the Ethernet control segment of a WQE (a HW descriptor) header.
The cited commit might nullify this header, hence the metadata is lost, this caused a significant performance drop during hw offloading operation.
Fix by restoring the metadata at the Ethernet control segment in case it was nullified.
--- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +6 -0
@@ -387,8 +387,14 @@ netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb, num_wqebbs =DIV_ROUND_UP (ds_cnt,MLX5_SEND_WQEBB_NUM_DS ); contig_wqebbs_room =mlx5_wq_cyc_get_contig_wqebbs (wq, pi);if (unlikely (contig_wqebbs_room < num_wqebbs)) { +#ifdef CONFIG_MLX5_EN_IPSEC +struct mlx5_wqe_eth_seg cur_eth = wqe->eth; +#endif mlx5e_fill_sq_frag_edge (sq, wq, pi, contig_wqebbs_room);mlx5e_sq_fetch_wqe (sq, &wqe, &pi); +#ifdef CONFIG_MLX5_EN_IPSEC + wqe->eth = cur_eth; +#endif }/* fill wqe */
Signature · 1 line
2.20.1
PATCH 2/3 net/mlx5e: Properly set steering match levels for offloaded TC decap rules
In reply to Saeed MahameedFrom: Or Gerlitz <[email protected]>
The match level computed by the driver gets to be wrong for decap rules with wildcarded inner packet match such as:
tc filter add dev vxlan_sys_4789 protocol all parent ffff: prio 2 flower
enc_dst_ip 192.168.0.9 enc_key_id 100 enc_dst_port 4789 action tunnel_key unset
action mirred egress redirect dev eth1
The FW errs for a missing matching meta-data indicator for the outer headers (where we do have a match), and a wrong matching meta-data indicator for the inner headers (where we don't have a match).
Fix that by taking into account the matching on the tunnel info and relating the match level of the encapsulated packet to the firmware inner headers indicator in case of decap.
As for vxlan we mandate a match on the tunnel udp dst port, and in general we practically madndate a match on the source or dest ip for any IP tunnel, the fix was done in a minimal manner around the tunnel match parsing code.
--- .../ethernet/mellanox/mlx5/core/en/tc_tun.c | 4 +++- .../ethernet/mellanox/mlx5/core/en/tc_tun.h | 2 +- .../net/ethernet/mellanox/mlx5/core/en_tc.c | 18 ++++++++++-------- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 1 + .../mellanox/mlx5/core/eswitch_offloads.c | 17 +++++++++-------- 5 files changed, 24 insertions(+), 18 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +3 -1
@@ -612,16 +612,18 @@ int mlx5e_tc_tun_parse(struct net_device *filter_dev,struct mlx5_flow_spec *spec, struct tc_cls_flower_offload *f, void *headers_c, - void *headers_v) + void *headers_v, u8 *match_level) { int tunnel_type;int err =0 ; tunnel_type =mlx5e_tc_tun_get_type (filter_dev);if (tunnel_type ==MLX5E_TC_TUNNEL_TYPE_VXLAN ) { + *match_level =MLX5_MATCH_L4 ; err =mlx5e_tc_tun_parse_vxlan (priv, spec, f, headers_c, headers_v); }else if (tunnel_type ==MLX5E_TC_TUNNEL_TYPE_GRETAP ) { + *match_level =MLX5_MATCH_L3 ; err =mlx5e_tc_tun_parse_gretap (priv, spec, f, headers_c, headers_v); }else {
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h +1 -1
@@ -39,6 +39,6 @@ int mlx5e_tc_tun_parse(struct net_device *filter_dev,struct mlx5_flow_spec *spec, struct tc_cls_flower_offload *f, void *headers_c, - void *headers_v); + void *headers_v, u8 *match_level);#endif //__MLX5_EN_TC_TUNNEL_H__
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +10 -8
@@ -1302,7 +1302,7 @@ static void mlx5e_tc_del_flow(struct mlx5e_priv *priv,static int parse_tunnel_attr (struct mlx5e_priv *priv,struct mlx5_flow_spec *spec,struct tc_cls_flower_offload *f, -struct net_device *filter_dev) +struct net_device *filter_dev,u8 *match_level) {struct netlink_ext_ack *extack = f->common.extack; void *headers_c = MLX5_ADDR_OF(fte_match_param, spec->match_criteria,
@@ -1317,7 +1317,7 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv,int err =0 ; err =mlx5e_tc_tun_parse (filter_dev, priv, spec, f, - headers_c, headers_v); + headers_c, headers_v, match_level);if (err) {NL_SET_ERR_MSG_MOD (extack,"failed to parse tunnel attributes" );
@@ -1426,7 +1426,7 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,struct mlx5_flow_spec *spec, struct tc_cls_flower_offload *f, struct net_device *filter_dev, - u8 *match_level) + u8 *match_level, u8 *tunnel_match_level) { struct netlink_ext_ack *extack = f->common.extack; void *headers_c = MLX5_ADDR_OF(fte_match_param, spec->match_criteria,
@@ -1477,7 +1477,7 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,switch (key->addr_type) {case FLOW_DISSECTOR_KEY_IPV4_ADDRS :case FLOW_DISSECTOR_KEY_IPV6_ADDRS : -if (parse_tunnel_attr (priv, spec, f, filter_dev)) +if (parse_tunnel_attr (priv, spec, f, filter_dev, tunnel_match_level))return -EOPNOTSUPP ;break ;default :
@@ -1826,11 +1826,11 @@ static int parse_cls_flower(struct mlx5e_priv *priv,struct mlx5_core_dev *dev = priv->mdev;struct mlx5_eswitch *esw = dev->priv.eswitch;struct mlx5e_rep_priv *rpriv = priv->ppriv; +u8 match_level, tunnel_match_level =MLX5_MATCH_NONE ;struct mlx5_eswitch_rep *rep; -u8 match_level;int err; - err =__parse_cls_flower (priv, spec, f, filter_dev, &match_level); + err =__parse_cls_flower (priv, spec, f, filter_dev, &match_level, &tunnel_match_level);if (!err && (flow->flags &MLX5E_TC_FLOW_ESWITCH )) { rep = rpriv->rep;
@@ -1846,10 +1846,12 @@ static int parse_cls_flower(struct mlx5e_priv *priv, } } -if (flow->flags &MLX5E_TC_FLOW_ESWITCH ) +if (flow->flags &MLX5E_TC_FLOW_ESWITCH ) { flow->esw_attr->match_level = match_level; -else + flow->esw_attr->tunnel_match_level = tunnel_match_level; + }else { flow->nic_attr->match_level = match_level; + }return err; }
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +1 -0
@@ -312,6 +312,7 @@ struct mlx5_esw_flow_attr { } dests[MLX5_MAX_FLOW_FWD_VPORTS ];u32 mod_hdr_id;u8 match_level; +u8 tunnel_match_level;struct mlx5_fc *counter;u32 chain;u16 prio;
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +9 -8
@@ -160,14 +160,15 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw,MLX5_SET_TO_ONES (fte_match_set_misc, misc, source_eswitch_owner_vhca_id); -if (attr->match_level ==MLX5_MATCH_NONE ) - spec->match_criteria_enable =MLX5_MATCH_MISC_PARAMETERS ; -else - spec->match_criteria_enable =MLX5_MATCH_OUTER_HEADERS | -MLX5_MATCH_MISC_PARAMETERS ; - -if (flow_act.action &MLX5_FLOW_CONTEXT_ACTION_DECAP ) - spec->match_criteria_enable |=MLX5_MATCH_INNER_HEADERS ; + spec->match_criteria_enable =MLX5_MATCH_MISC_PARAMETERS ; +if (flow_act.action &MLX5_FLOW_CONTEXT_ACTION_DECAP ) { +if (attr->tunnel_match_level !=MLX5_MATCH_NONE ) + spec->match_criteria_enable |=MLX5_MATCH_OUTER_HEADERS ; +if (attr->match_level !=MLX5_MATCH_NONE ) + spec->match_criteria_enable |=MLX5_MATCH_INNER_HEADERS ; + }else if (attr->match_level !=MLX5_MATCH_NONE ) { + spec->match_criteria_enable |=MLX5_MATCH_OUTER_HEADERS ; + }if (flow_act.action &MLX5_FLOW_CONTEXT_ACTION_MOD_HDR ) flow_act.modify_id = attr->mod_hdr_id;
Signature · 1 line
2.20.1
PATCH 3/3 net/mlx5e: Use the inner headers to determine tc/pedit offload limitation on decap flows
In reply to Saeed MahameedFrom: Guy Shattah <[email protected]>
In packets that need to be decaped the internal headers have to be checked, not the external ones.
--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +7 -2
@@ -2181,6 +2181,7 @@ static bool csum_offload_supported(struct mlx5e_priv *priv,static bool modify_header_match_supported (struct mlx5_flow_spec *spec,struct tcf_exts *exts, +u32 actions,struct netlink_ext_ack *extack) {const struct tc_action *a;
@@ -2190,7 +2191,11 @@ static bool modify_header_match_supported(struct mlx5_flow_spec *spec,u16 ethertype;int nkeys, i; - headers_v =MLX5_ADDR_OF (fte_match_param, spec->match_value, outer_headers); +if (actions &MLX5_FLOW_CONTEXT_ACTION_DECAP ) + headers_v =MLX5_ADDR_OF (fte_match_param, spec->match_value, inner_headers); +else + headers_v =MLX5_ADDR_OF (fte_match_param, spec->match_value, outer_headers); + ethertype =MLX5_GET (fte_match_set_lyr_2_4, headers_v, ethertype);/* for non-IP we only re-write MACs, so we're okay */
@@ -2247,7 +2252,7 @@ static bool actions_match_supported(struct mlx5e_priv *priv,if (actions &MLX5_FLOW_CONTEXT_ACTION_MOD_HDR )return modify_header_match_supported (&parse_attr->spec, exts, - extack); + actions, extack);return true; }
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Saeed Mahameed <[email protected]>
Date: Tue, 5 Feb 2019 12:20:08 -0800
Quoted 3 lines
This series introduces some fixes to mlx5 driver.
Please pull and let me know if there is any problem.
Pulled.
Quoted 5 lines
For -stable v4.19
('net/mlx5e: FPGA, fix Innova IPsec TX offload data path performance')For -stable v4.20
('net/mlx5e: Use the inner headers to determine tc/pedit offload limitation on decap flows')
Queued up.
Thanks.