From patchwork Wed Apr 22 21:45:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 69154 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 583D2A00C2; Wed, 22 Apr 2020 23:46:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0CAD01D166; Wed, 22 Apr 2020 23:46:19 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 12FB31C2EC for ; Wed, 22 Apr 2020 23:46:16 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200422214615euoutp01b1f265e359e0e3327b8aadeb38d0abc7~IQn2GYmQ21855618556euoutp01D for ; Wed, 22 Apr 2020 21:46:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200422214615euoutp01b1f265e359e0e3327b8aadeb38d0abc7~IQn2GYmQ21855618556euoutp01D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587591975; bh=rSVA9K7s4KDty17e5koTI8u67FJxUQ6xYh1s7FtkPVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=POQn8Q+fO20h5VhJC2sIixU9gkzuDYtH+wSxvmSDUuEzizM/9kzMqlMfHTmaGrTwg QL/G7kn/6bH7c0iP12ttbib+lfhj/+bWPp4OTi3bPtXs0aPxahJpe22r3dzJj2yu2o 1qibY8tvgkQQtmMRZqIGGAYdMyyPrAleD2+wL4Wg= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200422214615eucas1p1930a814fbbc65fec257817f550b56ff0~IQn1mjP9Z0073700737eucas1p1S; Wed, 22 Apr 2020 21:46:15 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id FA.4B.60679.62BB0AE5; Wed, 22 Apr 2020 22:46:14 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200422214614eucas1p1044184e60bcb04469783ef0dd95091c1~IQn06AhSZ0612206122eucas1p17; Wed, 22 Apr 2020 21:46:14 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200422214614eusmtrp145b69957ddced74fa9d7c66c299fb6af~IQn05gCWT3110331103eusmtrp1W; Wed, 22 Apr 2020 21:46:14 +0000 (GMT) X-AuditID: cbfec7f4-0e5ff7000001ed07-e7-5ea0bb264ae4 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id BD.7A.08375.62BB0AE5; Wed, 22 Apr 2020 22:46:14 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20200422214613eusmtip1a4bc0398dc925a7344d6d5b1353127f9~IQn0gWoTO0760407604eusmtip1T; Wed, 22 Apr 2020 21:46:13 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Bruce Richardson Cc: dev@dpdk.org Date: Wed, 22 Apr 2020 23:45:53 +0200 Message-Id: <20200422214555.11837-2-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200422214555.11837-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrHIsWRmVeSWpSXmKPExsWy7djP87pquxfEGUzqNrO4scre4t2n7UwW nx6cYHFg9vi1YCmrx+I9L5k8jt2cxh7AHMVlk5Kak1mWWqRvl8CVsfDCZ+aCvWIVN+Z+YWlg vCfUxcjJISFgInHo2AOWLkYuDiGBFYwSqw4/YAVJCAl8YZTYMoUTIvGZUaJ/VzczTMe1VSsY IRLLGSWmHL7DDFe17899NpAqNgFbiSMzv4KNEhGIkti55ygTiM0sICDx+N4zsLiwgL1E+4UG FhCbRUBV4vmeRnYQm1fAVaL1VD/UNnmJ1RsOgNmcAm4Sp4+2gN0qIXCETeL/pscsEEUuEtvu b2GFsIUlXh3fwg5hy0icntwD1bCNUeLq75+MEM5+RonrvSugqqwlDv/7DXQ2B9B5mhLrd+lD hB0lrm27wwoSlhDgk7jxVhDiAT6JSdumM0OEeSU62qDhqCfxtGcqI8zaP2ufQJ3mIbHucQMb JICuMkrMbZ/NNoFRfhbCsgWMjKsYxVNLi3PTU4uN8lLL9YoTc4tL89L1kvNzNzECY/30v+Nf djDu+pN0iFGAg1GJhzdCcUGcEGtiWXFl7iFGCQ5mJRHeDQ/nxQnxpiRWVqUW5ccXleakFh9i lOZgURLnNV70MlZIID2xJDU7NbUgtQgmy8TBKdXAyH424hDviXs3V7xO3HrKyqSM5YvHCy+e BVsKzmS90Fmko3vo1uTSyakmhScDNy3zeGUVm7PaeMU7lQ0hwdPMoyMk1e5Z3Ejc8lt151n1 9ZtWJbmKT776Om/z0i7vsDWai28+TzRVvCOVsuEQJ8svM/biywXdDC0X1LsP3FdgZG+xv9k2 9+Cz40osxRmJhlrMRcWJAIZ05j3xAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsVy+t/xu7pquxfEGRw7yGdxY5W9xbtP25ks Pj04weLA7PFrwVJWj8V7XjJ5HLs5jT2AOUrPpii/tCRVISO/uMRWKdrQwkjP0NJCz8jEUs/Q 2DzWyshUSd/OJiU1J7MstUjfLkEvY+GFz8wFe8Uqbsz9wtLAeE+oi5GTQ0LAROLaqhWMXYxc HEICSxklpu38yNLFyAGUkJH4cEkAokZY4s+1LjaImo+MEg9/t7GCJNgEbCWOzPwKZosIREn0 7FoOZjMLCEg8vvcMzBYWsJdov9DAAmKzCKhKPN/TyA5i8wq4SrSe6meGWCAvsXrDATCbU8BN 4vTRFhaIZY2MEtcnH2WawMi3gJFhFaNIamlxbnpusaFecWJucWleul5yfu4mRmDgbTv2c/MO xksbgw8xCnAwKvHwRiguiBNiTSwrrsw9xCjBwawkwrvh4bw4Id6UxMqq1KL8+KLSnNTiQ4ym QFdNZJYSTc4HRkVeSbyhqaG5haWhubG5sZmFkjhvh8DBGCGB9MSS1OzU1ILUIpg+Jg5OqQZG 45872rbbhRb9231t1g7fW5OPant5V2ukt+7b5j3lVPrv1QxZW/fGm88yTjy0sqKrkvuOfzrH vTXPhJnimCOdzCYZ6SuwX7xxrN6R9RhnCXviLp95r1uSA799EfwvdG5+bMMLjXzl/9wJQk6x QbxfS38duSje5/4rYVY5a9bU/50Se+t/dAQpsRRnJBpqMRcVJwIAX+xmA1ICAAA= X-CMS-MailID: 20200422214614eucas1p1044184e60bcb04469783ef0dd95091c1 X-Msg-Generator: CA X-RootMTR: 20200422214614eucas1p1044184e60bcb04469783ef0dd95091c1 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200422214614eucas1p1044184e60bcb04469783ef0dd95091c1 References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> <20200422214555.11837-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v2 1/3] config: introduce global rte 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" A new boolean meson build flag is introduced with this patch: rte_debug. To enable this option add -Drte_debug=true to the meson configure command. 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. Additionally for all enabled to be built libraries a RTE_DEBUG_{library name} is defined and assigned a value 1. This standardize names of library specific debug macros. Those can be used also without rte_debug option by using CFLAGS="-D..." build parameter. Code put inside RTE_DEBUG* #ifdef sections should be also put inside if (rte_log_can_log(...)) condition to allow run-time filtering of sanity checks, validations, logs and dumps when using rte_debug option. Libraries will be adjusted to the change in separate patches. Suggested-by: Bruce Richardson Signed-off-by: Lukasz Wojciechowski Reviewed-by: Bruce Richardson Acked-by: Bruce Richardson Acked-by: Andrew Rybchenko --- config/meson.build | 4 ++++ lib/meson.build | 4 ++++ meson_options.txt | 2 ++ 3 files changed, 10 insertions(+) diff --git a/config/meson.build b/config/meson.build index 224d29e1c..5ab510009 100644 --- a/config/meson.build +++ b/config/meson.build @@ -183,6 +183,10 @@ endif # add -include rte_config to cflags add_project_arguments('-include', 'rte_config.h', language: 'c') +if get_option('rte_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 diff --git a/lib/meson.build b/lib/meson.build index 63c17ee75..8e0abca1e 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -88,6 +88,10 @@ foreach l:libraries dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1) install_headers(headers) + if get_option('rte_debug') + dpdk_conf.set('RTE_DEBUG_' + name.to_upper(), 1) + endif + libname = 'rte_' + name includes += include_directories(dir_name) diff --git a/meson_options.txt b/meson_options.txt index 9e4923a4f..a14f0efdb 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -30,6 +30,8 @@ option('max_lcores', type: 'integer', value: 128, description: 'maximum number of cores/threads supported by EAL') option('max_numa_nodes', type: 'integer', value: 4, description: 'maximum number of NUMA nodes supported by EAL') +option('rte_debug', type: 'boolean', value: false, + description: 'build with additional sanity checks, validations and logs') option('tests', type: 'boolean', value: true, description: 'build unit tests') option('use_hpet', type: 'boolean', value: false, From patchwork Wed Apr 22 21:45:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 69155 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 17E36A00C2; Wed, 22 Apr 2020 23:46:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A65991D173; Wed, 22 Apr 2020 23:46:22 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 942EF1C2EC for ; Wed, 22 Apr 2020 23:46:16 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200422214616euoutp0100167c75329a53f9b7f358cb0b53cced~IQn2mcNYW1855318553euoutp01E for ; Wed, 22 Apr 2020 21:46:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200422214616euoutp0100167c75329a53f9b7f358cb0b53cced~IQn2mcNYW1855318553euoutp01E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587591976; bh=ZCR5n82IijhYyRbG2A9UEMZ/pSFy1RvHvQTNJkHsbwU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cR78iIP5Mt8v/3eOAsiSigfIYtk6Wi0j9O72WJVlfPmT2wHKPkY408c0KcgeyKifY k7vGBlVUARtGvTDXTehpcNhgdwgpuLVaV948IAkJBZ21fCzWtARJfHcuwsthATwc+D +upH2wmt3uovm0uV1XagV5AiiHD+1j5aCgTqrQgo= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200422214615eucas1p21e4ad18a36f0526d6d4b28546f53e9e5~IQn2RJJuE1845318453eucas1p2N; Wed, 22 Apr 2020 21:46:15 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 52.22.60698.72BB0AE5; Wed, 22 Apr 2020 22:46:15 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200422214614eucas1p2ad5c7a54972cf47f182f51ba3346027b~IQn1aLrxC1860518605eucas1p2L; Wed, 22 Apr 2020 21:46:14 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200422214614eusmtrp211a536c1ba46e2578da01a240a1a3b95~IQn1Zp3Wf2378123781eusmtrp2F; Wed, 22 Apr 2020 21:46:14 +0000 (GMT) X-AuditID: cbfec7f5-a0fff7000001ed1a-db-5ea0bb27270f Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id DF.A7.07950.62BB0AE5; Wed, 22 Apr 2020 22:46:14 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20200422214614eusmtip1df2e4d26fc9aea436df083509bd079be~IQn1B8Skf0927209272eusmtip1H; Wed, 22 Apr 2020 21:46:14 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon Cc: dev@dpdk.org Date: Wed, 22 Apr 2020 23:45:54 +0200 Message-Id: <20200422214555.11837-3-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200422214555.11837-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKIsWRmVeSWpSXmKPExsWy7djP87rquxfEGVz6o2Lx7tN2JotPD06w ODB5/FqwlNXj2M1p7AFMUVw2Kak5mWWpRfp2CVwZTTMb2QrWcla0Tu9hbmD8xt7FyMkhIWAi sfHTKaYuRi4OIYEVjBL9TbdZIZwvjBJze44yQjifGSV6/r1kg2lZdvsPM4gtJLCcUeLrkVq4 ogeHHrKCJNgEbCWOzPwKZosIaErc/j6LEcRmFhCQeHzvGVhcWMBK4vDuRWCDWARUJZb/3QN2 E6+Aq8THpt+MEMvkJVZvOABWwyngJnH6aAsLyDIJgR1sEkeeLYQqcpGY+e0eC4QtLPHq+Bao 52Qk/u+czwTRsI1R4urvn4wQzn5Gieu9K6CqrCUO//sN9BsH0HmaEut36UOEHSUuvT7EBBKW EOCTuPFWEOIBPolJ26YzQ4R5JTrahCCq9SSe9kxlhFn7Z+0TqHM8JNZ9/sIOCaCrjBIzFl1n nsAoPwth2QJGxlWM4qmlxbnpqcXGeanlesWJucWleel6yfm5mxiBkX363/GvOxj3/Uk6xCjA wajEwxuhuCBOiDWxrLgy9xCjBAezkgjvhofz4oR4UxIrq1KL8uOLSnNSiw8xSnOwKInzGi96 GSskkJ5YkpqdmlqQWgSTZeLglGpgjPzN53wrlnPFcuWX6/9oHZXdd+qLh3uEhZaNTmLkDe4Z mU4fNSJcV9+suPqmX2Zf/zaXIptPt+urmI4bXJe57LwlpNza69rcgNgJk083Mh3/7rXocoL+ tfVCV6uPPfE50vpFt/Tin/7fa57ePSbzsHf/gi8rdQ2nieZJJ1882hZ194Bt1WVrZSWW4oxE Qy3mouJEAIrdE7boAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKLMWRmVeSWpSXmKPExsVy+t/xu7pquxfEGTw6oGvx7tN2JotPD06w ODB5/FqwlNXj2M1p7AFMUXo2RfmlJakKGfnFJbZK0YYWRnqGlhZ6RiaWeobG5rFWRqZK+nY2 Kak5mWWpRfp2CXoZTTMb2QrWcla0Tu9hbmD8xt7FyMkhIWAisez2H2YQW0hgKaPE/Sa5LkYO oLiMxIdLAhAlwhJ/rnWxdTFyAZV8ZJRY07SXBSTBJmArcWTmV1YQW0RAU+L291mMIDazgIDE 43vPwOLCAlYSh3cvApvPIqAqsfzvHrC9vAKuEh+bfjNCLJCXWL3hAFgNp4CbxOmjLSwQyxoZ Ja5PPso0gZFvASPDKkaR1NLi3PTcYiO94sTc4tK8dL3k/NxNjMAg23bs55YdjF3vgg8xCnAw KvHwRiguiBNiTSwrrsw9xCjBwawkwrvh4bw4Id6UxMqq1KL8+KLSnNTiQ4ymQFdNZJYSTc4H RkBeSbyhqaG5haWhubG5sZmFkjhvh8DBGCGB9MSS1OzU1ILUIpg+Jg5OqQZGg5R3DNdfHd// ffPJkiM1TFfyrUosblW7Tpl8dZ3aoqfvViRdnN86tfhWkdv8R8uWl8Vc4tmkleD/OTR6V/uX 82aVKkd7YyYWFlU8vO3TrLxwk/oEhuxV1yd/q9rYZf/dS/TP1qaJ4tMf2u90/NmuWnW/QupJ yfzZmQp2G283vw75cVU7VnSFvRJLcUaioRZzUXEiAFPNfYBIAgAA X-CMS-MailID: 20200422214614eucas1p2ad5c7a54972cf47f182f51ba3346027b X-Msg-Generator: CA X-RootMTR: 20200422214614eucas1p2ad5c7a54972cf47f182f51ba3346027b X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200422214614eucas1p2ad5c7a54972cf47f182f51ba3346027b References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> <20200422214555.11837-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v2 2/3] 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 Acked-by: Bruce Richardson --- config/common_base | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/common_base b/config/common_base index 9ec689dde..38c5ada26 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 # @@ -591,7 +589,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 @@ -952,7 +949,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 Wed Apr 22 21:45:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Wojciechowski X-Patchwork-Id: 69156 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 71708A00C2; Wed, 22 Apr 2020 23:46:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EA8611D381; Wed, 22 Apr 2020 23:46:23 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 980F91C437 for ; Wed, 22 Apr 2020 23:46:16 +0200 (CEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200422214616euoutp01cf89e54d65c196d1d6e1fc18eaf02ae4~IQn2tAc991855618556euoutp01E for ; Wed, 22 Apr 2020 21:46:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200422214616euoutp01cf89e54d65c196d1d6e1fc18eaf02ae4~IQn2tAc991855618556euoutp01E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587591976; bh=eaXn8GQn3E8U1fma891erXqgRLPQ6qJioE0YY8JvR+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uifDOoeUYXnl79Fhf1yonbsNCH9PA9JgoCLeOcC7AhGLJdJ26f0NZX2h/4llLDIoc gzfXhShNejxm65fhXPakBUY+UjI1udPVoo2FQ1r47RKEcCnFlwDvAKWaZghqpWJCiD vDSZbeGcVFbP7jXoRHVIxRQlHZMz3oQ1PWAUiFWg= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200422214616eucas1p2d454aeb547e939f2e596066faada9d67~IQn2jEd8u1862618626eucas1p2R; Wed, 22 Apr 2020 21:46:16 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 82.22.60698.72BB0AE5; Wed, 22 Apr 2020 22:46:15 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200422214615eucas1p2a50ce20695a77b5b2888fd4521296094~IQn2C4q9O1865618656eucas1p2E; Wed, 22 Apr 2020 21:46:15 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200422214615eusmtrp1b6d0b27aacda91bbb0e433296bb66538~IQn2CUlqX3110331103eusmtrp1X; Wed, 22 Apr 2020 21:46:15 +0000 (GMT) X-AuditID: cbfec7f5-a29ff7000001ed1a-dc-5ea0bb2700a7 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id FD.7A.08375.72BB0AE5; Wed, 22 Apr 2020 22:46:15 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20200422214614eusmtip1c570559530ec4c3b22d1379c1506b61e~IQn1hGxS22464024640eusmtip1D; Wed, 22 Apr 2020 21:46:14 +0000 (GMT) From: Lukasz Wojciechowski To: Olivier Matz , Thomas Monjalon , John McNamara , Marko Kovacevic Cc: dev@dpdk.org Date: Wed, 22 Apr 2020 23:45:55 +0200 Message-Id: <20200422214555.11837-4-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200422214555.11837-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPIsWRmVeSWpSXmKPExsWy7djPc7rquxfEGSzfamPx7tN2Jovz87ay Wpzf2MtqsbVpI5PFpwcnWBxYPS7232H0+LVgKavH4j0vmTyO3ZzGHsASxWWTkpqTWZZapG+X wJWxdR5fwROZimP7ljE2MHZKdDFyckgImEjs+nOKpYuRi0NIYAWjxNRn29kgnC+MEuvX90I5 nxkl/h5bzgrT8mLRQqjEckaJT8vWsMNVTW7+wA5SxSZgK3Fk5ldWkISIwCpGib47h9hAEswC AhKP7z0DGyUsYCOx+2UzC4jNIqAq0fBnBzOIzSvgKnH5w2YWiHXyEqs3HACLcwq4SZw+2gJ2 rYTAfTaJthsroW5ykTi+q5cNwhaWeHV8CzuELSNxenIPVMM2Romrv38yQjj7GSWu966AqrKW OPzvN1A3B9B5mhLrd+lDhB0l3sx7zQISlhDgk7jxVhDiAT6JSdumM0OEeSU62oQgqvUknvZM ZYRZ+2ftE6j7PSQ+njzNBAmhq4wSkz6vZpzAKD8LYdkCRsZVjOKppcW56anFxnmp5XrFibnF pXnpesn5uZsYgcng9L/jX3cw7vuTdIhRgINRiYc3QnFBnBBrYllxZe4hRgkOZiUR3g0P58UJ 8aYkVlalFuXHF5XmpBYfYpTmYFES5zVe9DJWSCA9sSQ1OzW1ILUIJsvEwSnVwMirseF38V9n ZZsX8oGqBz6cy5ReYCjOfjq0LHKdDYPIpaRzAlvXPnqqtmVNYJZK1e4OV17vjrmJbyQe5rhI cZ1SPbqKT1zi6etO3n3v36udnmMYMP2lzjyvvWZCQm0KeSbhFn/f9J2wTej6ctDBd+n1tNmX rr/esLBFpfZGZdxWiReWvdWHtiixFGckGmoxFxUnAgDOTObBAgMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPLMWRmVeSWpSXmKPExsVy+t/xu7rquxfEGWz/JW7x7tN2Jovz87ay Wpzf2MtqsbVpI5PFpwcnWBxYPS7232H0+LVgKavH4j0vmTyO3ZzGHsASpWdTlF9akqqQkV9c YqsUbWhhpGdoaaFnZGKpZ2hsHmtlZKqkb2eTkpqTWZZapG+XoJexdR5fwROZimP7ljE2MHZK dDFyckgImEi8WLSQrYuRi0NIYCmjxNy3n4EcDqCEjMSHSwIQNcISf651QdV8ZJRoPjWPGSTB JmArcWTmV1aQhIjAGkaJkxs+M4IkmAUEJB7fe8YKYgsL2EjsftnMAmKzCKhKNPzZAdbMK+Aq cfnDZhaIDfISqzccAItzCrhJnD7awgKxrZFR4vrko0wTGPkWMDKsYhRJLS3OTc8tNtQrTswt Ls1L10vOz93ECAzMbcd+bt7BeGlj8CFGAQ5GJR7eCMUFcUKsiWXFlbmHGCU4mJVEeDc8nBcn xJuSWFmVWpQfX1Sak1p8iNEU6KqJzFKiyfnAqMkriTc0NTS3sDQ0NzY3NrNQEuftEDgYIySQ nliSmp2aWpBaBNPHxMEp1cBYKHdYfa9ooNvfxcvjn6e83iWrZ6p/6P6HqUpH/JJCsu/FXHnJ +2jZ9vg132//bs9lyX2zdL3T4YvxLd8WdaZOkmF65l6342f1X8+sU1MWeWVkRXo3r9jnOXmG RLqp0qLbpSdKHjYfu62skjVH7UVYg3BNf3DTQV9XbuGog8eauO5vyZkxL7BWiaU4I9FQi7mo OBEAAqt6YmICAAA= X-CMS-MailID: 20200422214615eucas1p2a50ce20695a77b5b2888fd4521296094 X-Msg-Generator: CA X-RootMTR: 20200422214615eucas1p2a50ce20695a77b5b2888fd4521296094 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200422214615eucas1p2a50ce20695a77b5b2888fd4521296094 References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> <20200422214555.11837-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v2 3/3] mbuf: standardize library 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" Use standardized debug macro RTE_DEBUG_MBUF instead of RTE_LIBRTE_MBUF_DEBUG for wrapping sanity checks. Add runtime control of running sanity checks basing on rte_log_can_log() function. To run mbuf sanity checks all following conditions must occur: 1) RTE_DEBUG_MBUF - must be defined, this can be done by enabling meson rte_debug option or defining CFLAGS="-DRTE_DEBUG_MBUF" 2) global log level must be set to RTE_LOG_DEBUG 3) mbuf library logtype log level (lib.mbuf) must be set to RTE_LOG_DEBUG Tests and documentation were also updated. Signed-off-by: Lukasz Wojciechowski --- app/test/test_mbuf.c | 3 ++- config/common_base | 1 - doc/guides/prog_guide/mbuf_lib.rst | 2 +- lib/librte_mbuf/rte_mbuf.h | 12 ++++++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c index 8200b4f71..b7b956659 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -994,7 +994,8 @@ 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_MBUF defined + * or using rte_debug meson build option. */ #ifdef RTE_MBUF_REFCNT_ATOMIC diff --git a/config/common_base b/config/common_base index 38c5ada26..80fa3281f 100644 --- a/config/common_base +++ b/config/common_base @@ -859,7 +859,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..d633e9609 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_MBUF is enabled, e.g. by using "rte_debug" option during meson build), 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..f27d5e26e 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -341,17 +342,20 @@ 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_MBUF /** check mbuf type in debug mode */ -#define __rte_mbuf_sanity_check(m, is_h) rte_mbuf_sanity_check(m, is_h) +#define __rte_mbuf_sanity_check(m, is_h) do { \ + if (rte_log_can_log(RTE_LOGTYPE_MBUF, RTE_LOG_DEBUG)) \ + rte_mbuf_sanity_check(m, is_h); \ +} while (0) -#else /* RTE_LIBRTE_MBUF_DEBUG */ +#else /* RTE_DEBUG_MBUF */ /** 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_MBUF */ #ifdef RTE_MBUF_REFCNT_ATOMIC