From patchwork Fri Apr 17 21:57:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68813 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 78EAEA0597; Fri, 17 Apr 2020 23:58:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D00A11EB6C; Fri, 17 Apr 2020 23:58:00 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 3529A1DB4F for ; Fri, 17 Apr 2020 23:57:58 +0200 (CEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215757euoutp019acbb2f00bfe3721d592cb658131f44d~GujoUzG-X0105301053euoutp01G for ; Fri, 17 Apr 2020 21:57:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200417215757euoutp019acbb2f00bfe3721d592cb658131f44d~GujoUzG-X0105301053euoutp01G DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160677; bh=OV6VjyuYY861ZBAyWKnBm0J20dnZucakrq2ADxwAd4M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L84IMhbct08i7NcuRNqVFHnICVgLjofEiSAmTQLh7EdJ9b3GMoaU89XyYy45jyhUN E8CrM0wtTaqHSvyz4h0MWq/Q4pGGRPEV2E5VFL2FswxEs+0KjANMx73AQtn8c0hqQ6 ZfVx7AxLEqSbho49RSgzQ2gSMQ22ETXuVyNeSZ30= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200417215756eucas1p281e91ffda62f36bfb5e72653af6a047c~GujnunF352665826658eucas1p2J; Fri, 17 Apr 2020 21:57:56 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id CD.5E.60698.4662A9E5; Fri, 17 Apr 2020 22:57:56 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200417215756eucas1p107941824d555cdc91899d529d3c4ee67~GujnHR3tz0162301623eucas1p1r; Fri, 17 Apr 2020 21:57:56 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200417215756eusmtrp1d7eb1007c13a95418b75c0e3d45176fa~GujnGxDKz0397603976eusmtrp1o; Fri, 17 Apr 2020 21:57:56 +0000 (GMT) X-AuditID: cbfec7f5-a29ff7000001ed1a-a9-5e9a2664c0fe Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 2D.52.07950.3662A9E5; Fri, 17 Apr 2020 22:57:55 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215755eusmtip2e87bf327b7aec6511a7d634e0783250d~GujmqtdNW0325203252eusmtip2k; Fri, 17 Apr 2020 21:57:55 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:23 +0200 Message-Id: <20200417215739.23180-2-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCIsWRmVeSWpSXmKPExsWy7djPc7oparPiDK69V7Z492k7k8WnBydY HJg8fi1Yyupx7OY09gCmKC6blNSczLLUIn27BK6MQz/nsxes5qzoWtLI3sB4j72LkZNDQsBE 4sj6FYxdjFwcQgIrGCW+bWhlBkkICXxhlFiy0BEi8ZlRov3qfkaYjrlrv7BAJJYzSqzdsp0Z rmp7+082kCo2AVuJIzO/soLYIgKaEre/zwLrZhYQkHh87xlYXBio5v/T1WB3sAioSjzZ9gys l1fAVWJvy0Ko++QlVm84AHYSp4CbxNKX38FulRDYwibRfXc9VJGLxJFvb6BsYYlXx7dA2TIS pyf3sEA0bGOUuPr7J1T3fkaJ670roKqsJQ7/+w20mgPoPE2J9bv0IcKOEt3vvzGDhCUE+CRu vBWEeIBPYtK26VBhXomONiGIaj2Jpz1TGWHW/ln7hAWixENiynZoKM5klDj4fynzBEb5WQi7 FjAyrmIUTy0tzk1PLTbOSy3XK07MLS7NS9dLzs/dxAiM69P/jn/dwbjvT9IhRgEORiUeXoOe mXFCrIllxZW5hxglOJiVRHgPugGFeFMSK6tSi/Lji0pzUosPMUpzsCiJ8xovehkrJJCeWJKa nZpakFoEk2Xi4JRqYLStP+F9J2dhlnxJ4IwfqUW+Tz2iD7k7XmCYuePsx4+R8r3TPb4t+ckp 9db+g62kIosgh3tepmIAT46DWq6Vccip/uiVBrbedrvenu6dN1Pt3kuVL29OpJ/bOGm1mVna 4ik2e04rRkTVsapeO6b6t2jHx5i/LR+/PRHZYiJ+e4vg1R3/86cGsCmxFGckGmoxFxUnAgA2 apaK5wIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKLMWRmVeSWpSXmKPExsVy+t/xe7rJarPiDB5MsLB492k7k8WnBydY HJg8fi1Yyupx7OY09gCmKD2bovzSklSFjPziElulaEMLIz1DSws9IxNLPUNj81grI1MlfTub lNSczLLUIn27BL2MQz/nsxes5qzoWtLI3sB4j72LkZNDQsBEYu7aLyxdjFwcQgJLGSW+LzoE 5HAAJWQkPlwSgKgRlvhzrYsNouYjo8TCdcsYQRJsArYSR2Z+ZQWxRQQ0JW5/nwUWZxYQkHh8 7xlYXBio5v/T1WDLWARUJZ5se8YGYvMKuErsbVkIdYS8xOoNB5hBbE4BN4mlL7+DzRECqnn4 8BT7BEa+BYwMqxhFUkuLc9Nzi430ihNzi0vz0vWS83M3MQKDbNuxn1t2MHa9Cz7EKMDBqMTD a9AzM06INbGsuDL3EKMEB7OSCO9BN6AQb0piZVVqUX58UWlOavEhRlOgoyYyS4km5wMjIK8k 3tDU0NzC0tDc2NzYzEJJnLdD4GCMkEB6YklqdmpqQWoRTB8TB6dUA+N2/89/mUo29QXVmcZu Tc0w6zqiwtllYVyS+Gn1uoWBz79eSs548/HUoQnHLr+JzNOriotyfpxZnHO6uHDlr4NHfua9 qvk38fs3i+XT7MO6sq/wlzg+iz18bMF1mxaxZ8/0GdYdjN3BcWaG9ulDK+xvXF6z8KNNckOg kt7D/JNpmyKPqK45aKyixFKckWioxVxUnAgAbds6z0gCAAA= X-CMS-MailID: 20200417215756eucas1p107941824d555cdc91899d529d3c4ee67 X-Msg-Generator: CA X-RootMTR: 20200417215756eucas1p107941824d555cdc91899d529d3c4ee67 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215756eucas1p107941824d555cdc91899d529d3c4ee67 References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 01/17] config: introduce global debug flag X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" There already is a meson core option "debug". To enable this option add -Ddebug=true to the meson command during setup or configuration of the build environment. By enabling this flag the globaly defined macro RTE_DEBUG becomes defined. It should be used for enabling debug code in all dpdk project components. Using this flag allows to make additional checks or tests and provide additional logs even in performance sensitive parts of code. The flag is disabled by default. Suggested-by: Bruce Richardson Signed-off-by: Lukasz Wojciechowski --- config/meson.build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/meson.build b/config/meson.build index 58421342b..04909f922 100644 --- a/config/meson.build +++ b/config/meson.build @@ -176,6 +176,10 @@ endif # add -include rte_config to cflags add_project_arguments('-include', 'rte_config.h', language: 'c') +if get_option('debug') + dpdk_conf.set('RTE_DEBUG', 1) +endif + # enable extra warnings and disable any unwanted warnings warning_flags = [ # -Wall is added by meson by default, so add -Wextra only From patchwork Fri Apr 17 21:57:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68814 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A7B59A0597; Fri, 17 Apr 2020 23:58:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2597E1EB75; Fri, 17 Apr 2020 23:58:02 +0200 (CEST) Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by dpdk.org (Postfix) with ESMTP id E1E031DB4F for ; Fri, 17 Apr 2020 23:57:58 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215758euoutp02fa5e97fd9b814fc1d01e41dd43df0652~GujpEZLgS0278302783euoutp02U for ; Fri, 17 Apr 2020 21:57:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200417215758euoutp02fa5e97fd9b814fc1d01e41dd43df0652~GujpEZLgS0278302783euoutp02U DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160678; bh=ShNRZ5yQYDoV5kZC1CR53tv3I9XN77FcCvJBv0FgT68=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TCh+nyWP/EBA5Jf1RpN5cEXPgf3ruB/ukp+RumNeAcyGiw+UtKVkgai2Ro+vqWf3U i5v9z30Ed78PdLU00jF5qzG6ejPEB2xEf9Po5Ul5qrkD/0dWGjTip/R28humE8nb7f mzAQDoLqwbks9fy2jZwuo6oldu0cyOfY3JG2sY7k= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200417215757eucas1p1c7db091d08cc34e3e0a10c1913ad69e0~GujoYPHIb1355713557eucas1p1m; Fri, 17 Apr 2020 21:57:57 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id FD.5E.60698.5662A9E5; Fri, 17 Apr 2020 22:57:57 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200417215756eucas1p13a995889338901b81bf2a59a5a4f1260~Gujnm4iTT1204912049eucas1p1M; Fri, 17 Apr 2020 21:57:56 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200417215756eusmtrp2ef1ed3918921222ce118dfb7ca844434~GujnmX_0O2952229522eusmtrp2f; Fri, 17 Apr 2020 21:57:56 +0000 (GMT) X-AuditID: cbfec7f5-a0fff7000001ed1a-ac-5e9a2665bd8a Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id EB.94.08375.4662A9E5; Fri, 17 Apr 2020 22:57:56 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215756eusmtip21e1c109b5c8b29d6d67e7c95e14e5130~GujnK3PPY0325203252eusmtip2l; Fri, 17 Apr 2020 21:57:56 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:24 +0200 Message-Id: <20200417215739.23180-3-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGIsWRmVeSWpSXmKPExsWy7djPc7qparPiDI7PErZ492k7k8WnBydY HJg8fi1Yyupx7OY09gCmKC6blNSczLLUIn27BK6MX/eesRSs5axo7u5ibGD8xt7FyMkhIWAi Me/pTbYuRi4OIYEVjBLt21ZAOV8YJZ4+m8sK4XxmlHj18REzTMuut9egEssZJd5Pes0EV9X0 rYUNpIpNwFbiyMyvrCC2iICmxO3vsxhBbGYBAYnH956BxYUFbCR+t5wCq2cRUJV4ue8YC4jN K+AqcerhdyaIbfISqzccANvMKeAmsfTld0aQZRICO9gknr44CvWFi8SUr5+gGoQlXh3fAhWX kfi/cz4TRMM2Romrv39Cde9nlLjeuwKqylri8L/fQGdwAJ2nKbF+lz5E2FFi7rHZjCBhCQE+ iRtvBSEe4JOYtG06M0SYV6KjTQiiWk/iac9URpi1f9Y+YYGwPSSuLDzLDAmgmYwSOxbcYpvA KD8LYdkCRsZVjOKppcW56anFxnmp5XrFibnFpXnpesn5uZsYgbF9+t/xrzsY9/1JOsQowMGo xMNr0DMzTog1say4MvcQowQHs5II70E3oBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFe40UvY4UE 0hNLUrNTUwtSi2CyTBycUg2MJVfvq4Yli53/KX3wqOf9oNnM2dM3Hg3tOsTlWSsta2H80aRk kruq3xvx6N5vMyqSiiJC6x38GpKlOeIi6jafzXyi0LjZK2vpd54/cyx+CG16M/2gg8w7vmP7 Jv879jVoZ2LtkjUfX2xSaHHcc8/gb63+rZMRJz80f/IXYwivVZ94Zu61Ut1jSizFGYmGWsxF xYkAFbDNrukCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKLMWRmVeSWpSXmKPExsVy+t/xe7oparPiDLbOkLZ492k7k8WnBydY HJg8fi1Yyupx7OY09gCmKD2bovzSklSFjPziElulaEMLIz1DSws9IxNLPUNj81grI1MlfTub lNSczLLUIn27BL2MX/eesRSs5axo7u5ibGD8xt7FyMkhIWAisevtNdYuRi4OIYGljBKX705k 6WLkAErISHy4JABRIyzx51oXG0TNR0aJOXtWsYIk2ARsJY7M/ApmiwhoStz+PosRxGYWEJB4 fO8ZWFxYwEbid8spNhCbRUBV4uW+YywgNq+Aq8Sph9+ZIBbIS6zecIAZxOYUcJNY+vI72Bwh oJqHD0+xT2DkW8DIsIpRJLW0ODc9t9hQrzgxt7g0L10vOT93EyMwyLYd+7l5B+OljcGHGAU4 GJV4eA16ZsYJsSaWFVfmHmKU4GBWEuE96AYU4k1JrKxKLcqPLyrNSS0+xGgKdNREZinR5Hxg BOSVxBuaGppbWBqaG5sbm1koifN2CByMERJITyxJzU5NLUgtgulj4uCUamAsu7Nee8sOx6uH hHZcXDPRnOFmjXpC3fHHuWtr/wRabdeSrjDhPDdVv82gh1lDxuhAg9Sp3bXVYYvU1z11F9xu 7xB00Llk4Tb9mcr2zfsv+rn+tZO6KmXj9Et56oLVG+X3vN7wmjFkj+PDB8eTT5w+dXyeXN/1 I1+Yj9v9yysJ2SuUeHDGkqMPlViKMxINtZiLihMB0x5Al0gCAAA= X-CMS-MailID: 20200417215756eucas1p13a995889338901b81bf2a59a5a4f1260 X-Msg-Generator: CA X-RootMTR: 20200417215756eucas1p13a995889338901b81bf2a59a5a4f1260 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215756eucas1p13a995889338901b81bf2a59a5a4f1260 References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 02/17] config: remove unused config flags X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Following flags were still present in the common_base config, but they were not used anywhere in the code: * CONFIG_RTE_LIBRTE_ACL_DEBUG * CONFIG_RTE_LIBRTE_NFP_DEBUG_TX * CONFIG_RTE_LIBRTE_NFP_DEBUG_RX * CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO_DEBUG Signed-off-by: Lukasz Wojciechowski --- config/common_base | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/common_base b/config/common_base index c31175f9d..c5be57f11 100644 --- a/config/common_base +++ b/config/common_base @@ -380,8 +380,6 @@ CONFIG_RTE_IBVERBS_LINK_STATIC=n # Compile burst-oriented Netronome NFP PMD driver # CONFIG_RTE_LIBRTE_NFP_PMD=n -CONFIG_RTE_LIBRTE_NFP_DEBUG_TX=n -CONFIG_RTE_LIBRTE_NFP_DEBUG_RX=n # QLogic 10G/25G/40G/50G/100G PMD # @@ -586,7 +584,6 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64 # Compile PMD for ARMv8 Crypto device # CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=n -CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO_DEBUG=n # # Compile NXP CAAM JR crypto Driver @@ -947,7 +944,6 @@ CONFIG_RTE_LIBRTE_LPM_DEBUG=n # Compile librte_acl # CONFIG_RTE_LIBRTE_ACL=y -CONFIG_RTE_LIBRTE_ACL_DEBUG=n # # Compile librte_power From patchwork Fri Apr 17 21:57:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68815 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 55119A0597; Fri, 17 Apr 2020 23:58:29 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 795651EB84; Fri, 17 Apr 2020 23:58:05 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 05B061EB73 for ; Fri, 17 Apr 2020 23:58:02 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215801euoutp01aab495f9d8a9b13e968d2312aac71370~GujsD2EvQ0105301053euoutp01H; Fri, 17 Apr 2020 21:58:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200417215801euoutp01aab495f9d8a9b13e968d2312aac71370~GujsD2EvQ0105301053euoutp01H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160681; bh=jxEEHVfJ9JRxPlFwTEAYX2g1ZtovxtMT0lkzkO8cyNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rw58IW4dlARrRhUQIQ7FdPP/im8lCNxvWvOXB9Grj8FXII7sLkLWuKga7fyLhmFyC FLi3cj4HmNzWY/2/tD1c/gbmdVS5DUmtyVj/MX7+gP8qTl0UO59AkxCAjs+3QT5mZU 1AtqvYWVM6EBr6uJQ/CfYSONPtMokeSXEwfEoPQg= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200417215801eucas1p1542346f619d44e0497872bd0596d864b~Gujr6ChDg1204912049eucas1p1N; Fri, 17 Apr 2020 21:58:01 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id EE.B4.60679.9662A9E5; Fri, 17 Apr 2020 22:58:01 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200417215759eucas1p1c0fcc3046d87dc9de1d15572ba6b7caa~GujqwYYct0152001520eucas1p10; Fri, 17 Apr 2020 21:57:59 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200417215759eusmtrp1ac958f62b42217524c5a0fd119a47c33~GujqvSmCT0397603976eusmtrp1p; Fri, 17 Apr 2020 21:57:59 +0000 (GMT) X-AuditID: cbfec7f4-0cbff7000001ed07-75-5e9a2669cdaf Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 5D.52.07950.7662A9E5; Fri, 17 Apr 2020 22:57:59 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215756eusmtip2930bcb92118600e358fbffb23ab56a01~GujnwvCR00325203252eusmtip2m; Fri, 17 Apr 2020 21:57:56 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Igor Russkikh , Pavel Belous , Wenzhuo Lu , Marcin Wojtas , Michal Krawczyk , Guy Tzalik , Evgeny Schemeilin , Igor Chauskin , John Daley , Hyong Youb Kim , Qi Zhang , Xiao Wang , Ziyang Xuan , Xiaoyun Wang , Guoyang Zhou , "Wei Hu (Xavier)" , "Min Hu (Connor)" , Yisen Zhuang , Beilei Xing , Jingjing Wu , Qiming Yang , Konstantin Ananyev , Rasesh Mody , Shahed Shaikh , Jasvinder Singh , Cristian Dumitrescu , Maxime Coquelin , Zhihong Wang , Xiaolong Ye , Yong Wang , Ferruh Yigit , Andrew Rybchenko , Olivier Matz Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:25 +0200 Message-Id: <20200417215739.23180-4-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA0VSa0xTZxjO23PpaWfJWTX6pdOR1OgmUVR0yZvMGXfRnBjnFv4sWTLxCCdI pIituOkvYogMLNMAA1tCqHQgE51UAUELSoGidmzjUgEjE1Md1EFlxVm5yNZyqv758rzv8zzv LR9HaX9hdVxaxmHJmCGm61k13eie/m1d2mrrng3jwyyOFIefk5M5CqzKeQ5Y+CBbgYHgVQX2 9/5N4/0WjxJz3A9ZdP0zBljQOUBjmb2Uwf8q0jHoGlWixTYF6Jy5RePTuUoa3XlOGquCPgr7 xjoZbDjuUOCUORFL606xWNzcBDjeWElh19VqBoMjYVfDry8BfcM/A94YbVfi3PgH2JabT6H9 vIfFmQs/0Xilp1CBE3l59LaVQs+p+yDU/JHPCN3nBhmheNbBCDO2KkbI6ZhgBLvTrxCKzvZQ gnuoRCk8bfWygr8+U6h99IIVAhUT7Jear9VbUqT0tCOScf3Wver95Zd62UxzyndXSoJMNvQn 5oOKI/xmcvtBN5UPak7L1wAp7bdGg2dA2kMtrBxMAXk5UhtmuAVL812NnD8H5HqPTfFaFPB2 KyN1Wf4j0mH5l4kQS/h7amIvc1IRguJ54vvzLyaCF/O7iLPBtpCn+VUk1OqBCNbw24m1pImW B4wltXU3FzQqfgep8ocgUpTwYxx5cWaQkUWfkb7c56yMF5MnXfVKGS8nniIzLRsagXhnp6Pu G0AGCmqiqg9J+/wsG1mO4teQS9fWy+mPScGdNpB3jiGDE2/LC8SQwsbS6Ck05PsTWlkdTx6b f4RXbecuPorOLxDfBUv0QhYg5TenqdMQa33TzAZwHpZJWSZDqmRKyJC+jTeJBlNWRmp88kHD ZQj/Ys9817MmuDa3zwU8B/pFmg1myx4tIx4xHTW4gHCUfommbUc4pUkRjx6TjAeTjFnpkskF 73C0fplmU6X/Gy2fKh6WDkhSpmR8xSo4lS4b4JDD3qnv3htYdSbX4U7aeLc8dudk04mKlNTl Ze/1Tpc7DNuOTVriygI63dZ3Yzx33of6RX1vecSh4a+qf0/ervI62j4fVy79YXVrc5pP7Bho ifskRCddPLm0aEj1BEaHV5yuqA5hwuNEm3f+1vzs2hUJI1/stibr6lyuok93P/TradN+cWMc ZTSJ/wOMwfB/wQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAAzWSa0hTcRjG++9ctkmrwzQ6SZCcqKBodrzkq2X1pTgfItKkwEwdepqRc7Kz SUqRmGAuwy6maBdNXXYxTNu8wLq4SisNvDUN7xl5v22lZXbZlL49PM/v4X0/PBJMfpnwlJxK 0PHaBGU8Q7rhTX8a+7arNhdE7mjJ8IOBnF4SLs2ki8CYPofgWn+qCKbsNSLoaBvHoedZkxjS GwZJsM6OILj8phOHmyV5BPwtjAe7dVgM+UUOBJaFtzhMLxbj0JBpwcFoH8KgfeQNAea0ShE4 skIh70k2CTl1tQgmqosxaKy5R4B9wNkyN/9GMNT7AMGL4VdiWJzwh/oMAwYlD5tIWCgvxeFp 6zURTGZm4vs2cq3ZPYi732IguA9lXQSX86uS4BaKjASX/nqS4EosoyLu+t1WjGv4lCvmpp9/ JLlRUyL36MsPkpsqnCQPy8IVu7UavY73itMIumDmOAs+CjYQFD5+gQrWN+BEkI8/471ndywf fyqJ13rviVbE3a5oIxOzYs88zbUTqagj1IAkEpryo+tsMgNyk8gpI6I/3XlHLvvr6Zk2yoCk TulOL9oM5DIzi+hvDx4jV0BSwfTr/O+EK/Cg5txo+8V2kSvAKIoe6vtKuLQ7dZC2mIswl8ap TfT886alsozaTxfk1uLLFzbQj568XGKk1AHaODq/xMidzODge/EVtKoIrXiIPHi9oFapBR+F oFQL+gSVIkajrkLOKVQ3/DTVIsPUESuiJIhZKduRlR8pJ5RJQrLaimgJxnjI6g84LVmsMjmF 12qitPp4XrAif+dTVzHPNTEa57ASdFGsPxsAgWyAb4DvTmDWyi5S9RFySqXU8ad5PpHX/u+J JFLPVNQ8NuYnZR2fm/GTW7rDjb2Pbf1ny6OiuhaDts+GRH9Y5zCGjW9Ion6Zd20bwss6Oo+N uxWouCsR5/broLyb728Osq2hpF2NFarKzvCUC+enjIW3mNUm06Gj1T8daS0nMry2Zatv6MMY Ft9a1u7VXVU4UzqQZ6kI6QlOidh7ycbgQpyS3YppBeU/6zlOOiADAAA= X-CMS-MailID: 20200417215759eucas1p1c0fcc3046d87dc9de1d15572ba6b7caa X-Msg-Generator: CA X-RootMTR: 20200417215759eucas1p1c0fcc3046d87dc9de1d15572ba6b7caa X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215759eucas1p1c0fcc3046d87dc9de1d15572ba6b7caa References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 03/17] ethdev: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_ETHDEV_DEBUG. The old define is completely removed from source code and config. The changes were applied also to all drivers using this flag. Signed-off-by: Lukasz Wojciechowski --- config/common_base | 1 - drivers/net/atlantic/atl_rxtx.c | 2 +- drivers/net/e1000/em_rxtx.c | 2 +- drivers/net/e1000/igb_rxtx.c | 2 +- drivers/net/ena/ena_ethdev.c | 2 +- drivers/net/enic/enic_rxtx.c | 2 +- drivers/net/fm10k/fm10k_rxtx.c | 2 +- drivers/net/hinic/hinic_pmd_tx.c | 2 +- drivers/net/hns3/hns3_rxtx.c | 2 +- drivers/net/i40e/i40e_rxtx.c | 2 +- drivers/net/iavf/iavf_rxtx.c | 2 +- drivers/net/ice/ice_rxtx.c | 2 +- drivers/net/ixgbe/ixgbe_rxtx.c | 2 +- drivers/net/qede/qede_rxtx.c | 4 ++-- drivers/net/softnic/rte_eth_softnic.c | 2 +- drivers/net/softnic/rte_eth_softnic_thread.c | 2 +- drivers/net/virtio/virtio_rxtx.c | 2 +- drivers/net/vmxnet3/vmxnet3_rxtx.c | 2 +- lib/librte_ethdev/rte_ethdev.h | 16 ++++++++-------- lib/librte_net/rte_net.h | 4 ++-- 20 files changed, 28 insertions(+), 29 deletions(-) diff --git a/config/common_base b/config/common_base index c5be57f11..16a8f09b6 100644 --- a/config/common_base +++ b/config/common_base @@ -149,7 +149,6 @@ CONFIG_RTE_LIBRTE_KVARGS=y # Compile generic ethernet library # CONFIG_RTE_LIBRTE_ETHER=y -CONFIG_RTE_LIBRTE_ETHDEV_DEBUG=n CONFIG_RTE_MAX_ETHPORTS=32 CONFIG_RTE_MAX_QUEUES_PER_PORT=1024 CONFIG_RTE_LIBRTE_IEEE1588=n diff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c index 449ffd454..eae54df22 100644 --- a/drivers/net/atlantic/atl_rxtx.c +++ b/drivers/net/atlantic/atl_rxtx.c @@ -821,7 +821,7 @@ atl_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c index 49c53712a..c4083ff00 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c @@ -626,7 +626,7 @@ eth_em_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c index 684fa4ad8..6a78f26e6 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -641,7 +641,7 @@ eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 665afee4f..b9855e91b 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -2145,7 +2145,7 @@ eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c index 6a8718c08..c42d563b4 100644 --- a/drivers/net/enic/enic_rxtx.c +++ b/drivers/net/enic/enic_rxtx.c @@ -414,7 +414,7 @@ uint16_t enic_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, rte_errno = ENOTSUP; return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c index 4accaa2cd..43d773f08 100644 --- a/drivers/net/fm10k/fm10k_rxtx.c +++ b/drivers/net/fm10k/fm10k_rxtx.c @@ -710,7 +710,7 @@ fm10k_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/hinic/hinic_pmd_tx.c b/drivers/net/hinic/hinic_pmd_tx.c index 64ec2c119..41d5a25b6 100644 --- a/drivers/net/hinic/hinic_pmd_tx.c +++ b/drivers/net/hinic/hinic_pmd_tx.c @@ -804,7 +804,7 @@ hinic_tx_offload_pkt_prepare(struct rte_mbuf *m, !(ol_flags & PKT_TX_TUNNEL_VXLAN)) return -ENOTSUP; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG if (rte_validate_tx_offload(m) != 0) return -EINVAL; #endif diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index ec6d19f58..45aa64b70 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -2296,7 +2296,7 @@ hns3_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 5e7c86ed8..282baf514 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -1499,7 +1499,7 @@ i40e_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 85d9a8e3b..8122d35be 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -1689,7 +1689,7 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 1c9f31efd..fd8ed2573 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -3037,7 +3037,7 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index 2e20e18c7..6964c4e52 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -992,7 +992,7 @@ ixgbe_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c index b81788ca4..646eb2275 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -2156,7 +2156,7 @@ qede_xmit_prep_pkts(__rte_unused void *p_txq, struct rte_mbuf **tx_pkts, uint64_t ol_flags; struct rte_mbuf *m; uint16_t i; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG int ret; #endif @@ -2196,7 +2196,7 @@ qede_xmit_prep_pkts(__rte_unused void *p_txq, struct rte_mbuf **tx_pkts, break; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c index 11723778f..b5b169ff7 100644 --- a/drivers/net/softnic/rte_eth_softnic.c +++ b/drivers/net/softnic/rte_eth_softnic.c @@ -704,7 +704,7 @@ rte_pmd_softnic_manage(uint16_t port_id) struct rte_eth_dev *dev = &rte_eth_devices[port_id]; struct pmd_internals *softnic; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, 0); #endif diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c index d610b1617..2f7c3a838 100644 --- a/drivers/net/softnic/rte_eth_softnic_thread.c +++ b/drivers/net/softnic/rte_eth_softnic_thread.c @@ -3093,7 +3093,7 @@ rte_pmd_softnic_run(uint16_t port_id) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, 0); #endif diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 752faa0f6..02eaf38e3 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -1979,7 +1979,7 @@ virtio_xmit_pkts_prepare(void *tx_queue __rte_unused, struct rte_mbuf **tx_pkts, for (nb_tx = 0; nb_tx < nb_pkts; nb_tx++) { struct rte_mbuf *m = tx_pkts[nb_tx]; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG error = rte_validate_tx_offload(m); if (unlikely(error)) { rte_errno = -error; diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index dd99684be..a801290ff 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -373,7 +373,7 @@ vmxnet3_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index e9e3a1699..f314b57c7 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -4375,7 +4375,7 @@ rte_eth_rx_burst(uint16_t port_id, uint16_t queue_id, struct rte_eth_dev *dev = &rte_eth_devices[port_id]; uint16_t nb_rx; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, 0); RTE_FUNC_PTR_OR_ERR_RET(*dev->rx_pkt_burst, 0); @@ -4498,11 +4498,11 @@ rte_eth_rx_descriptor_status(uint16_t port_id, uint16_t queue_id, struct rte_eth_dev *dev; void *rxq; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); #endif dev = &rte_eth_devices[port_id]; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG if (queue_id >= dev->data->nb_rx_queues) return -ENODEV; #endif @@ -4555,11 +4555,11 @@ static inline int rte_eth_tx_descriptor_status(uint16_t port_id, struct rte_eth_dev *dev; void *txq; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); #endif dev = &rte_eth_devices[port_id]; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG if (queue_id >= dev->data->nb_tx_queues) return -ENODEV; #endif @@ -4641,7 +4641,7 @@ rte_eth_tx_burst(uint16_t port_id, uint16_t queue_id, { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, 0); RTE_FUNC_PTR_OR_ERR_RET(*dev->tx_pkt_burst, 0); @@ -4727,7 +4727,7 @@ rte_eth_tx_prepare(uint16_t port_id, uint16_t queue_id, { struct rte_eth_dev *dev; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG if (!rte_eth_dev_is_valid_port(port_id)) { RTE_ETHDEV_LOG(ERR, "Invalid TX port_id=%u\n", port_id); rte_errno = EINVAL; @@ -4737,7 +4737,7 @@ rte_eth_tx_prepare(uint16_t port_id, uint16_t queue_id, dev = &rte_eth_devices[port_id]; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG if (queue_id >= dev->data->nb_tx_queues) { RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u\n", queue_id); rte_errno = EINVAL; diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h index 1560ecfa4..9a9732189 100644 --- a/lib/librte_net/rte_net.h +++ b/lib/librte_net/rte_net.h @@ -120,7 +120,7 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) struct rte_udp_hdr *udp_hdr; uint64_t inner_l3_offset = m->l2_len; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG /* * Does packet set any of available offloads? * Mainly it is required to avoid fragmented headers check if @@ -133,7 +133,7 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) if (ol_flags & (PKT_TX_OUTER_IPV4 | PKT_TX_OUTER_IPV6)) inner_l3_offset += m->outer_l2_len + m->outer_l3_len; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG /* * Check if headers are fragmented. * The check could be less strict depending on which offloads are From patchwork Fri Apr 17 21:57:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68816 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 757A2A0597; Fri, 17 Apr 2020 23:58:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4B1181EB8B; Fri, 17 Apr 2020 23:58:07 +0200 (CEST) Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by dpdk.org (Postfix) with ESMTP id 3E5D21EB78 for ; Fri, 17 Apr 2020 23:58:02 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215802euoutp023e6d656487f309042b92634a3a2dfd28~GujsuSF5X0278302783euoutp02V for ; Fri, 17 Apr 2020 21:58:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200417215802euoutp023e6d656487f309042b92634a3a2dfd28~GujsuSF5X0278302783euoutp02V DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160682; bh=99T0Lx9giDczyfTuMIjRaCtdi3qOObhMVVvSDAGHzoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pub0pyGS0Ifgec+S5F30BHPSbysiH6/lG2gLr3F6bYd0xwg1H0Eyy9OSQpDTApLhc gLWimkUdLBpl9CBQfi86F+3IPFqOskpu0wUFK8wWqfSzZkonXrVqrqcXX96jtwxa99 gbCAwDuX/TonIGSQDN5vrI8b6Hml/Dx0iK1auwkk= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200417215801eucas1p2f38173356244971ef79b5f4d06419abb~GujsGQKgJ1681616816eucas1p2l; Fri, 17 Apr 2020 21:58:01 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 5C.FF.61286.9662A9E5; Fri, 17 Apr 2020 22:58:01 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200417215800eucas1p2f3a71aaf69584fc37c9c4a47c3a2d39d~GujrbUiyK1701917019eucas1p2c; Fri, 17 Apr 2020 21:58:00 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200417215800eusmtrp2ade5d3a062d3828ababb52dff0f70032~Gujraz_we2952229522eusmtrp2g; Fri, 17 Apr 2020 21:58:00 +0000 (GMT) X-AuditID: cbfec7f2-f0bff7000001ef66-54-5e9a266939d4 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 1C.94.08375.8662A9E5; Fri, 17 Apr 2020 22:58:00 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215800eusmtip2a8c97addc943df9ff5fa9b052f325756~Gujq4YZa50325203252eusmtip2n; Fri, 17 Apr 2020 21:57:59 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Nikhil Rao , Jerin Jacob , Erik Gabriel Carrillo Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:26 +0200 Message-Id: <20200417215739.23180-5-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHIsWRmVeSWpSXmKPExsWy7djP87qZarPiDC5PE7V492k7k8WPb/2s Fr3nZzNavD30m9Xi04MTLA6sHr8WLGX1WLznJZPH5IUXmT2O3ZzGHsASxWWTkpqTWZZapG+X wJWxduZX9oL3WhXL195haWB8qtLFyMkhIWAi8fzmGTYQW0hgBaPEkX6JLkYuIPsLo0TXzgNs EM5nRom1kyexwHRMmnsXKrGcUeJV5wuodqCqB/2KIDabgK3EkZlfWUGKRASWMkq07v7GDpJg FhCQeHzvGSuILSwQIDF56lJmEJtFQFXi6fknjCA2r4CrxNbn01ghtslLrN5wAKyGU8BNYunL 74wgQyUEHrNJvDjfAHWSi8ShcwfZIWxhiVfHt0DZMhL/d85ngmjYxihx9fdPqO79jBLXe1dA VVlLHP73G+gHDqDzNCXW79KHCDtKdE44xwISlhDgk7jxVhDiAT6JSdumM0OEeSU62oQgqvUk nvZMZYRZ+2ftE6jTPCTOztzFDAmtmYwSe86eZpvAKD8LYdkCRsZVjOKppcW56anFhnmp5XrF ibnFpXnpesn5uZsYgang9L/jn3Ywfr2UdIhRgINRiYfXoGdmnBBrYllxZe4hRgkOZiUR3oNu QCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8xotexgoJpCeWpGanphakFsFkmTg4pRoY65bOMNO9 p6DAaf0pTCZ15gWp7w4ldqqR7f1R61v2TDb7x64+IS4o08r5zimjEhd9o/ICD64LU5JDdf58 uyrbHM9ge5bJyjeYMbF2flNyWhMvl/UE7tTUxWkX5pnkXmb6qlTaquzH2rqt3tvja8jrecsv 5ph9ufJQLOpM5n/7za+6/674sEiJpTgj0VCLuag4EQB0so//AQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHLMWRmVeSWpSXmKPExsVy+t/xe7oZarPiDO58ULF492k7k8WPb/2s Fr3nZzNavD30m9Xi04MTLA6sHr8WLGX1WLznJZPH5IUXmT2O3ZzGHsASpWdTlF9akqqQkV9c YqsUbWhhpGdoaaFnZGKpZ2hsHmtlZKqkb2eTkpqTWZZapG+XoJexduZX9oL3WhXL195haWB8 qtLFyMkhIWAiMWnuXbYuRi4OIYGljBKfNz5n72LkAErISHy4JABRIyzx51oXG4gtJPCRUeL1 xVgQm03AVuLIzK+sIL0iAssZJc4fuMAMkmAWEJB4fO8ZK4gtLOAn8eDQe7A4i4CqxNPzTxhB bF4BV4mtz6exQiyQl1i94QBYDaeAm8TSl98ZIZa5Sjx8eIp9AiPfAkaGVYwiqaXFuem5xYZ6 xYm5xaV56XrJ+bmbGIFhue3Yz807GC9tDD7EKMDBqMTDa9AzM06INbGsuDL3EKMEB7OSCO9B N6AQb0piZVVqUX58UWlOavEhRlOgoyYyS4km5wNjJq8k3tDU0NzC0tDc2NzYzEJJnLdD4GCM kEB6YklqdmpqQWoRTB8TB6dUA2OSDLdC/svVl/ICN/887r3/Z9X+i/077ilMPdXj8l/vzYPd Rk9PxUupRPHLRVUwZ5w5GC4uVhuuxHZpzszTh36+W21ht8fp2dIt7mkfPA6c7paVyRG+Zuuv nrpBc8oLxeqFy23W/LjQ7HAqTP30dj+JJZ+2cBvmLDJaI/sjLrnoROX3Oz6336cqsRRnJBpq MRcVJwIAjPoVmGECAAA= X-CMS-MailID: 20200417215800eucas1p2f3a71aaf69584fc37c9c4a47c3a2d39d X-Msg-Generator: CA X-RootMTR: 20200417215800eucas1p2f3a71aaf69584fc37c9c4a47c3a2d39d X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215800eucas1p2f3a71aaf69584fc37c9c4a47c3a2d39d References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 04/17] eventdev: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_EVENTDEV_DEBUG. The old define is completely removed from source code and config. Signed-off-by: Lukasz Wojciechowski --- config/common_base | 1 - lib/librte_eventdev/rte_event_eth_tx_adapter.h | 2 +- lib/librte_eventdev/rte_event_timer_adapter.c | 6 +++--- lib/librte_eventdev/rte_event_timer_adapter.h | 6 +++--- lib/librte_eventdev/rte_eventdev.h | 4 ++-- lib/librte_eventdev/rte_eventdev_pmd.h | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/config/common_base b/config/common_base index 16a8f09b6..96d5031d9 100644 --- a/config/common_base +++ b/config/common_base @@ -722,7 +722,6 @@ CONFIG_RTE_LIBRTE_PMD_ZLIB=n # Compile generic event device library # CONFIG_RTE_LIBRTE_EVENTDEV=y -CONFIG_RTE_LIBRTE_EVENTDEV_DEBUG=n CONFIG_RTE_EVENT_MAX_DEVS=16 CONFIG_RTE_EVENT_MAX_QUEUES_PER_DEV=64 CONFIG_RTE_EVENT_TIMER_ADAPTER_NUM_MAX=32 diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.h b/lib/librte_eventdev/rte_event_eth_tx_adapter.h index 93b717af9..de13ca7f0 100644 --- a/lib/librte_eventdev/rte_event_eth_tx_adapter.h +++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.h @@ -357,7 +357,7 @@ rte_event_eth_tx_adapter_enqueue(uint8_t dev_id, { const struct rte_eventdev *dev = &rte_eventdevs[dev_id]; -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG if (dev_id >= RTE_EVENT_MAX_DEVS || !rte_eventdevs[dev_id].attached) { rte_errno = EINVAL; diff --git a/lib/librte_eventdev/rte_event_timer_adapter.c b/lib/librte_eventdev/rte_event_timer_adapter.c index 161e21a68..02c27b91e 100644 --- a/lib/librte_eventdev/rte_event_timer_adapter.c +++ b/lib/librte_eventdev/rte_event_timer_adapter.c @@ -43,7 +43,7 @@ static const struct rte_event_timer_adapter_ops swtim_ops; #define EVTIM_LOG_ERR(...) EVTIM_LOG(ERR, evtim_logtype, __VA_ARGS__) -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG #define EVTIM_LOG_DBG(...) \ EVTIM_LOG(DEBUG, evtim_logtype, __VA_ARGS__) #define EVTIM_BUF_LOG_DBG(...) \ @@ -1008,7 +1008,7 @@ __swtim_arm_burst(const struct rte_event_timer_adapter *adapter, struct rte_timer *tim, *tims[nb_evtims]; uint64_t cycles; -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG /* Check that the service is running. */ if (rte_service_runstate_get(adapter->data->service_id) != 1) { rte_errno = EINVAL; @@ -1114,7 +1114,7 @@ swtim_cancel_burst(const struct rte_event_timer_adapter *adapter, uint64_t opaque; struct swtim *sw = swtim_pmd_priv(adapter); -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG /* Check that the service is running. */ if (rte_service_runstate_get(adapter->data->service_id) != 1) { rte_errno = EINVAL; diff --git a/lib/librte_eventdev/rte_event_timer_adapter.h b/lib/librte_eventdev/rte_event_timer_adapter.h index 7f6dc5c29..8e7e2b0e3 100644 --- a/lib/librte_eventdev/rte_event_timer_adapter.h +++ b/lib/librte_eventdev/rte_event_timer_adapter.h @@ -575,7 +575,7 @@ rte_event_timer_arm_burst(const struct rte_event_timer_adapter *adapter, struct rte_event_timer **evtims, uint16_t nb_evtims) { -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG ADAPTER_VALID_OR_ERR_RET(adapter, -EINVAL); FUNC_PTR_OR_ERR_RET(adapter->arm_burst, -EINVAL); #endif @@ -618,7 +618,7 @@ rte_event_timer_arm_tmo_tick_burst( const uint64_t timeout_ticks, const uint16_t nb_evtims) { -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG ADAPTER_VALID_OR_ERR_RET(adapter, -EINVAL); FUNC_PTR_OR_ERR_RET(adapter->arm_tmo_tick_burst, -EINVAL); #endif @@ -651,7 +651,7 @@ rte_event_timer_cancel_burst(const struct rte_event_timer_adapter *adapter, struct rte_event_timer **evtims, uint16_t nb_evtims) { -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG ADAPTER_VALID_OR_ERR_RET(adapter, -EINVAL); FUNC_PTR_OR_ERR_RET(adapter->cancel_burst, -EINVAL); #endif diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h index 226f352ad..cb237fdd0 100644 --- a/lib/librte_eventdev/rte_eventdev.h +++ b/lib/librte_eventdev/rte_eventdev.h @@ -1332,7 +1332,7 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, { const struct rte_eventdev *dev = &rte_eventdevs[dev_id]; -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG if (dev_id >= RTE_EVENT_MAX_DEVS || !rte_eventdevs[dev_id].attached) { rte_errno = EINVAL; return 0; @@ -1609,7 +1609,7 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, struct rte_event ev[], { struct rte_eventdev *dev = &rte_eventdevs[dev_id]; -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG if (dev_id >= RTE_EVENT_MAX_DEVS || !rte_eventdevs[dev_id].attached) { rte_errno = EINVAL; return 0; diff --git a/lib/librte_eventdev/rte_eventdev_pmd.h b/lib/librte_eventdev/rte_eventdev_pmd.h index d118b9e5b..090cb4309 100644 --- a/lib/librte_eventdev/rte_eventdev_pmd.h +++ b/lib/librte_eventdev/rte_eventdev_pmd.h @@ -34,7 +34,7 @@ extern "C" { RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \ __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,))) -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG #define RTE_EDEV_LOG_DEBUG(...) \ RTE_LOG(DEBUG, EVENTDEV, \ RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \ From patchwork Fri Apr 17 21:57:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68817 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9F2D4A0597; Fri, 17 Apr 2020 23:58:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C78B01EB94; Fri, 17 Apr 2020 23:58:08 +0200 (CEST) Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by dpdk.org (Postfix) with ESMTP id F3F571EB73 for ; Fri, 17 Apr 2020 23:58:02 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215802euoutp02fc1ef39b66bf159897da30cba80c7c86~Gujtb1l_d0662106621euoutp02C for ; Fri, 17 Apr 2020 21:58:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200417215802euoutp02fc1ef39b66bf159897da30cba80c7c86~Gujtb1l_d0662106621euoutp02C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160682; bh=koyQOeBYFT8VW1boLYwNoiaNdNnpJgTEmbKeU4FpfQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oorveYiN4CZ8Sxw+Y/JMqu/BDgTr2Q8HcWS7jM5pIxysoBSlGb+hopr5CFLNF2sGa Ndb7KqMXZi01rPAcpHq1aKPgcgB1SKWVnt/ggawxaFpWp1hrFx/b5RUgT4hVFZgTea T4nfPb1POZtyElSRZmOwJ9t04eN5vK76qjXBbYlI= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200417215802eucas1p15b2db5deffbdaa9168790fb4411de86a~GujtBfBrK0153301533eucas1p1A; Fri, 17 Apr 2020 21:58:02 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 21.C4.60679.A662A9E5; Fri, 17 Apr 2020 22:58:02 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200417215801eucas1p28aefc04e119aa5de16a7f0771bb0e268~GujsACQFK2665726657eucas1p2H; Fri, 17 Apr 2020 21:58:01 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200417215801eusmtrp19897cd86f899f8fb984f7a661561c200~Gujr8xUSu0397603976eusmtrp1q; Fri, 17 Apr 2020 21:58:01 +0000 (GMT) X-AuditID: cbfec7f4-0e5ff7000001ed07-78-5e9a266a1059 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 9F.52.07950.9662A9E5; Fri, 17 Apr 2020 22:58:01 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215800eusmtip283fc313455f1c4780cf73534474d1528~GujrnUJTb0325203252eusmtip2o; Fri, 17 Apr 2020 21:58:00 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Vladimir Medvedkin Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:27 +0200 Message-Id: <20200417215739.23180-6-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrLIsWRmVeSWpSXmKPExsWy7djPc7pZarPiDGZ3iFq8+7SdyeLTgxMs Fk+vejowe/xasJTVY/Gel0wex25OYw9gjuKySUnNySxLLdK3S+DK6H71gblgDk/Fx0W72RsY J3J1MXJySAiYSMxfPpGti5GLQ0hgBaPE8Sf3mCCcL4wS16f0sEM4nxklVt5dBZThAGtZfSIY Ir6cUeLk7DlscEVPb7Syg8xlE7CVODLzKyuILSIQJ3Hz4w4mEJtZQEDi8b1nYHFhAU+J/mcn wOIsAqoSW4+tZQaxeQVcJXa3fGSGuE9eYvWGA2A2p4CbxNKX3xlBlkkIHGCTOPptCQtEkYvE hoO/2CBsYYlXx7ewQ9gyEqcn97BANGxjlLj6+ydU936g53pXQFVZSxz+95sN5DdmAU2J9bv0 IcKOEttvPGSDeJlP4sZbQYgH+CQmbZvODBHmlehoE4Ko1pN42jOVEWbtn7VPWCBKPCTerIqE hM9MRokZ91azTmCUn4WwawEj4ypG8dTS4tz01GKjvNRyveLE3OLSvHS95PzcTYzASD/97/iX HYy7/iQdYhTgYFTi4TXomRknxJpYVlyZe4hRgoNZSYT3oBtQiDclsbIqtSg/vqg0J7X4EKM0 B4uSOK/xopexQgLpiSWp2ampBalFMFkmDk6pBsaqP0p6/K9fWyWsOy60x79pbUDT5IcHRVYz bpthpnz52y7d9uYfGmI7uF6kxP6WmFNjFz756YJNcQffL3GKUDtVyjArYf75drkM5Y0cZq+1 zzfyX2ioC4779GLtxqyjloKXJofLnKje8ntTUv458fezXvnfXCn/TDjhxNpwkR85U9bv0Q3w 03uixFKckWioxVxUnAgAnOzZa/ACAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLLMWRmVeSWpSXmKPExsVy+t/xe7qZarPiDL5N4LZ492k7k8WnBydY LJ5e9XRg9vi1YCmrx+I9L5k8jt2cxh7AHKVnU5RfWpKqkJFfXGKrFG1oYaRnaGmhZ2RiqWdo bB5rZWSqpG9nk5Kak1mWWqRvl6CX0f3qA3PBHJ6Kj4t2szcwTuTqYuTgkBAwkVh9IriLkYtD SGApo8TGOa3sEHEZiQ+XBLoYOYFMYYk/17rYIGo+Mkq0vZ7ICJJgE7CVODLzKyuILSIQJ3Hg 6C0wm1lAQOLxvWdgtrCAp0T/sxNMIDaLgKrE1mNrmUFsXgFXid0tH5khFshLrN5wAMzmFHCT WPryO9h8IaCahw9PsU9g5FvAyLCKUSS1tDg3PbfYSK84Mbe4NC9dLzk/dxMjMOi2Hfu5ZQdj 17vgQ4wCHIxKPLwGPTPjhFgTy4orcw8xSnAwK4nwHnQDCvGmJFZWpRblxxeV5qQWH2I0BTpq IrOUaHI+MCLySuINTQ3NLSwNzY3Njc0slMR5OwQOxggJpCeWpGanphakFsH0MXFwSjUwylmk Gn74Nm/bM5617009/pXGfikIeRLQPMnr7NSZned6Zkkfrij+4S1aP716Z/J7qUuH2WZNOD7H 6OOx6yrrvkZcWBQjZ7/s7OQl5+43bchijSq46Xz909PcYz5hbxzTi37djz16SsO6UsR+xu29 OWEsokddjgWar3nYr7BLitMh+ehVsQt9MUosxRmJhlrMRcWJANcinG5QAgAA X-CMS-MailID: 20200417215801eucas1p28aefc04e119aa5de16a7f0771bb0e268 X-Msg-Generator: CA X-RootMTR: 20200417215801eucas1p28aefc04e119aa5de16a7f0771bb0e268 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215801eucas1p28aefc04e119aa5de16a7f0771bb0e268 References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 05/17] fib: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_FIB_DEBUG. The old define is completely removed from source code and config. Signed-off-by: Lukasz Wojciechowski --- config/common_base | 1 - lib/librte_fib/rte_fib.c | 2 +- lib/librte_fib/rte_fib6.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/common_base b/config/common_base index 96d5031d9..09f54c460 100644 --- a/config/common_base +++ b/config/common_base @@ -930,7 +930,6 @@ CONFIG_RTE_LIBRTE_RIB=y # Compile librte_fib # CONFIG_RTE_LIBRTE_FIB=y -CONFIG_RTE_LIBRTE_FIB_DEBUG=n # # Compile librte_lpm diff --git a/lib/librte_fib/rte_fib.c b/lib/librte_fib/rte_fib.c index e0908084f..52a64f726 100644 --- a/lib/librte_fib/rte_fib.c +++ b/lib/librte_fib/rte_fib.c @@ -28,7 +28,7 @@ EAL_REGISTER_TAILQ(rte_fib_tailq) /* Maximum length of a FIB name. */ #define RTE_FIB_NAMESIZE 64 -#if defined(RTE_LIBRTE_FIB_DEBUG) +#ifdef RTE_DEBUG #define FIB_RETURN_IF_TRUE(cond, retval) do { \ if (cond) \ return retval; \ diff --git a/lib/librte_fib/rte_fib6.c b/lib/librte_fib/rte_fib6.c index a1f0db844..bd9b990cf 100644 --- a/lib/librte_fib/rte_fib6.c +++ b/lib/librte_fib/rte_fib6.c @@ -28,7 +28,7 @@ EAL_REGISTER_TAILQ(rte_fib6_tailq) /* Maximum length of a FIB name. */ #define FIB6_NAMESIZE 64 -#if defined(RTE_LIBRTE_FIB_DEBUG) +#ifdef RTE_DEBUG #define FIB6_RETURN_IF_TRUE(cond, retval) do { \ if (cond) \ return retval; \ From patchwork Fri Apr 17 21:57:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68819 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1F785A0597; Fri, 17 Apr 2020 23:59:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0B7921EBA4; Fri, 17 Apr 2020 23:58:12 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id A92BA1EB7C for ; Fri, 17 Apr 2020 23:58:03 +0200 (CEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215803euoutp014a4994c99de4d014b260a32f0e2cfe3b~GujuCwj4b2759027590euoutp01g for ; Fri, 17 Apr 2020 21:58:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200417215803euoutp014a4994c99de4d014b260a32f0e2cfe3b~GujuCwj4b2759027590euoutp01g DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160683; bh=7rjoTk6aRUzh7KI3ruqgkcruHP2wkIqdapkknPlSQcE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nNCVBBQhO4gAcXvdYfCp/7O82F76ngx2KYkTRj7Wk18+kORdYijTY+s9NS/heZf0h 1HraGjqJQV8naG0ZaSh1ceNd53jX0CWlwndj4DD5EnkmfH9CVrSYfzSZ9Bs29GxfIS XzJ1UOynyTshlNTFPw2+XvYDqK+4dtzNr6HEfeFs= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200417215802eucas1p1d6d09d45fcd2deff2fb1e3340946874b~GujtCUKj81355713557eucas1p1o; Fri, 17 Apr 2020 21:58:02 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 2E.5E.60698.A662A9E5; Fri, 17 Apr 2020 22:58:02 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200417215801eucas1p25e56a60eda9b741ba26e686b90ed8e28~Gujso2B7O2688626886eucas1p2K; Fri, 17 Apr 2020 21:58:01 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200417215801eusmtrp2e7d36af0539f3eb4165465448ebff587~GujsoTzLl2952229522eusmtrp2h; Fri, 17 Apr 2020 21:58:01 +0000 (GMT) X-AuditID: cbfec7f5-a29ff7000001ed1a-b1-5e9a266a84ba Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 7C.94.08375.9662A9E5; Fri, 17 Apr 2020 22:58:01 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215801eusmtip2c16373d18c2c422565889af3611af894~GujsLncM70325203252eusmtip2p; Fri, 17 Apr 2020 21:58:01 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Olivier Matz Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:28 +0200 Message-Id: <20200417215739.23180-7-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrPIsWRmVeSWpSXmKPExsWy7djPc7pZarPiDCa3i1q8+7SdyWJr00Ym i08PTrA4MHtc7L/D6PFrwVJWj2M3p7EHMEdx2aSk5mSWpRbp2yVwZWyYd5i54IZAxclv85ga GBfxdTFyckgImEg0THrK2MXIxSEksIJRYtmJR+wgCSGBL4wSk9fYQiQ+M0qc3LOOBabjzI8f rBCJ5YwSnRtvsMNVXV48lxGkik3AVuLIzK+sILaIQJBE85YjYGOZBQQkHt97BhYXFvCXeDZz LxuIzSKgKjHz7TKwDbwCrhLTL/xjhdgmL7F6wwFmEJtTwE1i6cvvYLdKCBxhk7j77y/USS4S E98eZYOwhSVeHd/CDmHLSPzfOZ8JomEbo8TV3z+huvczSlzvXQFVZS1x+N9voG4OoPM0Jdbv 0ocIO0o8fLqBHSQsIcAnceOtIMQDfBKTtk1nhgjzSnS0CUFU60k87ZnKCLP2z9onUKd5SPy+ NocFEkAzGSU+b+tnnMAoPwth2QJGxlWM4qmlxbnpqcXGeanlesWJucWleel6yfm5mxiB0X76 3/GvOxj3/Uk6xCjAwajEw2vQMzNOiDWxrLgy9xCjBAezkgjvQTegEG9KYmVValF+fFFpTmrx IUZpDhYlcV7jRS9jhQTSE0tSs1NTC1KLYLJMHJxSDYxb3D/E79BctJgh/+DTzK8lJt6F554E Fsd4TZLOuLvpSfm7Dl+3k4+/xBhWneOfuIWbtZWdO2tRivmMLb69mfpJP/gzZI9KfikV2n0s 847fPIYNZSwiyX/OVuZla/1tej/n791Z8955PVb6PeFOxH277fcWpk9TfFSfaaWwQCa/dn32 +bpKVlclluKMREMt5qLiRADXYdlB8gIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHLMWRmVeSWpSXmKPExsVy+t/xe7qZarPiDK6/N7F492k7k8XWpo1M Fp8enGBxYPa42H+H0ePXgqWsHsduTmMPYI7SsynKLy1JVcjILy6xVYo2tDDSM7S00DMysdQz NDaPtTIyVdK3s0lJzcksSy3St0vQy9gw7zBzwQ2BipPf5jE1MC7i62Lk5JAQMJE48+MHaxcj F4eQwFJGiaMbtzN3MXIAJWQkPlwSgKgRlvhzrYsNouYjo8SLviWsIAk2AVuJIzO/soLUiwgE STzpYwIJMwsISDy+9wysRFjAV6J9wlIwm0VAVWLm22UsIDavgKvE9Av/WCHmy0us3nCAGcTm FHCTWPryOyOILQRU8/DhKfYJjHwLGBlWMYqklhbnpucWG+oVJ+YWl+al6yXn525iBIbdtmM/ N+9gvLQx+BCjAAejEg+vQc/MOCHWxLLiytxDjBIczEoivAfdgEK8KYmVValF+fFFpTmpxYcY TYGOmsgsJZqcD4yJvJJ4Q1NDcwtLQ3Njc2MzCyVx3g6BgzFCAumJJanZqakFqUUwfUwcnFIN jFJv3yTKmCY6bMt+xPctzrWhM4pv4/kvRw/VVbi2JC5+9HXawgpv7dPV5XOE+NeaTP3EekTj oOtkjqja5MC4zxFM2x+YvlsnY8wQv29StF+V4ZuLufZHmk7pzl256F3aqZYg+fumcW+du57O /Fe/p3u1Wdf/M42cEhxitWWPJ+xcIXjuxqm5VUosxRmJhlrMRcWJAEIjF41RAgAA X-CMS-MailID: 20200417215801eucas1p25e56a60eda9b741ba26e686b90ed8e28 X-Msg-Generator: CA X-RootMTR: 20200417215801eucas1p25e56a60eda9b741ba26e686b90ed8e28 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215801eucas1p25e56a60eda9b741ba26e686b90ed8e28 References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 06/17] cmdline: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_CMDLINE_DEBUG. The old define is completely removed from source code and config. Signed-off-by: Lukasz Wojciechowski --- config/common_base | 1 - lib/librte_cmdline/cmdline_cirbuf.h | 2 +- lib/librte_cmdline/cmdline_parse.c | 2 +- lib/librte_cmdline/cmdline_parse_num.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/common_base b/config/common_base index 09f54c460..ea5ccafc9 100644 --- a/config/common_base +++ b/config/common_base @@ -872,7 +872,6 @@ CONFIG_RTE_LIBRTE_CFGFILE=y # Compile librte_cmdline # CONFIG_RTE_LIBRTE_CMDLINE=y -CONFIG_RTE_LIBRTE_CMDLINE_DEBUG=n # # Compile librte_hash diff --git a/lib/librte_cmdline/cmdline_cirbuf.h b/lib/librte_cmdline/cmdline_cirbuf.h index c23b211ad..d11394985 100644 --- a/lib/librte_cmdline/cmdline_cirbuf.h +++ b/lib/librte_cmdline/cmdline_cirbuf.h @@ -24,7 +24,7 @@ struct cirbuf { char *buf; }; -#ifdef RTE_LIBRTE_CMDLINE_DEBUG +#ifdef RTE_DEBUG #define dprintf_(fmt, ...) printf("line %3.3d - " fmt "%.0s", __LINE__, __VA_ARGS__) #define dprintf(...) dprintf_(__VA_ARGS__, "dummy") #else diff --git a/lib/librte_cmdline/cmdline_parse.c b/lib/librte_cmdline/cmdline_parse.c index b57b30e8f..72bf543d9 100644 --- a/lib/librte_cmdline/cmdline_parse.c +++ b/lib/librte_cmdline/cmdline_parse.c @@ -20,7 +20,7 @@ #include "cmdline_parse.h" #include "cmdline.h" -#ifdef RTE_LIBRTE_CMDLINE_DEBUG +#ifdef RTE_DEBUG #define debug_printf printf #else #define debug_printf(args...) do {} while(0) diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/librte_cmdline/cmdline_parse_num.c index 478f181b4..ddcd14419 100644 --- a/lib/librte_cmdline/cmdline_parse_num.c +++ b/lib/librte_cmdline/cmdline_parse_num.c @@ -16,7 +16,7 @@ #include "cmdline_parse.h" #include "cmdline_parse_num.h" -#ifdef RTE_LIBRTE_CMDLINE_DEBUG +#ifdef RTE_DEBUG #define debug_printf(args...) printf(args) #else #define debug_printf(args...) do {} while(0) From patchwork Fri Apr 17 21:57:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68818 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B958AA0597; Fri, 17 Apr 2020 23:58:53 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 495D01EB9D; Fri, 17 Apr 2020 23:58:10 +0200 (CEST) Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by dpdk.org (Postfix) with ESMTP id B77BD1EB7D for ; Fri, 17 Apr 2020 23:58:03 +0200 (CEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215803euoutp0292ed5d879e38be2363d237e938853f89~GujuIeNit0278302783euoutp02Y for ; Fri, 17 Apr 2020 21:58:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200417215803euoutp0292ed5d879e38be2363d237e938853f89~GujuIeNit0278302783euoutp02Y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160683; bh=O52/BYBAHuOLst0ZSPgN8ESWKq5i2ad6ldxZXceUlS8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FM3VUh/QQ/uElKBxItZD9Vxopa9u806B7LgPs/obS20kfTZBQEQqrXyHC5l+wjSwL PAto61VsawZRFA+WRVf2Bwv89iDk4zfxEiqfcLwVZDe/G+vNtIQlBh9EX+DsxBVNOH GWk3xVPx8xyaXgghSwtFhDdGcs/DbObbegCIZNKw= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200417215803eucas1p23619cf8ac5efa02e81efc641db506bcc~Gujt9Cr1M2677826778eucas1p2J; Fri, 17 Apr 2020 21:58:03 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 61.C4.60679.B662A9E5; Fri, 17 Apr 2020 22:58:03 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200417215802eucas1p27d4041768b717226b7161d0b896c3261~GujtWzbZF1656816568eucas1p2m; Fri, 17 Apr 2020 21:58:02 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200417215802eusmtrp1a891167c565623aa67298e2946850538~GujtWOMl20397603976eusmtrp1r; Fri, 17 Apr 2020 21:58:02 +0000 (GMT) X-AuditID: cbfec7f4-0e5ff7000001ed07-7a-5e9a266b6e7b Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id DF.52.07950.A662A9E5; Fri, 17 Apr 2020 22:58:02 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215802eusmtip211a74dc29923cb806ce7ea1923c163fb~GujsyhHUa0325203252eusmtip2q; Fri, 17 Apr 2020 21:58:02 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Yipeng Wang , Sameh Gobriel , Bruce Richardson Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:29 +0200 Message-Id: <20200417215739.23180-8-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBIsWRmVeSWpSXmKPExsWy7djP87rZarPiDC4vFrG4scre4t2n7UwW 2/7/Z7T49OAEi8XZtv+sDqwevxYsZfVYvOclk8exm9PYA5ijuGxSUnMyy1KL9O0SuDK6Fuxl LjjGVdHT9Iq5gfEeRxcjJ4eEgInE21d/WbsYuTiEBFYwSlw69JEFwvnCKPF99kso5zOjxPWJ 39lgWi6u3MYIkVjOKLG3cT87XNXyuzMYQarYBGwljsz8ygpiiwisZpS4ekYaxGYWEJB4fO8Z WFxYwEti89qNYDaLgKrE2ZZbLCA2r4CrxNwPyxghtslLrN5wgBnE5hRwk1j68jtU/DqbxN3X mhC2i8Sr540sELawxKvjW9ghbBmJ05N7wF6QENgGdMPvn4wQzn6gf3pXQFVZSxz+9xvoNw6g 6zQl1u/Shwg7SixYMZMJJCwhwCdx460gxP18EpO2TWeGCPNKdLQJQVTrSTztmcoIs/bP2idQ 53hIXP9xkxkSPjMZJf68Wsg2gVF+FsKyBYyMqxjFU0uLc9NTi43yUsv1ihNzi0vz0vWS83M3 MQLj//S/4192MO76k3SIUYCDUYmH16BnZpwQa2JZcWXuIUYJDmYlEd6DbkAh3pTEyqrUovz4 otKc1OJDjNIcLErivMaLXsYKCaQnlqRmp6YWpBbBZJk4OKUaGIVUGbqWt6RNvd0srHsjnn3F Rsfnn3alxC6M3l80b9ra90wTQs7++HrjigXbzbPhNpGBLgFRgQ9OzV+1JIR1kfmCucYBm94t 527Uyn+7bdOP5uWsDi/rVmtzG4ez7gt682JCQ927kGk2HLGvPoXuDBT2+/t44u/Eg/vPyHKt X7v1R+X5Vdt/Pt6nxFKckWioxVxUnAgAJ27EYvsCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJLMWRmVeSWpSXmKPExsVy+t/xe7pZarPiDJ50a1ncWGVv8e7TdiaL bf//M1p8enCCxeJs239WB1aPXwuWsnos3vOSyePYzWnsAcxRejZF+aUlqQoZ+cUltkrRhhZG eoaWFnpGJpZ6hsbmsVZGpkr6djYpqTmZZalF+nYJehldC/YyFxzjquhpesXcwHiPo4uRk0NC wETi4sptjF2MXBxCAksZJZbu+c7SxcgBlJCR+HBJAKJGWOLPtS42iJqPjBLnvj5mBEmwCdhK HJn5lRUkISKwllHi8u2/YAlmAQGJx/eesYLYwgJeEpvXbgSzWQRUJc623GIBsXkFXCXmfljG CLFBXmL1hgPMIDangJvE0pffweJCQDUPH55in8DIt4CRYRWjSGppcW56brGRXnFibnFpXrpe cn7uJkZgMG479nPLDsaud8GHGAU4GJV4eA16ZsYJsSaWFVfmHmKU4GBWEuE96AYU4k1JrKxK LcqPLyrNSS0+xGgKdNREZinR5HxgpOSVxBuaGppbWBqaG5sbm1koifN2CByMERJITyxJzU5N LUgtgulj4uCUamAs2WkSlnfGqml7w1T7yFiX7bGrhA3+cNyrMswof3zI4MrE6CntB9xm3pym 9v/VxNJW7aQL63cwCR8KCWu4NPNF7aVo3c5/bUHbd6y2tNuRselGCcfHGTvfr4yUWt/X9/nH 8V5dZcfV77yYTA41X+A565CUYzbnbOX64K0msQUaZmJyhzbPDPuvxFKckWioxVxUnAgAv8SX p1wCAAA= X-CMS-MailID: 20200417215802eucas1p27d4041768b717226b7161d0b896c3261 X-Msg-Generator: CA X-RootMTR: 20200417215802eucas1p27d4041768b717226b7161d0b896c3261 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215802eucas1p27d4041768b717226b7161d0b896c3261 References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 07/17] hash: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_HASH_DEBUG. The old define is completely removed from source code and config. Signed-off-by: Lukasz Wojciechowski --- config/common_base | 1 - lib/librte_hash/rte_cuckoo_hash.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/common_base b/config/common_base index ea5ccafc9..a12a869a9 100644 --- a/config/common_base +++ b/config/common_base @@ -877,7 +877,6 @@ CONFIG_RTE_LIBRTE_CMDLINE=y # Compile librte_hash # CONFIG_RTE_LIBRTE_HASH=y -CONFIG_RTE_LIBRTE_HASH_DEBUG=n # # Compile librte_efd diff --git a/lib/librte_hash/rte_cuckoo_hash.h b/lib/librte_hash/rte_cuckoo_hash.h index 345de6bf9..57ef74a47 100644 --- a/lib/librte_hash/rte_cuckoo_hash.h +++ b/lib/librte_hash/rte_cuckoo_hash.h @@ -20,7 +20,7 @@ #endif /* Macro to enable/disable run-time checking of function parameters */ -#if defined(RTE_LIBRTE_HASH_DEBUG) +#ifdef RTE_DEBUG #define RETURN_IF_TRUE(cond, retval) do { \ if (cond) \ return retval; \ @@ -29,7 +29,7 @@ #define RETURN_IF_TRUE(cond, retval) #endif -#if defined(RTE_LIBRTE_HASH_DEBUG) +#ifdef RTE_DEBUG #define ERR_IF_TRUE(cond, fmt, args...) do { \ if (cond) { \ RTE_LOG(ERR, HASH, fmt, ##args); \ From patchwork Fri Apr 17 21:57:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68820 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BA407A0597; Fri, 17 Apr 2020 23:59:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 814461EBB1; Fri, 17 Apr 2020 23:58:14 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id CB5D51EB84 for ; Fri, 17 Apr 2020 23:58:04 +0200 (CEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215804euoutp01547ab1532ea15a10a38f951fd4872ea5~GujvIP3Qu2759027590euoutp01i for ; Fri, 17 Apr 2020 21:58:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200417215804euoutp01547ab1532ea15a10a38f951fd4872ea5~GujvIP3Qu2759027590euoutp01i DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160684; bh=QHqi1LWFdkO587dDZokPQxDwpswrWtVfK316/aO9me4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I3PKShtJUCC/98nL6fgd5+nYLAUh8SV0uPUcO+9oV/Z1PXLaeIIoxuLTd7RvpAKWB sTfm5D/nw9zbYC4FqWBchKmzXP5FOmOv/kPnDm+GrXxwymFrUNcCP4ZvHPZQxpNx4A WK7ffHlDvoZZmI2PalXp5LQ9UoisjHtl2S9+VdcQ= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200417215804eucas1p2053657f5faf6d52dd908e948bd4bb976~Guju-Doet1848618486eucas1p2o; Fri, 17 Apr 2020 21:58:04 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id BC.FF.61286.C662A9E5; Fri, 17 Apr 2020 22:58:04 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200417215803eucas1p16013610674ce6ac58189259f2632f562~GujuISc252225522255eucas1p1j; Fri, 17 Apr 2020 21:58:03 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200417215803eusmtrp27665cd532cce44cd0a1d47bd0229ed14~GujuHtAtG2952229522eusmtrp2i; Fri, 17 Apr 2020 21:58:03 +0000 (GMT) X-AuditID: cbfec7f2-ef1ff7000001ef66-57-5e9a266ce3af Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id BC.94.08375.B662A9E5; Fri, 17 Apr 2020 22:58:03 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215802eusmtip29b1e03ea07c3fb22e222b8404b14f795~GujtlAbHy0325203252eusmtip2r; Fri, 17 Apr 2020 21:58:02 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Konstantin Ananyev , John McNamara , Marko Kovacevic Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:30 +0200 Message-Id: <20200417215739.23180-9-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87o5arPiDA7+FLN492k7k8X5eVtZ Ld7/WcRicX5jL6vFpwcnWBxYPX4tWMrqsXjPSyaPYzensQcwR3HZpKTmZJalFunbJXBlbH+1 iKXgglDFla6pzA2MN/m7GDk5JARMJC4f6WXrYuTiEBJYwSgxf/8JKOcLo8T37V+ZIJzPjBK9 lxezwLT0T5nHCJFYzihxdfd/VriqlmnP2UCq2ARsJY7M/AqWEBHYxihxuv8SE0iCWUBA4vG9 Z6wgtrCAv8SthT+ZQWwWAVWJq2fXgdXwCrhK/Duxlw1inbzE6g0HwGo4Bdwklr78DrZaQuA2 m8TpNVcZIYpcJJa3/INqEJZ4dXwLO4QtI/F/53wmiAagK67+/gnVvZ9R4nrvCqgqa4nD/34D dXMAnacpsX6XPkTYUWLnr9XsIGEJAT6JG28FIR7gk5i0bTozRJhXoqNNCKJaT+Jpz1RGmLV/ 1j6BBpeHxNfZDdBwnMkosWzybLYJjPKzEJYtYGRcxSieWlqcm55abJiXWq5XnJhbXJqXrpec n7uJEZgETv87/mkH49dLSYcYBTgYlXh4DXpmxgmxJpYVV+YeYpTgYFYS4T3oBhTiTUmsrEot yo8vKs1JLT7EKM3BoiTOa7zoZayQQHpiSWp2ampBahFMlomDU6qBMZjf+vyG+Iv6pj/q3Voe 6nzn+T9J33TX9NMpa2oqn7ja5PorJj8x2VAysXnH7xlL+lRNE22E9xxwL7hzdp6QTLejeenL rGkLN37xCp9Wvft8mGvGv1cL79m/k91x6OwpPb5SK3/m05btQfxvmRbn1SldjX1rP4t364Vw swNlX2tnn2OZfcj5vBJLcUaioRZzUXEiAMzpJu/+AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJLMWRmVeSWpSXmKPExsVy+t/xe7rZarPiDI7dkLN492k7k8X5eVtZ Ld7/WcRicX5jL6vFpwcnWBxYPX4tWMrqsXjPSyaPYzensQcwR+nZFOWXlqQqZOQXl9gqRRta GOkZWlroGZlY6hkam8daGZkq6dvZpKTmZJalFunbJehlbH+1iKXgglDFla6pzA2MN/m7GDk5 JARMJPqnzGPsYuTiEBJYyihx8dxBti5GDqCEjMSHSwIQNcISf651sUHUfGSU+NfXzAKSYBOw lTgy8ysrSEJEYAejxPd1v9lBEswCAhKP7z1jBRkkLOArsfSDAUiYRUBV4urZdUwgNq+Aq8S/ E3vZIBbIS6zecIAZxOYUcJNY+vI7I4gtBFTz8OEp9gmMfAsYGVYxiqSWFuem5xYb6hUn5haX 5qXrJefnbmIEBuO2Yz8372C8tDH4EKMAB6MSD69Bz8w4IdbEsuLK3EOMEhzMSiK8B92AQrwp iZVVqUX58UWlOanFhxhNgY6ayCwlmpwPjJS8knhDU0NzC0tDc2NzYzMLJXHeDoGDMUIC6Ykl qdmpqQWpRTB9TBycUg2Mwge5Il9GGNq4NK0xnnX7e//80GV2x1meyyxhfimjetpjk5afbbrP jzc/IrjZD+Vui3ryo3z5/IuNB5bce5hYyPtTuXFRJn9htEHBq55k5ym2Dx0Z74bxnrgkENQc tWuyDdcHno8TTt2M81X5EDfLl43j6TUjdtUNNnf1bA4tUD2bxTAvqveLEktxRqKhFnNRcSIA S+d6TlwCAAA= X-CMS-MailID: 20200417215803eucas1p16013610674ce6ac58189259f2632f562 X-Msg-Generator: CA X-RootMTR: 20200417215803eucas1p16013610674ce6ac58189259f2632f562 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215803eucas1p16013610674ce6ac58189259f2632f562 References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 08/17] ip_frag: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_IP_FRAG_DEBUG. The old define is completely removed from source code and config. The documentation was updated also. Signed-off-by: Lukasz Wojciechowski --- config/common_base | 1 - doc/guides/prog_guide/ip_fragment_reassembly_lib.rst | 4 ++-- lib/librte_ip_frag/ip_frag_common.h | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/config/common_base b/config/common_base index a12a869a9..44a9ab75c 100644 --- a/config/common_base +++ b/config/common_base @@ -956,7 +956,6 @@ CONFIG_RTE_LIBRTE_NET=y # Compile librte_ip_frag # CONFIG_RTE_LIBRTE_IP_FRAG=y -CONFIG_RTE_LIBRTE_IP_FRAG_DEBUG=n CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=4 CONFIG_RTE_LIBRTE_IP_FRAG_TBL_STAT=n diff --git a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst index 6ac1bba64..b48ccfbbf 100644 --- a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst +++ b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst @@ -104,7 +104,7 @@ Debug logging and Statistics Collection The RTE_LIBRTE_IP_FRAG_TBL_STAT config macro controls statistics collection for the Fragment Table. This macro is not enabled by default. -The RTE_LIBRTE_IP_FRAG_DEBUG controls debug logging of IP fragments processing and reassembling. -This macro is disabled by default. +The RTE_DEBUG controls debug logging of IP fragments processing and reassembling. +This macro is disabled by default and can be enabled using meson "debug" option. Note that while logging contains a lot of detailed information, it slows down packet processing and might cause the loss of a lot of packets. diff --git a/lib/librte_ip_frag/ip_frag_common.h b/lib/librte_ip_frag/ip_frag_common.h index a17a74076..79a0dbd18 100644 --- a/lib/librte_ip_frag/ip_frag_common.h +++ b/lib/librte_ip_frag/ip_frag_common.h @@ -8,11 +8,11 @@ #include "rte_ip_frag.h" /* logging macros. */ -#ifdef RTE_LIBRTE_IP_FRAG_DEBUG +#ifdef RTE_DEBUG #define IP_FRAG_LOG(lvl, fmt, args...) RTE_LOG(lvl, USER1, fmt, ##args) #else #define IP_FRAG_LOG(lvl, fmt, args...) do {} while(0) -#endif /* IP_FRAG_DEBUG */ +#endif /* RTE_DEBUG */ #define IPV4_KEYLEN 1 #define IPV6_KEYLEN 4 From patchwork Fri Apr 17 21:57:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68821 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 56AAAA0597; Fri, 17 Apr 2020 23:59:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B07341EBC8; Fri, 17 Apr 2020 23:58:16 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 9005A1EB87 for ; Fri, 17 Apr 2020 23:58:05 +0200 (CEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215805euoutp01a34841abf5c3604d2b879ac6d0c5f949~Gujv3Cmlh2759027590euoutp01j for ; Fri, 17 Apr 2020 21:58:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200417215805euoutp01a34841abf5c3604d2b879ac6d0c5f949~Gujv3Cmlh2759027590euoutp01j DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160685; bh=5PYeWBb8w13O/NBKe72u1/QU+tHOagzowElMuwz7tkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l+RCxXKnZyVcR05TkAYrzaMDx5XwBI2OJbT/nHTz17RebP2t3E7GhhPunc0ElqZtx H3RB/jfuQ4W9SYHaKATelcnwgZFWsZi0we8pfuumWP0XF6Syy3RlbmpWMPP/abv9ls 2lFBwc/cTOXicToUSBrqQyS0H9ATj+ElT/arDiUg= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200417215804eucas1p1456e404647d136844ed35189a2865ce2~GujvFccl40152001520eucas1p11; Fri, 17 Apr 2020 21:58:04 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 6E.5E.60698.C662A9E5; Fri, 17 Apr 2020 22:58:04 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200417215804eucas1p2c04d6f2141be07b25f0d346c73d4f965~GujuyCM5n1849618496eucas1p2s; Fri, 17 Apr 2020 21:58:04 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200417215804eusmtrp28fcd73a77a3048e642067e0096dd709f~GujuxdUXi2952229522eusmtrp2j; Fri, 17 Apr 2020 21:58:04 +0000 (GMT) X-AuditID: cbfec7f5-a0fff7000001ed1a-b4-5e9a266ce96f Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 1D.94.08375.C662A9E5; Fri, 17 Apr 2020 22:58:04 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215803eusmtip2ceec5b26286ea27fe6cb8f206dfbeb1f~GujuSP3EB0325203252eusmtip2s; Fri, 17 Apr 2020 21:58:03 +0000 (GMT) From: Lukasz Wojciechowski To: Bruce Richardson , Vladimir Medvedkin , Thomas Monjalon Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:31 +0200 Message-Id: <20200417215739.23180-10-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCIsWRmVeSWpSXmKPExsWy7djP87o5arPiDO71KlrcWGVv8e7TdiaL Tw9OsFg8verpwOLxa8FSVo/Fe14yeRy7OY09gDmKyyYlNSezLLVI3y6BK+PfuftsBZ/4K9q2 dbM0MH7h6WLk5JAQMJHovfKCpYuRi0NIYAWjxJEny6GcL4wSy/ZMY4VwPjNKHJy1iRGmZdWV JjaIxHJGieUT9yFUXZu0mA2kik3AVuLIzK9gCRGBXkaJk3MPM4EkmAUEJB7fe8YKYgsLeEos b/gB1sAioCqx5Nh/sBW8Am4SW2avZYZYJy+xesMBMJsTKL705XdGkKESAifYJJrWLmWHKHKR mH9/OiuELSzx6vgWqLiMxP+d85kgGrYxSlz9/ROqez+jxPXeFVBV1hKH//0GOoMD6DxNifW7 9CHCjhJ/fhxiAglLCPBJ3HgrCPEAn8SkbdOZIcK8Eh1tQhDVehJPe6Yywqz9s/YJC4TtIfHw fgM0hGYySrxZP41lAqP8LIRlCxgZVzGKp5YW56anFhvnpZbrFSfmFpfmpesl5+duYgTG/el/ x7/uYNz3J+kQowAHoxIPr0HPzDgh1sSy4srcQ4wSHMxKIrwH3YBCvCmJlVWpRfnxRaU5qcWH GKU5WJTEeY0XvYwVEkhPLEnNTk0tSC2CyTJxcEo1MFaFaS9l/DRf4Znqy9nTuneZlzCWni4R Eda8qV3LGSo4zcPA0Hin6D7N1I/zWc8ruhyVcXh4ze/ZWXkVvh62b+9lS0JPCJ6fwnFWZOai vHmG3SqPdpguulAce22vwYSf9avPbLjr4hlvmOv4QzV099T3F+NXH7PLXBz97LvTacsdZVM1 Zlo1MCuxFGckGmoxFxUnAgCs8rL79wIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrELMWRmVeSWpSXmKPExsVy+t/xe7o5arPiDDpvcFncWGVv8e7TdiaL Tw9OsFg8verpwOLxa8FSVo/Fe14yeRy7OY09gDlKz6Yov7QkVSEjv7jEVina0MJIz9DSQs/I xFLP0Ng81srIVEnfziYlNSezLLVI3y5BL+PfuftsBZ/4K9q2dbM0MH7h6WLk5JAQMJFYdaWJ DcQWEljKKPFwI3sXIwdQXEbiwyUBiBJhiT/XuoBKuIBKPjJK9F74zgiSYBOwlTgy8ysrSEJE oJ9R4vfng2AJZgEBicf3nrGC2MICnhLLG36ALWARUJVYcuw/WA2vgJvEltlrmSE2yEus3nAA zOYEii99CbFASMBV4uHDU+wTGPkWMDKsYhRJLS3OTc8tNtQrTswtLs1L10vOz93ECAy/bcd+ bt7BeGlj8CFGAQ5GJR5eg56ZcUKsiWXFlbmHGCU4mJVEeA+6AYV4UxIrq1KL8uOLSnNSiw8x mgIdNZFZSjQ5HxgbeSXxhqaG5haWhubG5sZmFkrivB0CB2OEBNITS1KzU1MLUotg+pg4OKUa GCeK/7JlEjCNnsO96ZbOnfuBv/+eOL7rcIViQcbN/WaG844a7HWXv2adde/JzNf1kXKtOf4X QyTPOl7avJD/n8Ghe+oLj6Wu01L5Jz/51sq7P2fcE340a4HvkXl18w/yMx7L8uEzeru4ch/X HclVv5unf73aGe7HufUTx+kH4porzPwXnVnMeChEiaU4I9FQi7moOBEAhmodG1UCAAA= X-CMS-MailID: 20200417215804eucas1p2c04d6f2141be07b25f0d346c73d4f965 X-Msg-Generator: CA X-RootMTR: 20200417215804eucas1p2c04d6f2141be07b25f0d346c73d4f965 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215804eucas1p2c04d6f2141be07b25f0d346c73d4f965 References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 09/17] lpm: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_LPM_DEBUG. The old define is completely removed from source code and config. Application of the flag in tests was also adjusted. Signed-off-by: Lukasz Wojciechowski --- app/test/test_lpm.c | 2 +- config/common_base | 1 - lib/librte_lpm/rte_lpm.c | 2 +- lib/librte_lpm/rte_lpm.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c index 3a3fd097f..339999e04 100644 --- a/app/test/test_lpm.c +++ b/app/test/test_lpm.c @@ -234,7 +234,7 @@ test4(void) int32_t test5(void) { -#if defined(RTE_LIBRTE_LPM_DEBUG) +#ifdef RTE_DEBUG struct rte_lpm *lpm = NULL; struct rte_lpm_config config; diff --git a/config/common_base b/config/common_base index 44a9ab75c..310d5ab24 100644 --- a/config/common_base +++ b/config/common_base @@ -933,7 +933,6 @@ CONFIG_RTE_LIBRTE_FIB=y # Compile librte_lpm # CONFIG_RTE_LIBRTE_LPM=y -CONFIG_RTE_LIBRTE_LPM_DEBUG=n # # Compile librte_acl diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c index 268756419..0907cf11c 100644 --- a/lib/librte_lpm/rte_lpm.c +++ b/lib/librte_lpm/rte_lpm.c @@ -40,7 +40,7 @@ enum valid_flag { }; /* Macro to enable/disable run-time checks. */ -#if defined(RTE_LIBRTE_LPM_DEBUG) +#ifdef RTE_DEBUG #include #define VERIFY_DEPTH(depth) do { \ if ((depth == 0) || (depth > RTE_LPM_MAX_DEPTH)) \ diff --git a/lib/librte_lpm/rte_lpm.h b/lib/librte_lpm/rte_lpm.h index b9d49ac87..350fa6bc8 100644 --- a/lib/librte_lpm/rte_lpm.h +++ b/lib/librte_lpm/rte_lpm.h @@ -48,7 +48,7 @@ extern "C" { RTE_LPM_TBL8_GROUP_NUM_ENTRIES) /** @internal Macro to enable/disable run-time checks. */ -#if defined(RTE_LIBRTE_LPM_DEBUG) +#ifdef RTE_DEBUG #define RTE_LPM_RETURN_IF_TRUE(cond, retval) do { \ if (cond) return (retval); \ } while (0) From patchwork Fri Apr 17 21:57:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68822 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 03DE6A0597; Fri, 17 Apr 2020 23:59:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E65FF1EBCC; Fri, 17 Apr 2020 23:58:17 +0200 (CEST) Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by dpdk.org (Postfix) with ESMTP id 1523F1EB87 for ; Fri, 17 Apr 2020 23:58:06 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215805euoutp025a78f7467ff8de3804da63f65c459001~GujwUPy6G0662106621euoutp02H for ; Fri, 17 Apr 2020 21:58:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200417215805euoutp025a78f7467ff8de3804da63f65c459001~GujwUPy6G0662106621euoutp02H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160685; bh=97f9dJ9CgXI5W5FtLgInRl9tf0JP8KjhPDMLPlw+jlc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zqs7PzMf6NualJW8KsTSPnJhPcPEqsZbBnVIX7ZMw4Su3beUiVbyc/BVAV/zfKQHx r2PEK97juTSFdReiWcYkS+VUYmbWMmKS2GbZ9tzO/ZB46VOwPhjHJqrs47lSChh8OY jGyPvyrPLumxrA+cRjXcXCo1jx7ESz/r6+PRPoC8= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200417215805eucas1p2113ed497cb501f4cd5bf2740c20a6aad~GujwGXSKJ1749217492eucas1p2b; Fri, 17 Apr 2020 21:58:05 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id C1.C4.60679.D662A9E5; Fri, 17 Apr 2020 22:58:05 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200417215805eucas1p114b3286afa16d6f12916048234f3a159~Gujvl3k-W0162301623eucas1p1s; Fri, 17 Apr 2020 21:58:05 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200417215805eusmtrp1ce02d4f64dc7d62aac52f38963d0ee9a~GujvlU6GF0397603976eusmtrp1s; Fri, 17 Apr 2020 21:58:05 +0000 (GMT) X-AuditID: cbfec7f4-0e5ff7000001ed07-7e-5e9a266d6bb9 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 30.62.07950.D662A9E5; Fri, 17 Apr 2020 22:58:05 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215804eusmtip220eba79d20dea9ac4aef3b1258e40925~Guju50mX80325203252eusmtip2t; Fri, 17 Apr 2020 21:58:04 +0000 (GMT) From: Lukasz Wojciechowski To: Olivier Matz , Thomas Monjalon , John McNamara , Marko Kovacevic Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:32 +0200 Message-Id: <20200417215739.23180-11-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHIsWRmVeSWpSXmKPExsWy7djPc7q5arPiDDY+ULV492k7k8X5eVtZ Lc5v7GW12Nq0kcni04MTLA6sHhf77zB6/FqwlNVj8Z6XTB7Hbk5jD2CJ4rJJSc3JLEst0rdL 4MrYueAeU8EisYrnT/+yNjBeFupi5OSQEDCR+PH1MVMXIxeHkMAKRonPx6azQThfGCUadz2B cj4zSizvOcgO0zLt92moluWMEm2nNrKCJMCqlnyWBLHZBGwljsz8ygpSJCKwilGi784hNpAE s4CAxON7z8AahAW8JA78OgYWZxFQlVi97BoziM0r4Cbx8fgqJoht8hKrNxwAi3MCxZe+/M4I MlRC4D6bxIfN64EcDiDHRWLjZA6IemGJV8e3QF0qI3F6cg8LRP02Romrv39CNe9nlLjeuwKq ylri8L/fbCCDmAU0Jdbv0ocIO0qcPfiSCWI+n8SNt4IQ9/NJTNo2nRkizCvR0QYNRz2Jpz1T GWHW/ln7hAXC9pCY1HicHRJYMxklfr9tYJ/AKD8LYdkCRsZVjOKppcW56anFRnmp5XrFibnF pXnpesn5uZsYgang9L/jX3Yw7vqTdIhRgINRiYfXoGdmnBBrYllxZe4hRgkOZiUR3oNuQCHe lMTKqtSi/Pii0pzU4kOM0hwsSuK8xotexgoJpCeWpGanphakFsFkmTg4pRoYRZPnG2i7JxUn RZl3fpl6tlv6bb67yKlbq44+flNRpblpopqXKOPbU48CtvTf2/SrUWVv1BdWl8abvb8cuz7c isvJUp3b7HtTItiyht3S6WrZ4hdz/rqGFlik2ZQntUyR38TeuJJj79ZN64I7Wd+EO93snjNB TWzL+cfae376rHT0V9Yzv9aqxFKckWioxVxUnAgA+J6sqAEDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHLMWRmVeSWpSXmKPExsVy+t/xe7q5arPiDGavZbZ492k7k8X5eVtZ Lc5v7GW12Nq0kcni04MTLA6sHhf77zB6/FqwlNVj8Z6XTB7Hbk5jD2CJ0rMpyi8tSVXIyC8u sVWKNrQw0jO0tNAzMrHUMzQ2j7UyMlXSt7NJSc3JLEst0rdL0MvYueAeU8EisYrnT/+yNjBe Fupi5OSQEDCRmPb7NFMXIxeHkMBSRokpnyezdjFyACVkJD5cEoCoEZb4c62LDcQWEvjIKHHv eQqIzSZgK3Fk5ldWkF4RgTWMEic3fGYESTALCEg8vveMFcQWFvCSOPDrGFgzi4CqxOpl15hB bF4BN4mPx1cxQSyQl1i94QBYnBMovvTld0aIZa4SDx+eYp/AyLeAkWEVo0hqaXFuem6xkV5x Ym5xaV66XnJ+7iZGYFhuO/Zzyw7GrnfBhxgFOBiVeHgNembGCbEmlhVX5h5ilOBgVhLhPegG FOJNSaysSi3Kjy8qzUktPsRoCnTURGYp0eR8YMzklcQbmhqaW1gamhubG5tZKInzdggcjBES SE8sSc1OTS1ILYLpY+LglGpg3KESs2mq6sXPJ5q5TRw893j3s+Rl387atMqwTPjgQ6a9oQZv uq8V73zlbGL++ttvu6mabw7sSf4530wtkfVU+9zbkkuFOhZdFv6xRGbLmfmrC7VkpooKyJ8V 3+KnL7BzdkjTOV9XPcezG0M+hDDeFZfS/xfkpLym0iOthNE3WslMo0fj++QKJZbijERDLeai 4kQA+shxW2ECAAA= X-CMS-MailID: 20200417215805eucas1p114b3286afa16d6f12916048234f3a159 X-Msg-Generator: CA X-RootMTR: 20200417215805eucas1p114b3286afa16d6f12916048234f3a159 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215805eucas1p114b3286afa16d6f12916048234f3a159 References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 10/17] mbuf: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_MBUF_DEBUG. The old define is completely removed from source code and config. Tests and documentation were also updated. Signed-off-by: Lukasz Wojciechowski --- app/test/test_mbuf.c | 2 +- config/common_base | 1 - doc/guides/prog_guide/mbuf_lib.rst | 2 +- lib/librte_mbuf/rte_mbuf.h | 6 +++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c index 8200b4f71..0f0036c49 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -994,7 +994,7 @@ test_pktmbuf_free_segment(struct rte_mempool *pktmbuf_pool) /* * Stress test for rte_mbuf atomic refcnt. * Implies that RTE_MBUF_REFCNT_ATOMIC is defined. - * For more efficiency, recommended to run with RTE_LIBRTE_MBUF_DEBUG defined. + * For more efficiency, recommended to run with RTE_DEBUG defined. */ #ifdef RTE_MBUF_REFCNT_ATOMIC diff --git a/config/common_base b/config/common_base index 310d5ab24..c24086789 100644 --- a/config/common_base +++ b/config/common_base @@ -852,7 +852,6 @@ CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL=y # Compile librte_mbuf # CONFIG_RTE_LIBRTE_MBUF=y -CONFIG_RTE_LIBRTE_MBUF_DEBUG=n CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS="ring_mp_mc" CONFIG_RTE_MBUF_REFCNT_ATOMIC=y CONFIG_RTE_PKTMBUF_HEADROOM=128 diff --git a/doc/guides/prog_guide/mbuf_lib.rst b/doc/guides/prog_guide/mbuf_lib.rst index 0d3223b08..c04bb45d8 100644 --- a/doc/guides/prog_guide/mbuf_lib.rst +++ b/doc/guides/prog_guide/mbuf_lib.rst @@ -243,7 +243,7 @@ can be found in several of the sample applications, for example, the IPv4 Multic Debug ----- -In debug mode (CONFIG_RTE_MBUF_DEBUG is enabled), +In debug mode (RTE_DEBUG is enabled, e.g. by using "debug" option during meson setup), the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, bad type, and so on). Use Cases diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index f8e492e59..2deb309e0 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -341,17 +341,17 @@ rte_pktmbuf_priv_flags(struct rte_mempool *mp) #define RTE_MBUF_HAS_PINNED_EXTBUF(mb) \ (rte_pktmbuf_priv_flags(mb->pool) & RTE_PKTMBUF_POOL_F_PINNED_EXT_BUF) -#ifdef RTE_LIBRTE_MBUF_DEBUG +#ifdef RTE_DEBUG /** check mbuf type in debug mode */ #define __rte_mbuf_sanity_check(m, is_h) rte_mbuf_sanity_check(m, is_h) -#else /* RTE_LIBRTE_MBUF_DEBUG */ +#else /* RTE_DEBUG */ /** check mbuf type in debug mode */ #define __rte_mbuf_sanity_check(m, is_h) do { } while (0) -#endif /* RTE_LIBRTE_MBUF_DEBUG */ +#endif /* RTE_DEBUG */ #ifdef RTE_MBUF_REFCNT_ATOMIC From patchwork Fri Apr 17 21:57:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68823 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EFF0AA0597; Fri, 17 Apr 2020 23:59:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 351EF1EBD3; Fri, 17 Apr 2020 23:58:19 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id B84A71EB88 for ; Fri, 17 Apr 2020 23:58:06 +0200 (CEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215806euoutp01bfdf1c6448f5b34f2d88237706b1efb7~Gujw8CrOv0105301053euoutp01O for ; Fri, 17 Apr 2020 21:58:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200417215806euoutp01bfdf1c6448f5b34f2d88237706b1efb7~Gujw8CrOv0105301053euoutp01O DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160686; bh=JK7GvMVPo/tRQQF82iEFycIE0MHkaBWSpEwLpVMYSZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rmiyf32Q0/0IguixDiQPh+mu0sXXZSXu17a5tzIyukx+ocaiFPwNKJkrkF+foQb8/ JEgDLsZIhWZe2lbHEVh93Y398GRIqSmFGya4aUyWngBI1KKtFGMT1Vn5n0x9ouxdDY hH+DFaOl96S/1vAXmZjfrS8SAyflQpZWpbS3hvUQ= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200417215806eucas1p1e840e8666f3a5f62d047b59a9c00e434~GujwmClun2647326473eucas1p1D; Fri, 17 Apr 2020 21:58:06 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id BE.5E.60698.E662A9E5; Fri, 17 Apr 2020 22:58:06 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200417215805eucas1p2530efed5c5a73df8cc5fb613b11dfdde~GujwRZRR41701917019eucas1p2d; Fri, 17 Apr 2020 21:58:05 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200417215805eusmtrp21d49a613cbf22a2a5dc804d44819429a~GujwQ4OeV2952229522eusmtrp2k; Fri, 17 Apr 2020 21:58:05 +0000 (GMT) X-AuditID: cbfec7f5-a29ff7000001ed1a-b7-5e9a266ef1d1 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 6D.94.08375.D662A9E5; Fri, 17 Apr 2020 22:58:05 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215805eusmtip286a19a7568dab24dce0b58bc34a0e75d~GujvmzkF50325203252eusmtip2u; Fri, 17 Apr 2020 21:58:05 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Olivier Matz , Andrew Rybchenko , John McNamara , Marko Kovacevic Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:33 +0200 Message-Id: <20200417215739.23180-12-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBIsWRmVeSWpSXmKPExsWy7djP87p5arPiDGb9Y7d4MOUum8W7T9uZ LM7P28pqcX5jL6vF1qaNTBafHpxgcWDzuNh/h9Hj14KlrB6L97xk8jh2cxq7x+onP9gCWKO4 bFJSczLLUov07RK4Mrb81inY61jRs/sCWwPjbrMuRk4OCQETiUXP3jN2MXJxCAmsYJTonv8Z yvnCKNF5rZUVpEpI4DOjxOX9iTAdZ3/OZYEoWs4o0XNvBxuEA1R0ac41FpAqNgFbiSMzv7KC JEQEbjFKLJnzkxEkwSwgIPH43jOwscIC/hI/2+aB2SwCqhLzd/9kB7F5BdwkVl/5wQyxTl5i 9YYDYDYnUHzpy+9g90kIvGaT2P9oLgtEkYvEhYNfGCFsYYlXx7ewQ9gyEv93zmeCaNjGKHH1 90+o7v2MEtd7V0BVWUsc/vcb6AkOoPM0Jdbv0ocIO0ocvnubBSQsIcAnceOtIMQDfBKTtk1n hgjzSnS0CUFU60k87ZnKCLP2z9onUKd5SHyevpIZEkIzGSVubr7KOoFRfhbCsgWMjKsYxVNL i3PTU4uN81LL9YoTc4tL89L1kvNzNzEC08Ppf8e/7mDc9yfpEKMAB6MSD69Bz8w4IdbEsuLK 3EOMEhzMSiK8B92AQrwpiZVVqUX58UWlOanFhxilOViUxHmNF72MFRJITyxJzU5NLUgtgsky cXBKNTAuDOEUKTsye+5lY1Vf7RebhDofTc5d/ruFjVOonvHU9ZcHTkulPzdw3qmrJblMSbDA /55F26SstZoPfBJUrcudvl309n9dGRERb7K2OmIt55YpbxPcL7+Zs+K7wkFxlZqA2KLVmr9a 77W5NJy1DqxrNoz3DFnv83x7nUCHt/uThbZrZb2VTJRYijMSDbWYi4oTAawS+isLAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBLMWRmVeSWpSXmKPExsVy+t/xe7q5arPiDPYsM7R4MOUum8W7T9uZ LM7P28pqcX5jL6vF1qaNTBafHpxgcWDzuNh/h9Hj14KlrB6L97xk8jh2cxq7x+onP9gCWKP0 bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0Mrb81inY 61jRs/sCWwPjbrMuRk4OCQETibM/57J0MXJxCAksZZRY2rUbyOEASshIfLgkAFEjLPHnWhcb RM1HRonPE8+ygCTYBGwljsz8ygqSEBG4wygxeepvVpAEs4CAxON7z8BsYQFfia87mhlBbBYB VYn5u3+yg9i8Am4Sq6/8YIbYIC+xesMBMJsTKL705XeweiEBV4mHD0+xT2DkW8DIsIpRJLW0 ODc9t9hQrzgxt7g0L10vOT93EyMwVLcd+7l5B+OljcGHGAU4GJV4eA16ZsYJsSaWFVfmHmKU 4GBWEuE96AYU4k1JrKxKLcqPLyrNSS0+xGgKdNREZinR5HxgHOWVxBuaGppbWBqaG5sbm1ko ifN2CByMERJITyxJzU5NLUgtgulj4uCUamBUFNLtNtkekLFPMGTXZ02fR0GfF7+uz4o79bX3 zgy7OcdtDNcazww8+a/xuY+inF3lv5tObiwMV7ZOjj6rf/aOg+BWqU5j1/qtlns+77qZfPem q0gcc1Gm7tMqfqn3EZPPLzdY8PvLr78GGy3Zj+jUnOV9njF9ZdY6BzelkoK0K4Z1Gy4Yr/NQ YinOSDTUYi4qTgQAzTHfbWsCAAA= X-CMS-MailID: 20200417215805eucas1p2530efed5c5a73df8cc5fb613b11dfdde X-Msg-Generator: CA X-RootMTR: 20200417215805eucas1p2530efed5c5a73df8cc5fb613b11dfdde X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215805eucas1p2530efed5c5a73df8cc5fb613b11dfdde References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 11/17] mempool: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_MEMPOOL_DEBUG. The old define is completely removed from source code and config. Documentation was also updated. Signed-off-by: Lukasz Wojciechowski --- config/common_base | 1 - doc/guides/prog_guide/mempool_lib.rst | 7 ++++--- lib/librte_mempool/rte_mempool.c | 16 ++++++++-------- lib/librte_mempool/rte_mempool.h | 20 ++++++++++---------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/config/common_base b/config/common_base index c24086789..b975a1feb 100644 --- a/config/common_base +++ b/config/common_base @@ -828,7 +828,6 @@ CONFIG_RTE_LIBRTE_STACK=y # CONFIG_RTE_LIBRTE_MEMPOOL=y CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE=512 -CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG=n # # Compile Mempool drivers diff --git a/doc/guides/prog_guide/mempool_lib.rst b/doc/guides/prog_guide/mempool_lib.rst index f8b430d65..b8104163e 100644 --- a/doc/guides/prog_guide/mempool_lib.rst +++ b/doc/guides/prog_guide/mempool_lib.rst @@ -17,14 +17,15 @@ This library is used by the :ref:`Mbuf Library `. Cookies ------- -In debug mode (CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is enabled), cookies are added at the beginning and end of allocated blocks. +In debug mode (RTE_DEBUG is enabled), cookies are added at the beginning and end of allocated blocks. The allocated objects then contain overwrite protection fields to help debugging buffer overflows. +The RTE_DEBUG flag can be enabled using meson "debug" option. Stats ----- -In debug mode (CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is enabled), -statistics about get from/put in the pool are stored in the mempool structure. +In debug mode (RTE_DEBUG is enabled), statistics about get from/put in the pool +are stored in the mempool structure. Statistics are per-lcore to avoid concurrent access to statistics counters. Memory Alignment Constraints on x86 architecture diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c index 712c839a0..7772895cc 100644 --- a/lib/librte_mempool/rte_mempool.c +++ b/lib/librte_mempool/rte_mempool.c @@ -164,7 +164,7 @@ mempool_add_elem(struct rte_mempool *mp, __rte_unused void *opaque, STAILQ_INSERT_TAIL(&mp->elt_list, hdr, next); mp->populated_size++; -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG hdr->cookie = RTE_MEMPOOL_HEADER_COOKIE2; tlr = __mempool_get_trailer(obj); tlr->cookie = RTE_MEMPOOL_TRAILER_COOKIE; @@ -219,7 +219,7 @@ rte_mempool_calc_obj_size(uint32_t elt_size, uint32_t flags, sz->header_size = RTE_ALIGN_CEIL(sz->header_size, RTE_MEMPOOL_ALIGN); -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG sz->trailer_size = sizeof(struct rte_mempool_objtlr); #else sz->trailer_size = 0; @@ -806,7 +806,7 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size, RTE_CACHE_LINE_MASK) != 0); RTE_BUILD_BUG_ON((sizeof(struct rte_mempool_cache) & RTE_CACHE_LINE_MASK) != 0); -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG RTE_BUILD_BUG_ON((sizeof(struct rte_mempool_debug_stats) & RTE_CACHE_LINE_MASK) != 0); RTE_BUILD_BUG_ON((offsetof(struct rte_mempool, stats) & @@ -1033,7 +1033,7 @@ rte_mempool_dump_cache(FILE *f, const struct rte_mempool *mp) void rte_mempool_check_cookies(const struct rte_mempool *mp, void * const *obj_table_const, unsigned n, int free) { -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG struct rte_mempool_objhdr *hdr; struct rte_mempool_objtlr *tlr; uint64_t cookie; @@ -1102,7 +1102,7 @@ void rte_mempool_contig_blocks_check_cookies(const struct rte_mempool *mp, void * const *first_obj_table_const, unsigned int n, int free) { -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG struct rte_mempool_info info; const size_t total_elt_sz = mp->header_size + mp->elt_size + mp->trailer_size; @@ -1128,7 +1128,7 @@ rte_mempool_contig_blocks_check_cookies(const struct rte_mempool *mp, #endif } -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG static void mempool_obj_audit(struct rte_mempool *mp, __rte_unused void *opaque, void *obj, __rte_unused unsigned idx) @@ -1192,7 +1192,7 @@ rte_mempool_audit(struct rte_mempool *mp) void rte_mempool_dump(FILE *f, struct rte_mempool *mp) { -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG struct rte_mempool_info info; struct rte_mempool_debug_stats sum; unsigned lcore_id; @@ -1234,7 +1234,7 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp) fprintf(f, " common_pool_count=%u\n", common_count); /* sum and dump statistics */ -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG rte_mempool_ops_get_info(mp, &info); memset(&sum, 0, sizeof(sum)); for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h index c90cf3146..dd16c1146 100644 --- a/lib/librte_mempool/rte_mempool.h +++ b/lib/librte_mempool/rte_mempool.h @@ -59,7 +59,7 @@ extern "C" { #define RTE_MEMPOOL_HEADER_COOKIE2 0xf2eef2eedadd2e55ULL /**< Header cookie. */ #define RTE_MEMPOOL_TRAILER_COOKIE 0xadd2e55badbadbadULL /**< Trailer cookie.*/ -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG /** * A structure that stores the mempool statistics (per-lcore). */ @@ -141,7 +141,7 @@ struct rte_mempool_objhdr { rte_iova_t iova; /**< IO address of the object. */ phys_addr_t physaddr; /**< deprecated - Physical address of the object. */ }; -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG uint64_t cookie; /**< Debug cookie. */ #endif }; @@ -151,7 +151,7 @@ struct rte_mempool_objhdr { */ STAILQ_HEAD(rte_mempool_objhdr_list, rte_mempool_objhdr); -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG /** * Mempool object trailer structure @@ -254,7 +254,7 @@ struct rte_mempool { uint32_t nb_mem_chunks; /**< Number of memory chunks */ struct rte_mempool_memhdr_list mem_list; /**< List of memory chunks */ -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG /** Per-lcore statistics. */ struct rte_mempool_debug_stats stats[RTE_MAX_LCORE]; #endif @@ -279,7 +279,7 @@ struct rte_mempool { * @param n * Number to add to the object-oriented statistics. */ -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG #define __MEMPOOL_STAT_ADD(mp, name, n) do { \ unsigned __lcore_id = rte_lcore_id(); \ if (__lcore_id < RTE_MAX_LCORE) { \ @@ -357,12 +357,12 @@ static inline struct rte_mempool_objtlr *__mempool_get_trailer(void *obj) void rte_mempool_check_cookies(const struct rte_mempool *mp, void * const *obj_table_const, unsigned n, int free); -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG #define __mempool_check_cookies(mp, obj_table_const, n, free) \ rte_mempool_check_cookies(mp, obj_table_const, n, free) #else #define __mempool_check_cookies(mp, obj_table_const, n, free) do {} while(0) -#endif /* RTE_LIBRTE_MEMPOOL_DEBUG */ +#endif /* RTE_DEBUG */ /** * @warning @@ -385,7 +385,7 @@ void rte_mempool_check_cookies(const struct rte_mempool *mp, void rte_mempool_contig_blocks_check_cookies(const struct rte_mempool *mp, void * const *first_obj_table_const, unsigned int n, int free); -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG #define __mempool_contig_blocks_check_cookies(mp, first_obj_table_const, n, \ free) \ rte_mempool_contig_blocks_check_cookies(mp, first_obj_table_const, n, \ @@ -394,7 +394,7 @@ void rte_mempool_contig_blocks_check_cookies(const struct rte_mempool *mp, #define __mempool_contig_blocks_check_cookies(mp, first_obj_table_const, n, \ free) \ do {} while (0) -#endif /* RTE_LIBRTE_MEMPOOL_DEBUG */ +#endif /* RTE_DEBUG */ #define RTE_MEMPOOL_OPS_NAMESIZE 32 /**< Max length of ops struct name. */ @@ -1337,7 +1337,7 @@ __mempool_generic_put(struct rte_mempool *mp, void * const *obj_table, ring_enqueue: /* push remaining objects in ring */ -#ifdef RTE_LIBRTE_MEMPOOL_DEBUG +#ifdef RTE_DEBUG if (rte_mempool_ops_enqueue_bulk(mp, obj_table, n) < 0) rte_panic("cannot put objects in mempool\n"); #else From patchwork Fri Apr 17 21:57:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68824 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E4955A0597; Sat, 18 Apr 2020 00:00:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8F4791EBDB; Fri, 17 Apr 2020 23:58:20 +0200 (CEST) Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by dpdk.org (Postfix) with ESMTP id 3D6FF1EB90 for ; Fri, 17 Apr 2020 23:58:08 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215808euoutp02d2c69065c6b025fb80939b2f71ac4266~GujyWJv0o0278302783euoutp02d for ; Fri, 17 Apr 2020 21:58:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200417215808euoutp02d2c69065c6b025fb80939b2f71ac4266~GujyWJv0o0278302783euoutp02d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160688; bh=Vzvv/A3kKIKamyEfAdGkrG5mfGSYRlkoOOHsMjRI+kE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sTOkZoCnxT8vYgq/hQc9P8DmQX+D4j7eyuzeX5uQt0TKroK9ieQXB2/eqxf9feRFp llEH4faw6MYe1ABZuLV0i2F+Gb42pW8PxU6E4v3vyiXIV3L4a20U00X5FnEDbTRFIC xqwV8iRpV5dhW536lkNTpEFYeHrEPDtI5hY2flNM= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200417215807eucas1p270a501722da000edf275d4e2e9fc1624~GujxmnI5J2665726657eucas1p2I; Fri, 17 Apr 2020 21:58:07 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 1D.FF.61286.F662A9E5; Fri, 17 Apr 2020 22:58:07 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200417215806eucas1p1df0cf8a6cfe65dd687dde9056854bbad~Gujw5Qt3U0152001520eucas1p13; Fri, 17 Apr 2020 21:58:06 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200417215806eusmtrp162fdeea371bab07f3f4a66048c5e25ea~Gujw4vgxO0397603976eusmtrp1t; Fri, 17 Apr 2020 21:58:06 +0000 (GMT) X-AuditID: cbfec7f2-f0bff7000001ef66-5a-5e9a266f6aea Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 90.62.07950.E662A9E5; Fri, 17 Apr 2020 22:58:06 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215805eusmtip2942d0674b759a8cccc822d1e6c113b3f~GujwZs9Pe0325203252eusmtip2v; Fri, 17 Apr 2020 21:58:05 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , David Hunt Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:34 +0200 Message-Id: <20200417215739.23180-13-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDIsWRmVeSWpSXmKPExsWy7djP87r5arPiDD728Fj0TfrIZPHu03Ym i08PTrA4MHv8WrCU1WPxnpdMHsduTmMPYI7isklJzcksSy3St0vgyji1fhpTQTNvxaHtrxkb GJu4uxg5OSQETCSuvu1jBrGFBFYwSvxoU+xi5AKyvzBKrLh+khnC+cwocfz/QRaYjmWLt7FA dCxnlDjWIA9X1Nm1nAkkwSZgK3Fk5lfWLkYODhEBH4nFr6JAwswCAhKP7z1jBbGFBbwlbp3Z DbaZRUBVYvesu0wg5bwCbhKdTWEQq+QlVm84AFbCCRRe+vI7I8gqCYETbBKvJu9khChykfi8 /TYbhC0s8er4FnYIW0bi9OQeFoiGbYwSV3//hOrezyhxvXcFVJW1xOF/v9lANjMLaEqs36UP EXaUeLFgB9j9EgJ8EjfeCkLczycxadt0Zogwr0RHmxBEtZ7E056pjDBr/6x9Ag0qD4mPnx+z Q4JnJjB4Tt5hnMAoPwth2QJGxlWM4qmlxbnpqcWGeanlesWJucWleel6yfm5mxiBcX763/FP Oxi/Xko6xCjAwajEw2vQMzNOiDWxrLgy9xCjBAezkgjvQTegEG9KYmVValF+fFFpTmrxIUZp DhYlcV7jRS9jhQTSE0tSs1NTC1KLYLJMHJxSDYzJFYtnOn8LK3peYPbRKiN6xa7JMQ94Xok+ f6PF7MpYv+JoVaOa7nGXcvmv9xTfO6glTt5Vz/PiRPBhvtPVk1fYLvfu+fzvxGVd0VXtM1Sy m6pff53DMJUzZcq3qfLrF05aLKr2xejob7WM6uoZmVPbqzQy7j4oymIo+p76VmjP/h6Z3cyT zHmVWIozEg21mIuKEwF8kHO07wIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHLMWRmVeSWpSXmKPExsVy+t/xe7p5arPiDA4dlLDom/SRyeLdp+1M Fp8enGBxYPb4tWApq8fiPS+ZPI7dnMYewBylZ1OUX1qSqpCRX1xiqxRtaGGkZ2hpoWdkYqln aGwea2VkqqRvZ5OSmpNZllqkb5egl3Fq/TSmgmbeikPbXzM2MDZxdzFyckgImEgsW7yNpYuR i0NIYCmjxKT7L5m7GDmAEjISHy4JQNQIS/y51sUGUfORUWLnt1lMIAk2AVuJIzO/soLYIgJ+ Emt6DrOD2MwCAhKP7z0DiwsLeEvcOrObGcRmEVCV2D3rLhPIfF4BN4nOpjCI+fISqzccACvh BAovffmdEcQWEnCVePjwFPsERr4FjAyrGEVSS4tz03OLjfSKE3OLS/PS9ZLzczcxAsNu27Gf W3Ywdr0LPsQowMGoxMNr0DMzTog1say4MvcQowQHs5II70E3oBBvSmJlVWpRfnxRaU5q8SFG U6CbJjJLiSbnA2MiryTe0NTQ3MLS0NzY3NjMQkmct0PgYIyQQHpiSWp2ampBahFMHxMHp1QD Y4Ah95vn/JpxdauuPjSb93vywYen3K/Unt3P2hz5tyYxLeDGhooF9+w0vzx75rdJJH/lkhOh X4XVP/w47fi4oeRy+uIXlxb/Lyy42cKRa3bmQWVNezr3No410+Ksv00ySWM+XF2qrJvY+lej 9eyj71/6lj889oGXXedd9KumJwvZjPZuWPqlvkWJpTgj0VCLuag4EQBEliZmUQIAAA== X-CMS-MailID: 20200417215806eucas1p1df0cf8a6cfe65dd687dde9056854bbad X-Msg-Generator: CA X-RootMTR: 20200417215806eucas1p1df0cf8a6cfe65dd687dde9056854bbad X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215806eucas1p1df0cf8a6cfe65dd687dde9056854bbad References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 12/17] power: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_POWER_DEBUG. The old define is completely removed from source code and config. Signed-off-by: Lukasz Wojciechowski --- config/common_base | 1 - lib/librte_power/power_acpi_cpufreq.c | 2 +- lib/librte_power/power_pstate_cpufreq.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/common_base b/config/common_base index b975a1feb..5863b4327 100644 --- a/config/common_base +++ b/config/common_base @@ -941,7 +941,6 @@ CONFIG_RTE_LIBRTE_ACL=y # Compile librte_power # CONFIG_RTE_LIBRTE_POWER=n -CONFIG_RTE_LIBRTE_POWER_DEBUG=n CONFIG_RTE_MAX_LCORE_FREQS=64 # diff --git a/lib/librte_power/power_acpi_cpufreq.c b/lib/librte_power/power_acpi_cpufreq.c index f443fce69..d5791699d 100644 --- a/lib/librte_power/power_acpi_cpufreq.c +++ b/lib/librte_power/power_acpi_cpufreq.c @@ -20,7 +20,7 @@ #include "power_acpi_cpufreq.h" #include "power_common.h" -#ifdef RTE_LIBRTE_POWER_DEBUG +#ifdef RTE_DEBUG #define POWER_DEBUG_TRACE(fmt, args...) do { \ RTE_LOG(ERR, POWER, "%s: " fmt, __func__, ## args); \ } while (0) diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/librte_power/power_pstate_cpufreq.c index 2d8a9499d..0e522f768 100644 --- a/lib/librte_power/power_pstate_cpufreq.c +++ b/lib/librte_power/power_pstate_cpufreq.c @@ -23,7 +23,7 @@ #include "power_common.h" -#ifdef RTE_LIBRTE_POWER_DEBUG +#ifdef RTE_DEBUG #define POWER_DEBUG_TRACE(fmt, args...) do { \ RTE_LOG(ERR, POWER, "%s: " fmt, __func__, ## args); \ } while (0) From patchwork Fri Apr 17 21:57:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68825 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 97AF8A0597; Sat, 18 Apr 2020 00:00:18 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D19971EBE4; Fri, 17 Apr 2020 23:58:21 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 6781F1EB92 for ; Fri, 17 Apr 2020 23:58:08 +0200 (CEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215808euoutp0149f1b6420ea05db9c409dcfa7f57f086~GujyetlsO2759027590euoutp01m for ; Fri, 17 Apr 2020 21:58:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200417215808euoutp0149f1b6420ea05db9c409dcfa7f57f086~GujyetlsO2759027590euoutp01m DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160688; bh=Bfl84AtPOW/TlVMh9AOzjSBS6cWoXLM1R1YVjTrBg94=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NVKkLhi9fHWwpRlgjfn8YneBlq2h1usNd/PcSv/V2wCBW1V7/vMTrjInXsZrrrMBc sCMtiEDIpLMrHQpid1PtkivLrnyx0AjUneuvGGY4MSt8SXF+ZdL9W6NCioKoQUUbx8 C88u1QmwPGnr7XyA2jcj1KrZEdzwEphowRDLXr74= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200417215807eucas1p19f7eacf1d35714883f4a0c901da73635~Gujx7KqEm0163101631eucas1p15; Fri, 17 Apr 2020 21:58:07 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 22.C4.60679.F662A9E5; Fri, 17 Apr 2020 22:58:07 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200417215807eucas1p14de926321e5a683224f7550ae902af5b~GujxjC6Fd1204912049eucas1p1P; Fri, 17 Apr 2020 21:58:07 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200417215807eusmtrp1c1a2f953f457b42561b5566f4af205ac~GujxifsUl0397603976eusmtrp1u; Fri, 17 Apr 2020 21:58:07 +0000 (GMT) X-AuditID: cbfec7f4-0cbff7000001ed07-81-5e9a266f6864 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id D0.62.07950.F662A9E5; Fri, 17 Apr 2020 22:58:07 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215806eusmtip2ca4500acddf7aded06f5549bf437f8ae~Gujw-H5DL0325203252eusmtip2w; Fri, 17 Apr 2020 21:58:06 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Honnappa Nagarahalli , John McNamara , Marko Kovacevic Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:35 +0200 Message-Id: <20200417215739.23180-14-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHIsWRmVeSWpSXmKPExsWy7djPc7r5arPiDKb/kbN492k7k8XMpy3s FufnbWW1OL+xl9Xi04MTLA6sHmvmrWH0+LVgKavH4j0vmTyO3ZzGHsASxWWTkpqTWZZapG+X wJXRc20zS8FjpYoXd6awNDA+leli5OSQEDCR2HBxBlMXIxeHkMAKRol/N7tZIZwvjBJv932B ynxmlHi2eQU7TMu/q5ehqpYzSvz585oFrurt3DdgVWwCthJHZn5lBbFFBHYwSkzYbApiMwsI SDy+9wwozsEhLOAp0f/ACiTMIqAq8bt1ETOIzSvgJrFt+X9GiGXyEqs3HACLcwLFl778zgiy S0LgPpvExRu3WSGKXCSWvZ0O1SAs8er4FqhLZSROT+5hgWjYxihx9fdPqO79jBLXe2H+sZY4 /O83G8hFzAKaEut36UOEHSWe/X/DAhKWEOCTuPFWEOJ+PolJ26YzQ4R5JTrahCCq9SSe9kxl hFn7Z+0TFgjbQ2Lt69vQ8JnJKPFz1SfGCYzysxCWLWBkXMUonlpanJueWmyUl1quV5yYW1ya l66XnJ+7iRGYCk7/O/5lB+OuP0mHGAU4GJV4eA16ZsYJsSaWFVfmHmKU4GBWEuE96AYU4k1J rKxKLcqPLyrNSS0+xCjNwaIkzmu86GWskEB6YklqdmpqQWoRTJaJg1OqgVEs5/+0UAH3STp8 lf3iPIpxra2rX+dd/jAtbn+gwKJ712XFKh/Zy4oyZ8doK+x1uu946kav/ueHMfE55+Q7JY9/ Y67bXFc7Xc5V9UFf1vTbFht+BhWk5v2+y5p2Je9RcqtucXnxizPz4/9Nsypc1nh19rP/Cfd9 OI1uHoiuXlqkmi/vMm/hbSWW4oxEQy3mouJEAHDcJaQBAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHLMWRmVeSWpSXmKPExsVy+t/xe7r5arPiDPpecFi8+7SdyWLm0xZ2 i/PztrJanN/Yy2rx6cEJFgdWjzXz1jB6/FqwlNVj8Z6XTB7Hbk5jD2CJ0rMpyi8tSVXIyC8u sVWKNrQw0jO0tNAzMrHUMzQ2j7UyMlXSt7NJSc3JLEst0rdL0MvoubaZpeCxUsWLO1NYGhif ynQxcnJICJhI/Lt6mbWLkYtDSGApo8TdK9OZuxg5gBIyEh8uCUDUCEv8udbFBlHzkVFia+cR ZpAEm4CtxJGZX8GaRQR2MUrc2zGRBSTBLCAg8fjeM1aQQcICnhL9D6xAwiwCqhK/WxeB9fIK uElsW/6fEWKBvMTqDQfA4pxA8aUvv4PFhQRcJR4+PMU+gZFvASPDKkaR1NLi3PTcYiO94sTc 4tK8dL3k/NxNjMCw3Hbs55YdjF3vgg8xCnAwKvHwGvTMjBNiTSwrrsw9xCjBwawkwnvQDSjE m5JYWZValB9fVJqTWnyI0RToqInMUqLJ+cCYySuJNzQ1NLewNDQ3Njc2s1AS5+0QOBgjJJCe WJKanZpakFoE08fEwSnVwKgkyzxjR35J63W2AvZyUW+F/T0ltTPn5xtr3Q1jm33sX/f85h03 Zk3b2zF/Q0Fk2bKecrnW7ezxRTdXPNFflz3hJ/PyI7+V2NvztLISlI9W3q+YdyrTjz1j+u2p UpoHDgUeOrF8yud1FiEfVj2e9tOnchLvn4JCsZkcnYdmhNrw53FWi+04d0KJpTgj0VCLuag4 EQC1GSfEYQIAAA== X-CMS-MailID: 20200417215807eucas1p14de926321e5a683224f7550ae902af5b X-Msg-Generator: CA X-RootMTR: 20200417215807eucas1p14de926321e5a683224f7550ae902af5b X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215807eucas1p14de926321e5a683224f7550ae902af5b References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 13/17] rcu: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_RCU_DEBUG. The old define is completely removed from source code and config. Documentation was also updated. Signed-off-by: Lukasz Wojciechowski --- config/common_base | 1 - doc/guides/prog_guide/rcu_lib.rst | 8 ++++---- lib/librte_rcu/rte_rcu_qsbr.h | 16 ++++++++-------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/config/common_base b/config/common_base index 5863b4327..c22e9a6fe 100644 --- a/config/common_base +++ b/config/common_base @@ -915,7 +915,6 @@ CONFIG_RTE_LIBRTE_TELEMETRY=n # Compile librte_rcu # CONFIG_RTE_LIBRTE_RCU=y -CONFIG_RTE_LIBRTE_RCU_DEBUG=n # # Compile librte_rib diff --git a/doc/guides/prog_guide/rcu_lib.rst b/doc/guides/prog_guide/rcu_lib.rst index 9b0bf138f..ecdea9c9c 100644 --- a/doc/guides/prog_guide/rcu_lib.rst +++ b/doc/guides/prog_guide/rcu_lib.rst @@ -186,7 +186,7 @@ they entered a quiescent state. This API checks if a writer has triggered a quiescent state query and update the state accordingly. The ``rte_rcu_qsbr_lock()`` and ``rte_rcu_qsbr_unlock()`` are empty functions. -However, when ``CONFIG_RTE_LIBRTE_RCU_DEBUG`` is enabled, these APIs aid -in debugging issues. One can mark the access to shared data structures on the -reader side using these APIs. The ``rte_rcu_qsbr_quiescent()`` will check if -all the locks are unlocked. +However, when ``RTE_DEBUG`` is enabled, these APIs aid in debugging issues. +One can mark the access to shared data structures on the reader side using +these APIs. The ``rte_rcu_qsbr_quiescent()`` will check if all the locks +are unlocked. diff --git a/lib/librte_rcu/rte_rcu_qsbr.h b/lib/librte_rcu/rte_rcu_qsbr.h index 0b5585925..bc8ab102c 100644 --- a/lib/librte_rcu/rte_rcu_qsbr.h +++ b/lib/librte_rcu/rte_rcu_qsbr.h @@ -45,7 +45,7 @@ extern int rte_rcu_log_type; #define __RTE_RCU_DP_LOG(level, fmt, args...) #endif -#if defined(RTE_LIBRTE_RCU_DEBUG) +#ifdef RTE_DEBUG #define __RTE_RCU_IS_LOCK_CNT_ZERO(v, thread_id, level, fmt, args...) do {\ if (v->qsbr_cnt[thread_id].lock_cnt) \ rte_log(RTE_LOG_ ## level, rte_rcu_log_type, \ @@ -78,7 +78,7 @@ struct rte_rcu_qsbr_cnt { * changes to various APIs. */ uint32_t lock_cnt; - /**< Lock counter. Used when CONFIG_RTE_LIBRTE_RCU_DEBUG is enabled */ + /**< Lock counter. Used when RTE_DEBUG is enabled */ } __rte_cache_aligned; #define __RTE_QSBR_CNT_THR_OFFLINE 0 @@ -323,11 +323,11 @@ rte_rcu_qsbr_thread_offline(struct rte_rcu_qsbr *v, unsigned int thread_id) * This API is provided to aid debugging. This should be called before * accessing a shared data structure. * - * When CONFIG_RTE_LIBRTE_RCU_DEBUG is enabled a lock counter is incremented. + * When RTE_DEBUG is enabled a lock counter is incremented. * Similarly rte_rcu_qsbr_unlock will decrement the counter. When the * rte_rcu_qsbr_check API will verify that this counter is 0. * - * When CONFIG_RTE_LIBRTE_RCU_DEBUG is disabled, this API will do nothing. + * When RTE_DEBUG is disabled, this API will do nothing. * * @param v * QS variable @@ -341,7 +341,7 @@ rte_rcu_qsbr_lock(__rte_unused struct rte_rcu_qsbr *v, { RTE_ASSERT(v != NULL && thread_id < v->max_threads); -#if defined(RTE_LIBRTE_RCU_DEBUG) +#ifdef RTE_DEBUG /* Increment the lock counter */ __atomic_fetch_add(&v->qsbr_cnt[thread_id].lock_cnt, 1, __ATOMIC_ACQUIRE); @@ -360,11 +360,11 @@ rte_rcu_qsbr_lock(__rte_unused struct rte_rcu_qsbr *v, * This API is provided to aid debugging. This should be called after * accessing a shared data structure. * - * When CONFIG_RTE_LIBRTE_RCU_DEBUG is enabled, rte_rcu_qsbr_unlock will + * When RTE_DEBUG is enabled, rte_rcu_qsbr_unlock will * decrement a lock counter. rte_rcu_qsbr_check API will verify that this * counter is 0. * - * When CONFIG_RTE_LIBRTE_RCU_DEBUG is disabled, this API will do nothing. + * When RTE_DEBUG is disabled, this API will do nothing. * * @param v * QS variable @@ -378,7 +378,7 @@ rte_rcu_qsbr_unlock(__rte_unused struct rte_rcu_qsbr *v, { RTE_ASSERT(v != NULL && thread_id < v->max_threads); -#if defined(RTE_LIBRTE_RCU_DEBUG) +#ifdef RTE_DEBUG /* Decrement the lock counter */ __atomic_fetch_sub(&v->qsbr_cnt[thread_id].lock_cnt, 1, __ATOMIC_RELEASE); From patchwork Fri Apr 17 21:57:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68826 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 42B52A0597; Sat, 18 Apr 2020 00:00:29 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2BB111EBEC; Fri, 17 Apr 2020 23:58:23 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 5BA541EB74 for ; Fri, 17 Apr 2020 23:58:09 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215809euoutp01b3169c18f636c64350a5aabf2712f35f~GujzZMgtQ0379003790euoutp01E for ; Fri, 17 Apr 2020 21:58:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200417215809euoutp01b3169c18f636c64350a5aabf2712f35f~GujzZMgtQ0379003790euoutp01E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160689; bh=1VJRoLQNO8/hJG8UI8syIfi89711+5L/VAw3BFew/5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jaTEMLd/I86U4ODx+YWc57ivLUIkYgAVmdBh8GjbNAzndMfRkZTzCtEjZoO238Vdx AT+EXkPJVl6kbLoYDgVuQXHMBsd+YA2KBYNiOT0aFU+F7uyh1IrwlPd4OSHYD4Xaj/ G3nmMQCZtBszemBpaHLlwLrcWsURXky9cdoMSu5k= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200417215808eucas1p1e0fe0677fbf7065f6aa7c72697457091~Gujyk5pkL1204912049eucas1p1Q; Fri, 17 Apr 2020 21:58:08 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 82.C4.60679.0762A9E5; Fri, 17 Apr 2020 22:58:08 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200417215808eucas1p26bb784466131275eeccff018ecac83ca~GujySuDyU1721717217eucas1p2q; Fri, 17 Apr 2020 21:58:08 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200417215808eusmtrp1be17e1473d9a644a77f893ee3809ea63~GujySK8Y-0397603976eusmtrp1v; Fri, 17 Apr 2020 21:58:08 +0000 (GMT) X-AuditID: cbfec7f4-0e5ff7000001ed07-82-5e9a26700991 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 31.62.07950.F662A9E5; Fri, 17 Apr 2020 22:58:07 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215807eusmtip2d86c93c59ba2d3a17fdef282277459cc~GujxqdTGI0325203252eusmtip2x; Fri, 17 Apr 2020 21:58:07 +0000 (GMT) From: Lukasz Wojciechowski To: Robert Sanford , Erik Gabriel Carrillo , Thomas Monjalon Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:36 +0200 Message-Id: <20200417215739.23180-15-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7oFarPiDC4857d492k7k8WPb/2s FvcPPGa3+PTgBIsDi8fkIwuYPX4tWMrqsXjPSyaPYzensQewRHHZpKTmZJalFunbJXBlHP+w iL2gU7Zi3oUpLA2MCyW6GDk5JARMJFpeb2LvYuTiEBJYwSix52onK0hCSOALo8Ssy+EQic+M Ei2zn7DBdCzds4YRIrGcUWLNqdlMcFUPlp1nBqliE7CVODLzKytIQkSghVHiwI9pTCAJZgEB icf3noHtEBbwljg5+SeYzSKgKnHkz3wWEJtXwE3i84crzBDr5CVWbzgAZnMCxZe+/A62WkLg OpvE1Xc7GSGKXCS+f9nECmELS7w6voUdwpaROD25hwWiYRujxNXfP6G69zNKXO9dAVVlLXH4 32+g7ziAztOUWL9LHyLsKHHz7QZWkLCEAJ/EjbeCEA/wSUzaNp0ZIswr0dEmBFGtJ/G0Zyoj zNo/a5+wQNgeEkdunmKGhNBMRontWzezT2CUn4WwbAEj4ypG8dTS4tz01GKjvNRyveLE3OLS vHS95PzcTYzAFHD63/EvOxh3/Uk6xCjAwajEw2vQMzNOiDWxrLgy9xCjBAezkgjvQTegEG9K YmVValF+fFFpTmrxIUZpDhYlcV7jRS9jhQTSE0tSs1NTC1KLYLJMHJxSDYx1GwPdZZ/NX3VZ y8+u4Xlb3D6Nvv9ON6ZaHNw4QcvfzvSOg/TZbV3eGoZuDx4W9HqeaPH8Pa3swCKWhSs1y1qn +StFavw5sLv+8LLZSQVyPw55GolbT5pcbWWjdNj+7/bVNswsh/z1RTv2fXV4b3T3Bke0ebDO vufTTppl3jdh6zXoOFN5sl2JpTgj0VCLuag4EQA+ECUx/QIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFLMWRmVeSWpSXmKPExsVy+t/xe7r5arPiDK4tsrF492k7k8WPb/2s FvcPPGa3+PTgBIsDi8fkIwuYPX4tWMrqsXjPSyaPYzensQewROnZFOWXlqQqZOQXl9gqRRta GOkZWlroGZlY6hkam8daGZkq6dvZpKTmZJalFunbJehlHP+wiL2gU7Zi3oUpLA2MCyW6GDk5 JARMJJbuWcPYxcjFISSwlFFi4aJfzF2MHEAJGYkPlwQgaoQl/lzrYoOo+cgo8eBxJztIgk3A VuLIzK+sIAkRgTZGiUcbV7GAJJgFBCQe33vGCmILC3hLnJz8E8xmEVCVOPJnPlgNr4CbxOcP V5ghNshLrN5wAMzmBIovffmdEcQWEnCVePjwFPsERr4FjAyrGEVSS4tz03OLjfSKE3OLS/PS 9ZLzczcxAsNx27GfW3Ywdr0LPsQowMGoxMNr0DMzTog1say4MvcQowQHs5II70E3oBBvSmJl VWpRfnxRaU5q8SFGU6CjJjJLiSbnA2MlryTe0NTQ3MLS0NzY3NjMQkmct0PgYIyQQHpiSWp2 ampBahFMHxMHp1QDo+f3UybeD2ecXSxtqx1XvezELM8fS3pdRD5tYFd/3v7q2eGX+xRd334L frH4k6vG/G9H2kOzoi4KnWG4+/z5M4Pdum4BKaFbFTI5XOQWilr8E9ZV1Jx8/NDHksBP69cX TL6ZJpHA7rX66fbwePZgJwaOeYeO/8ysjW5Qrd5zTpvxW1lGYl7hdCWW4oxEQy3mouJEAGwX uytdAgAA X-CMS-MailID: 20200417215808eucas1p26bb784466131275eeccff018ecac83ca X-Msg-Generator: CA X-RootMTR: 20200417215808eucas1p26bb784466131275eeccff018ecac83ca X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215808eucas1p26bb784466131275eeccff018ecac83ca References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 14/17] timer: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_TIMER_DEBUG. The old define is completely removed from source code and config. The tests were adjusted to use new flag. Signed-off-by: Lukasz Wojciechowski --- app/test/test_timer_secondary.c | 2 +- config/common_base | 1 - lib/librte_timer/rte_timer.c | 12 ++++++------ lib/librte_timer/rte_timer.h | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/test/test_timer_secondary.c b/app/test/test_timer_secondary.c index 7a3bc873b..7f3d5645c 100644 --- a/app/test/test_timer_secondary.c +++ b/app/test/test_timer_secondary.c @@ -158,7 +158,7 @@ test_timer_secondary(void) test_info->exit_flag = 1; rte_eal_wait_lcore(*mgr_lcorep); -#ifdef RTE_LIBRTE_TIMER_DEBUG +#ifdef RTE_DEBUG rte_timer_alt_dump_stats(test_info->timer_data_id, stdout); #endif diff --git a/config/common_base b/config/common_base index c22e9a6fe..025ae7c62 100644 --- a/config/common_base +++ b/config/common_base @@ -859,7 +859,6 @@ CONFIG_RTE_PKTMBUF_HEADROOM=128 # Compile librte_timer # CONFIG_RTE_LIBRTE_TIMER=y -CONFIG_RTE_LIBRTE_TIMER_DEBUG=n # # Compile librte_cfgfile diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c index 89f27074f..fc96b1a2c 100644 --- a/lib/librte_timer/rte_timer.c +++ b/lib/librte_timer/rte_timer.c @@ -48,7 +48,7 @@ struct priv_timer { /** running timer on this lcore now */ struct rte_timer *running_tim; -#ifdef RTE_LIBRTE_TIMER_DEBUG +#ifdef RTE_DEBUG /** per-lcore statistics */ struct rte_timer_debug_stats stats; #endif @@ -68,7 +68,7 @@ static const uint32_t default_data_id; static uint32_t rte_timer_subsystem_initialized; /* when debug is enabled, store some statistics */ -#ifdef RTE_LIBRTE_TIMER_DEBUG +#ifdef RTE_DEBUG #define __TIMER_STAT_ADD(priv_timer, name, n) do { \ unsigned __lcore_id = rte_lcore_id(); \ if (__lcore_id < RTE_MAX_LCORE) \ @@ -302,7 +302,7 @@ timer_set_running_state(struct rte_timer *tim) static uint32_t timer_get_skiplist_level(unsigned curr_depth) { -#ifdef RTE_LIBRTE_TIMER_DEBUG +#ifdef RTE_DEBUG static uint32_t i, count = 0; static uint32_t levels[MAX_SKIPLIST_DEPTH] = {0}; #endif @@ -321,7 +321,7 @@ timer_get_skiplist_level(unsigned curr_depth) level = curr_depth; if (level >= MAX_SKIPLIST_DEPTH) level = MAX_SKIPLIST_DEPTH-1; -#ifdef RTE_LIBRTE_TIMER_DEBUG +#ifdef RTE_DEBUG count ++; levels[level]++; if (count % 10000 == 0) @@ -1008,7 +1008,7 @@ rte_timer_next_ticks(void) static void __rte_timer_dump_stats(struct rte_timer_data *timer_data __rte_unused, FILE *f) { -#ifdef RTE_LIBRTE_TIMER_DEBUG +#ifdef RTE_DEBUG struct rte_timer_debug_stats sum; unsigned lcore_id; struct priv_timer *priv_timer = timer_data->priv_timer; @@ -1026,7 +1026,7 @@ __rte_timer_dump_stats(struct rte_timer_data *timer_data __rte_unused, FILE *f) fprintf(f, " manage = %"PRIu64"\n", sum.manage); fprintf(f, " pending = %"PRIu64"\n", sum.pending); #else - fprintf(f, "No timer statistics, RTE_LIBRTE_TIMER_DEBUG is disabled\n"); + fprintf(f, "No timer statistics, RTE_DEBUG is disabled\n"); #endif } diff --git a/lib/librte_timer/rte_timer.h b/lib/librte_timer/rte_timer.h index c6b3d450d..b4edd3f30 100644 --- a/lib/librte_timer/rte_timer.h +++ b/lib/librte_timer/rte_timer.h @@ -73,7 +73,7 @@ union rte_timer_status { uint32_t u32; /**< To atomic-set status + owner. */ }; -#ifdef RTE_LIBRTE_TIMER_DEBUG +#ifdef RTE_DEBUG /** * A structure that stores the timer statistics (per-lcore). */ From patchwork Fri Apr 17 21:57:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68827 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7D0EFA0597; Sat, 18 Apr 2020 00:00:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7FCA91EBF3; Fri, 17 Apr 2020 23:58:24 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 296A31EB9A for ; Fri, 17 Apr 2020 23:58:10 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215809euoutp0100aa63062517f1ec74fa1fbeb8d4a56d~Guj0HHG0Y0105301053euoutp01R for ; Fri, 17 Apr 2020 21:58:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200417215809euoutp0100aa63062517f1ec74fa1fbeb8d4a56d~Guj0HHG0Y0105301053euoutp01R DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160690; bh=Xi7JGoEEy/gqH5uTdS2hr/ii0GpwoHeIGpZFCK+j/cQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E+U6LgNQzDi8mkiTTAghg+hWK82USRfnKvjgJJrXiTM4WZkqC/Krzp6u3i2/2RyTt 6NTyjX0ZaoGtouzAJpYq6uvPWEAf/uOoZiBqouV23ZrXknYcP5KQFRyxOqLbK4I8sr JqWGIcJZHXMN9luQjpJar7e+oTOrhwxOFqcRmuO8= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200417215809eucas1p28b0b3944577a4e184f40efca3817badb~Guj0Bm_xK1749217492eucas1p2d; Fri, 17 Apr 2020 21:58:09 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 5D.FF.61286.1762A9E5; Fri, 17 Apr 2020 22:58:09 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200417215808eucas1p1aa9a24a464a4470d27b6c770d2e8c297~GujzKNHm70162301623eucas1p1t; Fri, 17 Apr 2020 21:58:08 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200417215808eusmtrp2ae69b56425dfe49222b0219c93eadd64~GujzJrZhL2952229522eusmtrp2l; Fri, 17 Apr 2020 21:58:08 +0000 (GMT) X-AuditID: cbfec7f2-ef1ff7000001ef66-5f-5e9a26714850 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id DD.94.08375.0762A9E5; Fri, 17 Apr 2020 22:58:08 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215808eusmtip202622fd726705b2987eada2dc4390258~Gujyjo9ZV0325203252eusmtip2y; Fri, 17 Apr 2020 21:58:08 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Maxime Coquelin , Zhihong Wang , Xiaolong Ye Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:37 +0200 Message-Id: <20200417215739.23180-16-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djPc7qFarPiDH5f0rN492k7k8Wxzj0s Fp8enGCx+PPG1GLzxUlMDqwevxYsZfVYvOclk8exm9PYPd7vu8oWwBLFZZOSmpNZllqkb5fA ldG57ydjwV+Bio8/3jE2MM7l62Lk4JAQMJE48suni5GLQ0hgBaPEwt9NbBDOF0aJnidfmCGc z4wSs5ddYO1i5ATreDzpORNEYjmjxJr/zYwgCbCq3TulQWw2AVuJIzO/soIUiYAUNTR8ZwdJ MAsISDy+9wxskrCAt0TXiotsIDaLgKrEvMWdzCA38Qq4Sdzo4YdYJi+xesMBZhCbEyi89OV3 RpCZEgK32SRW7l/JBFHkIrH36SJGCFtY4tXxLewQtozE/53zmSAatjFKXP39E6p7P6PE9d4V UFXWEof//WYD2cwsoCmxfpc+RNhRYvmxFkZIIPFJ3HgrCHE/n8SkbdOZIcK8Eh1tQhDVehJP e6Yywqz9s/YJC0SJh8TzpS6QsJrJKNGy8BH7BEb5WQi7FjAyrmIUTy0tzk1PLTbMSy3XK07M LS7NS9dLzs/dxAhMAqf/Hf+0g/HrpaRDjAIcjEo8vAY9M+OEWBPLiitzDzFKcDArifAedAMK 8aYkVlalFuXHF5XmpBYfYpTmYFES5zVe9DJWSCA9sSQ1OzW1ILUIJsvEwSnVwLje50SaQoSF RpuV4rSO9i/+SuVWC/bUlm6f/ybHWNtX1ohliUqcVy/fXK4Db+81lNjcDzCad7n6u9xilQWt KiKrF9tzHxPWTGV0WVOYc1QzfNf6F7c810j0pby6O8vp5nazlRxBIjc9trQuetT9c55Mzu5j Gv88WYoVK7crWF/1F8+dliJnq8RSnJFoqMVcVJwIAHSG9qT+AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLLMWRmVeSWpSXmKPExsVy+t/xe7oFarPiDCZ8MbJ492k7k8Wxzj0s Fp8enGCx+PPG1GLzxUlMDqwevxYsZfVYvOclk8exm9PYPd7vu8oWwBKlZ1OUX1qSqpCRX1xi qxRtaGGkZ2hpoWdkYqlnaGwea2VkqqRvZ5OSmpNZllqkb5egl9G57ydjwV+Bio8/3jE2MM7l 62Lk5JAQMJF4POk5UxcjF4eQwFJGif5fE5i7GDmAEjISHy4JQNQIS/y51sUGUfORUeLwtC3M IAk2AVuJIzO/soIkRARWMkp8nn0PLMEsICDx+N4zVhBbWMBbomvFRTYQm0VAVWLe4k6wBbwC bhI3evghFshLrN5wAKyVEyi89OV3RhBbSMBV4uHDU+wTGPkWMDKsYhRJLS3OTc8tNtQrTswt Ls1L10vOz93ECAzKbcd+bt7BeGlj8CFGAQ5GJR5eg56ZcUKsiWXFlbmHGCU4mJVEeA+6AYV4 UxIrq1KL8uOLSnNSiw8xmgLdNJFZSjQ5HxgxeSXxhqaG5haWhubG5sZmFkrivB0CB2OEBNIT S1KzU1MLUotg+pg4OKUaGNtbbnSfUffiFBV/LPVU9PDDK7Wf8jp4Z15q8jh3yyRyn3HdJC1R Tp91+tLVvqc866JXh0QYurgyePU6s4aGHogKXdl76dWlPpvV0S5VJpxiC+KiVjreuPF7/ZXp KgbXCkuUuLLaUgXrDY9I3/EJ25wxscS8Vv/JLonEMwaKLAs5OFgPOicosRRnJBpqMRcVJwIA ueXF8mACAAA= X-CMS-MailID: 20200417215808eucas1p1aa9a24a464a4470d27b6c770d2e8c297 X-Msg-Generator: CA X-RootMTR: 20200417215808eucas1p1aa9a24a464a4470d27b6c770d2e8c297 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215808eucas1p1aa9a24a464a4470d27b6c770d2e8c297 References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 15/17] vhost: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_VHOST_DEBUG. The old define is completely removed from source code and config. Signed-off-by: Lukasz Wojciechowski --- config/common_base | 1 - lib/librte_vhost/vhost.h | 2 +- lib/librte_vhost/vhost_crypto.c | 2 +- lib/librte_vhost/vhost_user.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/common_base b/config/common_base index 025ae7c62..1f7be1219 100644 --- a/config/common_base +++ b/config/common_base @@ -1031,7 +1031,6 @@ CONFIG_RTE_LIBRTE_PDUMP=y # CONFIG_RTE_LIBRTE_VHOST=n CONFIG_RTE_LIBRTE_VHOST_NUMA=n -CONFIG_RTE_LIBRTE_VHOST_DEBUG=n # # Compile vhost PMD diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index 2087d1400..ea44e3aa6 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -520,7 +520,7 @@ extern int vhost_data_log_level; "VHOST_DATA : " fmt, ##args) : \ 0) -#ifdef RTE_LIBRTE_VHOST_DEBUG +#ifdef RTE_DEBUG #define VHOST_MAX_PRINT_BUFF 6072 #define PRINT_PACKET(device, addr, size, header) do { \ char *pkt_addr = (char *)(addr); \ diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c index 68911972b..5648e5c34 100644 --- a/lib/librte_vhost/vhost_crypto.c +++ b/lib/librte_vhost/vhost_crypto.c @@ -16,7 +16,7 @@ #define IV_OFFSET (sizeof(struct rte_crypto_op) + \ sizeof(struct rte_crypto_sym_op)) -#ifdef RTE_LIBRTE_VHOST_DEBUG +#ifdef RTE_DEBUG #define VC_LOG_ERR(fmt, args...) \ RTE_LOG(ERR, USER1, "[%s] %s() line %u: " fmt "\n", \ "Vhost-Crypto", __func__, __LINE__, ## args) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index bd1be0104..dea334dfd 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -967,7 +967,7 @@ add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg, return 0; } -#ifdef RTE_LIBRTE_VHOST_DEBUG +#ifdef RTE_DEBUG /* TODO: enable it only in debug mode? */ static void dump_guest_pages(struct virtio_net *dev) From patchwork Fri Apr 17 21:57:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68828 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8DAECA0597; Sat, 18 Apr 2020 00:00:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B33601EBFB; Fri, 17 Apr 2020 23:58:25 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 40AC51EB9B for ; Fri, 17 Apr 2020 23:58:10 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215810euoutp0119d5a0a6daff7c010ef73c8e4f20b29c~Guj0OUaNq0379003790euoutp01G for ; Fri, 17 Apr 2020 21:58:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200417215810euoutp0119d5a0a6daff7c010ef73c8e4f20b29c~Guj0OUaNq0379003790euoutp01G DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160690; bh=9b/o6/TtpQqAlP2eFUc508ovP7LCFdbpnpiPGXx0k1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=By2VQuJUbf5DqCPeGk+bA/gYNU/0fFycbnsCB0tGU9LCXEuCGxuCCVON31FyuvwmS axrohWdeX6G0F3VXRpxIe/eE3nT9+08Tg2/nFGk37xcVQI5JD5H88rnNMJaU4vPuzJ WNwcw4BCykZdD3+3+ffiMvJ5HW6XxttNlWyYo0tk= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200417215809eucas1p2365904f4284051fdca1a0bda523beff7~Guj0ETh1E2665826658eucas1p2L; Fri, 17 Apr 2020 21:58:09 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id D2.C4.60679.1762A9E5; Fri, 17 Apr 2020 22:58:09 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200417215809eucas1p1d826c921a9880007af4ee4282dda5d32~Gujz1s9gJ2647326473eucas1p1F; Fri, 17 Apr 2020 21:58:09 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200417215809eusmtrp13b88e966fd71ea3d695333624bada7fc~Gujzxk-ul0397603976eusmtrp1w; Fri, 17 Apr 2020 21:58:09 +0000 (GMT) X-AuditID: cbfec7f4-0cbff7000001ed07-85-5e9a2671491b Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 81.62.07950.1762A9E5; Fri, 17 Apr 2020 22:58:09 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215809eusmtip2e2b84f927036f69f3c8743179a95fbe8~GujzPlpwK0325203252eusmtip2z; Fri, 17 Apr 2020 21:58:08 +0000 (GMT) From: Lukasz Wojciechowski To: Anatoly Burakov , Thomas Monjalon , John McNamara , Marko Kovacevic Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:38 +0200 Message-Id: <20200417215739.23180-17-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBIsWRmVeSWpSXmKPExsWy7djPc7qFarPiDE79N7V4dG8xs8W7T9uZ LM7P28pqcX5jL6vFpwcnWBxYPX4tWMrqsXjPSyaPYzensQcwR3HZpKTmZJalFunbJXBlnLx4 ibngqULFlNsaDYx/pLoYOTkkBEwkft76yNLFyMUhJLCCUWJK1zs2kISQwBdGibauPIjEZ0aJ 9acusMN0vHs1jREisZxR4vjpBcwQHUBVv7Z6gdhsArYSR2Z+ZQUpEhHYwCjxr3UKC0iCWUBA 4vG9Z6wgtrCAp8TVaXfAprIIqEqsnbMZbBCvgJvE79m9UNvkJVZvOAAW5wSKL335HWyzhMB1 NolXTVtYIYpcJJ7/XMEIYQtLvDq+BapZRuL05B4WiIZtjBJXf/+E6t7PKHG9dwVUlbXE4X+/ gb7mADpPU2L9Ln2IsKPEiTO3WUHCEgJ8EjfeCkI8wCcxadt0Zogwr0RHmxBEtZ7E056pjDBr /6x9wgJhe0ic+zodGlozGSWWXWpknMAoPwth2QJGxlWM4qmlxbnpqcVGeanlesWJucWleel6 yfm5mxiB8X/63/EvOxh3/Uk6xCjAwajEw2vQMzNOiDWxrLgy9xCjBAezkgjvQTegEG9KYmVV alF+fFFpTmrxIUZpDhYlcV7jRS9jhQTSE0tSs1NTC1KLYLJMHJxSDYwOyfVaWlxLcvI4XF9Y mx+6ceCKOCdz4G7Ne2tEXaV+n50Z2q6Zpx1mZHkzqj1deKuJTdentI/sd6Vm/8kXvWgZ8PL+ 9UmRts+T7y+dzf7OpmeRUlKwVmmMRNWB9/PjpLVWVn6NfMz1OHu2QOznLy2X2Zi5piZPOPVz a0eij8+UM7vss4JaepVYijMSDbWYi4oTAS3w6pL7AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJLMWRmVeSWpSXmKPExsVy+t/xe7qFarPiDKZMVLF4dG8xs8W7T9uZ LM7P28pqcX5jL6vFpwcnWBxYPX4tWMrqsXjPSyaPYzensQcwR+nZFOWXlqQqZOQXl9gqRRta GOkZWlroGZlY6hkam8daGZkq6dvZpKTmZJalFunbJehlnLx4ibngqULFlNsaDYx/pLoYOTkk BEwk3r2axtjFyMUhJLCUUeLs8RnMXYwcQAkZiQ+XBCBqhCX+XOtig6j5yChxrquJBSTBJmAr cWTmV1aQhIjAJkaJZRMeMIEkmAUEJB7fe8YKYgsLeEpcnXaHHcRmEVCVWDtnMzOIzSvgJvF7 di87xAZ5idUbDoDFOYHiS19+ZwSxhQRcJR4+PMU+gZFvASPDKkaR1NLi3PTcYiO94sTc4tK8 dL3k/NxNjMBg3Hbs55YdjF3vgg8xCnAwKvHwGvTMjBNiTSwrrsw9xCjBwawkwnvQDSjEm5JY WZValB9fVJqTWnyI0RToqInMUqLJ+cBIySuJNzQ1NLewNDQ3Njc2s1AS5+0QOBgjJJCeWJKa nZpakFoE08fEwSnVwLh805z38olGnRfDtMI8JtZEbQj1sfg3pfq7qKD1kbYrG9kv3+Bk3qFy oyrK4M7MP9Xzcz23v6mrD+zRL1lxr9xKuGzxa9cviedb71hmL1zC3Tf1VJde4MnlVf92H87l yJTdEnh1yU+2u4XcrIpf+x/fuxpnxx1jGeXHu4az3P+bapBZ7y2PT0osxRmJhlrMRcWJAO0y buNcAgAA X-CMS-MailID: 20200417215809eucas1p1d826c921a9880007af4ee4282dda5d32 X-Msg-Generator: CA X-RootMTR: 20200417215809eucas1p1d826c921a9880007af4ee4282dda5d32 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215809eucas1p1d826c921a9880007af4ee4282dda5d32 References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 16/17] eal: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_MALLOC_DEBUG. The old define is completely removed from source code and config. Tests and documentation were also updated. Signed-off-by: Lukasz Wojciechowski --- app/test/test_malloc.c | 4 ++-- config/common_base | 1 - doc/guides/prog_guide/env_abstraction_layer.rst | 5 +++-- lib/librte_eal/common/malloc_elem.c | 2 +- lib/librte_eal/common/malloc_elem.h | 4 ++-- lib/librte_eal/common/rte_malloc.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c index 232d3186d..61b89d0c1 100644 --- a/app/test/test_malloc.c +++ b/app/test/test_malloc.c @@ -641,7 +641,7 @@ test_rte_malloc_validate(void) const size_t request_size = 1024; size_t allocated_size; char *data_ptr = rte_malloc(NULL, request_size, RTE_CACHE_LINE_SIZE); -#ifdef RTE_MALLOC_DEBUG +#ifdef RTE_DEBUG int retval; char *over_write_vals = NULL; #endif @@ -663,7 +663,7 @@ test_rte_malloc_validate(void) if (allocated_size < request_size) err_return(); -#ifdef RTE_MALLOC_DEBUG +#ifdef RTE_DEBUG /****** change the header to be bad */ char save_buf[64]; diff --git a/config/common_base b/config/common_base index 1f7be1219..ae6db0adb 100644 --- a/config/common_base +++ b/config/common_base @@ -107,7 +107,6 @@ CONFIG_RTE_EAL_IGB_UIO=n CONFIG_RTE_EAL_VFIO=n CONFIG_RTE_MAX_VFIO_GROUPS=64 CONFIG_RTE_MAX_VFIO_CONTAINERS=64 -CONFIG_RTE_MALLOC_DEBUG=n CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n CONFIG_RTE_USE_LIBBSD=n # Use WFE instructions to implement the rte_wait_for_equal_xxx APIs, diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst index 48a2fec06..a8d2ef1a3 100644 --- a/doc/guides/prog_guide/env_abstraction_layer.rst +++ b/doc/guides/prog_guide/env_abstraction_layer.rst @@ -714,8 +714,9 @@ manual for more information. Cookies ~~~~~~~ -When CONFIG_RTE_MALLOC_DEBUG is enabled, the allocated memory contains -overwrite protection fields to help identify buffer overflows. +When RTE_DEBUG is enabled (e.g. by enabling "debug" option in meson setup, +the allocated memory contains overwrite protection fields to help identify +buffer overflows. Alignment and NUMA Constraints ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/lib/librte_eal/common/malloc_elem.c b/lib/librte_eal/common/malloc_elem.c index 885d00424..662adb6b9 100644 --- a/lib/librte_eal/common/malloc_elem.c +++ b/lib/librte_eal/common/malloc_elem.c @@ -28,7 +28,7 @@ * to catch buggy programs. Otherwise, freed memory is set to zero * to avoid having to zero in zmalloc */ -#ifdef RTE_MALLOC_DEBUG +#ifdef RTE_DEBUG #define MALLOC_POISON 0x6b #else #define MALLOC_POISON 0 diff --git a/lib/librte_eal/common/malloc_elem.h b/lib/librte_eal/common/malloc_elem.h index a1e5f7f02..e5286415e 100644 --- a/lib/librte_eal/common/malloc_elem.h +++ b/lib/librte_eal/common/malloc_elem.h @@ -32,13 +32,13 @@ struct malloc_elem { size_t size; struct malloc_elem *orig_elem; size_t orig_size; -#ifdef RTE_MALLOC_DEBUG +#ifdef RTE_DEBUG uint64_t header_cookie; /* Cookie marking start of data */ /* trailer cookie at start + size */ #endif } __rte_cache_aligned; -#ifndef RTE_MALLOC_DEBUG +#ifndef RTE_DEBUG static const unsigned MALLOC_ELEM_TRAILER_LEN = 0; /* dummy function - just check if pointer is non-null */ diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c index d6026a2b1..912bfeb9b 100644 --- a/lib/librte_eal/common/rte_malloc.c +++ b/lib/librte_eal/common/rte_malloc.c @@ -78,7 +78,7 @@ rte_zmalloc_socket(const char *type, size_t size, unsigned align, int socket) { void *ptr = rte_malloc_socket(type, size, align, socket); -#ifdef RTE_MALLOC_DEBUG +#ifdef RTE_DEBUG /* * If DEBUG is enabled, then freed memory is marked with poison * value and set to zero on allocation. From patchwork Fri Apr 17 21:57:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 68829 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 64146A0597; Sat, 18 Apr 2020 00:01:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 040C01EC05; Fri, 17 Apr 2020 23:58:27 +0200 (CEST) Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by dpdk.org (Postfix) with ESMTP id D8A141EBA6 for ; Fri, 17 Apr 2020 23:58:12 +0200 (CEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215812euoutp02156976aeef483e4b5c7a6b027b2808ee~Guj2nrfsj0663506635euoutp02I for ; Fri, 17 Apr 2020 21:58:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200417215812euoutp02156976aeef483e4b5c7a6b027b2808ee~Guj2nrfsj0663506635euoutp02I DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160692; bh=RVwfVQIU5xOO9qsinW+mlChh7nK3Agte5Qo9g4mU448=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lMjn06XkxJr69Eijgc2DZ6Qfr9eiKSMP0RLT+m4zwhDwiHVWaHX8HBa9QXRzDdP3i zyS5lf2h5POthxfK077EZRA3t8a4yxBxmll5C5E7s19QCUoUR3p6gjpDtx0STMdH3V NIizf2arWKpY6bqPMjLF/KPlO2XaGNId6FUOPjIs= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200417215811eucas1p13574077911d84db9691fd16e772b4c36~Guj1nnd3R0152001520eucas1p14; Fri, 17 Apr 2020 21:58:11 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id BD.FF.61286.3762A9E5; Fri, 17 Apr 2020 22:58:11 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200417215810eucas1p17a63d33a4d49c8866733a33ce717484b~Guj0hxcMa1204912049eucas1p1S; Fri, 17 Apr 2020 21:58:10 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200417215810eusmtrp1ddc9770377d006152c70bababb6a9c9c~Guj0hQvte0397603976eusmtrp1x; Fri, 17 Apr 2020 21:58:10 +0000 (GMT) X-AuditID: cbfec7f2-f0bff7000001ef66-62-5e9a26730c32 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id E1.62.07950.2762A9E5; Fri, 17 Apr 2020 22:58:10 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215809eusmtip2f6e98a0341e47d9421081ae9f7410317~Guj0C9Wy40325203252eusmtip20; Fri, 17 Apr 2020 21:58:09 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Cristian Dumitrescu , Jasvinder Singh Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:39 +0200 Message-Id: <20200417215739.23180-18-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKIsWRmVeSWpSXmKPExsWy7djPc7rFarPiDK42KVtMut/AZPHu03Ym i0+HnrNbfHpwgsWBxePXgqWsHov3vGTyOHZzGnsAcxSXTUpqTmZZapG+XQJXxuZzvcwFawQr Xq06zdrAeIGvi5GTQ0LAROL7t3esXYxcHEICKxglDs+bxAzhfGGUWLpgA5TzmVGia9NvVpiW j3v3sEMkljNKdM+ZyQhX9XL+KzaQKjYBW4kjM7+CDRYR6GWUOPlyFwtIgllAQOLxvWdACQ4O YQFviY3/ykDCLAKqEo9+nmIEsXkF3CR+f1nMArFNXmL1hgPMIDYnUHzpy+9gyyQELrNJrHj3 hQ2iyEViwvNrTBC2sMSr41vYIWwZidOTe1ggGrYxSlz9/ROqez+jxPXeFVBV1hKH//1mA7mI WUBTYv0ufYiwo8T7V6eZQcISAnwSN94KQtzPJzFp23SoMK9ER5sQRLWexNOeqYwwa/+sfQJ1 v4fEw9VPoKE1k1Fi64UPLBMY5WchLFvAyLiKUTy1tDg3PbXYMC+1XK84Mbe4NC9dLzk/dxMj MPJP/zv+aQfj10tJhxgFOBiVeHgNembGCbEmlhVX5h5ilOBgVhLhPegGFOJNSaysSi3Kjy8q zUktPsQozcGiJM5rvOhlrJBAemJJanZqakFqEUyWiYNTqoEx+2Kv92bGDFe5hIxqPTVOAX+m NVMfMOvd271zgfAjLoXXPRefWTva7OZ1OGJ6QnGXWFxDq27+2SXVSiYPzi37YjxnmXPlqZDb LzdaLH9ReFTafOYDXcES7T2T+SQLVe9KRc+4yrXh/bsztz7Vek71+fZ8o4nPoZufH65rWFuj /+MW46u38moJSizFGYmGWsxFxYkA/DyMR/gCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCLMWRmVeSWpSXmKPExsVy+t/xe7pFarPiDD5fFLOYdL+ByeLdp+1M Fp8OPWe3+PTgBIsDi8evBUtZPRbvecnkcezmNPYA5ig9m6L80pJUhYz84hJbpWhDCyM9Q0sL PSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jM3nepkL1ghWvFp1mrWB8QJfFyMnh4SAicTH vXvYuxi5OIQEljJKLDryja2LkQMoISPx4ZIARI2wxJ9rXWwQNR8ZJc7cm8IIkmATsJU4MvMr K0hCRKCfUeLJopNsIAlmAQGJx/eesYIMEhbwltj4rwwkzCKgKvHo5ymwXl4BN4nfXxazQCyQ l1i94QAziM0JFF/68jtYjZCAq8TDh6fYJzDyLWBkWMUoklpanJueW2ykV5yYW1yal66XnJ+7 iREYgtuO/dyyg7HrXfAhRgEORiUeXoOemXFCrIllxZW5hxglOJiVRHgPugGFeFMSK6tSi/Lj i0pzUosPMZoCHTWRWUo0OR8YH3kl8YamhuYWlobmxubGZhZK4rwdAgdjhATSE0tSs1NTC1KL YPqYODilGhh3T3upftzm5cPG+rVaW1j9j9t9XPHE5sRm9yfyM0PO37P91HT16/nHXsVhDF8z mz9en1LGvqqsaZnWG66u9ipBL/OQm+kXU27PL3y3XPpNf+C/DE7dDUGGnga/tFYyaLVW5K+O yeJw3u/9LvngHsW0ynw9VcnA6MWykwV4Jso3GFodYtzxiUOJpTgj0VCLuag4EQCcGWsMVwIA AA== X-CMS-MailID: 20200417215810eucas1p17a63d33a4d49c8866733a33ce717484b X-Msg-Generator: CA X-RootMTR: 20200417215810eucas1p17a63d33a4d49c8866733a33ce717484b X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215810eucas1p17a63d33a4d49c8866733a33ce717484b References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 17/17] sched: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_SCHED_DEBUG. The old define is completely removed from source code and config. Signed-off-by: Lukasz Wojciechowski --- config/common_base | 1 - lib/librte_sched/rte_sched.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config/common_base b/config/common_base index ae6db0adb..eb8b83224 100644 --- a/config/common_base +++ b/config/common_base @@ -976,7 +976,6 @@ CONFIG_RTE_LIBRTE_FLOW_CLASSIFY=y # Compile librte_sched # CONFIG_RTE_LIBRTE_SCHED=y -CONFIG_RTE_SCHED_DEBUG=n CONFIG_RTE_SCHED_RED=n CONFIG_RTE_SCHED_COLLECT_STATS=n CONFIG_RTE_SCHED_SUBPORT_TC_OV=n diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c index c0983ddda..e19f1d959 100644 --- a/lib/librte_sched/rte_sched.c +++ b/lib/librte_sched/rte_sched.c @@ -1482,7 +1482,7 @@ rte_sched_queue_read_stats(struct rte_sched_port *port, return 0; } -#ifdef RTE_SCHED_DEBUG +#ifdef RTE_DEBUG static inline int rte_sched_port_queue_is_empty(struct rte_sched_subport *subport, @@ -1493,7 +1493,7 @@ rte_sched_port_queue_is_empty(struct rte_sched_subport *subport, return queue->qr == queue->qw; } -#endif /* RTE_SCHED_DEBUG */ +#endif /* RTE_DEBUG */ #ifdef RTE_SCHED_COLLECT_STATS @@ -1627,7 +1627,7 @@ static inline int rte_sched_port_red_drop(struct rte_sched_port *port __rte_unus #endif /* RTE_SCHED_RED */ -#ifdef RTE_SCHED_DEBUG +#ifdef RTE_DEBUG static inline void debug_check_queue_slab(struct rte_sched_subport *subport, uint32_t bmp_pos, @@ -1654,7 +1654,7 @@ debug_check_queue_slab(struct rte_sched_subport *subport, uint32_t bmp_pos, bmp_slab, bmp_pos); } -#endif /* RTE_SCHED_DEBUG */ +#endif /* RTE_DEBUG */ static inline struct rte_sched_subport * rte_sched_port_subport(struct rte_sched_port *port, @@ -2404,7 +2404,7 @@ grinder_next_pipe(struct rte_sched_port *port, if (unlikely(rte_bitmap_scan(subport->bmp, &bmp_pos, &bmp_slab) <= 0)) return 0; -#ifdef RTE_SCHED_DEBUG +#ifdef RTE_DEBUG debug_check_queue_slab(subport, bmp_pos, bmp_slab); #endif