Hi Dave,
This series introduces some fixes to mlx5 driver.
Highlights:
1) From Tariq, Critical mlx5 kTLS fixes to better align with hw specs.
2) From Aya, Fixes to mlx5 tx devlink health reporter.
3) From Maxim, aRFs parsing to use flow dissector to avoid relying on
invalid skb fields.
Please pull and let me know if there is any problem.
For -stable v4.3
('net/mlx5e: Only support tx/rx pause setting for port owner')
For -stable v4.9
('net/mlx5e: Use flow keys dissector to parse packets for ARFS')
For -stable v5.1
('net/mlx5e: Fix false negative indication on tx reporter CQE recovery')
('net/mlx5e: Remove redundant check in CQE recovery flow of tx reporter')
('net/mlx5e: ethtool, Avoid setting speed to 56GBASE when autoneg off')
Note: when merged with net-next this minor conflict will pop up:
++<<<<<<< (net-next)
+ if (is_eswitch_flow) {
+ flow->esw_attr->match_level = match_level;
+ flow->esw_attr->tunnel_match_level = tunnel_match_level;
++=======
+ if (flow->flags & MLX5E_TC_FLOW_ESWITCH) {
+ flow->esw_attr->inner_match_level = inner_match_level;
+ flow->esw_attr->outer_match_level = outer_match_level;
++>>>>>>> (net)
To resolve, use hunks from net (2nd) and replace:
if (flow->flags & MLX5E_TC_FLOW_ESWITCH)
with
if (is_eswitch_flow)
Thanks,
Saeed.
---
The following changes since commit f6649feb264ed10ce425455df48242c0e704cba2:
Merge tag 'batadv-net-for-davem-20190808' of
git://git.open-mesh.org/linux-merge (2019-08-08 11:25:39 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git
tags/mlx5-fixes-2019-08-08
for you to fetch changes up to a4e508cab623951dc4754f346e5673714f3bbade:
net/mlx5e: Remove redundant check in CQE recovery flow of tx reporter
(2019-08-08 13:01:20 -0700)
----------------------------------------------------------------
mlx5-fixes-2019-08-08
----------------------------------------------------------------
Aya Levin (3):
net/mlx5e: Fix false negative indication on tx reporter CQE recovery
net/mlx5e: Fix error flow of CQE recovery on tx reporter
net/mlx5e: Remove redundant check in CQE recovery flow of tx reporter
Huy Nguyen (2):
net/mlx5: Support inner header match criteria for non decap flow action
net/mlx5e: Only support tx/rx pause setting for port owner
Maxim Mikityanskiy (1):
net/mlx5e: Use flow keys dissector to parse packets for ARFS
Mohamad Heib (1):
net/mlx5e: ethtool, Avoid setting speed to 56GBASE when autoneg off
Tariq Toukan (5):
net/mlx5: crypto, Fix wrong offset in encryption key command
net/mlx5: kTLS, Fix wrong TIS opmod constants
net/mlx5e: kTLS, Fix progress params context WQE layout
net/mlx5e: kTLS, Fix tisn field name
net/mlx5e: kTLS, Fix tisn field placement
drivers/net/ethernet/mellanox/mlx5/core/en.h | 9 +-
.../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 19 ++---
.../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 6 +-
.../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 10 +--
drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 97 ++++++++--------------
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 11 +++
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 -
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 31 ++++---
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 4 +-
.../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 12 +--
.../net/ethernet/mellanox/mlx5/core/lib/crypto.c | 1 +
include/linux/mlx5/device.h | 4 +-
include/linux/mlx5/mlx5_ifc.h | 5 +-
13 files changed, 101 insertions(+), 109 deletions(-)
