From patchwork Wed Jul 12 07:59:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Blunck X-Patchwork-Id: 26854 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 014827CBF; Wed, 12 Jul 2017 10:00:03 +0200 (CEST) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by dpdk.org (Postfix) with ESMTP id 43EE07CB8 for ; Wed, 12 Jul 2017 09:59:59 +0200 (CEST) Received: by mail-lf0-f65.google.com with SMTP id t72so1509211lff.0 for ; Wed, 12 Jul 2017 00:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ShCodx7pM/0cXw9umiEd+zU1e4KHozXPh1jV2m4h1EM=; b=vIq6KCs/cwXzbS8E5qzBxvLcU5TZCq1xg10jOVXtGE+dVg/LCZQFPVf3THC2/P8+CB 0bX8ZTO6OfVa6TsXq6CMyUOL4ETR6bCsdLyC0qj5Qh3Sv1iqovBvcEcFmAe5kGjaFbm0 B0a+n5Z6l/BoClvjHdQ+0RnzEyT9PcseyYqHJyZG7dettxyW/2iotKR3Jql68+P4Oaoh wb93gTe2nObvDZo5mYs3sPoXj4oYMwOiudX5IxV+hZ4QPmVNijysWYD0HGiIQjBj5cqG xUYoVG+aGodzfhKrMzxXatzisxC2pC+1SF1yniy27P2NeN67FhHIJimCJoqYVtGA453X UmFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ShCodx7pM/0cXw9umiEd+zU1e4KHozXPh1jV2m4h1EM=; b=ixV3pF+w8m0ybHY24Mzl6zggLXQ3eFwEZiOaNGy912G00YpIttv40XnExLQLBwIEMD Nx4wZfklTLCGhixsu3xmQGkvpFK8Xwj7ULqs8iq+qV8WGNqFq1HMsL+ALLMZN9Xsw4oL wabuniLFupUqB57u6Osc6GWtuloXfsA59T+FcZrSQYRCkcYhNArjNKZrAiSlKnP6L1RL afQKGBl4jflhmSBHeY8j2QcWfNJt2Nkeeg4UbTpyMFRqQ0bdCh3kLln0XiVglkG35V19 WmzB9lmGLhJtoQaN8j2YchEd/jMF9+3CvScyr7MMStWLDT+pHWJrmqp5CXgDdC5Gkznf +99Q== X-Gm-Message-State: AIVw1139DD9NJI8RVvgV6f84n6BwhhhtZb9Y4SYoMZcy0/onXfLc3ZzC kvr8rQ3p5Q3Xx70u X-Received: by 10.80.146.14 with SMTP id i14mr5371987eda.48.1499846398594; Wed, 12 Jul 2017 00:59:58 -0700 (PDT) Received: from localhost.localdomain ([37.228.147.16]) by smtp.gmail.com with ESMTPSA id j56sm863420eda.58.2017.07.12.00.59.57 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 12 Jul 2017 00:59:57 -0700 (PDT) From: Jan Blunck To: dev@dpdk.org Cc: declan.doherty@intel.com Date: Wed, 12 Jul 2017 03:59:40 -0400 Message-Id: <20170712075940.58559-3-jblunck@infradead.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170712075940.58559-1-jblunck@infradead.org> References: <20170712075940.58559-1-jblunck@infradead.org> Subject: [dpdk-dev] [PATCH 2/2] cryptodev: rework cryptodev PMD init to not require 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This reworks the library code so that it doesn't require to include rte_vdev.h. This is a preparation to move the vdev bus into a standalone library. Signed-off-by: Jan Blunck --- drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 4 ++-- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 4 ++-- drivers/crypto/armv8/rte_armv8_pmd.c | 4 ++-- drivers/crypto/kasumi/rte_kasumi_pmd.c | 4 ++-- drivers/crypto/null/null_crypto_pmd.c | 4 ++-- drivers/crypto/openssl/rte_openssl_pmd.c | 4 ++-- drivers/crypto/scheduler/scheduler_pmd.c | 4 ++-- drivers/crypto/snow3g/rte_snow3g_pmd.c | 4 ++-- drivers/crypto/zuc/rte_zuc_pmd.c | 4 ++-- lib/librte_cryptodev/rte_cryptodev_pmd.c | 6 +++--- lib/librte_cryptodev/rte_cryptodev_vdev.h | 7 +++---- lib/librte_cryptodev/rte_cryptodev_version.map | 2 +- 12 files changed, 25 insertions(+), 26 deletions(-) diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c index 91c3801c2..6848a4d20 100644 --- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c +++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c @@ -529,9 +529,9 @@ aesni_gcm_create(const char *name, else vector_mode = RTE_AESNI_GCM_SSE; - dev = rte_cryptodev_vdev_pmd_init(init_params->name, + dev = rte_cryptodev_pmd_init(init_params->name, sizeof(struct aesni_gcm_private), init_params->socket_id, - vdev); + &vdev->device); if (dev == NULL) { GCM_LOG_ERR("failed to create cryptodev vdev"); goto init_error; diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c index 3aaa070e2..e952569b5 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c @@ -712,9 +712,9 @@ cryptodev_aesni_mb_create(const char *name, else vector_mode = RTE_AESNI_MB_SSE; - dev = rte_cryptodev_vdev_pmd_init(init_params->name, + dev = rte_cryptodev_pmd_init(init_params->name, sizeof(struct aesni_mb_private), init_params->socket_id, - vdev); + &vdev->device); if (dev == NULL) { MB_LOG_ERR("failed to create cryptodev vdev"); goto init_error; diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c index 2e0701867..e2fc56275 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd.c +++ b/drivers/crypto/armv8/rte_armv8_pmd.c @@ -820,10 +820,10 @@ cryptodev_armv8_crypto_create(const char *name, snprintf(init_params->name, sizeof(init_params->name), "%s", name); - dev = rte_cryptodev_vdev_pmd_init(init_params->name, + dev = rte_cryptodev_pmd_init(init_params->name, sizeof(struct armv8_crypto_private), init_params->socket_id, - vdev); + &vdev->device); if (dev == NULL) { ARMV8_CRYPTO_LOG_ERR("failed to create cryptodev vdev"); goto init_error; diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c index cff40fb55..360cdb5a8 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd.c +++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c @@ -592,9 +592,9 @@ cryptodev_kasumi_create(const char *name, else cpu_flags |= RTE_CRYPTODEV_FF_CPU_SSE; - dev = rte_cryptodev_vdev_pmd_init(init_params->name, + dev = rte_cryptodev_pmd_init(init_params->name, sizeof(struct kasumi_private), init_params->socket_id, - vdev); + &vdev->device); if (dev == NULL) { KASUMI_LOG_ERR("failed to create cryptodev vdev"); goto init_error; diff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/null_crypto_pmd.c index 7f7dee642..471774cf2 100644 --- a/drivers/crypto/null/null_crypto_pmd.c +++ b/drivers/crypto/null/null_crypto_pmd.c @@ -198,10 +198,10 @@ cryptodev_null_create(const char *name, snprintf(init_params->name, sizeof(init_params->name), "%s", name); - dev = rte_cryptodev_vdev_pmd_init(init_params->name, + dev = rte_cryptodev_pmd_init(init_params->name, sizeof(struct null_crypto_private), init_params->socket_id, - vdev); + &vdev->device); if (dev == NULL) { NULL_CRYPTO_LOG_ERR("failed to create cryptodev vdev"); goto init_error; diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index d943d72bb..1a57e7538 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -1406,10 +1406,10 @@ cryptodev_openssl_create(const char *name, snprintf(init_params->name, sizeof(init_params->name), "%s", name); - dev = rte_cryptodev_vdev_pmd_init(init_params->name, + dev = rte_cryptodev_pmd_init(init_params->name, sizeof(struct openssl_private), init_params->socket_id, - vdev); + &vdev->device); if (dev == NULL) { OPENSSL_LOG_ERR("failed to create cryptodev vdev"); goto init_error; diff --git a/drivers/crypto/scheduler/scheduler_pmd.c b/drivers/crypto/scheduler/scheduler_pmd.c index 0f57fbefd..8a38a8d08 100644 --- a/drivers/crypto/scheduler/scheduler_pmd.c +++ b/drivers/crypto/scheduler/scheduler_pmd.c @@ -112,10 +112,10 @@ cryptodev_scheduler_create(const char *name, sizeof(init_params->def_p.name), "%s", name); - dev = rte_cryptodev_vdev_pmd_init(init_params->def_p.name, + dev = rte_cryptodev_pmd_init(init_params->def_p.name, sizeof(struct scheduler_ctx), init_params->def_p.socket_id, - vdev); + &vdev->device); if (dev == NULL) { CS_LOG_ERR("driver %s: failed to create cryptodev vdev", name); diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c index 107e1b424..1f9ced950 100644 --- a/drivers/crypto/snow3g/rte_snow3g_pmd.c +++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c @@ -575,9 +575,9 @@ cryptodev_snow3g_create(const char *name, snprintf(init_params->name, sizeof(init_params->name), "%s", name); - dev = rte_cryptodev_vdev_pmd_init(init_params->name, + dev = rte_cryptodev_pmd_init(init_params->name, sizeof(struct snow3g_private), init_params->socket_id, - vdev); + &vdev->device); if (dev == NULL) { SNOW3G_LOG_ERR("failed to create cryptodev vdev"); goto init_error; diff --git a/drivers/crypto/zuc/rte_zuc_pmd.c b/drivers/crypto/zuc/rte_zuc_pmd.c index 664c58ff6..2a8cc21d4 100644 --- a/drivers/crypto/zuc/rte_zuc_pmd.c +++ b/drivers/crypto/zuc/rte_zuc_pmd.c @@ -479,9 +479,9 @@ cryptodev_zuc_create(const char *name, snprintf(init_params->name, sizeof(init_params->name), "%s", name); - dev = rte_cryptodev_vdev_pmd_init(init_params->name, + dev = rte_cryptodev_pmd_init(init_params->name, sizeof(struct zuc_private), init_params->socket_id, - vdev); + &vdev->device); if (dev == NULL) { ZUC_LOG_ERR("failed to create cryptodev vdev"); goto init_error; diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.c b/lib/librte_cryptodev/rte_cryptodev_pmd.c index a57faadcf..49f2e8fc5 100644 --- a/lib/librte_cryptodev/rte_cryptodev_pmd.c +++ b/lib/librte_cryptodev/rte_cryptodev_pmd.c @@ -76,8 +76,8 @@ rte_cryptodev_vdev_parse_integer_arg(const char *key __rte_unused, } struct rte_cryptodev * -rte_cryptodev_vdev_pmd_init(const char *name, size_t dev_private_size, - int socket_id, struct rte_vdev_device *vdev) +rte_cryptodev_pmd_init(const char *name, size_t dev_private_size, + int socket_id, struct rte_device *dev) { struct rte_cryptodev *cryptodev; @@ -99,7 +99,7 @@ rte_cryptodev_vdev_pmd_init(const char *name, size_t dev_private_size, " data"); } - cryptodev->device = &vdev->device; + cryptodev->device = dev; /* initialise user call-back tail queue */ TAILQ_INIT(&(cryptodev->link_intr_cbs)); diff --git a/lib/librte_cryptodev/rte_cryptodev_vdev.h b/lib/librte_cryptodev/rte_cryptodev_vdev.h index 94ab9d33d..a877eed74 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" @@ -72,15 +71,15 @@ struct rte_crypto_vdev_init_params { * @param name PMD type name * @param dev_private_size Size of crypto PMDs private data * @param socket_id Socket to allocate resources on. - * @param vdev Pointer to virtual device structure. + * @param dev Pointer to device structure. * * @return * - Cryptodev pointer if device is successfully created. * - NULL if device cannot be created. */ struct rte_cryptodev * -rte_cryptodev_vdev_pmd_init(const char *name, size_t dev_private_size, - int socket_id, struct rte_vdev_device *vdev); +rte_cryptodev_pmd_init(const char *name, size_t dev_private_size, + int socket_id, struct rte_device *dev); /** * @internal diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map index e9ba88ac5..28ab3cf48 100644 --- a/lib/librte_cryptodev/rte_cryptodev_version.map +++ b/lib/librte_cryptodev/rte_cryptodev_version.map @@ -74,7 +74,7 @@ DPDK_17.08 { rte_cryptodev_sym_session_init; rte_cryptodev_sym_session_clear; rte_cryptodev_vdev_parse_init_params; - rte_cryptodev_vdev_pmd_init; + rte_cryptodev_pmd_init; rte_crypto_aead_algorithm_strings; rte_crypto_aead_operation_strings;