From patchwork Mon Jul 17 15:25:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rybalchenko, Kirill" X-Patchwork-Id: 26981 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com 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 8F881377E; Mon, 17 Jul 2017 17:25:21 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 91489376C for ; Mon, 17 Jul 2017 17:25:20 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jul 2017 08:25:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.40,374,1496127600"; d="scan'208"; a="1196362103" Received: from silpixa00389036.ir.intel.com (HELO silpixa00389036.ger.corp.intel.com) ([10.237.223.231]) by fmsmga002.fm.intel.com with ESMTP; 17 Jul 2017 08:25:17 -0700 From: Kirill Rybalchenko To: roy.fan.zhang@intel.com, declan.doherty@intel.com Cc: dev@dpdk.org, Kirill Rybalchenko Date: Mon, 17 Jul 2017 16:25:00 +0100 Message-Id: <1500305100-63460-1-git-send-email-kirill.rybalchenko@intel.com> X-Mailer: git-send-email 2.5.5 Subject: [dpdk-dev] [PATCH] cryptodev: remove crypto operation status value 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" Crypto operation status RTE_CRYPTO_OP_STATUS_ENQUEUED is removed from rte_crypto.h as it is not needed for crypto operation processing. This status value is redundant to RTE_CRYPTO_OP_STATUS_NOT_PROCESSED value and it was not intended to be part of public API. Signed-off-by: Kirill Rybalchenko Acked-by: Declan Doherty --- doc/guides/rel_notes/release_17_08.rst | 1 + drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 3 +-- drivers/crypto/scheduler/scheduler_pmd_private.h | 3 +-- lib/librte_cryptodev/rte_crypto.h | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/guides/rel_notes/release_17_08.rst b/doc/guides/rel_notes/release_17_08.rst index 6f3b662..fc886a3 100644 --- a/doc/guides/rel_notes/release_17_08.rst +++ b/doc/guides/rel_notes/release_17_08.rst @@ -293,6 +293,7 @@ API Changes * Added new field ``session_pool`` to ``rte_cryptodev_queue_pair_setup()``. * Removed ``aad_size`` parameter from ``rte_cryptodev_sym_capability_check_auth()``. * Added ``iv_size`` parameter to ``rte_cryptodev_sym_capability_check_auth()``. + * Removed ``RTE_CRYPTO_OP_STATUS_ENQUEUED`` from enum ``rte_crypto_op_status``. ABI Changes diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c index 13cffaf..1b335e0 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c @@ -414,7 +414,6 @@ set_mb_job_params(JOB_AES_HMAC *job, struct aesni_mb_qp *qp, op->status = RTE_CRYPTO_OP_STATUS_INVALID_SESSION; return -1; } - op->status = RTE_CRYPTO_OP_STATUS_ENQUEUED; /* Set crypto operation */ job->chain_order = session->chain_order; @@ -541,7 +540,7 @@ post_process_mb_job(struct aesni_mb_qp *qp, JOB_AES_HMAC *job) op->sym->session, cryptodev_driver_id); - if (unlikely(op->status == RTE_CRYPTO_OP_STATUS_ENQUEUED)) { + if (likely(op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)) { switch (job->status) { case STS_COMPLETED: op->status = RTE_CRYPTO_OP_STATUS_SUCCESS; diff --git a/drivers/crypto/scheduler/scheduler_pmd_private.h b/drivers/crypto/scheduler/scheduler_pmd_private.h index a786d3a..e606716 100644 --- a/drivers/crypto/scheduler/scheduler_pmd_private.h +++ b/drivers/crypto/scheduler/scheduler_pmd_private.h @@ -142,8 +142,7 @@ scheduler_order_drain(struct rte_ring *order_ring, while (nb_ops_to_deq < nb_objs) { SCHEDULER_GET_RING_OBJ(order_ring, nb_ops_to_deq, op); - if (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED || - op->status == RTE_CRYPTO_OP_STATUS_ENQUEUED) + if (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED) break; nb_ops_to_deq++; } diff --git a/lib/librte_cryptodev/rte_crypto.h b/lib/librte_cryptodev/rte_crypto.h index 4695229..0908368 100644 --- a/lib/librte_cryptodev/rte_crypto.h +++ b/lib/librte_cryptodev/rte_crypto.h @@ -66,8 +66,6 @@ enum rte_crypto_op_status { /**< Operation completed successfully */ RTE_CRYPTO_OP_STATUS_NOT_PROCESSED, /**< Operation has not yet been processed by a crypto device */ - RTE_CRYPTO_OP_STATUS_ENQUEUED, - /**< Operation is enqueued on device */ RTE_CRYPTO_OP_STATUS_AUTH_FAILED, /**< Authentication verification failed */ RTE_CRYPTO_OP_STATUS_INVALID_SESSION,