| Message ID | 20240710075127.2274582-5-schalla@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e23ac1095b9eb8ac48f98c398d81d6ba062c9b5d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Fixes for CPT and RSS configuration | expand |
On Wed, Jul 10, 2024 at 1:24 PM Srujana Challa <schalla@marvell.com> wrote: > > From: Kiran Kumar K <kirankumark@marvell.com> > > While performing RSS based on IPv6, extension ltype > is not being considered. This will be problem for > fragmented packets or packets with extension header. > Adding changes to match IPv6 ext header along with IPv6 > ltype. > > Fixes: 41a7aa7b800d ("octeontx2-af: NIX Rx flowkey configuration for RSS") > Signed-off-by: Kiran Kumar K <kirankumark@marvell.com> Thanks for making the change. LGTM Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> > --- > drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c > index 00af8888e329..19fe3ed5c0ee 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c > +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c > @@ -3864,6 +3864,9 @@ static int get_flowkey_alg_idx(struct nix_hw *nix_hw, u32 flow_cfg) > return -ERANGE; > } > > +/* Mask to match ipv6(NPC_LT_LC_IP6) and ipv6 ext(NPC_LT_LC_IP6_EXT) */ > +#define NPC_LT_LC_IP6_MATCH_MSK ((~(NPC_LT_LC_IP6 ^ NPC_LT_LC_IP6_EXT)) & 0xf) > + > static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) > { > int idx, nr_field, key_off, field_marker, keyoff_marker; > @@ -3990,7 +3993,7 @@ static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) > field->bytesm1 = 15; /* DIP,16 bytes */ > } > } > - field->ltype_mask = 0xF; /* Match only IPv6 */ > + field->ltype_mask = NPC_LT_LC_IP6_MATCH_MSK; > break; > case NIX_FLOW_KEY_TYPE_TCP: > case NIX_FLOW_KEY_TYPE_UDP: > -- > 2.25.1 > >
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c index 00af8888e329..19fe3ed5c0ee 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c @@ -3864,6 +3864,9 @@ static int get_flowkey_alg_idx(struct nix_hw *nix_hw, u32 flow_cfg) return -ERANGE; } +/* Mask to match ipv6(NPC_LT_LC_IP6) and ipv6 ext(NPC_LT_LC_IP6_EXT) */ +#define NPC_LT_LC_IP6_MATCH_MSK ((~(NPC_LT_LC_IP6 ^ NPC_LT_LC_IP6_EXT)) & 0xf) + static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) { int idx, nr_field, key_off, field_marker, keyoff_marker; @@ -3990,7 +3993,7 @@ static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) field->bytesm1 = 15; /* DIP,16 bytes */ } } - field->ltype_mask = 0xF; /* Match only IPv6 */ + field->ltype_mask = NPC_LT_LC_IP6_MATCH_MSK; break; case NIX_FLOW_KEY_TYPE_TCP: case NIX_FLOW_KEY_TYPE_UDP: