diff mbox series

[v3,1/2] common/cnxk: configure reassembly specific params

Message ID 20220223122834.2571860-2-gakhil@marvell.com (mailing list archive)
State Changes Requested, archived
Delegated to: Jerin Jacob
Headers
Series net/cnxk: support IP reassembly offload |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Akhil Goyal Feb. 23, 2022, 12:28 p.m. UTC 
  From: Vidya Sagar Velumuri <vvelumuri@marvell.com>

When reassembly is enabled by application, set corresponding
flags in SA during creation.

Provide roc API to configure reassembly unit with active and zombie limits
and step size

Signed-off-by: Vidya Sagar Velumuri <vvelumuri@marvell.com>
---
 drivers/common/cnxk/cnxk_security.c | 10 ++++++++++
 drivers/common/cnxk/roc_nix_inl.c   | 23 +++++++++++++++++++++++
 drivers/common/cnxk/roc_nix_inl.h   |  7 +++++++
 drivers/common/cnxk/version.map     |  1 +
 4 files changed, 41 insertions(+)

Comments

Jerin Jacob Feb. 23, 2022, 4:51 p.m. UTC | #1 
On Wed, Feb 23, 2022 at 5:58 PM Akhil Goyal <gakhil@marvell.com> wrote:
>
> From: Vidya Sagar Velumuri <vvelumuri@marvell.com>
>
> When reassembly is enabled by application, set corresponding
> flags in SA during creation.
>
> Provide roc API to configure reassembly unit with active and zombie limits
> and step size
>
> Signed-off-by: Vidya Sagar Velumuri <vvelumuri@marvell.com>
> ---
>  drivers/common/cnxk/cnxk_security.c | 10 ++++++++++
>  drivers/common/cnxk/roc_nix_inl.c   | 23 +++++++++++++++++++++++
>  drivers/common/cnxk/roc_nix_inl.h   |  7 +++++++
>  drivers/common/cnxk/version.map     |  1 +
>  4 files changed, 41 insertions(+)
>
> diff --git a/drivers/common/cnxk/cnxk_security.c b/drivers/common/cnxk/cnxk_security.c
> index d6006d3176..ec808c0033 100644
> --- a/drivers/common/cnxk/cnxk_security.c
> +++ b/drivers/common/cnxk/cnxk_security.c
> @@ -339,6 +339,16 @@ cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
>         if (rc)
>                 return rc;
>
> +       /* Default options for pkt_out and pkt_fmt are with
> +        * second pass meta and no defrag.
> +        */
> +       sa->w0.s.pkt_format = ROC_IE_OT_SA_PKT_FMT_META;
> +       sa->w0.s.pkt_output = ROC_IE_OT_SA_PKT_OUTPUT_NO_FRAG;
> +       sa->w0.s.pkind = ROC_IE_OT_CPT_PKIND;
> +
> +       if (ipsec_xfrm->options.ip_reassembly_en)
> +               sa->w0.s.pkt_output = ROC_IE_OT_SA_PKT_OUTPUT_HW_BASED_DEFRAG;
> +
>         /* ESN */
>         sa->w2.s.esn_en = !!ipsec_xfrm->options.esn;
>         if (ipsec_xfrm->options.udp_encap) {
> diff --git a/drivers/common/cnxk/roc_nix_inl.c b/drivers/common/cnxk/roc_nix_inl.c
> index 7bf89a44c1..9db97b65df 100644
> --- a/drivers/common/cnxk/roc_nix_inl.c
> +++ b/drivers/common/cnxk/roc_nix_inl.c
> @@ -231,6 +231,29 @@ roc_nix_inl_inb_sa_get(struct roc_nix *roc_nix, bool inb_inl_dev, uint32_t spi)
>         return (sa_base + ((spi & mask) * sz));
>  }
>
> +int
> +roc_nix_reassembly_configure(uint32_t max_wait_time, uint16_t max_frags)
> +{
> +       struct idev_cfg *idev = idev_get_cfg();
> +       struct roc_cpt *roc_cpt;
> +       struct roc_cpt_rxc_time_cfg cfg;
> +
> +       (void)max_frags;

Use PLT_SET_USED

> +       roc_cpt = idev->cpt;
> +       if (!roc_cpt) {
> +               plt_err("Cannot support inline inbound, cryptodev not probed");
> +               return -ENOTSUP;
> +       }
> +
> +       cfg.step = (max_wait_time * 1000 / ROC_NIX_INL_REAS_ACTIVE_LIMIT);
> +       cfg.zombie_limit = ROC_NIX_INL_REAS_ZOMBIE_LIMIT;
> +       cfg.zombie_thres = ROC_NIX_INL_REAS_ZOMBIE_THRESHOLD;
> +       cfg.active_limit = ROC_NIX_INL_REAS_ACTIVE_LIMIT;
> +       cfg.active_thres = ROC_NIX_INL_REAS_ACTIVE_THRESHOLD;
> +
> +       return roc_cpt_rxc_time_cfg(roc_cpt, &cfg);
> +}
> +
>  int
>  roc_nix_inl_inb_init(struct roc_nix *roc_nix)
>  {
> diff --git a/drivers/common/cnxk/roc_nix_inl.h b/drivers/common/cnxk/roc_nix_inl.h
> index 5eb1a81471..45d349acf4 100644
> --- a/drivers/common/cnxk/roc_nix_inl.h
> +++ b/drivers/common/cnxk/roc_nix_inl.h
> @@ -43,6 +43,11 @@
>  /* Alignment of SA Base */
>  #define ROC_NIX_INL_SA_BASE_ALIGN BIT_ULL(16)
>
> +#define ROC_NIX_INL_REAS_ACTIVE_LIMIT    0xFFF
> +#define ROC_NIX_INL_REAS_ACTIVE_THRESHOLD 10
> +#define ROC_NIX_INL_REAS_ZOMBIE_LIMIT    0xFFF
> +#define ROC_NIX_INL_REAS_ZOMBIE_THRESHOLD 10
> +
>  static inline struct roc_onf_ipsec_inb_sa *
>  roc_nix_inl_onf_ipsec_inb_sa(uintptr_t base, uint64_t idx)
>  {
> @@ -152,6 +157,8 @@ struct roc_nix_rq *__roc_api roc_nix_inl_dev_rq(void);
>  int __roc_api roc_nix_inl_inb_tag_update(struct roc_nix *roc_nix,
>                                          uint32_t tag_const, uint8_t tt);
>  uint64_t __roc_api roc_nix_inl_dev_rq_limit_get(void);
> +int __roc_api roc_nix_reassembly_configure(uint32_t max_wait_time,
> +                                       uint16_t max_frags);
>
>  /* NIX Inline Outbound API */
>  int __roc_api roc_nix_inl_outb_init(struct roc_nix *roc_nix);
> diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
> index dbede4aeed..2e8da4c2a7 100644
> --- a/drivers/common/cnxk/version.map
> +++ b/drivers/common/cnxk/version.map
> @@ -206,6 +206,7 @@ INTERNAL {
>         roc_nix_ptp_tx_ena_dis;
>         roc_nix_queues_ctx_dump;
>         roc_nix_ras_intr_ena_dis;
> +       roc_nix_reassembly_configure;
>         roc_nix_register_cq_irqs;
>         roc_nix_register_queue_irqs;
>         roc_nix_rq_dump;
> --
> 2.25.1
>
diff mbox series

Patch

diff --git a/drivers/common/cnxk/cnxk_security.c b/drivers/common/cnxk/cnxk_security.c
index d6006d3176..ec808c0033 100644
--- a/drivers/common/cnxk/cnxk_security.c
+++ b/drivers/common/cnxk/cnxk_security.c
@@ -339,6 +339,16 @@  cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
 	if (rc)
 		return rc;
 
+	/* Default options for pkt_out and pkt_fmt are with
+	 * second pass meta and no defrag.
+	 */
+	sa->w0.s.pkt_format = ROC_IE_OT_SA_PKT_FMT_META;
+	sa->w0.s.pkt_output = ROC_IE_OT_SA_PKT_OUTPUT_NO_FRAG;
+	sa->w0.s.pkind = ROC_IE_OT_CPT_PKIND;
+
+	if (ipsec_xfrm->options.ip_reassembly_en)
+		sa->w0.s.pkt_output = ROC_IE_OT_SA_PKT_OUTPUT_HW_BASED_DEFRAG;
+
 	/* ESN */
 	sa->w2.s.esn_en = !!ipsec_xfrm->options.esn;
 	if (ipsec_xfrm->options.udp_encap) {
diff --git a/drivers/common/cnxk/roc_nix_inl.c b/drivers/common/cnxk/roc_nix_inl.c
index 7bf89a44c1..9db97b65df 100644
--- a/drivers/common/cnxk/roc_nix_inl.c
+++ b/drivers/common/cnxk/roc_nix_inl.c
@@ -231,6 +231,29 @@  roc_nix_inl_inb_sa_get(struct roc_nix *roc_nix, bool inb_inl_dev, uint32_t spi)
 	return (sa_base + ((spi & mask) * sz));
 }
 
+int
+roc_nix_reassembly_configure(uint32_t max_wait_time, uint16_t max_frags)
+{
+	struct idev_cfg *idev = idev_get_cfg();
+	struct roc_cpt *roc_cpt;
+	struct roc_cpt_rxc_time_cfg cfg;
+
+	(void)max_frags;
+	roc_cpt = idev->cpt;
+	if (!roc_cpt) {
+		plt_err("Cannot support inline inbound, cryptodev not probed");
+		return -ENOTSUP;
+	}
+
+	cfg.step = (max_wait_time * 1000 / ROC_NIX_INL_REAS_ACTIVE_LIMIT);
+	cfg.zombie_limit = ROC_NIX_INL_REAS_ZOMBIE_LIMIT;
+	cfg.zombie_thres = ROC_NIX_INL_REAS_ZOMBIE_THRESHOLD;
+	cfg.active_limit = ROC_NIX_INL_REAS_ACTIVE_LIMIT;
+	cfg.active_thres = ROC_NIX_INL_REAS_ACTIVE_THRESHOLD;
+
+	return roc_cpt_rxc_time_cfg(roc_cpt, &cfg);
+}
+
 int
 roc_nix_inl_inb_init(struct roc_nix *roc_nix)
 {
diff --git a/drivers/common/cnxk/roc_nix_inl.h b/drivers/common/cnxk/roc_nix_inl.h
index 5eb1a81471..45d349acf4 100644
--- a/drivers/common/cnxk/roc_nix_inl.h
+++ b/drivers/common/cnxk/roc_nix_inl.h
@@ -43,6 +43,11 @@ 
 /* Alignment of SA Base */
 #define ROC_NIX_INL_SA_BASE_ALIGN BIT_ULL(16)
 
+#define ROC_NIX_INL_REAS_ACTIVE_LIMIT	  0xFFF
+#define ROC_NIX_INL_REAS_ACTIVE_THRESHOLD 10
+#define ROC_NIX_INL_REAS_ZOMBIE_LIMIT	  0xFFF
+#define ROC_NIX_INL_REAS_ZOMBIE_THRESHOLD 10
+
 static inline struct roc_onf_ipsec_inb_sa *
 roc_nix_inl_onf_ipsec_inb_sa(uintptr_t base, uint64_t idx)
 {
@@ -152,6 +157,8 @@  struct roc_nix_rq *__roc_api roc_nix_inl_dev_rq(void);
 int __roc_api roc_nix_inl_inb_tag_update(struct roc_nix *roc_nix,
 					 uint32_t tag_const, uint8_t tt);
 uint64_t __roc_api roc_nix_inl_dev_rq_limit_get(void);
+int __roc_api roc_nix_reassembly_configure(uint32_t max_wait_time,
+					uint16_t max_frags);
 
 /* NIX Inline Outbound API */
 int __roc_api roc_nix_inl_outb_init(struct roc_nix *roc_nix);
diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
index dbede4aeed..2e8da4c2a7 100644
--- a/drivers/common/cnxk/version.map
+++ b/drivers/common/cnxk/version.map
@@ -206,6 +206,7 @@  INTERNAL {
 	roc_nix_ptp_tx_ena_dis;
 	roc_nix_queues_ctx_dump;
 	roc_nix_ras_intr_ena_dis;
+	roc_nix_reassembly_configure;
 	roc_nix_register_cq_irqs;
 	roc_nix_register_queue_irqs;
 	roc_nix_rq_dump;