Hi Dave,
This series includes some misc updates and vlan encap tunnel support.
For more information please see tag log below.
Please pull and let me know if there is any problem.
v1->v2:
- Apply the check on not being a rep after and not before adjusting
out_dev in patch #5.
- improve commit message of patch #5.
- Add two patches (#12,13) to the series from Aviv to fix VF LAG minor issues.
=======================
Conflict note: when merged with net branch this series adds 2 trivial
conflicts in mlx5.
1)
+<<<<<<< HEAD
+#define MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE \
+ max(0x7, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)
++=======
+ #define MLX5E_REP_PARAMS_LOG_SQ_SIZE \
+ max(0x6, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)
+ #define MLX5E_REP_PARAMS_DEF_NUM_CHANNELS 1
++>>>>>>> dave/master
Resolution:
define MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE \
max(0x7, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)
#define MLX5E_REP_PARAMS_DEF_NUM_CHANNELS 1
=======================
Thanks,
Saeed.
---
The following changes since commit a9cd3439e3c6d777a05c63b4d06c3500d1d4074e:
neighbor: Use nda_policy for validating attributes in adds and dump requests
(2018-12-19 23:55:36 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git
tags/mlx5-updates-2018-12-19
for you to fetch changes up to a64917446eafc7212e962561622d697fce04e9a6:
net/mlx5: Fix LAG requirement when CONFIG_MLX5_ESWITCH is off (2018-12-20
05:06:03 -0800)
----------------------------------------------------------------
mlx5-updates-2018-12-19
This series adds some misc updates and the support for tunnels over VLAN
tc offloads.
>From Miroslav Lichvar, patches #1,2
1) Update timecounter at least twice per counter overflow
2) Extend PTP gettime function to read system clock
>From Gavi Teitz, patch #3
3) Increase VF representors' SQ size to 128
>From Eli Britstein and Or Gerlitz, patches #4-10
4) Adds the capability to support tunnels over VLAN device.
Patch 4 avoids crash for TC flow with egress upper devices
Patch 5 refactors tunnel routing devs into a helper function
Patch 6 avoids crash for TC encap flows with vlan on underlay
Patches 7-8 refactor encap tunnel header preparing code.
Patch 9 adds support for building VLAN tagged ETH header.
Patch 10 adds support for tunnel routing to VLAN device.
>From Aviv, patches 11,12 to fix earlier VF lag series
5) Fix query_nic_sys_image_guid() error during init
6) Fix LAG requirement when CONFIG_MLX5_ESWITCH is off
----------------------------------------------------------------
Aviv Heller (2):
net/mlx5: Fix query_nic_sys_image_guid() error during init
net/mlx5: Fix LAG requirement when CONFIG_MLX5_ESWITCH is off
Eli Britstein (7):
net/mlx5e: Fail attempt to offload e-switch TC flows with egress upper
devices
net/mlx5e: Tunnel routing output devs helper function
net/mlx5e: Fail attempt to offload e-switch TC encap flows with vlan on
underlay
net/mlx5e: Tunnel encap ETH header helper function
net/mlx5e: Re-order route and encap header memory allocation
net/mlx5e: Support VLAN encap ETH header generation
net/mlx5e: Support tunnel encap over tagged Ethernet
Gavi Teitz (1):
net/mlx5e: Increase VF representors' SQ size to 128
Miroslav Lichvar (2):
mlx5: update timecounter at least twice per counter overflow
mlx5: extend PTP gettime function to read system clock
Or Gerlitz (1):
net/mlx5e: Allow vlans on e-switch uplink reps
.../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 186 ++++++++++++---------
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 20 ++-
drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 3 +
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 3 +
drivers/net/ethernet/mellanox/mlx5/core/lag.c | 13 +-
.../net/ethernet/mellanox/mlx5/core/lib/clock.c | 24 +--
drivers/net/ethernet/mellanox/mlx5/core/main.c | 11 +-
.../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 4 +-
drivers/net/ethernet/mellanox/mlx5/core/vport.c | 16 +-
9 files changed, 177 insertions(+), 103 deletions(-)
