Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/139414/?format=api
{ "id": 139414, "url": "http://patches.dpdk.org/api/patches/139414/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240416081222.3002268-1-ganapati.kundapura@intel.com/", "project": { "id": 1, "url": "http://patches.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": "<20240416081222.3002268-1-ganapati.kundapura@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240416081222.3002268-1-ganapati.kundapura@intel.com", "date": "2024-04-16T08:12:22", "name": "[v1] crypto: fix build issues on crypto callbacks macro undefined", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "4a774cd0404d6d5fa7deec0135fe6081cf5e0e29", "submitter": { "id": 2287, "url": "http://patches.dpdk.org/api/people/2287/?format=api", "name": "Ganapati Kundapura", "email": "ganapati.kundapura@intel.com" }, "delegate": { "id": 6690, "url": "http://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20240416081222.3002268-1-ganapati.kundapura@intel.com/mbox/", "series": [ { "id": 31752, "url": "http://patches.dpdk.org/api/series/31752/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31752", "date": "2024-04-16T08:12:22", "name": "[v1] crypto: fix build issues on crypto callbacks macro undefined", "version": 1, "mbox": "http://patches.dpdk.org/series/31752/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/139414/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/139414/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 6537A43E74;\n\tTue, 16 Apr 2024 10:12:29 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E24DE4029E;\n\tTue, 16 Apr 2024 10:12:28 +0200 (CEST)", "from mgamail.intel.com (mgamail.intel.com [192.198.163.17])\n by mails.dpdk.org (Postfix) with ESMTP id 25FBA40293\n for <dev@dpdk.org>; Tue, 16 Apr 2024 10:12:26 +0200 (CEST)", "from fmviesa006.fm.intel.com ([10.60.135.146])\n by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 16 Apr 2024 01:12:26 -0700", "from txandevlnx322.an.intel.com ([10.123.117.44])\n by fmviesa006.fm.intel.com with ESMTP; 16 Apr 2024 01:12:26 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1713255147; x=1744791147;\n h=from:to:cc:subject:date:message-id:mime-version:\n content-transfer-encoding;\n bh=vSkqWVwFPa9RgO/8VYcQeZe2/WqqVi03bfhOwZI0wuk=;\n b=JuYBQVcsBIz9GbQQauEeZnsJCeaX6jcaEw0+mskW93MSBFvac6f0h2do\n EScZPmFyxoEx3c7CLoHO26wh2n8SBHjyndJXY4Fw6qcZNlTH/yAr/oWSd\n ZnIMkB83cRbmmyY0I6X7QH2fCTpnH3NOCk0Ra2WjNj/mIxeVgU19ICR86\n 4GtWu/7hpeogexUG7K4KI7JMMAdvMS3blyOi8bAzP3BdUov1SUuwO6nPJ\n QSLLSXuy1uAfhW1jWx4z0dsNyae5GjXNMb17SuGA31vfv06aAAvC5fgBy\n 20Cg0bZXxIpp8EPK/V6A6E47jk1ZszDtYpohR3E9fXzEM5jjJ8A9B4eQX Q==;", "X-CSE-ConnectionGUID": [ "KoFjEH8BTpGniC+3YVaKpA==", "I2jS85jBRiSUx4RIFIgCOQ==" ], "X-CSE-MsgGUID": [ "fGZw8s4HS3OF4DKJ3zLIiQ==", "StpomYV5Q2iK51m+vHM9ig==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6600,9927,11045\"; a=\"8540901\"", "E=Sophos;i=\"6.07,205,1708416000\";\n d=\"scan'208\";a=\"8540901\"", "E=Sophos;i=\"6.07,205,1708416000\"; d=\"scan'208\";a=\"22246330\"" ], "X-ExtLoop1": "1", "From": "Ganapati Kundapura <ganapati.kundapura@intel.com>", "To": "dev@dpdk.org", "Cc": "abhinandan.gujjar@intel.com, ciara.power@intel.com, gakhil@marvell.com,\n fanzhang.oss@gmail.com", "Subject": "[PATCH v1] crypto: fix build issues on crypto callbacks macro\n undefined", "Date": "Tue, 16 Apr 2024 03:12:22 -0500", "Message-Id": "<20240416081222.3002268-1-ganapati.kundapura@intel.com>", "X-Mailer": "git-send-email 2.23.0", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "Crypto callbacks macro is defined with value 1 and being used with ifdef,\non config value is changed to 0 to disable, crypto callback changes\nstill being compiled.\n\nDefined crypto callbacks macro without value, undef to disable\n\nWrapped crypto callback changes with RTE_CRYPTO_CALLBACKS macro\nto fix build issues when macro is undefined.\n\nAs callback head nodes have valid pointer, this patch checks the next\nnode from the head if callbacks registered.\n\nFixes: 1c3ffb9 (\"cryptodev: add enqueue and dequeue callbacks\")\nFixes: 5523a75 (\"test/crypto: add case for enqueue/dequeue callbacks\")\n\nSigned-off-by: Ganapati Kundapura <ganapati.kundapura@intel.com>", "diff": "diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c\nindex 1703ebccf1..1a592f2302 100644\n--- a/app/test/test_cryptodev.c\n+++ b/app/test/test_cryptodev.c\n@@ -14547,6 +14547,7 @@ test_null_burst_operation(void)\n \treturn TEST_SUCCESS;\n }\n \n+#ifdef RTE_CRYPTO_CALLBACKS\n static uint16_t\n test_enq_callback(uint16_t dev_id, uint16_t qp_id, struct rte_crypto_op **ops,\n \t\t uint16_t nb_ops, void *user_param)\n@@ -14784,6 +14785,7 @@ test_deq_callback_setup(void)\n \n \treturn TEST_SUCCESS;\n }\n+#endif /* RTE_CRYPTO_CALLBACKS */\n \n static void\n generate_gmac_large_plaintext(uint8_t *data)\n@@ -18069,8 +18071,10 @@ static struct unit_test_suite cryptodev_gen_testsuite = {\n \t\tTEST_CASE_ST(ut_setup, ut_teardown,\n \t\t\t\ttest_device_configure_invalid_queue_pair_ids),\n \t\tTEST_CASE_ST(ut_setup, ut_teardown, test_stats),\n+#ifdef RTE_CRYPTO_CALLBACKS\n \t\tTEST_CASE_ST(ut_setup, ut_teardown, test_enq_callback_setup),\n \t\tTEST_CASE_ST(ut_setup, ut_teardown, test_deq_callback_setup),\n+#endif\n \t\tTEST_CASES_END() /**< NULL terminate unit test array */\n \t}\n };\ndiff --git a/config/rte_config.h b/config/rte_config.h\nindex dd7bb0d35b..b647a69ba8 100644\n--- a/config/rte_config.h\n+++ b/config/rte_config.h\n@@ -72,7 +72,7 @@\n /* cryptodev defines */\n #define RTE_CRYPTO_MAX_DEVS 64\n #define RTE_CRYPTODEV_NAME_LEN 64\n-#define RTE_CRYPTO_CALLBACKS 1\n+#define RTE_CRYPTO_CALLBACKS\t/* No Value, undef/comment out to disable */\n \n /* compressdev defines */\n #define RTE_COMPRESS_MAX_DEVS 64\ndiff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c\nindex 886eb7adc4..5f3b17a517 100644\n--- a/lib/cryptodev/rte_cryptodev.c\n+++ b/lib/cryptodev/rte_cryptodev.c\n@@ -628,6 +628,7 @@ rte_cryptodev_asym_xform_capability_check_hash(\n \treturn ret;\n }\n \n+#ifdef RTE_CRYPTO_CALLBACKS\n /* spinlock for crypto device enq callbacks */\n static rte_spinlock_t rte_cryptodev_callback_lock = RTE_SPINLOCK_INITIALIZER;\n \n@@ -744,6 +745,7 @@ cryptodev_cb_init(struct rte_cryptodev *dev)\n \tcryptodev_cb_cleanup(dev);\n \treturn -ENOMEM;\n }\n+#endif /* RTE_CRYPTO_CALLBACKS */\n \n const char *\n rte_cryptodev_get_feature_name(uint64_t flag)\n@@ -1244,9 +1246,11 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config)\n \tif (*dev->dev_ops->dev_configure == NULL)\n \t\treturn -ENOTSUP;\n \n+#ifdef RTE_CRYPTO_CALLBACKS\n \trte_spinlock_lock(&rte_cryptodev_callback_lock);\n \tcryptodev_cb_cleanup(dev);\n \trte_spinlock_unlock(&rte_cryptodev_callback_lock);\n+#endif\n \n \t/* Setup new number of queue pairs and reconfigure device. */\n \tdiag = rte_cryptodev_queue_pairs_config(dev, config->nb_queue_pairs,\n@@ -1257,6 +1261,7 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config)\n \t\treturn diag;\n \t}\n \n+#ifdef RTE_CRYPTO_CALLBACKS\n \trte_spinlock_lock(&rte_cryptodev_callback_lock);\n \tdiag = cryptodev_cb_init(dev);\n \trte_spinlock_unlock(&rte_cryptodev_callback_lock);\n@@ -1264,6 +1269,7 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config)\n \t\tCDEV_LOG_ERR(\"Callback init failed for dev_id=%d\", dev_id);\n \t\treturn diag;\n \t}\n+#endif\n \n \trte_cryptodev_trace_configure(dev_id, config);\n \treturn (*dev->dev_ops->dev_configure)(dev, config);\n@@ -1485,6 +1491,7 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,\n \t\t\tsocket_id);\n }\n \n+#ifdef RTE_CRYPTO_CALLBACKS\n struct rte_cryptodev_cb *\n rte_cryptodev_add_enq_callback(uint8_t dev_id,\n \t\t\t uint16_t qp_id,\n@@ -1763,6 +1770,7 @@ rte_cryptodev_remove_deq_callback(uint8_t dev_id,\n \trte_spinlock_unlock(&rte_cryptodev_callback_lock);\n \treturn ret;\n }\n+#endif /* RTE_CRYPTO_CALLBACKS */\n \n int\n rte_cryptodev_stats_get(uint8_t dev_id, struct rte_cryptodev_stats *stats)\ndiff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h\nindex 00ba6a234a..b811b458d5 100644\n--- a/lib/cryptodev/rte_cryptodev.h\n+++ b/lib/cryptodev/rte_cryptodev.h\n@@ -1910,7 +1910,7 @@ rte_cryptodev_dequeue_burst(uint8_t dev_id, uint16_t qp_id,\n \tnb_ops = fp_ops->dequeue_burst(qp, ops, nb_ops);\n \n #ifdef RTE_CRYPTO_CALLBACKS\n-\tif (unlikely(fp_ops->qp.deq_cb != NULL)) {\n+\tif (unlikely(fp_ops->qp.deq_cb[qp_id].next != NULL)) {\n \t\tstruct rte_cryptodev_cb_rcu *list;\n \t\tstruct rte_cryptodev_cb *cb;\n \n@@ -1977,7 +1977,7 @@ rte_cryptodev_enqueue_burst(uint8_t dev_id, uint16_t qp_id,\n \tfp_ops = &rte_crypto_fp_ops[dev_id];\n \tqp = fp_ops->qp.data[qp_id];\n #ifdef RTE_CRYPTO_CALLBACKS\n-\tif (unlikely(fp_ops->qp.enq_cb != NULL)) {\n+\tif (unlikely(fp_ops->qp.enq_cb[qp_id].next != NULL)) {\n \t\tstruct rte_cryptodev_cb_rcu *list;\n \t\tstruct rte_cryptodev_cb *cb;\n \n", "prefixes": [ "v1" ] }