Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/128827/?format=api
{ "id": 128827, "url": "http://patchwork.dpdk.org/api/patches/128827/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230620075251.103491-5-maxime.coquelin@redhat.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230620075251.103491-5-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230620075251.103491-5-maxime.coquelin@redhat.com", "date": "2023-06-20T07:52:49", "name": "[v2,4/6] crypto/dpaa_sec: remove security lib presence checks", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "47f0566836e1ea20e120d03e2890f634b71d34e6", "submitter": { "id": 512, "url": "http://patchwork.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 6690, "url": "http://patchwork.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230620075251.103491-5-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 28572, "url": "http://patchwork.dpdk.org/api/series/28572/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=28572", "date": "2023-06-20T07:52:45", "name": "Trivial crypto PMDs cleanup", "version": 2, "mbox": "http://patchwork.dpdk.org/series/28572/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/128827/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/128827/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id AA2C742D04;\n\tTue, 20 Jun 2023 09:53:28 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 2F5FE42D36;\n\tTue, 20 Jun 2023 09:53:11 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by mails.dpdk.org (Postfix) with ESMTP id 8ADD242D13\n for <dev@dpdk.org>; Tue, 20 Jun 2023 09:53:09 +0200 (CEST)", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-266-Vuh-WKxkNYuDPAT1p0_AVQ-1; Tue, 20 Jun 2023 03:53:04 -0400", "from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com\n [10.11.54.4])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 655BC185A78F;\n Tue, 20 Jun 2023 07:53:04 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.39.208.22])\n by smtp.corp.redhat.com (Postfix) with ESMTP id B9E19200A398;\n Tue, 20 Jun 2023 07:53:02 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1687247589;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=5ajUYu1Pmg8bNI/6PgaykrLGohcXppaupk8hQoj9xZo=;\n b=DlR0jpcdar42qycgXSJ20fY7AAPnv0pw4eJPddJo6lWLtAVrplHlqX2f3GAI7/ldIqEjaU\n 09R4blV/vUXJUlim1zMpPGauHUwp+H/X4mzXTWnFuXtat2GkBnSEVr/jvdxP1rxowPm502\n tPIy83AVlnrIRGsjxZaXuG0YXWTfVPA=", "X-MC-Unique": "Vuh-WKxkNYuDPAT1p0_AVQ-1", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, kai.ji@intel.com, g.singh@nxp.com, hemant.agrawal@nxp.com,\n pablo.de.lara.guarch@intel.com, fanzhang.oss@gmail.com,\n roretzla@linux.microsoft.com", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Subject": "[PATCH v2 4/6] crypto/dpaa_sec: remove security lib presence checks", "Date": "Tue, 20 Jun 2023 09:52:49 +0200", "Message-ID": "<20230620075251.103491-5-maxime.coquelin@redhat.com>", "In-Reply-To": "<20230620075251.103491-1-maxime.coquelin@redhat.com>", "References": "<20230620075251.103491-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.1 on 10.11.54.4", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Since security library is a required dependency for\nbuilding DPAA crypto PMD, remove useless #ifdefs around\nrte_security APIs calls.\n\nAcked-by: Hemant Agrawal <hemant.agrawal@nxp.com>\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n drivers/crypto/dpaa_sec/dpaa_sec.c | 26 ++---------------------\n drivers/crypto/dpaa_sec/dpaa_sec.h | 9 +-------\n drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c | 6 ------\n 3 files changed, 3 insertions(+), 38 deletions(-)", "diff": "diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c\nindex db52683847..7d47c32693 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c\n@@ -15,9 +15,7 @@\n #include <cryptodev_pmd.h>\n #include <rte_crypto.h>\n #include <rte_cryptodev.h>\n-#ifdef RTE_LIB_SECURITY\n #include <rte_security_driver.h>\n-#endif\n #include <rte_cycles.h>\n #include <dev_driver.h>\n #include <rte_io.h>\n@@ -237,7 +235,6 @@ static inline int is_decode(dpaa_sec_session *ses)\n \treturn ses->dir == DIR_DEC;\n }\n \n-#ifdef RTE_LIB_SECURITY\n static int\n dpaa_sec_prep_pdcp_cdb(dpaa_sec_session *ses)\n {\n@@ -441,7 +438,7 @@ dpaa_sec_prep_ipsec_cdb(dpaa_sec_session *ses)\n \t}\n \treturn shared_desc_len;\n }\n-#endif\n+\n /* prepare command block of the session */\n static int\n dpaa_sec_prep_cdb(dpaa_sec_session *ses)\n@@ -459,14 +456,12 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\n \tmemset(cdb, 0, sizeof(struct sec_cdb));\n \n \tswitch (ses->ctxt) {\n-#ifdef RTE_LIB_SECURITY\n \tcase DPAA_SEC_IPSEC:\n \t\tshared_desc_len = dpaa_sec_prep_ipsec_cdb(ses);\n \t\tbreak;\n \tcase DPAA_SEC_PDCP:\n \t\tshared_desc_len = dpaa_sec_prep_pdcp_cdb(ses);\n \t\tbreak;\n-#endif\n \tcase DPAA_SEC_CIPHER:\n \t\talginfo_c.key = (size_t)ses->cipher_key.data;\n \t\talginfo_c.keylen = ses->cipher_key.length;\n@@ -1745,7 +1740,6 @@ build_cipher_auth(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \treturn cf;\n }\n \n-#ifdef RTE_LIB_SECURITY\n static inline struct dpaa_sec_job *\n build_proto(struct rte_crypto_op *op, dpaa_sec_session *ses)\n {\n@@ -1877,7 +1871,6 @@ build_proto_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \n \treturn cf;\n }\n-#endif\n \n static uint16_t\n dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n@@ -1924,11 +1917,9 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\tcase RTE_CRYPTO_OP_WITH_SESSION:\n \t\t\t\tses = CRYPTODEV_GET_SYM_SESS_PRIV(op->sym->session);\n \t\t\t\tbreak;\n-#ifdef RTE_LIB_SECURITY\n \t\t\tcase RTE_CRYPTO_OP_SECURITY_SESSION:\n \t\t\t\tses = SECURITY_GET_SESS_PRIV(op->sym->session);\n \t\t\t\tbreak;\n-#endif\n \t\t\tdefault:\n \t\t\t\tDPAA_SEC_DP_ERR(\n \t\t\t\t\t\"sessionless crypto op not supported\");\n@@ -1969,12 +1960,10 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\t\t ((op->sym->m_dst == NULL) ||\n \t\t\t\t rte_pktmbuf_is_contiguous(op->sym->m_dst))) {\n \t\t\t\tswitch (ses->ctxt) {\n-#ifdef RTE_LIB_SECURITY\n \t\t\t\tcase DPAA_SEC_PDCP:\n \t\t\t\tcase DPAA_SEC_IPSEC:\n \t\t\t\t\tcf = build_proto(op, ses);\n \t\t\t\t\tbreak;\n-#endif\n \t\t\t\tcase DPAA_SEC_AUTH:\n \t\t\t\t\tcf = build_auth_only(op, ses);\n \t\t\t\t\tbreak;\n@@ -2003,12 +1992,10 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\t\t}\n \t\t\t} else {\n \t\t\t\tswitch (ses->ctxt) {\n-#ifdef RTE_LIB_SECURITY\n \t\t\t\tcase DPAA_SEC_PDCP:\n \t\t\t\tcase DPAA_SEC_IPSEC:\n \t\t\t\t\tcf = build_proto_sg(op, ses);\n \t\t\t\t\tbreak;\n-#endif\n \t\t\t\tcase DPAA_SEC_AUTH:\n \t\t\t\t\tcf = build_auth_only_sg(op, ses);\n \t\t\t\t\tbreak;\n@@ -2060,7 +2047,6 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\t\t\t((auth_tail_len << 16) | auth_hdr_len);\n \t\t\t}\n \n-#ifdef RTE_LIB_SECURITY\n \t\t\t/* In case of PDCP, per packet HFN is stored in\n \t\t\t * mbuf priv after sym_op.\n \t\t\t */\n@@ -2073,7 +2059,6 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\t\t\tses->pdcp.hfn_ovd_offset)),\n \t\t\t\t\tses->pdcp.hfn_ovd);\n \t\t\t}\n-#endif\n \t\t}\n send_pkts:\n \t\tloop = 0;\n@@ -2715,7 +2700,6 @@ dpaa_sec_sym_session_clear(struct rte_cryptodev *dev,\n \tfree_session_memory(dev, s);\n }\n \n-#ifdef RTE_LIB_SECURITY\n static int\n dpaa_sec_ipsec_aead_init(struct rte_crypto_aead_xform *aead_xform,\n \t\t\tstruct rte_security_ipsec_xform *ipsec_xform,\n@@ -3296,7 +3280,6 @@ dpaa_sec_security_session_get_size(void *device __rte_unused)\n \treturn sizeof(dpaa_sec_session);\n }\n \n-#endif\n static int\n dpaa_sec_dev_configure(struct rte_cryptodev *dev __rte_unused,\n \t\t struct rte_cryptodev_config *config __rte_unused)\n@@ -3544,7 +3527,6 @@ static struct rte_cryptodev_ops crypto_ops = {\n \t.sym_configure_raw_dp_ctx = dpaa_sec_configure_raw_dp_ctx,\n };\n \n-#ifdef RTE_LIB_SECURITY\n static const struct rte_security_capability *\n dpaa_sec_capabilities_get(void *device __rte_unused)\n {\n@@ -3560,7 +3542,7 @@ static const struct rte_security_ops dpaa_sec_security_ops = {\n \t.set_pkt_metadata = NULL,\n \t.capabilities_get = dpaa_sec_capabilities_get\n };\n-#endif\n+\n static int\n dpaa_sec_uninit(struct rte_cryptodev *dev)\n {\n@@ -3620,9 +3602,7 @@ static int\n dpaa_sec_dev_init(struct rte_cryptodev *cryptodev)\n {\n \tstruct dpaa_sec_dev_private *internals;\n-#ifdef RTE_LIB_SECURITY\n \tstruct rte_security_ctx *security_instance;\n-#endif\n \tstruct dpaa_sec_qp *qp;\n \tuint32_t i, flags;\n \tint ret;\n@@ -3683,7 +3663,6 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev)\n \t\tDPAA_SEC_WARN(\"Device already init by primary process\");\n \t\treturn 0;\n \t}\n-#ifdef RTE_LIB_SECURITY\n \t/* Initialize security_ctx only for primary process*/\n \tsecurity_instance = rte_malloc(\"rte_security_instances_ops\",\n \t\t\t\tsizeof(struct rte_security_ctx), 0);\n@@ -3693,7 +3672,6 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev)\n \tsecurity_instance->ops = &dpaa_sec_security_ops;\n \tsecurity_instance->sess_cnt = 0;\n \tcryptodev->security_ctx = security_instance;\n-#endif\n \trte_spinlock_init(&internals->lock);\n \tfor (i = 0; i < internals->max_nb_queue_pairs; i++) {\n \t\t/* init qman fq for queue pair */\ndiff --git a/drivers/crypto/dpaa_sec/dpaa_sec.h b/drivers/crypto/dpaa_sec/dpaa_sec.h\nindex 8921e3ed89..412a9da942 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.h\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.h\n@@ -106,7 +106,7 @@ struct sec_cdb {\n \n \tuint32_t sh_desc[DPAA_SEC_MAX_DESC_SIZE];\n };\n-#ifdef RTE_LIB_SECURITY\n+\n /*!\n * The structure is to be filled by user as a part of\n * dpaa_sec_proto_ctxt for PDCP Protocol\n@@ -124,7 +124,6 @@ struct sec_pdcp_ctxt {\n \tuint32_t hfn;\t/*!< Hyper Frame Number */\n \tuint32_t hfn_threshold;\t/*!< HFN Threashold for key renegotiation */\n };\n-#endif\n \n typedef int (*dpaa_sec_build_fd_t)(\n \tvoid *qp, uint8_t *drv_ctx, struct rte_crypto_vec *data_vec,\n@@ -153,9 +152,7 @@ typedef struct dpaa_sec_session_entry {\n \tenum rte_crypto_cipher_algorithm cipher_alg; /*!< Cipher Algorithm*/\n \tenum rte_crypto_auth_algorithm auth_alg; /*!< Authentication Algorithm*/\n \tenum rte_crypto_aead_algorithm aead_alg; /*!< AEAD Algorithm*/\n-#ifdef RTE_LIB_SECURITY\n \tenum rte_security_session_protocol proto_alg; /*!< Security Algorithm*/\n-#endif\n \tdpaa_sec_build_fd_t build_fd;\n \tdpaa_sec_build_raw_dp_fd_t build_raw_dp_fd;\n \tunion {\n@@ -198,9 +195,7 @@ typedef struct dpaa_sec_session_entry {\n \t\t\tuint8_t auth_cipher_text;\n \t\t\t\t/**< Authenticate/cipher ordering */\n \t\t};\n-#ifdef RTE_LIB_SECURITY\n \t\tstruct sec_pdcp_ctxt pdcp;\n-#endif\n \t};\n } dpaa_sec_session;\n \n@@ -790,7 +785,6 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {\n \tRTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()\n };\n \n-#ifdef RTE_LIB_SECURITY\n static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = {\n \t{\t/* SNOW 3G (UIA2) */\n \t\t.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,\n@@ -1003,7 +997,6 @@ static const struct rte_security_capability dpaa_sec_security_cap[] = {\n \t\t.action = RTE_SECURITY_ACTION_TYPE_NONE\n \t}\n };\n-#endif\n \n /**\n * Checksum\ndiff --git a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c\nindex b7dd8beab2..ce49c4996f 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c\n@@ -7,9 +7,7 @@\n #include <cryptodev_pmd.h>\n #include <rte_crypto.h>\n #include <rte_cryptodev.h>\n-#ifdef RTE_LIB_SECURITY\n #include <rte_security_driver.h>\n-#endif\n \n /* RTA header files */\n #include <desc/algo.h>\n@@ -645,7 +643,6 @@ build_dpaa_raw_dp_cipher_fd(uint8_t *drv_ctx,\n \treturn cf;\n }\n \n-#ifdef RTE_LIB_SECURITY\n static inline struct dpaa_sec_job *\n build_dpaa_raw_proto_sg(uint8_t *drv_ctx,\n \t\t\tstruct rte_crypto_sgl *sgl,\n@@ -772,7 +769,6 @@ build_dpaa_raw_proto_sg(uint8_t *drv_ctx,\n \n \treturn cf;\n }\n-#endif\n \n static uint32_t\n dpaa_sec_raw_enqueue_burst(void *qp_data, uint8_t *drv_ctx,\n@@ -1035,11 +1031,9 @@ dpaa_sec_configure_raw_dp_ctx(struct rte_cryptodev *dev, uint16_t qp_id,\n \t\tsess->build_raw_dp_fd = build_dpaa_raw_dp_chain_fd;\n \telse if (sess->ctxt == DPAA_SEC_AEAD)\n \t\tsess->build_raw_dp_fd = build_raw_cipher_auth_gcm_sg;\n-#ifdef RTE_LIB_SECURITY\n \telse if (sess->ctxt == DPAA_SEC_IPSEC ||\n \t\t\tsess->ctxt == DPAA_SEC_PDCP)\n \t\tsess->build_raw_dp_fd = build_dpaa_raw_proto_sg;\n-#endif\n \telse\n \t\treturn -ENOTSUP;\n \tdp_ctx = (struct dpaa_sec_raw_dp_ctx *)raw_dp_ctx->drv_ctx_data;\n", "prefixes": [ "v2", "4/6" ] }