netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [pull request][net 0/3] mlx5 fixes 2021-04-14
@ 2021-04-14 23:16 Saeed Mahameed
  2021-04-14 23:16 ` [net 1/3] net/mlx5: Fix setting of devlink traps in switchdev mode Saeed Mahameed
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Saeed Mahameed @ 2021-04-14 23:16 UTC (permalink / raw)
  To: David S. Miller, Jakub Kicinski; +Cc: netdev, Tariq Toukan, Saeed Mahameed

From: Saeed Mahameed <saeedm@nvidia.com>

Hi  Dave, Jakub,

This series provides 3 small fixes to mlx5 driver.
Please pull and let me know if there is any problem.

Thanks,
Saeed.

---
The following changes since commit 2afeec08ab5c86ae21952151f726bfe184f6b23d:

  xen-netback: Check for hotplug-status existence before watching (2021-04-13 15:24:14 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-fixes-2021-04-14

for you to fetch changes up to e3e0f9b279705154b951d579dc3d8b7041710e24:

  net/mlx5e: fix ingress_ifindex check in mlx5e_flower_parse_meta (2021-04-14 16:13:00 -0700)

----------------------------------------------------------------
mlx5-fixes-2021-04-14

----------------------------------------------------------------
Aya Levin (2):
      net/mlx5: Fix setting of devlink traps in switchdev mode
      net/mlx5e: Fix setting of RS FEC mode

wenxu (1):
      net/mlx5e: fix ingress_ifindex check in mlx5e_flower_parse_meta

 drivers/net/ethernet/mellanox/mlx5/core/devlink.c |  5 +++++
 drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 23 ++++-------------------
 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c   |  3 +++
 3 files changed, 12 insertions(+), 19 deletions(-)

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [net 1/3] net/mlx5: Fix setting of devlink traps in switchdev mode
  2021-04-14 23:16 [pull request][net 0/3] mlx5 fixes 2021-04-14 Saeed Mahameed
@ 2021-04-14 23:16 ` Saeed Mahameed
  2021-04-15 23:50   ` patchwork-bot+netdevbpf
  2021-04-14 23:16 ` [net 2/3] net/mlx5e: Fix setting of RS FEC mode Saeed Mahameed
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 6+ messages in thread
From: Saeed Mahameed @ 2021-04-14 23:16 UTC (permalink / raw)
  To: David S. Miller, Jakub Kicinski
  Cc: netdev, Tariq Toukan, Aya Levin, Moshe Shemesh, Roi Dayan,
	Saeed Mahameed

From: Aya Levin <ayal@nvidia.com>

Prevent setting of devlink traps on the uplink while in switchdev mode.
In this mode, it is the SW switch responsibility to handle both packets
with a mismatch in destination MAC or VLAN ID. Therefore, there are no
flow steering tables to trap undesirable packets and driver crashes upon
setting a trap.

Fixes: 241dc159391f ("net/mlx5: Notify on trap action by blocking event")
Signed-off-by: Aya Levin <ayal@nvidia.com>
Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
Reviewed-by: Roi Dayan <roid@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
index d7d8a68ef23d..d0f9d3cee97d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
@@ -246,6 +246,11 @@ static int mlx5_devlink_trap_action_set(struct devlink *devlink,
 	struct mlx5_devlink_trap *dl_trap;
 	int err = 0;
 
+	if (is_mdev_switchdev_mode(dev)) {
+		NL_SET_ERR_MSG_MOD(extack, "Devlink traps can't be set in switchdev mode");
+		return -EOPNOTSUPP;
+	}
+
 	dl_trap = mlx5_find_trap_by_id(dev, trap->id);
 	if (!dl_trap) {
 		mlx5_core_err(dev, "Devlink trap: Set action on invalid trap id 0x%x", trap->id);
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [net 2/3] net/mlx5e: Fix setting of RS FEC mode
  2021-04-14 23:16 [pull request][net 0/3] mlx5 fixes 2021-04-14 Saeed Mahameed
  2021-04-14 23:16 ` [net 1/3] net/mlx5: Fix setting of devlink traps in switchdev mode Saeed Mahameed
@ 2021-04-14 23:16 ` Saeed Mahameed
  2021-04-14 23:16 ` [net 3/3] net/mlx5e: fix ingress_ifindex check in mlx5e_flower_parse_meta Saeed Mahameed
  2021-04-14 23:31 ` [pull request][net 0/3] mlx5 fixes 2021-04-14 Jakub Kicinski
  3 siblings, 0 replies; 6+ messages in thread
From: Saeed Mahameed @ 2021-04-14 23:16 UTC (permalink / raw)
  To: David S. Miller, Jakub Kicinski
  Cc: netdev, Tariq Toukan, Aya Levin, Eran Ben Elisha, Saeed Mahameed

From: Aya Levin <ayal@nvidia.com>

Change register setting from bit number to bit mask.

Fixes: b5ede32d3329 ("net/mlx5e: Add support for FEC modes based on 50G per lane links")
Signed-off-by: Aya Levin <ayal@nvidia.com>
Reviewed-by: Eran Ben Elisha <eranbe@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
 .../net/ethernet/mellanox/mlx5/core/en/port.c | 23 ++++---------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/port.c b/drivers/net/ethernet/mellanox/mlx5/core/en/port.c
index 308fd279669e..89510cac46c2 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/port.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/port.c
@@ -387,21 +387,6 @@ enum mlx5e_fec_supported_link_mode {
 			*_policy = MLX5_GET(pplm_reg, _buf, fec_override_admin_##link);	\
 	} while (0)
 
-#define MLX5E_FEC_OVERRIDE_ADMIN_50G_POLICY(buf, policy, write, link)			\
-	do {										\
-		unsigned long policy_long;						\
-		u16 *__policy = &(policy);						\
-		bool _write = (write);							\
-											\
-		policy_long = *__policy;						\
-		if (_write && *__policy)						\
-			*__policy = find_first_bit(&policy_long,			\
-						   sizeof(policy_long) * BITS_PER_BYTE);\
-		MLX5E_FEC_OVERRIDE_ADMIN_POLICY(buf, *__policy, _write, link);		\
-		if (!_write && *__policy)						\
-			*__policy = 1 << *__policy;					\
-	} while (0)
-
 /* get/set FEC admin field for a given speed */
 static int mlx5e_fec_admin_field(u32 *pplm, u16 *fec_policy, bool write,
 				 enum mlx5e_fec_supported_link_mode link_mode)
@@ -423,16 +408,16 @@ static int mlx5e_fec_admin_field(u32 *pplm, u16 *fec_policy, bool write,
 		MLX5E_FEC_OVERRIDE_ADMIN_POLICY(pplm, *fec_policy, write, 100g);
 		break;
 	case MLX5E_FEC_SUPPORTED_LINK_MODE_50G_1X:
-		MLX5E_FEC_OVERRIDE_ADMIN_50G_POLICY(pplm, *fec_policy, write, 50g_1x);
+		MLX5E_FEC_OVERRIDE_ADMIN_POLICY(pplm, *fec_policy, write, 50g_1x);
 		break;
 	case MLX5E_FEC_SUPPORTED_LINK_MODE_100G_2X:
-		MLX5E_FEC_OVERRIDE_ADMIN_50G_POLICY(pplm, *fec_policy, write, 100g_2x);
+		MLX5E_FEC_OVERRIDE_ADMIN_POLICY(pplm, *fec_policy, write, 100g_2x);
 		break;
 	case MLX5E_FEC_SUPPORTED_LINK_MODE_200G_4X:
-		MLX5E_FEC_OVERRIDE_ADMIN_50G_POLICY(pplm, *fec_policy, write, 200g_4x);
+		MLX5E_FEC_OVERRIDE_ADMIN_POLICY(pplm, *fec_policy, write, 200g_4x);
 		break;
 	case MLX5E_FEC_SUPPORTED_LINK_MODE_400G_8X:
-		MLX5E_FEC_OVERRIDE_ADMIN_50G_POLICY(pplm, *fec_policy, write, 400g_8x);
+		MLX5E_FEC_OVERRIDE_ADMIN_POLICY(pplm, *fec_policy, write, 400g_8x);
 		break;
 	default:
 		return -EINVAL;
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [net 3/3] net/mlx5e: fix ingress_ifindex check in mlx5e_flower_parse_meta
  2021-04-14 23:16 [pull request][net 0/3] mlx5 fixes 2021-04-14 Saeed Mahameed
  2021-04-14 23:16 ` [net 1/3] net/mlx5: Fix setting of devlink traps in switchdev mode Saeed Mahameed
  2021-04-14 23:16 ` [net 2/3] net/mlx5e: Fix setting of RS FEC mode Saeed Mahameed
@ 2021-04-14 23:16 ` Saeed Mahameed
  2021-04-14 23:31 ` [pull request][net 0/3] mlx5 fixes 2021-04-14 Jakub Kicinski
  3 siblings, 0 replies; 6+ messages in thread
From: Saeed Mahameed @ 2021-04-14 23:16 UTC (permalink / raw)
  To: David S. Miller, Jakub Kicinski
  Cc: netdev, Tariq Toukan, wenxu, Pablo Neira Ayuso, Saeed Mahameed

From: wenxu <wenxu@ucloud.cn>

In the nft_offload there is the mate flow_dissector with no
ingress_ifindex but with ingress_iftype that only be used
in the software. So if the mask of ingress_ifindex in meta is
0, this meta check should be bypass.

Fixes: 6d65bc64e232 ("net/mlx5e: Add mlx5e_flower_parse_meta support")
Signed-off-by: wenxu <wenxu@ucloud.cn>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index df2a0af854bb..d675107d9eca 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -1895,6 +1895,9 @@ static int mlx5e_flower_parse_meta(struct net_device *filter_dev,
 		return 0;
 
 	flow_rule_match_meta(rule, &match);
+	if (!match.mask->ingress_ifindex)
+		return 0;
+
 	if (match.mask->ingress_ifindex != 0xFFFFFFFF) {
 		NL_SET_ERR_MSG_MOD(extack, "Unsupported ingress ifindex mask");
 		return -EOPNOTSUPP;
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [pull request][net 0/3] mlx5 fixes 2021-04-14
  2021-04-14 23:16 [pull request][net 0/3] mlx5 fixes 2021-04-14 Saeed Mahameed
                   ` (2 preceding siblings ...)
  2021-04-14 23:16 ` [net 3/3] net/mlx5e: fix ingress_ifindex check in mlx5e_flower_parse_meta Saeed Mahameed
@ 2021-04-14 23:31 ` Jakub Kicinski
  3 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2021-04-14 23:31 UTC (permalink / raw)
  To: Saeed Mahameed; +Cc: David S. Miller, netdev, Tariq Toukan, Saeed Mahameed

On Wed, 14 Apr 2021 16:16:07 -0700 Saeed Mahameed wrote:
> This series provides 3 small fixes to mlx5 driver.
> Please pull and let me know if there is any problem.

FWIW a little more info on user-visible misbehavior on patch 2 would
have helped.

Acked-by: Jakub Kicinski <kuba@kernel.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [net 1/3] net/mlx5: Fix setting of devlink traps in switchdev mode
  2021-04-14 23:16 ` [net 1/3] net/mlx5: Fix setting of devlink traps in switchdev mode Saeed Mahameed
@ 2021-04-15 23:50   ` patchwork-bot+netdevbpf
  0 siblings, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-04-15 23:50 UTC (permalink / raw)
  To: Saeed Mahameed; +Cc: davem, kuba, netdev, tariqt, ayal, moshe, roid, saeedm

Hello:

This series was applied to netdev/net.git (refs/heads/master):

On Wed, 14 Apr 2021 16:16:08 -0700 you wrote:
> From: Aya Levin <ayal@nvidia.com>
> 
> Prevent setting of devlink traps on the uplink while in switchdev mode.
> In this mode, it is the SW switch responsibility to handle both packets
> with a mismatch in destination MAC or VLAN ID. Therefore, there are no
> flow steering tables to trap undesirable packets and driver crashes upon
> setting a trap.
> 
> [...]

Here is the summary with links:
  - [net,1/3] net/mlx5: Fix setting of devlink traps in switchdev mode
    https://git.kernel.org/netdev/net/c/41bafb31dcd5
  - [net,2/3] net/mlx5e: Fix setting of RS FEC mode
    https://git.kernel.org/netdev/net/c/7a320c9db3e7
  - [net,3/3] net/mlx5e: fix ingress_ifindex check in mlx5e_flower_parse_meta
    https://git.kernel.org/netdev/net/c/e3e0f9b27970

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-04-15 23:50 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-14 23:16 [pull request][net 0/3] mlx5 fixes 2021-04-14 Saeed Mahameed
2021-04-14 23:16 ` [net 1/3] net/mlx5: Fix setting of devlink traps in switchdev mode Saeed Mahameed
2021-04-15 23:50   ` patchwork-bot+netdevbpf
2021-04-14 23:16 ` [net 2/3] net/mlx5e: Fix setting of RS FEC mode Saeed Mahameed
2021-04-14 23:16 ` [net 3/3] net/mlx5e: fix ingress_ifindex check in mlx5e_flower_parse_meta Saeed Mahameed
2021-04-14 23:31 ` [pull request][net 0/3] mlx5 fixes 2021-04-14 Jakub Kicinski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).