[v4] examples/ipsec-secgw: fix cryptodev to SA mapping
Checks
Commit Message
There are use cases where a SA should be able to use different cryptodevs on
different lcores, for example there can be cryptodevs with just 1 qp per VF.
For this purpose this patch relaxes the check in create lookaside session function.
Also add a check to verify that a CQP is available for the current lcore.
Fixes: a8ade12123c3 ("examples/ipsec-secgw: create lookaside sessions at init")
Cc: stable@dpdk.org
Cc: vfialko@marvell.com
Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
Tested-by: Ting-Kai Ku <ting-kai.ku@intel.com>
Acked-by: Ciara Power <ciara.power@intel.com>
Acked-by: Kai Ji <kai.ji@intel.com>
---
v4: replaced plain if with RTE_ASSERT
examples/ipsec-secgw/ipsec.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
Comments
>
> ----------------------------------------------------------------------
> There are use cases where a SA should be able to use different cryptodevs on
> different lcores, for example there can be cryptodevs with just 1 qp per VF.
> For this purpose this patch relaxes the check in create lookaside session
> function.
> Also add a check to verify that a CQP is available for the current lcore.
>
> Fixes: a8ade12123c3 ("examples/ipsec-secgw: create lookaside sessions at
> init")
> Cc: stable@dpdk.org
> Cc: vfialko@marvell.com
>
> Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
> Tested-by: Ting-Kai Ku <ting-kai.ku@intel.com>
> Acked-by: Ciara Power <ciara.power@intel.com>
> Acked-by: Kai Ji <kai.ji@intel.com>
Acked-by: Anoob Joseph <anoobj@marvell.com>
> > There are use cases where a SA should be able to use different cryptodevs on
> > different lcores, for example there can be cryptodevs with just 1 qp per VF.
> > For this purpose this patch relaxes the check in create lookaside session
> > function.
> > Also add a check to verify that a CQP is available for the current lcore.
> >
> > Fixes: a8ade12123c3 ("examples/ipsec-secgw: create lookaside sessions at
> > init")
> > Cc: stable@dpdk.org
> > Cc: vfialko@marvell.com
> >
> > Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
> > Tested-by: Ting-Kai Ku <ting-kai.ku@intel.com>
> > Acked-by: Ciara Power <ciara.power@intel.com>
> > Acked-by: Kai Ji <kai.ji@intel.com>
>
> Acked-by: Anoob Joseph <anoobj@marvell.com>
>
Applied to dpdk-next-crypto
Thanks.
@@ -288,10 +288,21 @@ create_lookaside_session(struct ipsec_ctx *ipsec_ctx_lcore[],
if (cdev_id == RTE_CRYPTO_MAX_DEVS)
cdev_id = ipsec_ctx->tbl[cdev_id_qp].id;
else if (cdev_id != ipsec_ctx->tbl[cdev_id_qp].id) {
- RTE_LOG(ERR, IPSEC,
- "SA mapping to multiple cryptodevs is "
- "not supported!");
- return -EINVAL;
+ struct rte_cryptodev_info dev_info_1, dev_info_2;
+ rte_cryptodev_info_get(cdev_id, &dev_info_1);
+ rte_cryptodev_info_get(ipsec_ctx->tbl[cdev_id_qp].id,
+ &dev_info_2);
+ if (dev_info_1.driver_id == dev_info_2.driver_id) {
+ RTE_LOG(WARNING, IPSEC,
+ "SA mapped to multiple cryptodevs for SPI %d\n",
+ sa->spi);
+
+ } else {
+ RTE_LOG(WARNING, IPSEC,
+ "SA mapped to multiple cryptodevs of different types for SPI %d\n",
+ sa->spi);
+
+ }
}
/* Store per core queue pair information */
@@ -908,6 +919,7 @@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
continue;
}
+ RTE_ASSERT(sa->cqp[ipsec_ctx->lcore_id] != NULL);
enqueue_cop(sa->cqp[ipsec_ctx->lcore_id], &priv->cop);
}
}