2022-03-31 03:54:35

by Alexander Lobakin

Subject: [PATCH intel-next] ice: switch: fix a braino in the new dummy packet match definitions

There's a trivial mistake[0] in @ice_dummy_pkt_profile due to which
it incorrectly states that "plain" TCP IPv6 packets should match on
the flag 'inner IPv6', not the 'outer' one.

[0] https://lore.kernel.org/netdev/PH0PR11MB5782637EA9771D3ED4E56012FD1E9@PH0PR11MB5782.namprd11.prod.outlook.com

Fixes: b5c7ae81ff90 ("ice: switch: convert packet template match code to rodata")
Reported-by: Wojciech Drewek <[email protected]>
Signed-off-by: Alexander Lobakin <[email protected]>
---
Tony, please squash it with the mentioned commit on applying.
Thanks.
---
drivers/net/ethernet/intel/ice/ice_switch.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
index ed7130b7abfe..496250f9f8fc 100644
--- a/drivers/net/ethernet/intel/ice/ice_switch.c
+++ b/drivers/net/ethernet/intel/ice/ice_switch.c
@@ -1276,8 +1276,8 @@ static const struct ice_dummy_pkt_profile ice_dummy_pkt_profiles[] = {
ICE_PKT_PROFILE(udp_ipv6, ICE_PKT_OUTER_IPV6 | ICE_PKT_INNER_UDP),
ICE_PKT_PROFILE(vlan_udp, ICE_PKT_INNER_UDP | ICE_PKT_VLAN),
ICE_PKT_PROFILE(udp, ICE_PKT_INNER_UDP),
- ICE_PKT_PROFILE(vlan_tcp_ipv6, ICE_PKT_INNER_IPV6 | ICE_PKT_VLAN),
- ICE_PKT_PROFILE(tcp_ipv6, ICE_PKT_INNER_IPV6),
+ ICE_PKT_PROFILE(vlan_tcp_ipv6, ICE_PKT_OUTER_IPV6 | ICE_PKT_VLAN),
+ ICE_PKT_PROFILE(tcp_ipv6, ICE_PKT_OUTER_IPV6),
ICE_PKT_PROFILE(vlan_tcp, ICE_PKT_VLAN),
ICE_PKT_PROFILE(tcp, 0),
};
--
2.35.1

2022-03-31 05:06:26

by Wojciech Drewek

Subject: RE: [PATCH intel-next] ice: switch: fix a braino in the new dummy packet match definitions

Thanks for the fix Alex!

> -----Original Message-----
> From: Lobakin, Alexandr <[email protected]>
> Sent: ?roda, 30 marca 2022 11:21
> To: [email protected]
> Cc: Lobakin, Alexandr <[email protected]>; Fijalkowski, Maciej <[email protected]>; Michal Swiatkowski
> <[email protected]>; Drewek, Wojciech <[email protected]>; Marcin Szycik
> <[email protected]>; Szapar-Mudlaw, Martyna <[email protected]>; David S. Miller
> <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>; [email protected]; linux-
> [email protected]
> Subject: [PATCH intel-next] ice: switch: fix a braino in the new dummy packet match definitions
>
> There's a trivial mistake[0] in @ice_dummy_pkt_profile due to which
> it incorrectly states that "plain" TCP IPv6 packets should match on
> the flag 'inner IPv6', not the 'outer' one.
>
> [0] https://lore.kernel.org/netdev/PH0PR11MB5782637EA9771D3ED4E56012FD1E9@PH0PR11MB5782.namprd11.prod.outlook.com
>
> Fixes: b5c7ae81ff90 ("ice: switch: convert packet template match code to rodata")
> Reported-by: Wojciech Drewek <[email protected]>
> Signed-off-by: Alexander Lobakin <[email protected]>
> ---
> Tony, please squash it with the mentioned commit on applying.
> Thanks.
> ---
> drivers/net/ethernet/intel/ice/ice_switch.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
> index ed7130b7abfe..496250f9f8fc 100644
> --- a/drivers/net/ethernet/intel/ice/ice_switch.c
> +++ b/drivers/net/ethernet/intel/ice/ice_switch.c
> @@ -1276,8 +1276,8 @@ static const struct ice_dummy_pkt_profile ice_dummy_pkt_profiles[] = {
> ICE_PKT_PROFILE(udp_ipv6, ICE_PKT_OUTER_IPV6 | ICE_PKT_INNER_UDP),
> ICE_PKT_PROFILE(vlan_udp, ICE_PKT_INNER_UDP | ICE_PKT_VLAN),
> ICE_PKT_PROFILE(udp, ICE_PKT_INNER_UDP),
> - ICE_PKT_PROFILE(vlan_tcp_ipv6, ICE_PKT_INNER_IPV6 | ICE_PKT_VLAN),
> - ICE_PKT_PROFILE(tcp_ipv6, ICE_PKT_INNER_IPV6),
> + ICE_PKT_PROFILE(vlan_tcp_ipv6, ICE_PKT_OUTER_IPV6 | ICE_PKT_VLAN),
> + ICE_PKT_PROFILE(tcp_ipv6, ICE_PKT_OUTER_IPV6),
> ICE_PKT_PROFILE(vlan_tcp, ICE_PKT_VLAN),
> ICE_PKT_PROFILE(tcp, 0),
> };
> --
> 2.35.1