diff mbox series

common/cnxk: add ROC API to merge base steering rule

Message ID 20210831041614.3453698-1-psatheesh@marvell.com (mailing list archive)
State Accepted, archived
Delegated to: Jerin Jacob
Headers
Series common/cnxk: add ROC API to merge base steering rule |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/github-robot: build success github build: passed
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/intel-Testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing fail Testing issues

Commit Message

Satheesh Paul Antonysamy Aug. 31, 2021, 4:16 a.m. UTC 
  From: Satheesh Paul <psatheesh@marvell.com>

This patch adds an ROC API to merge base steering rule with rules
added by VF.

Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
Reviewed-by: Kiran Kumar Kokkilagadda <kirankumark@marvell.com>
---
 drivers/common/cnxk/roc_npc.c   | 27 +++++++++++++++++++++++++++
 drivers/common/cnxk/roc_npc.h   |  5 ++---
 drivers/common/cnxk/version.map |  1 +
 3 files changed, 30 insertions(+), 3 deletions(-)

Comments

Ray Kinsella Aug. 31, 2021, 3:41 p.m. UTC | #1 
On 31/08/2021 05:16, psatheesh@marvell.com wrote:
> From: Satheesh Paul <psatheesh@marvell.com>
> 
> This patch adds an ROC API to merge base steering rule with rules
> added by VF.
> 
> Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
> Reviewed-by: Kiran Kumar Kokkilagadda <kirankumark@marvell.com>
> ---
>  drivers/common/cnxk/roc_npc.c   | 27 +++++++++++++++++++++++++++
>  drivers/common/cnxk/roc_npc.h   |  5 ++---
>  drivers/common/cnxk/version.map |  1 +
>  3 files changed, 30 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c
> index aff4eef554..53074bed99 100644
> --- a/drivers/common/cnxk/roc_npc.c
> +++ b/drivers/common/cnxk/roc_npc.c
> @@ -1136,3 +1136,30 @@ roc_npc_flow_dump(FILE *file, struct roc_npc *roc_npc)
>  		}
>  	}
>  }
> +
> +int
> +roc_npc_mcam_merge_base_steering_rule(struct roc_npc *roc_npc,
> +				      struct roc_npc_flow *flow)
> +{
> +	struct npc_mcam_read_base_rule_rsp *base_rule_rsp;
> +	struct npc *npc = roc_npc_to_npc_priv(roc_npc);
> +	struct mcam_entry *base_entry;
> +	int idx, rc;
> +
> +	if (roc_nix_is_pf(roc_npc->roc_nix))
> +		return 0;
> +
> +	(void)mbox_alloc_msg_npc_read_base_steer_rule(npc->mbox);
> +	rc = mbox_process_msg(npc->mbox, (void *)&base_rule_rsp);
> +	if (rc) {
> +		plt_err("Failed to fetch VF's base MCAM entry");
> +		return rc;
> +	}
> +	base_entry = &base_rule_rsp->entry_data;
> +	for (idx = 0; idx < ROC_NPC_MAX_MCAM_WIDTH_DWORDS; idx++) {
> +		flow->mcam_data[idx] |= base_entry->kw[idx];
> +		flow->mcam_mask[idx] |= base_entry->kw_mask[idx];
> +	}
> +
> +	return 0;
> +}
> diff --git a/drivers/common/cnxk/roc_npc.h b/drivers/common/cnxk/roc_npc.h
> index bab25fd72e..1f9d29e2dd 100644
> --- a/drivers/common/cnxk/roc_npc.h
> +++ b/drivers/common/cnxk/roc_npc.h
> @@ -215,15 +215,12 @@ int __roc_api roc_npc_flow_parse(struct roc_npc *roc_npc,
>  				 const struct roc_npc_action actions[],
>  				 struct roc_npc_flow *flow);
>  int __roc_api roc_npc_get_low_priority_mcam(struct roc_npc *roc_npc);
> -
>  int __roc_api roc_npc_mcam_free_counter(struct roc_npc *roc_npc,
>  					uint16_t ctr_id);
> -
>  int __roc_api roc_npc_mcam_read_counter(struct roc_npc *roc_npc,
>  					uint32_t ctr_id, uint64_t *count);
>  int __roc_api roc_npc_mcam_clear_counter(struct roc_npc *roc_npc,
>  					 uint32_t ctr_id);
> -
>  int __roc_api roc_npc_mcam_free_all_resources(struct roc_npc *roc_npc);
>  void __roc_api roc_npc_flow_dump(FILE *file, struct roc_npc *roc_npc);
>  void __roc_api roc_npc_flow_mcam_dump(FILE *file, struct roc_npc *roc_npc,
> @@ -234,4 +231,6 @@ int __roc_api roc_npc_mark_actions_sub_return(struct roc_npc *roc_npc,
>  int __roc_api roc_npc_vtag_actions_get(struct roc_npc *roc_npc);
>  int __roc_api roc_npc_vtag_actions_sub_return(struct roc_npc *roc_npc,
>  					      uint32_t count);
> +int __roc_api roc_npc_mcam_merge_base_steering_rule(struct roc_npc *roc_npc,
> +						    struct roc_npc_flow *flow);

Missing __rte_internal ?

>  #endif /* _ROC_NPC_H_ */
> diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
> index 2cbcc4b93a..13231fcf04 100644
> --- a/drivers/common/cnxk/version.map
> +++ b/drivers/common/cnxk/version.map
> @@ -234,6 +234,7 @@ INTERNAL {
>  	roc_npc_mcam_free_all_resources;
>  	roc_npc_mcam_free_counter;
>  	roc_npc_mcam_free_entry;
> +	roc_npc_mcam_merge_base_steering_rule;
>  	roc_npc_mcam_write_entry;
>  	roc_npc_mcam_read_counter;
>  	roc_npc_profile_name_get;
>
Satheesh Paul Antonysamy Sept. 1, 2021, 5:07 a.m. UTC | #2 
Please find reply inline.

-----Original Message-----
From: Kinsella, Ray <mdr@ashroe.eu> 
Sent: 31 August 2021 09:11 PM
To: Satheesh Paul <psatheesh@marvell.com>; Nithin Kumar Dabilpuram <ndabilpuram@marvell.com>; Kiran Kumar Kokkilagadda <kirankumark@marvell.com>; Sunil Kumar Kori <skori@marvell.com>; Satha Koteswara Rao Kottidi <skoteshwar@marvell.com>
Cc: dev@dpdk.org
Subject: [EXT] Re: [dpdk-dev] [PATCH] common/cnxk: add ROC API to merge base steering rule

External Email

----------------------------------------------------------------------


On 31/08/2021 05:16, psatheesh@marvell.com wrote:
> From: Satheesh Paul <psatheesh@marvell.com>
> 
> This patch adds an ROC API to merge base steering rule with rules 
> added by VF.
> 
> Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
> Reviewed-by: Kiran Kumar Kokkilagadda <kirankumark@marvell.com>
> ---
>  drivers/common/cnxk/roc_npc.c   | 27 +++++++++++++++++++++++++++
>  drivers/common/cnxk/roc_npc.h   |  5 ++---
>  drivers/common/cnxk/version.map |  1 +
>  3 files changed, 30 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/common/cnxk/roc_npc.c 
> b/drivers/common/cnxk/roc_npc.c index aff4eef554..53074bed99 100644
> --- a/drivers/common/cnxk/roc_npc.c
> +++ b/drivers/common/cnxk/roc_npc.c
> @@ -1136,3 +1136,30 @@ roc_npc_flow_dump(FILE *file, struct roc_npc *roc_npc)
>  		}
>  	}
>  }
> +
> +int
> +roc_npc_mcam_merge_base_steering_rule(struct roc_npc *roc_npc,
> +				      struct roc_npc_flow *flow)
> +{
> +	struct npc_mcam_read_base_rule_rsp *base_rule_rsp;
> +	struct npc *npc = roc_npc_to_npc_priv(roc_npc);
> +	struct mcam_entry *base_entry;
> +	int idx, rc;
> +
> +	if (roc_nix_is_pf(roc_npc->roc_nix))
> +		return 0;
> +
> +	(void)mbox_alloc_msg_npc_read_base_steer_rule(npc->mbox);
> +	rc = mbox_process_msg(npc->mbox, (void *)&base_rule_rsp);
> +	if (rc) {
> +		plt_err("Failed to fetch VF's base MCAM entry");
> +		return rc;
> +	}
> +	base_entry = &base_rule_rsp->entry_data;
> +	for (idx = 0; idx < ROC_NPC_MAX_MCAM_WIDTH_DWORDS; idx++) {
> +		flow->mcam_data[idx] |= base_entry->kw[idx];
> +		flow->mcam_mask[idx] |= base_entry->kw_mask[idx];
> +	}
> +
> +	return 0;
> +}
> diff --git a/drivers/common/cnxk/roc_npc.h 
> b/drivers/common/cnxk/roc_npc.h index bab25fd72e..1f9d29e2dd 100644
> --- a/drivers/common/cnxk/roc_npc.h
> +++ b/drivers/common/cnxk/roc_npc.h
> @@ -215,15 +215,12 @@ int __roc_api roc_npc_flow_parse(struct roc_npc *roc_npc,
>  				 const struct roc_npc_action actions[],
>  				 struct roc_npc_flow *flow);
>  int __roc_api roc_npc_get_low_priority_mcam(struct roc_npc *roc_npc);
> -
>  int __roc_api roc_npc_mcam_free_counter(struct roc_npc *roc_npc,
>  					uint16_t ctr_id);
> -
>  int __roc_api roc_npc_mcam_read_counter(struct roc_npc *roc_npc,
>  					uint32_t ctr_id, uint64_t *count);  int __roc_api 
> roc_npc_mcam_clear_counter(struct roc_npc *roc_npc,
>  					 uint32_t ctr_id);
> -
>  int __roc_api roc_npc_mcam_free_all_resources(struct roc_npc 
> *roc_npc);  void __roc_api roc_npc_flow_dump(FILE *file, struct 
> roc_npc *roc_npc);  void __roc_api roc_npc_flow_mcam_dump(FILE *file, 
> struct roc_npc *roc_npc, @@ -234,4 +231,6 @@ int __roc_api 
> roc_npc_mark_actions_sub_return(struct roc_npc *roc_npc,  int 
> __roc_api roc_npc_vtag_actions_get(struct roc_npc *roc_npc);  int __roc_api roc_npc_vtag_actions_sub_return(struct roc_npc *roc_npc,
>  					      uint32_t count);
> +int __roc_api roc_npc_mcam_merge_base_steering_rule(struct roc_npc *roc_npc,
> +						    struct roc_npc_flow *flow);

> Missing __rte_internal ?

__roc_api is defined as __rte_internal in "drivers/common/cnxk/roc_platform.h". 

>  #endif /* _ROC_NPC_H_ */
> diff --git a/drivers/common/cnxk/version.map 
> b/drivers/common/cnxk/version.map index 2cbcc4b93a..13231fcf04 100644
> --- a/drivers/common/cnxk/version.map
> +++ b/drivers/common/cnxk/version.map
> @@ -234,6 +234,7 @@ INTERNAL {
>  	roc_npc_mcam_free_all_resources;
>  	roc_npc_mcam_free_counter;
>  	roc_npc_mcam_free_entry;
> +	roc_npc_mcam_merge_base_steering_rule;
>  	roc_npc_mcam_write_entry;
>  	roc_npc_mcam_read_counter;
>  	roc_npc_profile_name_get;
>
Ray Kinsella Sept. 1, 2021, 11:16 a.m. UTC | #3 
On 31/08/2021 05:16, psatheesh@marvell.com wrote:
> From: Satheesh Paul <psatheesh@marvell.com>
> 
> This patch adds an ROC API to merge base steering rule with rules
> added by VF.
> 
> Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
> Reviewed-by: Kiran Kumar Kokkilagadda <kirankumark@marvell.com>
> ---
>  drivers/common/cnxk/roc_npc.c   | 27 +++++++++++++++++++++++++++
>  drivers/common/cnxk/roc_npc.h   |  5 ++---
>  drivers/common/cnxk/version.map |  1 +
>  3 files changed, 30 insertions(+), 3 deletions(-)
> 

Acked-by: Ray Kinsella <mdr@ashroe.eu>
Jerin Jacob Sept. 28, 2021, 1:45 p.m. UTC | #4 
On Wed, Sep 1, 2021 at 4:46 PM Kinsella, Ray <mdr@ashroe.eu> wrote:
>
>
>
> On 31/08/2021 05:16, psatheesh@marvell.com wrote:
> > From: Satheesh Paul <psatheesh@marvell.com>
> >
> > This patch adds an ROC API to merge base steering rule with rules
> > added by VF.
> >
> > Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
> > Reviewed-by: Kiran Kumar Kokkilagadda <kirankumark@marvell.com>
> > ---
> >  drivers/common/cnxk/roc_npc.c   | 27 +++++++++++++++++++++++++++
> >  drivers/common/cnxk/roc_npc.h   |  5 ++---
> >  drivers/common/cnxk/version.map |  1 +
> >  3 files changed, 30 insertions(+), 3 deletions(-)
> >
>
> Acked-by: Ray Kinsella <mdr@ashroe.eu>


Change the subject to common/cnxk: support merging base steering rule
Applied to dpdk-next-net-mrvl/for-next-net. Thanks
diff mbox series

Patch

diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c
index aff4eef554..53074bed99 100644
--- a/drivers/common/cnxk/roc_npc.c
+++ b/drivers/common/cnxk/roc_npc.c
@@ -1136,3 +1136,30 @@  roc_npc_flow_dump(FILE *file, struct roc_npc *roc_npc)
 		}
 	}
 }
+
+int
+roc_npc_mcam_merge_base_steering_rule(struct roc_npc *roc_npc,
+				      struct roc_npc_flow *flow)
+{
+	struct npc_mcam_read_base_rule_rsp *base_rule_rsp;
+	struct npc *npc = roc_npc_to_npc_priv(roc_npc);
+	struct mcam_entry *base_entry;
+	int idx, rc;
+
+	if (roc_nix_is_pf(roc_npc->roc_nix))
+		return 0;
+
+	(void)mbox_alloc_msg_npc_read_base_steer_rule(npc->mbox);
+	rc = mbox_process_msg(npc->mbox, (void *)&base_rule_rsp);
+	if (rc) {
+		plt_err("Failed to fetch VF's base MCAM entry");
+		return rc;
+	}
+	base_entry = &base_rule_rsp->entry_data;
+	for (idx = 0; idx < ROC_NPC_MAX_MCAM_WIDTH_DWORDS; idx++) {
+		flow->mcam_data[idx] |= base_entry->kw[idx];
+		flow->mcam_mask[idx] |= base_entry->kw_mask[idx];
+	}
+
+	return 0;
+}
diff --git a/drivers/common/cnxk/roc_npc.h b/drivers/common/cnxk/roc_npc.h
index bab25fd72e..1f9d29e2dd 100644
--- a/drivers/common/cnxk/roc_npc.h
+++ b/drivers/common/cnxk/roc_npc.h
@@ -215,15 +215,12 @@  int __roc_api roc_npc_flow_parse(struct roc_npc *roc_npc,
 				 const struct roc_npc_action actions[],
 				 struct roc_npc_flow *flow);
 int __roc_api roc_npc_get_low_priority_mcam(struct roc_npc *roc_npc);
-
 int __roc_api roc_npc_mcam_free_counter(struct roc_npc *roc_npc,
 					uint16_t ctr_id);
-
 int __roc_api roc_npc_mcam_read_counter(struct roc_npc *roc_npc,
 					uint32_t ctr_id, uint64_t *count);
 int __roc_api roc_npc_mcam_clear_counter(struct roc_npc *roc_npc,
 					 uint32_t ctr_id);
-
 int __roc_api roc_npc_mcam_free_all_resources(struct roc_npc *roc_npc);
 void __roc_api roc_npc_flow_dump(FILE *file, struct roc_npc *roc_npc);
 void __roc_api roc_npc_flow_mcam_dump(FILE *file, struct roc_npc *roc_npc,
@@ -234,4 +231,6 @@  int __roc_api roc_npc_mark_actions_sub_return(struct roc_npc *roc_npc,
 int __roc_api roc_npc_vtag_actions_get(struct roc_npc *roc_npc);
 int __roc_api roc_npc_vtag_actions_sub_return(struct roc_npc *roc_npc,
 					      uint32_t count);
+int __roc_api roc_npc_mcam_merge_base_steering_rule(struct roc_npc *roc_npc,
+						    struct roc_npc_flow *flow);
 #endif /* _ROC_NPC_H_ */
diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
index 2cbcc4b93a..13231fcf04 100644
--- a/drivers/common/cnxk/version.map
+++ b/drivers/common/cnxk/version.map
@@ -234,6 +234,7 @@  INTERNAL {
 	roc_npc_mcam_free_all_resources;
 	roc_npc_mcam_free_counter;
 	roc_npc_mcam_free_entry;
+	roc_npc_mcam_merge_base_steering_rule;
 	roc_npc_mcam_write_entry;
 	roc_npc_mcam_read_counter;
 	roc_npc_profile_name_get;