Fixes for CPT and RSS configuration
v2 cover Fixes for CPT and RSS configuration
This series of patches fixes various issues related to CPT configuration and RSS configuration.
v1->v2:
- Excluded the patch "octeontx2-af: reduce cpt flt interrupt vectors for cn10kb" to submit it to net-next.
- Addressed the review comments.
Kiran Kumar K (1):
octeontx2-af: Fix issue with IPv6 ext match for RSS
Michal Mazur (1):
octeontx2-af: fix detection of IP layer
Nithin Dabilpuram (1):
octeontx2-af: replace cpt slot with lf id on reg write
Satheesh Paul (1):
octeontx2-af: fix issue with IPv4 match for RSS
Srujana Challa (1):
octeontx2-af: fix a issue with cpt_lf_alloc mailbox
.../net/ethernet/marvell/octeontx2/af/mbox.h | 2 +- .../net/ethernet/marvell/octeontx2/af/npc.h | 8 +++++-- .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 23 +++++++++++++------ .../ethernet/marvell/octeontx2/af/rvu_nix.c | 12 ++++++---- 4 files changed, 31 insertions(+), 14 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/5 octeontx2-af: replace cpt slot with lf id on reg write
From: Nithin Dabilpuram <[email protected]>
Replace slot id with global CPT lf id on reg read/write as CPTPF/VF driver would send slot number instead of global lf id in the reg offset. And also update the mailbox response with the global lf's register offset.
--- .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c +16 -7
@@ -696,7 +696,8 @@ int rvu_mbox_handler_cpt_rd_wr_register(struct rvu *rvu,struct cpt_rd_wr_reg_msg *req, struct cpt_rd_wr_reg_msg *rsp) { - int blkaddr; + u64 offset = req->reg_offset; +int blkaddr, lf; blkaddr =validate_and_get_cpt_blkaddr (req->blkaddr);if (blkaddr <0 )
@@ -707,17 +708,25 @@ int rvu_mbox_handler_cpt_rd_wr_register(struct rvu *rvu, !is_cpt_vf(rvu, req->hdr.pcifunc))return CPT_AF_ERR_ACCESS_DENIED ; - rsp->reg_offset = req->reg_offset; - rsp->ret_val = req->ret_val; - rsp->is_write = req->is_write; -if (!is_valid_offset (rvu, req))return CPT_AF_ERR_ACCESS_DENIED ; +/* Translate local LF used by VFs to global CPT LF */ + lf =rvu_get_lf (rvu, &rvu->hw->block[blkaddr], req->hdr.pcifunc, + (offset &0xFFF ) >>3 ); + +/* Translate local LF's offset to global CPT LF's offset */ + offset &=0xFF000 ; + offset += lf <<3 ; + + rsp->reg_offset = offset; + rsp->ret_val = req->ret_val; + rsp->is_write = req->is_write; +if (req->is_write) -rvu_write64 (rvu, blkaddr, req->reg_offset, req->val); +rvu_write64 (rvu, blkaddr, offset, req->val);else - rsp->val =rvu_read64 (rvu, blkaddr, req->reg_offset); + rsp->val =rvu_read64 (rvu, blkaddr, offset);return 0 ; }
Signature · 1 line
2.25.1
PATCH v2 2/5 octeontx2-af: fix a issue with cpt_lf_alloc mailbox
In reply to Srujana ChallaThis patch fixes CPT_LF_ALLOC mailbox error due to incompatible mailbox message format. Specifically, it corrects the blkaddr field type from int to u8.
--- drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/af/mbox.h +1 -1
@@ -1745,7 +1745,7 @@ struct cpt_lf_alloc_req_msg {u16 nix_pf_func;u16 sso_pf_func;u16 eng_grpmsk; -int blkaddr; +u8 blkaddr; u8 ctx_ilen_valid : 1; u8 ctx_ilen : 7; };
Signature · 1 line
2.25.1
PATCH v2 3/5 octeontx2-af: fix detection of IP layer
In reply to Srujana ChallaFrom: Michal Mazur <[email protected]>
Checksum and length checks are not enabled for IPv4 header with options and IPv6 with extension headers.
To fix this a change in enum npc_kpu_lc_ltype is required which will allow adjustment of LTYPE_MASK to detect all types of IP headers.
--- drivers/net/ethernet/marvell/octeontx2/af/npc.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/npc.h +6 -2
@@ -63,8 +63,13 @@ enum npc_kpu_lb_ltype { NPC_LT_LB_CUSTOM1 = 0xF, }; +/* Don't modify ltypes up to IP6_EXT, otherwise length and checksum of IP +* headers may not be checked correctly. IPv4 ltypes and IPv6 ltypes must +* differ only at bit 0 so mask 0xE can be used to detect extended headers. +*/ enum npc_kpu_lc_ltype { -NPC_LT_LC_IP =1 , +NPC_LT_LC_PTP =1 , +NPC_LT_LC_IP ,NPC_LT_LC_IP_OPT ,NPC_LT_LC_IP6 ,NPC_LT_LC_IP6_EXT ,
@@ -72,7 +77,6 @@ enum npc_kpu_lc_ltype {NPC_LT_LC_RARP ,NPC_LT_LC_MPLS ,NPC_LT_LC_NSH , -NPC_LT_LC_PTP ,NPC_LT_LC_FCOE ,NPC_LT_LC_NGIO , NPC_LT_LC_CUSTOM0 = 0xE,
Signature · 1 line
2.25.1
PATCH v2 4/5 octeontx2-af: fix issue with IPv6 ext match for RSS
In reply to Srujana ChallaFrom: Kiran Kumar K <[email protected]>
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.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +4 -1
@@ -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 :
Signature · 1 line
2.25.1
Re: [PATCH net,v2,4/5] octeontx2-af: fix issue with IPv6 ext match for RSS
Quoted 11 lines · Srujana Challa
From: Kiran Kumar K <[email protected]>
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 <[email protected]>
Thanks for making the change. LGTM
Quoted 31 lines
--- drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +4
-2@@ -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
Signature · 2 lines
Regards, Kalesh A P
PATCH v2 5/5 octeontx2-af: fix issue with IPv4 match for RSS
In reply to Srujana ChallaFrom: Satheesh Paul <[email protected]>
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.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +4 -3
@@ -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 :
Signature · 1 line
2.25.1
Re: [PATCH net,v2,5/5] octeontx2-af: fix issue with IPv4 match for RSS
Quoted 9 lines · Srujana Challa
From: Satheesh Paul <[email protected]>
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 <[email protected]>
LGTM
Quoted 40 lines
--- drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +4
-4@@ -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
Signature · 2 lines
Regards, Kalesh A P
This series was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 9 lines · On Wed, 10 Jul 2024 13:21:22 +0530 you wrote:
This series of patches fixes various issues related to CPT configuration and RSS configuration.
v1->v2:
- Excluded the patch "octeontx2-af: reduce cpt flt interrupt vectors for cn10kb" to submit it to net-next.
- Addressed the review comments.[...]
Here is the summary with links:
- [net,v2,1/5] octeontx2-af: replace cpt slot with lf id on reg write
https://git.kernel.org/netdev/net/c/bc35e28af789 - [net,v2,2/5] octeontx2-af: fix a issue with cpt_lf_alloc mailbox https://git.kernel.org/netdev/net/c/845fe19139ab - [net,v2,3/5] octeontx2-af: fix detection of IP layer https://git.kernel.org/netdev/net/c/404dc0fd6fb0 - [net,v2,4/5] octeontx2-af: fix issue with IPv6 ext match for RSS https://git.kernel.org/netdev/net/c/e23ac1095b9e - [net,v2,5/5] octeontx2-af: fix issue with IPv4 match for RSS https://git.kernel.org/netdev/net/c/60795bbf0476
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html