Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/88719/?format=api
{ "id": 88719, "url": "http://patches.dpdk.org/api/patches/88719/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210308222855.823670-3-thomas@monjalon.net/", "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": "<20210308222855.823670-3-thomas@monjalon.net>", "list_archive_url": "https://inbox.dpdk.org/dev/20210308222855.823670-3-thomas@monjalon.net", "date": "2021-03-08T22:28:54", "name": "[2/3] common/mlx5: enable debug logs dynamically", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f297833f24780ddcfe6abc35024b26147bfc7178", "submitter": { "id": 685, "url": "http://patches.dpdk.org/api/people/685/?format=api", "name": "Thomas Monjalon", "email": "thomas@monjalon.net" }, "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/20210308222855.823670-3-thomas@monjalon.net/mbox/", "series": [ { "id": 15538, "url": "http://patches.dpdk.org/api/series/15538/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=15538", "date": "2021-03-08T22:28:52", "name": "adjust mlx debug logs", "version": 1, "mbox": "http://patches.dpdk.org/series/15538/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/88719/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/88719/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 9FBACA0566;\n\tMon, 8 Mar 2021 23:29:14 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 6BB0622A4E8;\n\tMon, 8 Mar 2021 23:29:10 +0100 (CET)", "from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com\n [66.111.4.27]) by mails.dpdk.org (Postfix) with ESMTP id C0B2322A4E7\n for <dev@dpdk.org>; Mon, 8 Mar 2021 23:29:08 +0100 (CET)", "from compute2.internal (compute2.nyi.internal [10.202.2.42])\n by mailout.nyi.internal (Postfix) with ESMTP id 741F75C00F2;\n Mon, 8 Mar 2021 17:29:08 -0500 (EST)", "from mailfrontend2 ([10.202.2.163])\n by compute2.internal (MEProxy); Mon, 08 Mar 2021 17:29:08 -0500", "from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])\n by mail.messagingengine.com (Postfix) with ESMTPA id CEEFC1080057;\n Mon, 8 Mar 2021 17:29:07 -0500 (EST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=\n from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding; s=fm3; bh=YZXHQb6Y1Jukg\n ECUqPem3RIUbav6hHgkjvuq/eNFNYQ=; b=RtDK3dIxuZsf302IlCc8WxDra6Zog\n iA6nYupBBXTr8Ok+UwJSsXqPFlVLn4liUsLU+xlKBTGV7aND/gx/wJLiPVH9cvwc\n GNybwSvl4KxWWN6GpJ7pufc2VSTYl2LuhaDVi6AkhN0EapY5c6XwWjqh1S3yfDsk\n vlDjTVPQhr6rA7OQqooyaOZJjesS2ohAO8uqrezTu/HHyYBSIxcQG+Ap4m0k4kzq\n oGYHTxNaJXjG1a/tggu1CcvZbXhQfqyqFiST/gBOy6155gUOlCCO0uzvE7AJJqGi\n rhgkqlr5v7glbJly3svz+bzsJ9C7TqEn7Ho1hGxUwhMX0SgJrtD3MPKDw==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=\n messagingengine.com; h=cc:content-transfer-encoding:date:from\n :in-reply-to:message-id:mime-version:references:subject:to\n :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=\n fm2; bh=YZXHQb6Y1JukgECUqPem3RIUbav6hHgkjvuq/eNFNYQ=; b=v8LkZUgj\n 8grWoDLkOK2Q2zwX6pblUKmRDzXuXo9j8ArsusmCJFcb9L57V0wf2nKEUNg1hXsK\n gj1+b0Vodyre4Bfolx1XtzRqDPFN6oT/AsxIm7xf1VYKHCix7s369Htavov9lGvE\n B0ovPXkmfoW23528qDgLpJXAIhb7rT0w852NDPPPFreEJkBKTSEpZjfs4xEae1YE\n 4bZtbBzZDuNmn2QNyDOyKBDulbXkLmM/Zc8sGIaCntNmOzF4Yw/8Zk4nRYDz/n/K\n JH3//nktd6/f6t/9DUIbdNfyaMRFSy0z/0hLeeGB6HPPOtdCL2YMGOi6x3N7EPiV\n eEJq2mMXx/6tew==" ], "X-ME-Sender": "<xms:NKVGYMjojGtzutdFjKNm1tTxvYKm45DaqSuNxoRiTF7twAgpsHapwg>\n <xme:NKVGYFDpeLRutVG8f5atf_TAMu0Nubyi7UwW3viwleLCLv5JABjAhVQqmm8xJuocq\n VZt8xYSFg_r5EuNKQ>", "X-ME-Proxy-Cause": "\n gggruggvucftvghtrhhoucdtuddrgeduledruddugedgledvucetufdoteggodetrfdotf\n fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen\n uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne\n cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr\n shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg\n ftrfgrthhtvghrnhepgefhuefggeeugeelfeevjeelieevhfegveefteejfefgteejueeu\n jeduleffkeetnecuffhomhgrihhnpehpmhgurdhnvghtpdgurhhivhgvrhdrnhgrmhgvne\n cukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghrufhiiigvpedtnecu\n rfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghlohhnrdhnvght", "X-ME-Proxy": "<xmx:NKVGYEGPOeYLwDhmkFtrI7oMotQ60-LyrYfNZt5lbOAYo_GIskiUYQ>\n <xmx:NKVGYNTQBXBaQhgeFWjGkRRPAUCdXndTmxQVxjU84e9YLojjazG-Kw>\n <xmx:NKVGYJwmzIMEcdrBz_sPVamBT-tSr4AEwZFHOLN_L6QofkU_DS4tvA>\n <xmx:NKVGYKqibgMlLWe2UBI8Fn0P8DmA3MGBG3I8_hTK8MFlk2tAUv3f_w>", "From": "Thomas Monjalon <thomas@monjalon.net>", "To": "dev@dpdk.org", "Cc": "Matan Azrad <matan@nvidia.com>, Shahaf Shuler <shahafs@nvidia.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>", "Date": "Mon, 8 Mar 2021 23:28:54 +0100", "Message-Id": "<20210308222855.823670-3-thomas@monjalon.net>", "X-Mailer": "git-send-email 2.30.1", "In-Reply-To": "<20210308222855.823670-1-thomas@monjalon.net>", "References": "<20210308222855.823670-1-thomas@monjalon.net>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 2/3] common/mlx5: enable debug logs dynamically", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Most debug logs are using DRV_LOG(DEBUG,)\nbut some were using DEBUG().\nThe macro DEBUG is doing nothing if not compiled with\nRTE_LIBRTE_MLX5_DEBUG.\n\nAs it is not used in the data path, the macro DEBUG\ncan be replaced with DRV_LOG.\nThen all debug logs can be enabled at runtime with:\n\t--log-level pmd.net.mlx5:debug\n\nSigned-off-by: Thomas Monjalon <thomas@monjalon.net>\n---\n drivers/common/mlx5/mlx5_common.h | 2 --\n drivers/common/mlx5/mlx5_common_mr.c | 45 ++++++++++++++-------------\n drivers/common/mlx5/mlx5_common_pci.c | 4 +--\n drivers/net/mlx5/linux/mlx5_verbs.c | 13 ++++----\n drivers/net/mlx5/mlx5_mr.c | 12 +++----\n drivers/net/mlx5/mlx5_rxq.c | 11 ++++---\n 6 files changed, 46 insertions(+), 41 deletions(-)", "diff": "diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h\nindex 3855582d0d..5028a05b49 100644\n--- a/drivers/common/mlx5/mlx5_common.h\n+++ b/drivers/common/mlx5/mlx5_common.h\n@@ -92,14 +92,12 @@ pmd_drv_log_basename(const char *s)\n /* claim_zero() does not perform any check when debugging is disabled. */\n #ifdef RTE_LIBRTE_MLX5_DEBUG\n \n-#define DEBUG(...) DRV_LOG(DEBUG, __VA_ARGS__)\n #define MLX5_ASSERT(exp) RTE_VERIFY(exp)\n #define claim_zero(...) MLX5_ASSERT((__VA_ARGS__) == 0)\n #define claim_nonzero(...) MLX5_ASSERT((__VA_ARGS__) != 0)\n \n #else /* RTE_LIBRTE_MLX5_DEBUG */\n \n-#define DEBUG(...) (void)0\n #define MLX5_ASSERT(exp) RTE_ASSERT(exp)\n #define claim_zero(...) (__VA_ARGS__)\n #define claim_nonzero(...) (__VA_ARGS__)\ndiff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c\nindex 7c25541dc4..e1ed0caf3a 100644\n--- a/drivers/common/mlx5/mlx5_common_mr.c\n+++ b/drivers/common/mlx5/mlx5_common_mr.c\n@@ -187,8 +187,9 @@ mlx5_mr_btree_init(struct mlx5_mr_btree *bt, int n, int socket)\n \t\t\t\t0, socket);\n \tif (bt->table == NULL) {\n \t\trte_errno = ENOMEM;\n-\t\tDEBUG(\"failed to allocate memory for btree cache on socket %d\",\n-\t\t socket);\n+\t\tDRV_LOG(DEBUG,\n+\t\t\t\"failed to allocate memory for btree cache on socket \"\n+\t\t\t\"%d\", socket);\n \t\treturn -rte_errno;\n \t}\n \tbt->size = n;\n@@ -196,7 +197,7 @@ mlx5_mr_btree_init(struct mlx5_mr_btree *bt, int n, int socket)\n \t(*bt->table)[bt->len++] = (struct mr_cache_entry) {\n \t\t.lkey = UINT32_MAX,\n \t};\n-\tDEBUG(\"initialized B-tree %p with table %p\",\n+\tDRV_LOG(DEBUG, \"initialized B-tree %p with table %p\",\n \t (void *)bt, (void *)bt->table);\n \treturn 0;\n }\n@@ -212,7 +213,7 @@ mlx5_mr_btree_free(struct mlx5_mr_btree *bt)\n {\n \tif (bt == NULL)\n \t\treturn;\n-\tDEBUG(\"freeing B-tree %p with table %p\",\n+\tDRV_LOG(DEBUG, \"freeing B-tree %p with table %p\",\n \t (void *)bt, (void *)bt->table);\n \tmlx5_free(bt->table);\n \tmemset(bt, 0, sizeof(*bt));\n@@ -237,7 +238,7 @@ mlx5_mr_btree_dump(struct mlx5_mr_btree *bt __rte_unused)\n \tfor (idx = 0; idx < bt->len; ++idx) {\n \t\tstruct mr_cache_entry *entry = &lkp_tbl[idx];\n \n-\t\tDEBUG(\"B-tree(%p)[%u],\"\n+\t\tDRV_LOG(DEBUG, \"B-tree(%p)[%u],\"\n \t\t \" [0x%\" PRIxPTR \", 0x%\" PRIxPTR \") lkey=0x%x\",\n \t\t (void *)bt, idx, entry->start, entry->end, entry->lkey);\n \t}\n@@ -543,11 +544,11 @@ mlx5_mr_create_secondary(void *pd __rte_unused,\n {\n \tint ret;\n \n-\tDEBUG(\"port %u requesting MR creation for address (%p)\",\n+\tDRV_LOG(DEBUG, \"port %u requesting MR creation for address (%p)\",\n \t mp_id->port_id, (void *)addr);\n \tret = mlx5_mp_req_mr_create(mp_id, addr);\n \tif (ret) {\n-\t\tDEBUG(\"Fail to request MR creation for address (%p)\",\n+\t\tDRV_LOG(DEBUG, \"Fail to request MR creation for address (%p)\",\n \t\t (void *)addr);\n \t\treturn UINT32_MAX;\n \t}\n@@ -557,7 +558,7 @@ mlx5_mr_create_secondary(void *pd __rte_unused,\n \t/* Lookup can't fail. */\n \tMLX5_ASSERT(entry->lkey != UINT32_MAX);\n \trte_rwlock_read_unlock(&share_cache->rwlock);\n-\tDEBUG(\"MR CREATED by primary process for %p:\\n\"\n+\tDRV_LOG(DEBUG, \"MR CREATED by primary process for %p:\\n\"\n \t \" [0x%\" PRIxPTR \", 0x%\" PRIxPTR \"), lkey=0x%x\",\n \t (void *)addr, entry->start, entry->end, entry->lkey);\n \treturn entry->lkey;\n@@ -647,7 +648,7 @@ mlx5_mr_create_primary(void *pd,\n \tMLX5_ASSERT(msl->page_sz == ms->hugepage_sz);\n \t/* Number of memsegs in the range. */\n \tms_n = len / msl->page_sz;\n-\tDEBUG(\"Extending %p to [0x%\" PRIxPTR \", 0x%\" PRIxPTR \"),\"\n+\tDRV_LOG(DEBUG, \"Extending %p to [0x%\" PRIxPTR \", 0x%\" PRIxPTR \"),\"\n \t \" page_sz=0x%\" PRIx64 \", ms_n=%u\",\n \t (void *)addr, data.start, data.end, msl->page_sz, ms_n);\n \t/* Size of memory for bitmap. */\n@@ -656,7 +657,7 @@ mlx5_mr_create_primary(void *pd,\n \t\t\t RTE_ALIGN_CEIL(sizeof(*mr), RTE_CACHE_LINE_SIZE) +\n \t\t\t bmp_size, RTE_CACHE_LINE_SIZE, msl->socket_id);\n \tif (mr == NULL) {\n-\t\tDEBUG(\"Unable to allocate memory for a new MR of\"\n+\t\tDRV_LOG(DEBUG, \"Unable to allocate memory for a new MR of\"\n \t\t \" address (%p).\", (void *)addr);\n \t\trte_errno = ENOMEM;\n \t\tgoto err_nolock;\n@@ -671,7 +672,7 @@ mlx5_mr_create_primary(void *pd,\n \tbmp_mem = RTE_PTR_ALIGN_CEIL(mr + 1, RTE_CACHE_LINE_SIZE);\n \tmr->ms_bmp = rte_bitmap_init(ms_n, bmp_mem, bmp_size);\n \tif (mr->ms_bmp == NULL) {\n-\t\tDEBUG(\"Unable to initialize bitmap for a new MR of\"\n+\t\tDRV_LOG(DEBUG, \"Unable to initialize bitmap for a new MR of\"\n \t\t \" address (%p).\", (void *)addr);\n \t\trte_errno = EINVAL;\n \t\tgoto err_nolock;\n@@ -688,9 +689,9 @@ mlx5_mr_create_primary(void *pd,\n \tdata_re = data;\n \tif (len > msl->page_sz &&\n \t !rte_memseg_contig_walk(mr_find_contig_memsegs_cb, &data_re)) {\n-\t\tDEBUG(\"Unable to find virtually contiguous\"\n-\t\t \" chunk for address (%p).\"\n-\t\t \" rte_memseg_contig_walk() failed.\", (void *)addr);\n+\t\tDRV_LOG(DEBUG,\n+\t\t\t\"Unable to find virtually contiguous chunk for address \"\n+\t\t\t\"(%p). rte_memseg_contig_walk() failed.\", (void *)addr);\n \t\trte_errno = ENXIO;\n \t\tgoto err_memlock;\n \t}\n@@ -718,7 +719,8 @@ mlx5_mr_create_primary(void *pd,\n \t\t * here again.\n \t\t */\n \t\tmr_btree_insert(&share_cache->cache, entry);\n-\t\tDEBUG(\"Found MR for %p on final lookup, abort\", (void *)addr);\n+\t\tDRV_LOG(DEBUG, \"Found MR for %p on final lookup, abort\",\n+\t\t\t(void *)addr);\n \t\trte_rwlock_write_unlock(&share_cache->rwlock);\n \t\trte_mcfg_mem_read_unlock();\n \t\t/*\n@@ -767,7 +769,7 @@ mlx5_mr_create_primary(void *pd,\n \t */\n \tshare_cache->reg_mr_cb(pd, (void *)data.start, len, &mr->pmd_mr);\n \tif (mr->pmd_mr.obj == NULL) {\n-\t\tDEBUG(\"Fail to create an MR for address (%p)\",\n+\t\tDRV_LOG(DEBUG, \"Fail to create an MR for address (%p)\",\n \t\t (void *)addr);\n \t\trte_errno = EINVAL;\n \t\tgoto err_mrlock;\n@@ -775,7 +777,7 @@ mlx5_mr_create_primary(void *pd,\n \tMLX5_ASSERT((uintptr_t)mr->pmd_mr.addr == data.start);\n \tMLX5_ASSERT(mr->pmd_mr.len);\n \tLIST_INSERT_HEAD(&share_cache->mr_list, mr, mr);\n-\tDEBUG(\"MR CREATED (%p) for %p:\\n\"\n+\tDRV_LOG(DEBUG, \"MR CREATED (%p) for %p:\\n\"\n \t \" [0x%\" PRIxPTR \", 0x%\" PRIxPTR \"),\"\n \t \" lkey=0x%x base_idx=%u ms_n=%u, ms_bmp_n=%u\",\n \t (void *)mr, (void *)addr, data.start, data.end,\n@@ -1079,7 +1081,7 @@ mlx5_mr_dump_cache(struct mlx5_mr_share_cache *share_cache __rte_unused)\n \tLIST_FOREACH(mr, &share_cache->mr_list, mr) {\n \t\tunsigned int n;\n \n-\t\tDEBUG(\"MR[%u], LKey = 0x%x, ms_n = %u, ms_bmp_n = %u\",\n+\t\tDRV_LOG(DEBUG, \"MR[%u], LKey = 0x%x, ms_n = %u, ms_bmp_n = %u\",\n \t\t mr_n++, rte_cpu_to_be_32(mr->pmd_mr.lkey),\n \t\t mr->ms_n, mr->ms_bmp_n);\n \t\tif (mr->ms_n == 0)\n@@ -1090,11 +1092,12 @@ mlx5_mr_dump_cache(struct mlx5_mr_share_cache *share_cache __rte_unused)\n \t\t\tn = mr_find_next_chunk(mr, &ret, n);\n \t\t\tif (!ret.end)\n \t\t\t\tbreak;\n-\t\t\tDEBUG(\" chunk[%u], [0x%\" PRIxPTR \", 0x%\" PRIxPTR \")\",\n-\t\t\t chunk_n++, ret.start, ret.end);\n+\t\t\tDRV_LOG(DEBUG,\n+\t\t\t\t\" chunk[%u], [0x%\" PRIxPTR \", 0x%\" PRIxPTR \")\",\n+\t\t\t\tchunk_n++, ret.start, ret.end);\n \t\t}\n \t}\n-\tDEBUG(\"Dumping global cache %p\", (void *)share_cache);\n+\tDRV_LOG(DEBUG, \"Dumping global cache %p\", (void *)share_cache);\n \tmlx5_mr_btree_dump(&share_cache->cache);\n \trte_rwlock_read_unlock(&share_cache->rwlock);\n #endif\ndiff --git a/drivers/common/mlx5/mlx5_common_pci.c b/drivers/common/mlx5/mlx5_common_pci.c\nindex 2b657686d1..a7f541a90c 100644\n--- a/drivers/common/mlx5/mlx5_common_pci.c\n+++ b/drivers/common/mlx5/mlx5_common_pci.c\n@@ -245,14 +245,14 @@ drivers_probe(struct mlx5_pci_device *dev, struct rte_pci_driver *pci_drv,\n \t\talready_loaded = dev->classes_loaded & driver->driver_class;\n \t\tif (already_loaded &&\n \t\t !(driver->pci_driver.drv_flags & RTE_PCI_DRV_PROBE_AGAIN)) {\n-\t\t\tDRV_LOG(ERR, \"Device %s is already probed\\n\",\n+\t\t\tDRV_LOG(ERR, \"Device %s is already probed\",\n \t\t\t\tpci_dev->device.name);\n \t\t\tret = -EEXIST;\n \t\t\tgoto probe_err;\n \t\t}\n \t\tret = driver->pci_driver.probe(pci_drv, pci_dev);\n \t\tif (ret < 0) {\n-\t\t\tDRV_LOG(ERR, \"Failed to load driver = %s.\\n\",\n+\t\t\tDRV_LOG(ERR, \"Failed to load driver %s\",\n \t\t\t\tdriver->pci_driver.driver.name);\n \t\t\tgoto probe_err;\n \t\t}\ndiff --git a/drivers/net/mlx5/linux/mlx5_verbs.c b/drivers/net/mlx5/linux/mlx5_verbs.c\nindex ade241b806..c7d4b177a0 100644\n--- a/drivers/net/mlx5/linux/mlx5_verbs.c\n+++ b/drivers/net/mlx5/linux/mlx5_verbs.c\n@@ -721,7 +721,7 @@ mlx5_rxq_ibv_obj_drop_create(struct rte_eth_dev *dev)\n \t\treturn 0;\n \trxq = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*rxq), 0, SOCKET_ID_ANY);\n \tif (!rxq) {\n-\t\tDEBUG(\"Port %u cannot allocate drop Rx queue memory.\",\n+\t\tDRV_LOG(DEBUG, \"Port %u cannot allocate drop Rx queue memory.\",\n \t\t dev->data->port_id);\n \t\trte_errno = ENOMEM;\n \t\treturn -rte_errno;\n@@ -729,7 +729,7 @@ mlx5_rxq_ibv_obj_drop_create(struct rte_eth_dev *dev)\n \tpriv->drop_queue.rxq = rxq;\n \trxq->ibv_cq = mlx5_glue->create_cq(ctx, 1, NULL, NULL, 0);\n \tif (!rxq->ibv_cq) {\n-\t\tDEBUG(\"Port %u cannot allocate CQ for drop queue.\",\n+\t\tDRV_LOG(DEBUG, \"Port %u cannot allocate CQ for drop queue.\",\n \t\t dev->data->port_id);\n \t\trte_errno = errno;\n \t\tgoto error;\n@@ -742,7 +742,7 @@ mlx5_rxq_ibv_obj_drop_create(struct rte_eth_dev *dev)\n \t\t\t\t\t\t .cq = rxq->ibv_cq,\n \t\t\t\t\t });\n \tif (!rxq->wq) {\n-\t\tDEBUG(\"Port %u cannot allocate WQ for drop queue.\",\n+\t\tDRV_LOG(DEBUG, \"Port %u cannot allocate WQ for drop queue.\",\n \t\t dev->data->port_id);\n \t\trte_errno = errno;\n \t\tgoto error;\n@@ -785,8 +785,9 @@ mlx5_ibv_drop_action_create(struct rte_eth_dev *dev)\n \t\t\t\t\t.comp_mask = 0,\n \t\t\t\t });\n \tif (!ind_tbl) {\n-\t\tDEBUG(\"Port %u cannot allocate indirection table for drop\"\n-\t\t \" queue.\", dev->data->port_id);\n+\t\tDRV_LOG(DEBUG, \"Port %u\"\n+\t\t\t\" cannot allocate indirection table for drop queue.\",\n+\t\t\tdev->data->port_id);\n \t\trte_errno = errno;\n \t\tgoto error;\n \t}\n@@ -806,7 +807,7 @@ mlx5_ibv_drop_action_create(struct rte_eth_dev *dev)\n \t\t\t.pd = priv->sh->pd\n \t\t });\n \tif (!hrxq->qp) {\n-\t\tDEBUG(\"Port %u cannot allocate QP for drop queue.\",\n+\t\tDRV_LOG(DEBUG, \"Port %u cannot allocate QP for drop queue.\",\n \t\t dev->data->port_id);\n \t\trte_errno = errno;\n \t\tgoto error;\ndiff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c\nindex da4e91fc24..3255393ca2 100644\n--- a/drivers/net/mlx5/mlx5_mr.c\n+++ b/drivers/net/mlx5/mlx5_mr.c\n@@ -57,7 +57,7 @@ mlx5_mr_mem_event_free_cb(struct mlx5_dev_ctx_shared *sh,\n \tint i;\n \tint rebuild = 0;\n \n-\tDEBUG(\"device %s free callback: addr=%p, len=%zu\",\n+\tDRV_LOG(DEBUG, \"device %s free callback: addr=%p, len=%zu\",\n \t sh->ibdev_name, addr, len);\n \tmsl = rte_mem_virt2memseg_list(addr);\n \t/* addr and len must be page-aligned. */\n@@ -87,13 +87,13 @@ mlx5_mr_mem_event_free_cb(struct mlx5_dev_ctx_shared *sh,\n \t\tpos = ms_idx - mr->ms_base_idx;\n \t\tMLX5_ASSERT(rte_bitmap_get(mr->ms_bmp, pos));\n \t\tMLX5_ASSERT(pos < mr->ms_bmp_n);\n-\t\tDEBUG(\"device %s MR(%p): clear bitmap[%u] for addr %p\",\n+\t\tDRV_LOG(DEBUG, \"device %s MR(%p): clear bitmap[%u] for addr %p\",\n \t\t sh->ibdev_name, (void *)mr, pos, (void *)start);\n \t\trte_bitmap_clear(mr->ms_bmp, pos);\n \t\tif (--mr->ms_n == 0) {\n \t\t\tLIST_REMOVE(mr, mr);\n \t\t\tLIST_INSERT_HEAD(&sh->share_cache.mr_free_list, mr, mr);\n-\t\t\tDEBUG(\"device %s remove MR(%p) from list\",\n+\t\t\tDRV_LOG(DEBUG, \"device %s remove MR(%p) from list\",\n \t\t\t sh->ibdev_name, (void *)mr);\n \t\t}\n \t\t/*\n@@ -114,7 +114,7 @@ mlx5_mr_mem_event_free_cb(struct mlx5_dev_ctx_shared *sh,\n \t\t * before the core sees the newly allocated memory.\n \t\t */\n \t\t++sh->share_cache.dev_gen;\n-\t\tDEBUG(\"broadcasting local cache flush, gen=%d\",\n+\t\tDRV_LOG(DEBUG, \"broadcasting local cache flush, gen=%d\",\n \t\t sh->share_cache.dev_gen);\n \t\trte_smp_wmb();\n \t}\n@@ -405,7 +405,7 @@ mlx5_dma_unmap(struct rte_pci_device *pdev, void *addr,\n \t}\n \tLIST_REMOVE(mr, mr);\n \tmlx5_mr_free(mr, sh->share_cache.dereg_mr_cb);\n-\tDEBUG(\"port %u remove MR(%p) from list\", dev->data->port_id,\n+\tDRV_LOG(DEBUG, \"port %u remove MR(%p) from list\", dev->data->port_id,\n \t (void *)mr);\n \tmlx5_mr_rebuild_cache(&sh->share_cache);\n \t/*\n@@ -418,7 +418,7 @@ mlx5_dma_unmap(struct rte_pci_device *pdev, void *addr,\n \t * before the core sees the newly allocated memory.\n \t */\n \t++sh->share_cache.dev_gen;\n-\tDEBUG(\"broadcasting local cache flush, gen=%d\",\n+\tDRV_LOG(DEBUG, \"broadcasting local cache flush, gen=%d\",\n \t sh->share_cache.dev_gen);\n \trte_smp_wmb();\n \trte_rwlock_read_unlock(&sh->share_cache.rwlock);\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 8f9ee97f7a..9009eb8d18 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -1972,7 +1972,8 @@ mlx5_ind_table_obj_setup(struct rte_eth_dev *dev,\n \tfor (j = 0; j < i; j++)\n \t\tmlx5_rxq_release(dev, ind_tbl->queues[j]);\n \trte_errno = err;\n-\tDEBUG(\"Port %u cannot setup indirection table.\", dev->data->port_id);\n+\tDRV_LOG(DEBUG, \"Port %u cannot setup indirection table.\",\n+\t\tdev->data->port_id);\n \treturn ret;\n }\n \n@@ -2056,8 +2057,9 @@ mlx5_ind_table_obj_modify(struct rte_eth_dev *dev,\n \t\t * reference unsupported. Intended for standalone indirection\n \t\t * tables only.\n \t\t */\n-\t\tDEBUG(\"Port %u cannot modify indirection table (refcnt> 1).\",\n-\t\t dev->data->port_id);\n+\t\tDRV_LOG(DEBUG,\n+\t\t\t\"Port %u cannot modify indirection table (refcnt> 1).\",\n+\t\t\tdev->data->port_id);\n \t\trte_errno = EINVAL;\n \t\treturn -rte_errno;\n \t}\n@@ -2081,7 +2083,8 @@ mlx5_ind_table_obj_modify(struct rte_eth_dev *dev,\n \tfor (j = 0; j < i; j++)\n \t\tmlx5_rxq_release(dev, ind_tbl->queues[j]);\n \trte_errno = err;\n-\tDEBUG(\"Port %u cannot setup indirection table.\", dev->data->port_id);\n+\tDRV_LOG(DEBUG, \"Port %u cannot setup indirection table.\",\n+\t\tdev->data->port_id);\n \treturn ret;\n }\n \n", "prefixes": [ "2/3" ] }