From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by dpdk.org (Postfix) with ESMTP id B830D1B1C4 for ; Thu, 5 Oct 2017 15:13:44 +0200 (CEST) Received: by mail-wr0-f194.google.com with SMTP id v38so6600046wrc.4 for ; Thu, 05 Oct 2017 06:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=o7a3slg5S0pHJN/NO1dlpTQNfqHtHzYzm0B5XSuQBNs=; b=SVaX1NxB+e1OOkgX0UC5OPh1H0qknFB+aLP9wFwUmfsYlRw7WDZV1x/CBYUQ6RQftG hMPJwJ5hFtfns8vbn6VxXQ37DfjOMIkkryKNBXTWEw0loKO7YpOXgcOB3D20m8WdMJRG X5yvo7COGDuerMGhElk3ao5uscjtlyyNlu1ZBTyQ9u0FO03s0WZPIlTlPmlojIsemjq/ lhSmVSVF81TJaXb381BzVcBVIzbe9zA3GpHEXnbgJQrF3s29piSVHUrg/TI3SfCIUIPz YhwC8e4ZNjHNvJ7gqkhPV7+pwYxcDDLrehrNXS7Vdtoa141iasljX6tJ0ZESWKWi+aoF FuwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=o7a3slg5S0pHJN/NO1dlpTQNfqHtHzYzm0B5XSuQBNs=; b=F8UKhEai8lRa9rvt7qneDo9/Z+TaN/Bd6s7KiNfHcfBN/rrEmbZkJkSGq+3f+4Z35X xK3AAf/sr9t0ytS0BLDvUKX6uoOUuMJmW3i63B7qz7UC/fxCTVwKk/Vl8C7S9c70eURw 92WBlVKq0mA8fs4VYWW2OIqG5MIZoklLamh4i2we9B1YFwSGSe8S8UUqanFgOxrECpB0 em1jb9X4aii1fj4wqi0fSGVmoB8f+GsVaGaGD2/iJf7MzTs15nH9/OCRSQtvBQMCO4Ih ZbQF8z6zRQWYjD3PGktcZwSqztmtKU72ArcWAkuEDWgxBZD5SSrcKUwBiyDvLBGMK/yH 7oSA== X-Gm-Message-State: AHPjjUhQHK93nwon49W+ix7qkBpq/8vE7zim8BcdUPUJXgDOBtYmIK3D dodjrJa2gT8AFqAHyARlNB2KfHRhrRDqi6sFdGw= X-Google-Smtp-Source: AOwi7QBYX01FjlXuqI/hX3UCsT0F8YswZ0yFYai7yCMzmmIxpddn6b0qLvX30B/6YreJUUG6714EjKSkZt33Qe4UzLU= X-Received: by 10.223.139.200 with SMTP id w8mr26773911wra.172.1507209224154; Thu, 05 Oct 2017 06:13:44 -0700 (PDT) MIME-Version: 1.0 Sender: jblunck@gmail.com Received: by 10.28.140.196 with HTTP; Thu, 5 Oct 2017 06:13:43 -0700 (PDT) In-Reply-To: <1506606959-76230-4-git-send-email-jianfeng.tan@intel.com> References: <1503654052-84730-1-git-send-email-jianfeng.tan@intel.com> <1506606959-76230-1-git-send-email-jianfeng.tan@intel.com> <1506606959-76230-4-git-send-email-jianfeng.tan@intel.com> From: Jan Blunck Date: Thu, 5 Oct 2017 15:13:43 +0200 X-Google-Sender-Auth: ElPYJVau2Ifw0Pt7pL-6PEAbx8Q Message-ID: To: Jianfeng Tan Cc: dev , Bruce Richardson , "Ananyev, Konstantin" , "De Lara Guarch, Pablo" , Thomas Monjalon , yliu@fridaylinux.org, Maxime Coquelin , Tetsuya Mukawa , Ferruh Yigit Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH v2 03/12] cryptodev: avoid dependency on rte_vdev.h 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: , X-List-Received-Date: Thu, 05 Oct 2017 13:13:44 -0000 On Thu, Sep 28, 2017 at 3:55 PM, Jianfeng Tan wrote: > The helper API, rte_cryptodev_vdev_pmd_init(), has a parameter of > struct rte_vdev_device *, which needs to include rte_vdev.h. > > We will move vdev into drivers/bus, so we need to avoid such > dependency. And also, we cannot break the ABI. > > This patch changes that pointer to void *, and defines an internal > structure same with struct rte_vdev_device. > This code duplication is unnecessary. Also you are doing evil thinks and define a type with the same name in multiple places. Look at my series how to do this properly. > Signed-off-by: Jianfeng Tan > --- > lib/librte_cryptodev/rte_cryptodev_pmd.c | 9 +- > lib/librte_cryptodev/rte_cryptodev_vdev.c | 161 ++++++++++++++++++++++++++++++ > lib/librte_cryptodev/rte_cryptodev_vdev.h | 3 +- > 3 files changed, 169 insertions(+), 4 deletions(-) > create mode 100644 lib/librte_cryptodev/rte_cryptodev_vdev.c > > diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.c b/lib/librte_cryptodev/rte_cryptodev_pmd.c > index a57faad..60b3980 100644 > --- a/lib/librte_cryptodev/rte_cryptodev_pmd.c > +++ b/lib/librte_cryptodev/rte_cryptodev_pmd.c > @@ -75,9 +75,14 @@ rte_cryptodev_vdev_parse_integer_arg(const char *key __rte_unused, > return 0; > } > > +struct vdev_device { > + TAILQ_ENTRY(rte_vdev_device) next; > + struct rte_device device; > +}; > + > struct rte_cryptodev * > rte_cryptodev_vdev_pmd_init(const char *name, size_t dev_private_size, > - int socket_id, struct rte_vdev_device *vdev) > + int socket_id, void *vdev) > { > struct rte_cryptodev *cryptodev; > > @@ -99,7 +104,7 @@ rte_cryptodev_vdev_pmd_init(const char *name, size_t dev_private_size, > " data"); > } > > - cryptodev->device = &vdev->device; > + cryptodev->device = &((struct vdev_device *)vdev)->device; > > /* initialise user call-back tail queue */ > TAILQ_INIT(&(cryptodev->link_intr_cbs)); > diff --git a/lib/librte_cryptodev/rte_cryptodev_vdev.c b/lib/librte_cryptodev/rte_cryptodev_vdev.c > new file mode 100644 > index 0000000..4af8d51 > --- /dev/null > +++ b/lib/librte_cryptodev/rte_cryptodev_vdev.c > @@ -0,0 +1,161 @@ > +/*- > + * BSD LICENSE > + * > + * Copyright(c) 2017 Intel Corporation. All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name of the copyright holder nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + */ > + > +#include > + > +#include "rte_cryptodev_vdev.h" > +#include "rte_cryptodev_pci.h" > +#include "rte_cryptodev_pmd.h" > + > +/** > + * Parse name from argument > + */ > +static int > +rte_cryptodev_vdev_parse_name_arg(const char *key __rte_unused, > + const char *value, void *extra_args) > +{ > + struct rte_crypto_vdev_init_params *params = extra_args; > + > + if (strlen(value) >= RTE_CRYPTODEV_NAME_MAX_LEN - 1) { > + CDEV_LOG_ERR("Invalid name %s, should be less than " > + "%u bytes", value, > + RTE_CRYPTODEV_NAME_MAX_LEN - 1); > + return -1; > + } > + > + strncpy(params->name, value, RTE_CRYPTODEV_NAME_MAX_LEN); > + > + return 0; > +} > + > +/** > + * Parse integer from argument > + */ > +static int > +rte_cryptodev_vdev_parse_integer_arg(const char *key __rte_unused, > + const char *value, void *extra_args) > +{ > + int *i = extra_args; > + > + *i = atoi(value); > + if (*i < 0) { > + CDEV_LOG_ERR("Argument has to be positive."); > + return -1; > + } > + > + return 0; > +} > + > +struct vdev_device { > + TAILQ_ENTRY(rte_vdev_device) next; > + struct rte_device device; > +}; > + > +struct rte_cryptodev * > +rte_cryptodev_vdev_pmd_init(const char *name, size_t dev_private_size, > + int socket_id, void *vdev) > +{ > + struct rte_cryptodev *cryptodev; > + > + /* allocate device structure */ > + cryptodev = rte_cryptodev_pmd_allocate(name, socket_id); > + if (cryptodev == NULL) > + return NULL; > + > + /* allocate private device structure */ > + if (rte_eal_process_type() == RTE_PROC_PRIMARY) { > + cryptodev->data->dev_private = > + rte_zmalloc_socket("cryptodev device private", > + dev_private_size, > + RTE_CACHE_LINE_SIZE, > + socket_id); > + > + if (cryptodev->data->dev_private == NULL) > + rte_panic("Cannot allocate memzone for private device" > + " data"); > + } > + > + cryptodev->device = &((struct vdev_device *)vdev)->device; > + > + /* initialise user call-back tail queue */ > + TAILQ_INIT(&(cryptodev->link_intr_cbs)); > + > + return cryptodev; > +} > + > +int > +rte_cryptodev_vdev_parse_init_params(struct rte_crypto_vdev_init_params *params, > + const char *input_args) > +{ > + struct rte_kvargs *kvlist = NULL; > + int ret = 0; > + > + if (params == NULL) > + return -EINVAL; > + > + if (input_args) { > + kvlist = rte_kvargs_parse(input_args, > + cryptodev_vdev_valid_params); > + if (kvlist == NULL) > + return -1; > + > + ret = rte_kvargs_process(kvlist, > + RTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG, > + &rte_cryptodev_vdev_parse_integer_arg, > + ¶ms->max_nb_queue_pairs); > + if (ret < 0) > + goto free_kvlist; > + > + ret = rte_kvargs_process(kvlist, > + RTE_CRYPTODEV_VDEV_MAX_NB_SESS_ARG, > + &rte_cryptodev_vdev_parse_integer_arg, > + ¶ms->max_nb_sessions); > + if (ret < 0) > + goto free_kvlist; > + > + ret = rte_kvargs_process(kvlist, RTE_CRYPTODEV_VDEV_SOCKET_ID, > + &rte_cryptodev_vdev_parse_integer_arg, > + ¶ms->socket_id); > + if (ret < 0) > + goto free_kvlist; > + > + ret = rte_kvargs_process(kvlist, RTE_CRYPTODEV_VDEV_NAME, > + &rte_cryptodev_vdev_parse_name_arg, > + params); > + if (ret < 0) > + goto free_kvlist; > + } > + > +free_kvlist: > + rte_kvargs_free(kvlist); > + return ret; > +} > diff --git a/lib/librte_cryptodev/rte_cryptodev_vdev.h b/lib/librte_cryptodev/rte_cryptodev_vdev.h > index 94ab9d3..1142d1d 100644 > --- a/lib/librte_cryptodev/rte_cryptodev_vdev.h > +++ b/lib/librte_cryptodev/rte_cryptodev_vdev.h > @@ -33,7 +33,6 @@ > #ifndef _RTE_CRYPTODEV_VDEV_H_ > #define _RTE_CRYPTODEV_VDEV_H_ > > -#include > #include > > #include "rte_cryptodev.h" > @@ -80,7 +79,7 @@ struct rte_crypto_vdev_init_params { > */ > struct rte_cryptodev * > rte_cryptodev_vdev_pmd_init(const char *name, size_t dev_private_size, > - int socket_id, struct rte_vdev_device *vdev); > + int socket_id, void *vdev); > > /** > * @internal > -- > 2.7.4 >