From patchwork Thu Jul 6 16:04:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Dooley X-Patchwork-Id: 129345 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A8CB642DEA; Thu, 6 Jul 2023 18:06:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 93C0A410FA; Thu, 6 Jul 2023 18:06:59 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 78A4840A79 for ; Thu, 6 Jul 2023 18:06:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688659618; x=1720195618; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oycUPYtJ6zfvBPkGRfrqDM6Imss3+MfJUitwP0If0gQ=; b=NSDq2IiafI2SFb1wDl7uXDI7C0Fm0zo3LdkmECJI3fSC3Ircek504iGh 9xR1IDt1F8IMUugSxwJlQ7Vd2kAkAFHBez+Gv+gZzPMmLfvaN+Hwq1Icx tMvyBIGuqJJNE273uV8/HOat5lrlP2jwTch3/SFzjoM0q6Ihq4Dy0uSLD JYZ0UuCfJUGZxSr56EZeV6quVuO8GInLiGeIxAWOy7lYn9wvXBvlSA4ez vYAejdmK2sFFcehJPkqy3md4xxT5GG1C4NGOUd4CL/Nl9L8YoOQBeLQrY yoGh1IyuPoVb+TecLn9cnUgM33zXhmYTWf/X8aPN0cBhk4eAiIen8uW8i g==; X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="361114354" X-IronPort-AV: E=Sophos;i="6.01,185,1684825200"; d="scan'208";a="361114354" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 09:05:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="713637214" X-IronPort-AV: E=Sophos;i="6.01,185,1684825200"; d="scan'208";a="713637214" Received: from unknown (HELO silpixa00400883.ir.intel.com) ([10.243.22.155]) by orsmga007.jf.intel.com with ESMTP; 06 Jul 2023 09:05:16 -0700 From: Brian Dooley To: Kai Ji , Pablo de Lara Cc: dev@dpdk.org, gakhil@marvell.com, Brian Dooley , maxime.coquelin@redhat.com Subject: [PATCH v2 1/2] crypto/ipsec_mb: remove unused defines Date: Thu, 6 Jul 2023 16:04:53 +0000 Message-Id: <20230706160454.479229-2-brian.dooley@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230706160454.479229-1-brian.dooley@intel.com> References: <20230706131517.374296-1-brian.dooley@intel.com> <20230706160454.479229-1-brian.dooley@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org removed AESNI_MB_DOCSIS_SEC_ENABLED defines as they are no longer used. Fixes: 66a9d8d0bc6d ("crypto/qat: remove security library presence checks") Cc: maxime.coquelin@redhat.com Signed-off-by: Brian Dooley Acked-by: Ciara Power --- drivers/crypto/ipsec_mb/ipsec_mb_private.c | 4 ---- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 22 ++------------------- drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 1 - 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_private.c b/drivers/crypto/ipsec_mb/ipsec_mb_private.c index 64f2b4b604..f485d130b6 100644 --- a/drivers/crypto/ipsec_mb/ipsec_mb_private.c +++ b/drivers/crypto/ipsec_mb/ipsec_mb_private.c @@ -205,10 +205,6 @@ ipsec_mb_remove(struct rte_vdev_device *vdev) rte_free(cryptodev->security_ctx); cryptodev->security_ctx = NULL; } -#ifdef AESNI_MB_DOCSIS_SEC_ENABLED - rte_free(cryptodev->security_ctx); - cryptodev->security_ctx = NULL; -#endif for (qp_id = 0; qp_id < cryptodev->data->nb_queue_pairs; qp_id++) ipsec_mb_qp_release(cryptodev, qp_id); diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c index 7fcb8f99e0..9e298023d7 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c @@ -851,7 +851,6 @@ aesni_mb_session_configure(IMB_MGR *mb_mgr, return 0; } -#ifdef AESNI_MB_DOCSIS_SEC_ENABLED /** Check DOCSIS security session configuration is valid */ static int check_docsis_sec_session(struct rte_security_session_conf *conf) @@ -988,7 +987,6 @@ aesni_mb_set_docsis_sec_session_parameters( free_mb_mgr(mb_mgr); return ret; } -#endif static inline uint64_t auth_start_offset(struct rte_crypto_op *op, struct aesni_mb_session *session, @@ -1762,7 +1760,6 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp, return 0; } -#ifdef AESNI_MB_DOCSIS_SEC_ENABLED /** * Process a crypto operation containing a security op and complete a * IMB_JOB job structure for submission to the multi buffer library for @@ -1853,7 +1850,6 @@ verify_docsis_sec_crc(IMB_JOB *job, uint8_t *status) if (memcmp(job->auth_tag_output, crc, RTE_ETHER_CRC_LEN) != 0) *status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED; } -#endif static inline void verify_digest(IMB_JOB *job, void *digest, uint16_t len, uint8_t *status) @@ -1921,8 +1917,6 @@ post_process_mb_job(struct ipsec_mb_qp *qp, IMB_JOB *job) struct aesni_mb_session *sess = NULL; uint8_t *linear_buf = NULL; int sgl = 0; - -#ifdef AESNI_MB_DOCSIS_SEC_ENABLED uint8_t is_docsis_sec = 0; if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) { @@ -1933,7 +1927,6 @@ post_process_mb_job(struct ipsec_mb_qp *qp, IMB_JOB *job) is_docsis_sec = 1; sess = SECURITY_GET_SESS_PRIV(op->sym->session); } else -#endif sess = CRYPTODEV_GET_SYM_SESS_PRIV(op->sym->session); if (likely(op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)) { @@ -1961,11 +1954,9 @@ post_process_mb_job(struct ipsec_mb_qp *qp, IMB_JOB *job) op->sym->aead.digest.data, sess->auth.req_digest_len, &op->status); -#ifdef AESNI_MB_DOCSIS_SEC_ENABLED else if (is_docsis_sec) verify_docsis_sec_crc(job, &op->status); -#endif else verify_digest(job, op->sym->auth.digest.data, @@ -2098,12 +2089,10 @@ aesni_mb_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops, job = jobs[i]; op = deqd_ops[i]; -#ifdef AESNI_MB_DOCSIS_SEC_ENABLED if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) retval = set_sec_mb_job_params(job, qp, op, &digest_idx); else -#endif retval = set_mb_job_params(job, qp, op, &digest_idx, mb_mgr); @@ -2259,12 +2248,10 @@ aesni_mb_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops, if (retval < 0) break; -#ifdef AESNI_MB_DOCSIS_SEC_ENABLED if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) retval = set_sec_mb_job_params(job, qp, op, &digest_idx); else -#endif retval = set_mb_job_params(job, qp, op, &digest_idx, mb_mgr); @@ -2440,7 +2427,6 @@ struct rte_cryptodev_ops aesni_mb_pmd_ops = { .sym_session_clear = ipsec_mb_sym_session_clear }; -#ifdef AESNI_MB_DOCSIS_SEC_ENABLED /** * Configure a aesni multi-buffer session from a security session * configuration @@ -2528,8 +2514,6 @@ aesni_mb_configure_dev(struct rte_cryptodev *dev) return -ENOMEM; } -#endif - static int aesni_mb_probe(struct rte_vdev_device *vdev) { @@ -2570,17 +2554,15 @@ RTE_INIT(ipsec_mb_register_aesni_mb) RTE_CRYPTODEV_FF_IN_PLACE_SGL | RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT | RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT | - RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT; + RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT | + RTE_CRYPTODEV_FF_SECURITY; aesni_mb_data->internals_priv_size = 0; aesni_mb_data->ops = &aesni_mb_pmd_ops; aesni_mb_data->qp_priv_size = sizeof(struct aesni_mb_qp_data); aesni_mb_data->queue_pair_configure = NULL; -#ifdef AESNI_MB_DOCSIS_SEC_ENABLED aesni_mb_data->security_ops = &aesni_mb_pmd_sec_ops; aesni_mb_data->dev_config = aesni_mb_configure_dev; - aesni_mb_data->feature_flags |= RTE_CRYPTODEV_FF_SECURITY; -#endif aesni_mb_data->session_configure = aesni_mb_session_configure; aesni_mb_data->session_priv_size = sizeof(struct aesni_mb_session); } diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h index 3f6cf30c39..85994fe5a1 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h @@ -5,7 +5,6 @@ #ifndef _PMD_AESNI_MB_PRIV_H_ #define _PMD_AESNI_MB_PRIV_H_ -#define AESNI_MB_DOCSIS_SEC_ENABLED 1 #include #include #include From patchwork Thu Jul 6 16:04:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Dooley X-Patchwork-Id: 129346 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BE1EB42DEA; Thu, 6 Jul 2023 18:07:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB64942FC6; Thu, 6 Jul 2023 18:07:15 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id D111C40A79 for ; Thu, 6 Jul 2023 18:07:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688659634; x=1720195634; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FlfW6lOrlC6LtvvmzW2OrgzdhVCqefRwax23qqGWuYM=; b=X+naiAw81Wkm0rtH0+DP9saX2xMUlfuojQ6IitaHiRwqZ6XIEyJuh21/ WwyVV1chTln+VtGl8SbMpAE0Yh2KEALAiW/64JtdpJIHAaJxoTnqHXngU wTbgy4wLj6LBPsctzMX+iPAKrVy4l7m1dwnGvln1Q14OSdheHscZhpaZN NrRKGx9XbT311LvRZxa35qDnB5MBmPh3uZgeAQvCSSIbTNs7teMXAmFaP jgyTsyXaJiUxo8ZXpkB1BhE7SwrnqPsb/zj8QN0bsSwZdzzqyWdBraQQX TKcxl7Xi4tAnZZYsilYiIWCruZ+Hnvq2TSLuE4RcKvWym3TyxHacd7Qa7 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="361114389" X-IronPort-AV: E=Sophos;i="6.01,185,1684825200"; d="scan'208";a="361114389" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 09:05:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="713637219" X-IronPort-AV: E=Sophos;i="6.01,185,1684825200"; d="scan'208";a="713637219" Received: from unknown (HELO silpixa00400883.ir.intel.com) ([10.243.22.155]) by orsmga007.jf.intel.com with ESMTP; 06 Jul 2023 09:05:22 -0700 From: Brian Dooley To: Kai Ji Cc: dev@dpdk.org, gakhil@marvell.com, Brian Dooley , kevin.osullivan@intel.com Subject: [PATCH v2 2/2] common/qat: change define header Date: Thu, 6 Jul 2023 16:04:54 +0000 Message-Id: <20230706160454.479229-3-brian.dooley@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230706160454.479229-1-brian.dooley@intel.com> References: <20230706131517.374296-1-brian.dooley@intel.com> <20230706160454.479229-1-brian.dooley@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org change define from RTE_LIB_SECURITY to BUILD_QAT_SYM as RTE_ETHER_CRC_LEN value is protected by BUILD_QAT_SYM. Fixes: ce7a737c8f02 ("crypto/qat: support cipher-CRC offload") Cc: kevin.osullivan@intel.com Signed-off-by: Brian Dooley Acked-by: Ciara Power --- drivers/common/qat/qat_qp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c index 094d684abc..f284718441 100644 --- a/drivers/common/qat/qat_qp.c +++ b/drivers/common/qat/qat_qp.c @@ -11,7 +11,7 @@ #include #include #include -#ifdef RTE_LIB_SECURITY +#ifdef BUILD_QAT_SYM #include #endif