You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
2.4 KiB
63 lines
2.4 KiB
4 years ago
|
From 9449eae0b7957d9a09f751c6b26f42bab3dbc478 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Date: Tue, 12 May 2020 10:55:05 -0400
|
||
|
|
Subject: [PATCH 189/312] [netdrv] net/mlx5: Eswitch, avoid redundant mask
|
||
|
|
|
||
|
|
Message-id: <20200512105530.4207-100-ahleihel@redhat.com>
|
||
|
|
Patchwork-id: 306972
|
||
|
|
Patchwork-instance: patchwork
|
||
|
|
O-Subject: [RHEL8.3 BZ 1789382 099/124] net/mlx5: Eswitch, avoid redundant mask
|
||
|
|
Bugzilla: 1789382
|
||
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
||
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1789382
|
||
|
|
Upstream: v5.7-rc1
|
||
|
|
|
||
|
|
commit 1708dd54687db4fd5baa3b6169aa116505c1e2ef
|
||
|
|
Author: Eli Cohen <eli@mellanox.com>
|
||
|
|
Date: Thu Feb 6 15:13:36 2020 +0200
|
||
|
|
|
||
|
|
net/mlx5: Eswitch, avoid redundant mask
|
||
|
|
|
||
|
|
misc_params.source_port is a 16 bit field already so no need for
|
||
|
|
redundant masking against 0xffff. Also change local variables type to
|
||
|
|
u16.
|
||
|
|
|
||
|
|
Signed-off-by: Eli Cohen <eli@mellanox.com>
|
||
|
|
Reviewed-by: Roi Dayan <roid@mellanox.com>
|
||
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
||
|
|
|
||
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
|
||
|
|
index d2f6af3a8a28..0050f3138e4b 100644
|
||
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
|
||
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
|
||
|
|
@@ -181,7 +181,7 @@ mlx5_eswitch_termtbl_actions_move(struct mlx5_flow_act *src,
|
||
|
|
static bool mlx5_eswitch_offload_is_uplink_port(const struct mlx5_eswitch *esw,
|
||
|
|
const struct mlx5_flow_spec *spec)
|
||
|
|
{
|
||
|
|
- u32 port_mask, port_value;
|
||
|
|
+ u16 port_mask, port_value;
|
||
|
|
|
||
|
|
if (MLX5_CAP_ESW_FLOWTABLE(esw->dev, flow_source))
|
||
|
|
return spec->flow_context.flow_source ==
|
||
|
|
@@ -191,7 +191,7 @@ static bool mlx5_eswitch_offload_is_uplink_port(const struct mlx5_eswitch *esw,
|
||
|
|
misc_parameters.source_port);
|
||
|
|
port_value = MLX5_GET(fte_match_param, spec->match_value,
|
||
|
|
misc_parameters.source_port);
|
||
|
|
- return (port_mask & port_value & 0xffff) == MLX5_VPORT_UPLINK;
|
||
|
|
+ return (port_mask & port_value) == MLX5_VPORT_UPLINK;
|
||
|
|
}
|
||
|
|
|
||
|
|
bool
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|