Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/65091/?format=api
{ "id": 65091, "url": "http://patches.dpdk.org/api/patches/65091/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1579803629-152938-3-git-send-email-akozyrev@mellanox.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": "<1579803629-152938-3-git-send-email-akozyrev@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1579803629-152938-3-git-send-email-akozyrev@mellanox.com", "date": "2020-01-23T18:20:26", "name": "[v2,2/5] net/mlx4: use mlx4 debug flag instead of NDEBUG", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b153ef745b1c285c578a4e79d99c04081536eb29", "submitter": { "id": 1573, "url": "http://patches.dpdk.org/api/people/1573/?format=api", "name": "Alexander Kozyrev", "email": "akozyrev@mellanox.com" }, "delegate": { "id": 3268, "url": "http://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1579803629-152938-3-git-send-email-akozyrev@mellanox.com/mbox/", "series": [ { "id": 8278, "url": "http://patches.dpdk.org/api/series/8278/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8278", "date": "2020-01-23T18:20:24", "name": "net/mlx: assert cleanup in mlx drivers", "version": 2, "mbox": "http://patches.dpdk.org/series/8278/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/65091/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/65091/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 90090A0530;\n\tThu, 23 Jan 2020 19:20:51 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id C0631378B;\n\tThu, 23 Jan 2020 19:20:37 +0100 (CET)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id C95222B98\n for <dev@dpdk.org>; Thu, 23 Jan 2020 19:20:31 +0100 (CET)", "from Internal Mail-Server by MTLPINE2 (envelope-from\n akozyrev@mellanox.com)\n with ESMTPS (AES256-SHA encrypted); 23 Jan 2020 20:20:30 +0200", "from pegasus02.mtr.labs.mlnx. (pegasus02.mtr.labs.mlnx\n [10.210.16.122])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 00NIKUb2026240;\n Thu, 23 Jan 2020 20:20:30 +0200" ], "From": "Alexander Kozyrev <akozyrev@mellanox.com>", "To": "dev@dpdk.org", "Cc": "rasland@mellanox.com, matan@mellanox.com, viacheslavo@mellanox.com,\n ferruh.yigit@intel.com, thomas@monjalon.net", "Date": "Thu, 23 Jan 2020 20:20:26 +0200", "Message-Id": "<1579803629-152938-3-git-send-email-akozyrev@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1579803629-152938-1-git-send-email-akozyrev@mellanox.com>", "References": "<1579789555-23239-1-git-send-email-akozyrev@mellanox.com>\n <1579803629-152938-1-git-send-email-akozyrev@mellanox.com>", "Subject": "[dpdk-dev] [PATCH v2 2/5] net/mlx4: use mlx4 debug flag instead of\n\tNDEBUG", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Define a new MLX4_DEBUG compilation flag to get rid of dependency\non the NDEBUG definition. This is a preparation step to switch\nfrom standard assert clauses to DPDK RTE_ASSERT ones in MLX4 driver.\n\nSigned-off-by: Alexander Kozyrev <akozyrev@mellanox.com>\nAcked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>\n---\n drivers/net/mlx4/Makefile | 4 ++--\n drivers/net/mlx4/meson.build | 4 ++--\n drivers/net/mlx4/mlx4.c | 4 ++--\n drivers/net/mlx4/mlx4_mr.c | 8 ++++----\n drivers/net/mlx4/mlx4_rxtx.c | 10 +++++-----\n drivers/net/mlx4/mlx4_utils.h | 8 ++++----\n 6 files changed, 19 insertions(+), 19 deletions(-)", "diff": "diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile\nindex 329569d..043e72f 100644\n--- a/drivers/net/mlx4/Makefile\n+++ b/drivers/net/mlx4/Makefile\n@@ -65,13 +65,13 @@ endif\n \n # User-defined CFLAGS.\n ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y)\n-CFLAGS += -pedantic -UNDEBUG\n+CFLAGS += -pedantic -DMLX4_DEBUG\n ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)\n CFLAGS += -DPEDANTIC\n endif\n AUTO_CONFIG_CFLAGS += -Wno-pedantic\n else\n-CFLAGS += -DNDEBUG -UPEDANTIC\n+CFLAGS += -UMLX4_DEBUG -UPEDANTIC\n endif\n \n include $(RTE_SDK)/mk/rte.lib.mk\ndiff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build\nindex 9eb4988..a15a301 100644\n--- a/drivers/net/mlx4/meson.build\n+++ b/drivers/net/mlx4/meson.build\n@@ -67,9 +67,9 @@ if build\n \t\tendif\n \tendforeach\n \tif get_option('buildtype').contains('debug')\n-\t\tcflags += [ '-pedantic', '-UNDEBUG', '-DPEDANTIC' ]\n+\t\tcflags += [ '-pedantic', '-DMLX4_DEBUG', '-DPEDANTIC' ]\n \telse\n-\t\tcflags += [ '-DNDEBUG', '-UPEDANTIC' ]\n+\t\tcflags += [ '-UMLX4_DEBUG', '-UPEDANTIC' ]\n \tendif\n \t# To maintain the compatibility with the make build system\n \t# mlx4_autoconf.h file is still generated.\ndiff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c\nindex ab5e6c6..e37ae23 100644\n--- a/drivers/net/mlx4/mlx4.c\n+++ b/drivers/net/mlx4/mlx4.c\n@@ -305,7 +305,7 @@ struct mlx4_conf {\n \t\t (void *)dev, strerror(-ret));\n \t\tgoto err;\n \t}\n-#ifndef NDEBUG\n+#ifdef MLX4_DEBUG\n \tmlx4_mr_dump_dev(dev);\n #endif\n \tret = mlx4_rxq_intr_enable(priv);\n@@ -1305,7 +1305,7 @@ struct mlx4_conf {\n \t\treturn;\n \tassert(mlx4_glue);\n #endif\n-#ifndef NDEBUG\n+#ifdef MLX4_DEBUG\n \t/* Glue structure must not contain any NULL pointers. */\n \t{\n \t\tunsigned int i;\ndiff --git a/drivers/net/mlx4/mlx4_mr.c b/drivers/net/mlx4/mlx4_mr.c\nindex 470cee0..069a450 100644\n--- a/drivers/net/mlx4/mlx4_mr.c\n+++ b/drivers/net/mlx4/mlx4_mr.c\n@@ -242,7 +242,7 @@ struct mr_update_mp_data {\n \tmemset(bt, 0, sizeof(*bt));\n }\n \n-#ifndef NDEBUG\n+#ifdef MLX4_DEBUG\n /**\n * Dump all the entries in a B-tree\n *\n@@ -962,7 +962,7 @@ struct mr_update_mp_data {\n \t\trte_smp_wmb();\n \t}\n \trte_rwlock_write_unlock(&priv->mr.rwlock);\n-#ifndef NDEBUG\n+#ifdef MLX4_DEBUG\n \tif (rebuild)\n \t\tmlx4_mr_dump_dev(dev);\n #endif\n@@ -1380,7 +1380,7 @@ struct mr_update_mp_data {\n \treturn data.ret;\n }\n \n-#ifndef NDEBUG\n+#ifdef MLX4_DEBUG\n /**\n * Dump all the created MRs and the global cache entries.\n *\n@@ -1440,7 +1440,7 @@ struct mr_update_mp_data {\n \trte_rwlock_write_lock(&mlx4_shared_data->mem_event_rwlock);\n \tLIST_REMOVE(priv, mem_event_cb);\n \trte_rwlock_write_unlock(&mlx4_shared_data->mem_event_rwlock);\n-#ifndef NDEBUG\n+#ifdef MLX4_DEBUG\n \tmlx4_mr_dump_dev(dev);\n #endif\n \trte_rwlock_write_lock(&priv->mr.rwlock);\ndiff --git a/drivers/net/mlx4/mlx4_rxtx.c b/drivers/net/mlx4/mlx4_rxtx.c\nindex 4dc0adb..a8e880e 100644\n--- a/drivers/net/mlx4/mlx4_rxtx.c\n+++ b/drivers/net/mlx4/mlx4_rxtx.c\n@@ -321,7 +321,7 @@ struct tso_info {\n \t\tif (unlikely(!!(cqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK) ^\n \t\t !!(cons_index & cq->cqe_cnt)))\n \t\t\tbreak;\n-#ifndef NDEBUG\n+#ifdef MLX4_DEBUG\n \t\t/*\n \t\t * Make sure we read the CQE after we read the ownership bit.\n \t\t */\n@@ -336,7 +336,7 @@ struct tso_info {\n \t\t\t cqe_err->syndrome);\n \t\t\tbreak;\n \t\t}\n-#endif /* NDEBUG */\n+#endif /* MLX4_DEBUG */\n \t\tcons_index++;\n \t} while (1);\n \tcompleted = (cons_index - cq->cons_index) * txq->elts_comp_cd_init;\n@@ -488,14 +488,14 @@ struct tso_info {\n \t\t\t\t((uintptr_t)dseg & (MLX4_TXBB_SIZE - 1))) >>\n \t\t\t MLX4_SEG_SHIFT;\n \t\tswitch (nb_segs_txbb) {\n-#ifndef NDEBUG\n+#ifdef MLX4_DEBUG\n \t\tdefault:\n \t\t\t/* Should never happen. */\n \t\t\trte_panic(\"%p: Invalid number of SGEs(%d) for a TXBB\",\n \t\t\t(void *)txq, nb_segs_txbb);\n \t\t\t/* rte_panic never returns. */\n \t\t\tbreak;\n-#endif /* NDEBUG */\n+#endif /* MLX4_DEBUG */\n \t\tcase 4:\n \t\t\t/* Memory region key for this memory pool. */\n \t\t\tlkey = mlx4_tx_mb2mr(txq, sbuf);\n@@ -922,7 +922,7 @@ struct tso_info {\n \t\tif (likely(elt->buf != NULL)) {\n \t\t\tstruct rte_mbuf *tmp = elt->buf;\n \n-#ifndef NDEBUG\n+#ifdef MLX4_DEBUG\n \t\t\t/* Poisoning. */\n \t\t\tmemset(&elt->buf, 0x66, sizeof(struct rte_mbuf *));\n #endif\ndiff --git a/drivers/net/mlx4/mlx4_utils.h b/drivers/net/mlx4/mlx4_utils.h\nindex 5718b9c..7f9a826 100644\n--- a/drivers/net/mlx4/mlx4_utils.h\n+++ b/drivers/net/mlx4/mlx4_utils.h\n@@ -27,10 +27,10 @@\n \n extern int mlx4_logtype;\n \n-#ifndef NDEBUG\n+#ifdef MLX4_DEBUG\n \n /*\n- * When debugging is enabled (NDEBUG not defined), file, line and function\n+ * When debugging is enabled (MLX4_DEBUG is defined), file, line and function\n * information replace the driver name (MLX4_DRIVER_NAME) in log messages.\n */\n \n@@ -56,7 +56,7 @@\n #define DEBUG(...) PMD_DRV_LOG(DEBUG, __VA_ARGS__)\n #define claim_zero(...) assert((__VA_ARGS__) == 0)\n \n-#else /* NDEBUG */\n+#else /* MLX4_DEBUG */\n \n /*\n * Like assert(), DEBUG() becomes a no-op and claim_zero() does not perform\n@@ -71,7 +71,7 @@\n #define DEBUG(...) (void)0\n #define claim_zero(...) (__VA_ARGS__)\n \n-#endif /* NDEBUG */\n+#endif /* MLX4_DEBUG */\n \n #define INFO(...) PMD_DRV_LOG(INFO, __VA_ARGS__)\n #define WARN(...) PMD_DRV_LOG(WARNING, __VA_ARGS__)\n", "prefixes": [ "v2", "2/5" ] }