| Message ID | 20240710075127.2274582-6-schalla@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 60795bbf047654c9f8ae88d34483233a56033578 |
| 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: Satheesh Paul <psatheesh@marvell.com> > > While performing RSS based on IPv4, packets with > IPv4 options are not being considered. Adding changes > to match both plain IPv4 and IPv4 with option header. > > Fixes: 41a7aa7b800d ("octeontx2-af: NIX Rx flowkey configuration for RSS") > Signed-off-by: Satheesh Paul <psatheesh@marvell.com> LGTM Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> > --- > drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c > index 19fe3ed5c0ee..3dc828cf6c5a 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c > +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c > @@ -3866,6 +3866,8 @@ static int get_flowkey_alg_idx(struct nix_hw *nix_hw, u32 flow_cfg) > > /* 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) > +/* Mask to match both ipv4(NPC_LT_LC_IP) and ipv4 ext(NPC_LT_LC_IP_OPT) */ > +#define NPC_LT_LC_IP_MATCH_MSK ((~(NPC_LT_LC_IP ^ NPC_LT_LC_IP_OPT)) & 0xf) > > static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) > { > @@ -3936,7 +3938,7 @@ static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) > field->hdr_offset = 9; /* offset */ > field->bytesm1 = 0; /* 1 byte */ > field->ltype_match = NPC_LT_LC_IP; > - field->ltype_mask = 0xF; > + field->ltype_mask = NPC_LT_LC_IP_MATCH_MSK; > break; > case NIX_FLOW_KEY_TYPE_IPV4: > case NIX_FLOW_KEY_TYPE_INNR_IPV4: > @@ -3963,8 +3965,7 @@ static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) > field->bytesm1 = 3; /* DIP, 4 bytes */ > } > } > - > - field->ltype_mask = 0xF; /* Match only IPv4 */ > + field->ltype_mask = NPC_LT_LC_IP_MATCH_MSK; > keyoff_marker = false; > break; > case NIX_FLOW_KEY_TYPE_IPV6: > -- > 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 19fe3ed5c0ee..3dc828cf6c5a 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c @@ -3866,6 +3866,8 @@ static int get_flowkey_alg_idx(struct nix_hw *nix_hw, u32 flow_cfg) /* 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) +/* Mask to match both ipv4(NPC_LT_LC_IP) and ipv4 ext(NPC_LT_LC_IP_OPT) */ +#define NPC_LT_LC_IP_MATCH_MSK ((~(NPC_LT_LC_IP ^ NPC_LT_LC_IP_OPT)) & 0xf) static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) { @@ -3936,7 +3938,7 @@ static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) field->hdr_offset = 9; /* offset */ field->bytesm1 = 0; /* 1 byte */ field->ltype_match = NPC_LT_LC_IP; - field->ltype_mask = 0xF; + field->ltype_mask = NPC_LT_LC_IP_MATCH_MSK; break; case NIX_FLOW_KEY_TYPE_IPV4: case NIX_FLOW_KEY_TYPE_INNR_IPV4: @@ -3963,8 +3965,7 @@ static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) field->bytesm1 = 3; /* DIP, 4 bytes */ } } - - field->ltype_mask = 0xF; /* Match only IPv4 */ + field->ltype_mask = NPC_LT_LC_IP_MATCH_MSK; keyoff_marker = false; break; case NIX_FLOW_KEY_TYPE_IPV6: