From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B1585A057B; Tue, 14 Apr 2020 15:54:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 20DC01C2DB; Tue, 14 Apr 2020 15:54:24 +0200 (CEST) Received: from qrelay93.mxroute.com (qrelay93.mxroute.com [172.82.139.93]) by dpdk.org (Postfix) with ESMTP id 121371C2BB for ; Tue, 14 Apr 2020 15:54:22 +0200 (CEST) Received: from filter004.mxroute.com ([149.28.56.236] 149.28.56.236.vultr.com) (Authenticated sender: mN4UYu2MZsgR) by qrelay93.mxroute.com (ZoneMTA) with ESMTPA id 17178f8236d0000d83.001 for ; Tue, 14 Apr 2020 13:54:20 +0000 X-Zone-Loop: e6fd7b3924a96abc8248bc691ba80d58b416f3d93474 X-Originating-IP: [149.28.56.236] Received: from galaxy.mxroute.com (unknown [23.92.70.113]) by filter004.mxroute.com (Postfix) with ESMTPS id B137E3E9FF for ; Tue, 14 Apr 2020 13:54:14 +0000 (UTC) Received: from [134.191.227.39] by galaxy.mxroute.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.91) (envelope-from ) id 1jOLc0-0006BX-FX for dev@dpdk.org; Tue, 14 Apr 2020 09:28:24 -0400 To: dev@dpdk.org References: <20200318204136.10508-1-arkadiuszx.kusztal@intel.com> From: Ray Kinsella Autocrypt: addr=mdr@ashroe.eu; keydata= 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 Message-ID: <7c5527ab-ee48-587c-b1f1-6a0020480b2f@ashroe.eu> Date: Tue, 14 Apr 2020 14:54:09 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200318204136.10508-1-arkadiuszx.kusztal@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-AuthUser: mdr@ashroe.eu Subject: Re: [dpdk-dev] [PATCH] cryptodev: version rte_cryptodev_info_get function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 18/03/2020 20:41, Arek Kusztal wrote: > This patch adds versioned function rte_cryptodev_info_get. > Node 20.05 function works the same way it was working before. > Node 20.0 function strips capability added in 20.05 release > to prevent some issues with ABI policy. To do that new capability > array is allocated per device and returned to user instead of the > original array passed by PMD. > > Signed-off-by: Arek Kusztal > --- > lib/librte_cryptodev/rte_cryptodev.c | 97 +++++++++++++++++++++++++- > lib/librte_cryptodev/rte_cryptodev.h | 12 +++- > lib/librte_cryptodev/rte_cryptodev_version.map | 7 ++ > 3 files changed, 113 insertions(+), 3 deletions(-) > > diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c > index 6d1d0e9..2d030ba 100644 > --- a/lib/librte_cryptodev/rte_cryptodev.c > +++ b/lib/librte_cryptodev/rte_cryptodev.c > @@ -41,6 +41,9 @@ > #include "rte_cryptodev.h" > #include "rte_cryptodev_pmd.h" > > +#include > +#include > + > static uint8_t nb_drivers; > > static struct rte_cryptodev rte_crypto_devices[RTE_CRYPTO_MAX_DEVS]; > @@ -56,6 +59,13 @@ static struct rte_cryptodev_global cryptodev_globals = { > /* spinlock for crypto device callbacks */ > static rte_spinlock_t rte_cryptodev_cb_lock = RTE_SPINLOCK_INITIALIZER; > > +static const struct rte_cryptodev_capabilities > + cryptodev_undefined_capabilities[] = { > + RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST() > +}; > + > +struct rte_cryptodev_capabilities *capability_copies[RTE_CRYPTO_MAX_DEVS]; > +uint8_t is_capability_checked[RTE_CRYPTO_MAX_DEVS]; > > /** > * The user application callback description. > @@ -999,6 +1009,13 @@ rte_cryptodev_close(uint8_t dev_id) > RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_close, -ENOTSUP); > retval = (*dev->dev_ops->dev_close)(dev); > > + > + if (capability_copies[dev_id]) { > + free(capability_copies[dev_id]); > + capability_copies[dev_id] = NULL; > + } > + is_capability_checked[dev_id] = 0; > + > if (retval < 0) > return retval; > > @@ -1111,11 +1128,12 @@ rte_cryptodev_stats_reset(uint8_t dev_id) > (*dev->dev_ops->stats_reset)(dev); > } > > - > void > -rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info) > +rte_cryptodev_info_get_v20(uint8_t dev_id, struct rte_cryptodev_info *dev_info) > { > struct rte_cryptodev *dev; > + const struct rte_cryptodev_capabilities *capability; > + uint8_t counter = 0; > > if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { > CDEV_LOG_ERR("Invalid dev_id=%d", dev_id); > @@ -1129,10 +1147,85 @@ rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info) > RTE_FUNC_PTR_OR_RET(*dev->dev_ops->dev_infos_get); > (*dev->dev_ops->dev_infos_get)(dev, dev_info); > > + if (capability_copies[dev_id] == NULL) { > + if (!is_capability_checked[dev_id]) { > + uint8_t found_invalid_capa = 0; > + > + for (capability = dev_info->capabilities; > + capability->op != RTE_CRYPTO_OP_TYPE_UNDEFINED; > + ++capability, ++counter) { > + if (capability->op == RTE_CRYPTO_OP_TYPE_SYMMETRIC && > + capability->sym.xform_type == > + RTE_CRYPTO_SYM_XFORM_AEAD > + && capability->sym.aead.algo >= > + RTE_CRYPTO_AEAD_CHACHA20_POLY1305) { > + found_invalid_capa = 1; > + counter--; > + } > + } > + is_capability_checked[dev_id] = 1; > + if (found_invalid_capa) { > + capability_copies[dev_id] = malloc(counter * > + sizeof(struct rte_cryptodev_capabilities)); > + if (capability_copies[dev_id] == NULL) { > + /* > + * error case - no memory to store the trimmed list, > + * so have to return an empty list > + */ > + dev_info->capabilities = > + cryptodev_undefined_capabilities; > + is_capability_checked[dev_id] = 0; > + } else { > + counter = 0; > + for (capability = dev_info->capabilities; > + capability->op != > + RTE_CRYPTO_OP_TYPE_UNDEFINED; > + capability++) { > + if (!(capability->op == > + RTE_CRYPTO_OP_TYPE_SYMMETRIC > + && capability->sym.xform_type == > + RTE_CRYPTO_SYM_XFORM_AEAD > + && capability->sym.aead.algo >= > + RTE_CRYPTO_AEAD_CHACHA20_POLY1305)) { > + capability_copies[dev_id][counter++] = > + *capability; > + } > + } > + dev_info->capabilities = > + capability_copies[dev_id]; > + } > + } > + } > + } else > + dev_info->capabilities = capability_copies[dev_id]; > + > dev_info->driver_name = dev->device->driver->name; > dev_info->device = dev->device; > } > +VERSION_SYMBOL(rte_cryptodev_info_get, _v20, 20.0); > + > +void > +rte_cryptodev_info_get_v2005(uint8_t dev_id, struct rte_cryptodev_info *dev_info) should be rte_cryptodev_info_get_v2002 > +{ > + struct rte_cryptodev *dev; > > + if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { > + CDEV_LOG_ERR("Invalid dev_id=%d", dev_id); > + return; > + } > + > + dev = &rte_crypto_devices[dev_id]; > + > + memset(dev_info, 0, sizeof(struct rte_cryptodev_info)); > + > + RTE_FUNC_PTR_OR_RET(*dev->dev_ops->dev_infos_get); > + (*dev->dev_ops->dev_infos_get)(dev, dev_info); > + > + dev_info->driver_name = dev->device->driver->name; > + dev_info->device = dev->device; > +} > +MAP_STATIC_SYMBOL(void rte_cryptodev_info_get(uint8_t dev_id, > + struct rte_cryptodev_info *dev_info), rte_cryptodev_info_get_v2005); should be rte_cryptodev_info_get_v2002 > > int > rte_cryptodev_callback_register(uint8_t dev_id, > diff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/librte_cryptodev/rte_cryptodev.h > index 437b8a9..06ce2f2 100644 > --- a/lib/librte_cryptodev/rte_cryptodev.h > +++ b/lib/librte_cryptodev/rte_cryptodev.h > @@ -24,6 +24,9 @@ extern "C" { > #include > #include > > +#include > +#include > + > extern const char **rte_cyptodev_names; > > /* Logging Macros */ > @@ -758,7 +761,14 @@ rte_cryptodev_stats_reset(uint8_t dev_id); > * the last valid element has it's op field set to > * RTE_CRYPTO_OP_TYPE_UNDEFINED. > */ > -extern void > +void > +rte_cryptodev_info_get_v20(uint8_t dev_id, struct rte_cryptodev_info *dev_info); > + > +void > +rte_cryptodev_info_get_v2005(uint8_t dev_id, struct rte_cryptodev_info *dev_info); > +BIND_DEFAULT_SYMBOL(rte_cryptodev_info_get, _v2005, 20.05); > + > +void > rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info); do we still need this forward declaration? > > > diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map > index 6e41b4b..d6c945a 100644 > --- a/lib/librte_cryptodev/rte_cryptodev_version.map > +++ b/lib/librte_cryptodev/rte_cryptodev_version.map > @@ -58,6 +58,13 @@ DPDK_20.0 { > local: *; > }; > > + > +DPDK_20.05 { should be DPDK_20.0.2 > + global: > + rte_cryptodev_info_get; > +} DPDK_20.0; > + > + > EXPERIMENTAL { > global: > >