mbox

[pull,request,net-next,00/13] Mellanox, mlx5 and bonding updates 2020-05-09

Message ID 20200509082856.97337-1-saeedm@mellanox.com
State Accepted
Delegated to: David Miller
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-updates-2020-05-09

Message

Saeed Mahameed May 9, 2020, 8:28 a.m. UTC 
Hi Dave,

This series includes updates to mlx5 driver and a merge commit to the
earlier bonding series which was submitted by Maor to mlx5-next branch.

For more information please see tag log below.

Please pull and let me know if there is any problem.

Please note that the series starts with a merge of mlx5-next branch,
to resolve and avoid dependency with rdma tree.

A minor conflict between Maor's bonding series [1] and Eric's [2] is
already handled in this merge commit.

[1] bonding: Add support to get xmit slave
[2] bonding: report transmit status to callers

Thanks,
Saeed.

---
The following changes since commit 76cd622fe2c2b10c1f0a7311ca797feccacc329d:

  Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux (2020-05-09 01:05:30 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-updates-2020-05-09

for you to fetch changes up to 28bff09518e9ef942173e41e7521b93ea7be0cf0:

  net/mlx5e: Enhance ICOSQ WQE info fields (2020-05-09 01:05:42 -0700)

----------------------------------------------------------------
mlx5-updates-2020-05-09

This series includes updates to mlx5 netdev driver and bonding updates
to support getting the next active tx slave.

1) merge commit with mlx5-next that includes bonding updates from Maor
   Bonding: Add support to get xmit slave
2) Maxim makes some general code improvements to TX data path
3) Tariq makes some general code improvements to kTLS and mlx5 accel layer
in preparation for mlx5 TLS RX.

----------------------------------------------------------------
Maxim Mikityanskiy (7):
      net/mlx5e: Return bool from TLS and IPSEC offloads
      net/mlx5e: Unify checks of TLS offloads
      net/mlx5e: Return void from mlx5e_sq_xmit and mlx5i_sq_xmit
      net/mlx5e: Pass only eseg to IPSEC offload
      net/mlx5e: Make TLS offload independent of wqe and pi
      net/mlx5e: Update UDP fields of the SKB for GSO first
      net/mlx5e: Split TX acceleration offloads into two phases

Tariq Toukan (6):
      net/mlx5e: kTLS, Fill work queue edge separately in TX flow
      net/mlx5e: kTLS, Do not fill edge for the DUMP WQEs in TX flow
      net/mlx5e: Take TX WQE info structures out of general EN header
      net/mlx5e: Use struct assignment for WQE info updates
      net/mlx5: Accel, Remove unnecessary header include
      net/mlx5e: Enhance ICOSQ WQE info fields

 .../net/ethernet/mellanox/mlx5/core/accel/accel.h  |  1 -
 drivers/net/ethernet/mellanox/mlx5/core/en.h       | 31 +---------
 drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h  | 29 ++++++++-
 drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h   |  5 ++
 .../mellanox/mlx5/core/en_accel/en_accel.h         | 48 ++++++++++-----
 .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c       | 15 +++--
 .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h       |  6 +-
 .../ethernet/mellanox/mlx5/core/en_accel/ktls.h    |  8 +--
 .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 66 +++++++--------------
 .../mellanox/mlx5/core/en_accel/tls_rxtx.c         | 69 +++++++++++-----------
 .../mellanox/mlx5/core/en_accel/tls_rxtx.h         | 13 ++--
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c  | 16 ++---
 drivers/net/ethernet/mellanox/mlx5/core/en_rx.c    | 24 +++++---
 drivers/net/ethernet/mellanox/mlx5/core/en_tx.c    | 35 ++++++-----
 drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c  |  7 ++-
 .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c  |  4 +-
 .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h  |  5 +-
 17 files changed, 197 insertions(+), 185 deletions(-)

Saeed Mahameed (1):
      Merge branch 'mlx5-next' of git://git.kernel.org/.../mellanox/linux

 drivers/net/bonding/bond_alb.c                |  39 +++++++++++++------
 drivers/net/bonding/bond_main.c               | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
 drivers/net/ethernet/mellanox/mlx5/core/lag.c |  66 +++++++++++++++++++++-----------
 include/linux/mlx5/driver.h                   |   2 +
 include/linux/netdevice.h                     |  12 ++++++
 include/net/bond_alb.h                        |   4 ++
 include/net/bonding.h                         |   3 +-
 net/core/dev.c                                |  22 +++++++++++
 8 files changed, 301 insertions(+), 99 deletions(-)

Comments

Jakub Kicinski May 9, 2020, 10:13 p.m. UTC | #1 
On Sat,  9 May 2020 01:28:43 -0700 Saeed Mahameed wrote:
> Hi Dave,
> 
> This series includes updates to mlx5 driver and a merge commit to the
> earlier bonding series which was submitted by Maor to mlx5-next branch.
> 
> For more information please see tag log below.
> 
> Please pull and let me know if there is any problem.
> 
> Please note that the series starts with a merge of mlx5-next branch,
> to resolve and avoid dependency with rdma tree.
> 
> A minor conflict between Maor's bonding series [1] and Eric's [2] is
> already handled in this merge commit.
> 
> [1] bonding: Add support to get xmit slave
> [2] bonding: report transmit status to callers

Pulled, thank you!