| Message ID | 20180526000207.19568-1-saeedm@mellanox.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Saeed Mahameed <saeedm@mellanox.com> Date: Fri, 25 May 2018 17:01:55 -0700 > This is a mlx5e only pull request, for more information please see tag > log below. > > Please pull and let me know if there's any problem. Pulled, thanks Saeed. There was a minor conflict to resolve (simple overlapping changes).
On Tue, 2018-05-29 at 09:47 -0400, David Miller wrote: > From: Saeed Mahameed <saeedm@mellanox.com> > Date: Fri, 25 May 2018 17:01:55 -0700 > > > This is a mlx5e only pull request, for more information please see > > tag > > log below. > > > > Please pull and let me know if there's any problem. > > Pulled, thanks Saeed. > > There was a minor conflict to resolve (simple overlapping changes). Yes, Sorry i didn't notify on this in advance, the merge commit looks ok, thanks a lot!.
Hi dave, This is a mlx5e only pull request, for more information please see tag log below. Please pull and let me know if there's any problem. Thanks, Saeed. ---- The following changes since commit e52cde71709348c0d67bf0f213b438fa4d6cf9a9: net: dsa: dsa_loop: Make dynamic debugging helpful (2018-05-25 16:46:29 -0400) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5e-updates-2018-05-25 for you to fetch changes up to 05909babce5328f468f7ac3a1033431c895f97a5: net/mlx5e: Avoid reset netdev stats on configuration changes (2018-05-25 16:14:28 -0700) ---------------------------------------------------------------- mlx5e-updates-2018-05-25 This series includes updates for mlx5e netdev driver. 1) Allowr flow based VF vport mirroring under sriov switchdev scheme, added support for offloading the TC mirred mirror sub-action, from Chris Mi. ================= From: Or Gerlitz <ogerlitz@mellanox.com> The user will typically set the actions order such that the mirror port (mirror VF) sees packets as the original port (VF under mirroring) sent them or as it will receive them. In the general case, it means that packets are potentially sent to the mirror port before or after some actions were applied on them. To properly do that, we follow on the exact action order as set for the flow and make sure this will also be the case when we program the HW offload. If all the actions should apply before forwarding to the mirror and dest port, mirroring is just multicasting to the two vports. Otherwise, we split the TC flow to two HW rules, where the 1st applies only the actions needed up to the mirror (if there are such) and the 2nd the rest of the actions plus the forwarding to the dest vport. ================= 2) Move to order-0 only allocations (using fragmented work queues) for all work queues used by the driver, RX and TX descriptor rings (RQs, SQs and Completion Queues (CQs)), from Tariq Toukan. 3) Avoid resetting netdevice statistics on netdevice state changes, from Eran Ben Elisha. ---------------------------------------------------------------- Chris Mi (5): net/mlx5: E-Switch, Reorganize and rename fdb flow tables net/mlx5: Add cap bits for flow table destination in FDB table net/mlx5: E-switch, Create a second level FDB flow table net/mlx5e: Parse mirroring action for offloaded TC eswitch flows net/mlx5e: Split offloaded eswitch TC rules for port mirroring Eran Ben Elisha (1): net/mlx5e: Avoid reset netdev stats on configuration changes Saeed Mahameed (1): net/mlx5e: Move phy link down events counter out of SW stats Shalom Lagziel (1): net/mlx5e: Introducing new statistics rwlock Tariq Toukan (4): net/mlx5e: Use WQ API functions instead of direct fields access net/mlx5e: TX, Use actual WQE size for SQ edge fill net/mlx5i: Use compilation flag in IPOIB header net/mlx5: Use order-0 allocations for all WQ types drivers/net/ethernet/mellanox/mlx5/core/en.h | 30 ++- .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 88 ++++--- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 20 +- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 126 ++++++---- drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 101 ++++---- drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 5 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 83 +++++-- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 262 +++++++++++++-------- drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 22 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 23 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 133 ++++++++--- .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 14 +- .../net/ethernet/mellanox/mlx5/core/fpga/conn.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +- .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 26 ++ drivers/net/ethernet/mellanox/mlx5/core/wq.c | 94 +++++--- drivers/net/ethernet/mellanox/mlx5/core/wq.h | 50 ++-- include/linux/mlx5/driver.h | 16 +- include/linux/mlx5/mlx5_ifc.h | 4 +- 21 files changed, 724 insertions(+), 387 deletions(-)