From patchwork Tue Feb 26 21:34:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 50526 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F36843798; Tue, 26 Feb 2019 22:34:31 +0100 (CET) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by dpdk.org (Postfix) with ESMTP id 4D29F326C for ; Tue, 26 Feb 2019 22:34:29 +0100 (CET) Received: by mail-pf1-f172.google.com with SMTP id s22so6867818pfh.4 for ; Tue, 26 Feb 2019 13:34:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=at4bGTz+g8y3T5mMILEaHBMJ2bXlA0RdWl9TFBrePsg=; b=N11y5sJ+DFlpjHzQFwrZ0qanDF8ZBh6wpG+3QZQFLZsN/2iHyu3wYSt/Tsfx+mmIJD 6pFNzoJpc28xnCJ6uft326oE2ivcys7wIcuccL2tUb1lkpbrzp9i7QSTa/SMCgA+JsTr 4ZkG5GlFHvVpz+uFQz3994hL29V3jbr/+ZFvKSQEkpb7ZHehyGNwH7JkxyyuhRerZgrz FSC/dH6UcFShWXLrDScdikrQIFsHpHfyg2n1rRi8SQuOQPJwrNIimlf2xpHBksfb6d37 soZUfvz/IhI9KcUaPA9jGavS6QeXhP870iCxTMO18kgNo298RaQo6x66SOSrhR/ZVAdu VF1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=at4bGTz+g8y3T5mMILEaHBMJ2bXlA0RdWl9TFBrePsg=; b=R59w9LgseOWMxa+pdPkT8wZLiJAhzPEm2F9oB8r9R0ceyU9Y7AxceEQSfUAnxB/dcf i5mgISX1pCu2CPMAET8TfIoiEmEdIkG3pAaznn+Cl48LEwWFOtteXtwAsqugjbdwKyb9 oW0TQ7V1tlw8Vpg9gVzO4yGaqNxk6Z6orOZLExrD7Qy1XZZqfjsF/u3JvZ9gvkKHvTSR 2RFz3me5JRS1bNLBWQpHqiJQietZORdxVY0iT8AMDRrMnrlT5yLBKAVW8Ec/T8jK54J3 7FvAvVG1GM/jVcvUtluFkXMLiWValMgu1g4hgHqqUvBgo16/MFLE31wMv4+i3CnrL1EW rghQ== X-Gm-Message-State: AHQUAubNnA+X7WdKlQZHIRmG6MrR48BjuEdDirVyezqFR3cIxjeRLxPf ys99xRSkEylazdXA9RI8qH/CML5S6cA= X-Google-Smtp-Source: AHgI3IbQuI43ig3JAdM5S2h8Po+zhj6zooP3gQ0F2kPfTmZwp4ygEonnxJbuTS3D9+gG8ceKKnLniQ== X-Received: by 2002:a65:5184:: with SMTP id h4mr26497344pgq.32.1551216868187; Tue, 26 Feb 2019 13:34:28 -0800 (PST) Received: from shemminger-XPS-13-9360.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id h75sm22191108pfd.150.2019.02.26.13.34.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 13:34:27 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 26 Feb 2019 13:34:20 -0800 Message-Id: <20190226213424.10567-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190226213424.10567-1-stephen@networkplumber.org> References: <20190226213424.10567-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH 1/5] eal: drop unused RTE_PROC_PRIMARY_OR macros 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" No usage in current DPDK code base. Signed-off-by: Stephen Hemminger Reviewed-by: Rami Rosen --- lib/librte_eal/common/include/rte_dev.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index a9724dc9181c..5e16a4f86b70 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -76,21 +76,6 @@ rte_pmd_debug_trace(const char *func_name, const char *fmt, ...) #define RTE_PMD_DEBUG_TRACE(...) (void)0 #endif -/* Macros for checking for restricting functions to primary instance only */ -#define RTE_PROC_PRIMARY_OR_ERR_RET(retval) do { \ - if (rte_eal_process_type() != RTE_PROC_PRIMARY) { \ - RTE_PMD_DEBUG_TRACE("Cannot run in secondary processes\n"); \ - return retval; \ - } \ -} while (0) - -#define RTE_PROC_PRIMARY_OR_RET() do { \ - if (rte_eal_process_type() != RTE_PROC_PRIMARY) { \ - RTE_PMD_DEBUG_TRACE("Cannot run in secondary processes\n"); \ - return; \ - } \ -} while (0) - /* Macros to check for invalid function pointers */ #define RTE_FUNC_PTR_OR_ERR_RET(func, retval) do { \ if ((func) == NULL) { \ From patchwork Tue Feb 26 21:34:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 50527 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8AC4047CE; Tue, 26 Feb 2019 22:34:33 +0100 (CET) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by dpdk.org (Postfix) with ESMTP id F1F8C375B for ; Tue, 26 Feb 2019 22:34:30 +0100 (CET) Received: by mail-pf1-f195.google.com with SMTP id n22so6865756pfa.3 for ; Tue, 26 Feb 2019 13:34:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dNlop5KUwlB6GYaCd3xVhG6XJXKJWcHk2SHjtFZkMsQ=; b=xw9yWx9WQ1mSrkqvpiAD6lhDiAbygt9czhF3cGdEGn1jRlmTx40By/NMLa9QAOOG+g RmMk5e8ZyJsFbCIxhl3FgJc5TWMvc25WqzkrZah1ltu4qo5SBBY+8DBWt2YNfMqIDI21 30pkgfs7K6KvtGJ7vKNQLywkniUtLAkUnmWrfFFp0I/T3/Txb5bC8mXvfPnkG+uKGft7 SDiOQMkHjwP907SDBGxKmzGr3WblKhPSoC3F54EdNdQTlykWrv8iix/jF7nDZkzFUUDf FhCP1XUm+FfV/+QEFkig4REX8GPG92odImLghlOypUnrwvdycXoVvdYxYmXj8SXKanea NSrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dNlop5KUwlB6GYaCd3xVhG6XJXKJWcHk2SHjtFZkMsQ=; b=RuD5dNcJCyxa+66DF8DJwNlHKl2PvEgyl2m2g6Q8b5/iuMtcI8g27OI2pIhNGtbM3N N0daJNv5EHx4mX6Slqcxhg1Z4iMDqI/FslB5k6aiIjRr761C5/Hq23n6YgT/upd66vMU HbmNdq9rq764p+XWcZ7JAQDNAM7Wn3YysyIiHLxrYTbiDvsjoPRUHqH2/qehOisCzDZw XmHJaa0djqxRoVgHL9en/DaQLedhL1QxO6/Sb2DE8M6td59me2+hXFO0hGjJojQ0qC6C izvZr19NjlTDqydXtHx2fZh0ISLugzpLly/HjQa9L4CGV8Ln//rLt/nxwKfJHYOuc7ZQ dghA== X-Gm-Message-State: AHQUAubU+ziI8Iu1JoKvlieHPz1ZQbI4NbSxpiCKDL/7MpSQpL397ynB kGjcSMHi+g/JT9khIpFHu1K8rw9AY04= X-Google-Smtp-Source: AHgI3IaJX6TJGjS/sDQDtmPDTAu9gQi7swdmLYAlZWGR2OB2eS++t+7gPb7PbAAeEHxMoIJ5qSZHkg== X-Received: by 2002:a62:53c7:: with SMTP id h190mr28692472pfb.204.1551216869771; Tue, 26 Feb 2019 13:34:29 -0800 (PST) Received: from shemminger-XPS-13-9360.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id h75sm22191108pfd.150.2019.02.26.13.34.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 13:34:28 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 26 Feb 2019 13:34:21 -0800 Message-Id: <20190226213424.10567-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190226213424.10567-1-stephen@networkplumber.org> References: <20190226213424.10567-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH 2/5] crypto/virtio: use local log type 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" The virtio crypto driver was using PMD log type and it should be using the local log type. Fixes: 25500d4b8076 ("crypto/virtio: support device init") Signed-off-by: Stephen Hemminger --- drivers/crypto/virtio/virtio_logs.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/virtio/virtio_logs.h b/drivers/crypto/virtio/virtio_logs.h index 26a286cf81ec..1ee3819309f7 100644 --- a/drivers/crypto/virtio/virtio_logs.h +++ b/drivers/crypto/virtio/virtio_logs.h @@ -7,8 +7,10 @@ #include +extern int virtio_crypto_logtype_init; + #define PMD_INIT_LOG(level, fmt, args...) \ - rte_log(RTE_LOG_ ## level, RTE_LOGTYPE_PMD, \ + rte_log(RTE_LOG_ ## level, virtio_crypto_logtype_init, \ "PMD: %s(): " fmt "\n", __func__, ##args) #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") From patchwork Tue Feb 26 21:34:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 50528 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3891B4C8E; Tue, 26 Feb 2019 22:34:35 +0100 (CET) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by dpdk.org (Postfix) with ESMTP id 7759A37B4 for ; Tue, 26 Feb 2019 22:34:32 +0100 (CET) Received: by mail-pf1-f169.google.com with SMTP id g6so6840238pfh.13 for ; Tue, 26 Feb 2019 13:34:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vDZfU9Gvg+lYRoXnP/xAbY9pO4dlalmIX9dSpgDE6x4=; b=qa3mxxRw6fgVsLBZjWUDgSO+dZq95kaPYZTDL/zv9AxJTVbqZ2YqDogorOb3ajIpu7 eIBgIzJ985nPNuPcoWjhyPsavUK6/V7BfIPn5E8QVmVaLEzGhj6AwKfKcnafOfejhbyS TsHnQyG8cU+wQdy6FKcGsURCH41weSmhOFLSSBP+yg7cLnG6lycFy74quS1lCbbedQYE CkuCMqU62jsYcswlRP84BQxchj6AV1nQ/HBQFLroZe5urppweD5mH0v6GQZWw6pD6KgC C5CIskIE4ZBh3TG1utWFDx3C+P40Fev6zSj0ztqvNDSt1vmk0b455ckEFzsNPIHyx3Pq s9cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vDZfU9Gvg+lYRoXnP/xAbY9pO4dlalmIX9dSpgDE6x4=; b=OuT1dGMCz5wDzRxxuq9xixOBMczNp1pjRX9D8GXONWU/CwoNt9wQI6aBN41JX/Ou1Y BpmplGp5tx/cTjViwJhi0Ti6yveO1npBNVlmyGkJw+gK2awPTp70UzFN2oZW2XoXCG1l 7sw6OSyVROIccwMfncYha//kn9v4YeMVKyHmovnHOe1+liIHAEnSivbBHj0x3UyV8fHw Y0TW0ur/Dia9rkWaY1ebc8lcIKWpRZupwrXmTWiQ6PBMZklGR2xGqrLESXumeREM5o3U S5wAj6UzDIrcsUjf0mWvyppbCDOb3IuzJEtITtrO9nH1Ajyxg847puhR6zMXzZqFlJO1 9e2w== X-Gm-Message-State: AHQUAuYPZ9vgBx6AJsQKu4ZuuML6sfafU4lYUhEg1M/cvhZe7hoRx8MW 45AuxK0VXLWvHmQj6nrYknkKGFgD1Gg= X-Google-Smtp-Source: AHgI3IYbfbQd4hZrqs68amlpnI9OGo5gYUsC+Sl3hJoHmfI8aOJQPkfS/GcxLoz+3Mbg9ygMNgk8bw== X-Received: by 2002:a63:814a:: with SMTP id t71mr26698456pgd.257.1551216871225; Tue, 26 Feb 2019 13:34:31 -0800 (PST) Received: from shemminger-XPS-13-9360.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id h75sm22191108pfd.150.2019.02.26.13.34.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 13:34:30 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 26 Feb 2019 13:34:22 -0800 Message-Id: <20190226213424.10567-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190226213424.10567-1-stephen@networkplumber.org> References: <20190226213424.10567-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH 3/5] eventdev: use same log macro for all unsupported calls 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" The driver already hase RTE_EDEV_XXX log macros so use them in two more places. Signed-off-by: Stephen Hemminger --- lib/librte_eventdev/rte_eventdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c index ebaf3087d925..4d4f07919554 100644 --- a/lib/librte_eventdev/rte_eventdev.c +++ b/lib/librte_eventdev/rte_eventdev.c @@ -892,7 +892,7 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id, dev = &rte_eventdevs[dev_id]; if (*dev->dev_ops->port_link == NULL) { - RTE_PMD_DEBUG_TRACE("Function not supported\n"); + RTE_EDEV_LOG_ERR("Function not supported\n"); rte_errno = -ENOTSUP; return 0; } @@ -951,7 +951,7 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id, dev = &rte_eventdevs[dev_id]; if (*dev->dev_ops->port_unlink == NULL) { - RTE_PMD_DEBUG_TRACE("Function not supported\n"); + RTE_EDEV_LOG_ERR("Function not supported"); rte_errno = -ENOTSUP; return 0; } From patchwork Tue Feb 26 21:34:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 50529 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 17C7A4C93; Tue, 26 Feb 2019 22:34:37 +0100 (CET) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id E184B4C77 for ; Tue, 26 Feb 2019 22:34:33 +0100 (CET) Received: by mail-pl1-f195.google.com with SMTP id y5so6849222plk.8 for ; Tue, 26 Feb 2019 13:34:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tM2FBJtCGqLbR2tDEn0Rts17RV6MzwcUez7IXfhTXIA=; b=rrid/WcPNoY4D7QDW5Vh1OGf76bziVSAKmrbWZNGLYUCKWEKdiMbkixLUwNG6rZyJg kypUbks3NePtnMe/fb1xWvIztOV3yWO/O6qYEPu+hBIm3nkqx4wVsYfgkBAGvcnV4MhX NQFbhKzXLKJ6nho6K87TINnvLB3/ZDlID8xIYxsVuygv/Dyvp2ivMYV8kYijSXc5dtjs ZvQwvjhrZlFxRJQwqHGRLeHjJ2ZP/v2AidHvjl9zu7ziZIRyz7oyJmm0bTi72gebZEpU bkpNW46/yf522eoicNcFXQtDD3ghYTK/HKcPXzBaPV5nOoCfdLmefYwMVIP1Bkpr3Ac+ 3+Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tM2FBJtCGqLbR2tDEn0Rts17RV6MzwcUez7IXfhTXIA=; b=lvq/ZyFapI39lJv3OP9KyA6EPtmL7K9SOpm/i4hZd6fZRHxRc294tiMNesILy19oMf 8vHgCZB63KEqx886igyQBwZwAA1yNHZfV+X4KVs09WOeFrORryF5zKWpjv7QBSFGx4VJ Xhdn9aA+13JTd9Q/HiRa+08Jawm+5r6bdG1ShYdHz3zc8TbrqCZvVGLsLZ29Zcuteiea Xk5uxKA+CH8IjoPpy6LopP8XQMnzJPGkEAWNcwK2UlRh+zQSCbu3ZauPFTRsuNffha3k dDElrKkgSkQvFCvyqPQcxUQMSLIOvtR8n2yr4NB78NFAqquB+A5SMIJx+YDcsS8f0F+i 4bsw== X-Gm-Message-State: AHQUAuaHs3sXQqAFQE8Uwy/oumqeTmwHocJ5hT+KbB3Q8c7NFql7/6pL g/l38TZm6EkZrcuxmuDNpYYL/S6OF1A= X-Google-Smtp-Source: AHgI3IZQDZhWiJfJEdafZQxMFdHhNM1hot/Bk0fptCvMAIYGeCGo8hr9WLriiPpV3YCNJBwxlTNWJA== X-Received: by 2002:a17:902:22f:: with SMTP id 44mr683891plc.249.1551216872748; Tue, 26 Feb 2019 13:34:32 -0800 (PST) Received: from shemminger-XPS-13-9360.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id h75sm22191108pfd.150.2019.02.26.13.34.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 13:34:31 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 26 Feb 2019 13:34:23 -0800 Message-Id: <20190226213424.10567-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190226213424.10567-1-stephen@networkplumber.org> References: <20190226213424.10567-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH 4/5] eal: remove RTE_PMD_DEBUG_TRACE 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" The RTE_PMD_DEBUG_TRACE was only enabled for EVENTDEV_DEBUG and that configuration is now handled by RTE_EDEV_LOG macros. Signed-off-by: Stephen Hemminger --- lib/librte_eal/common/include/rte_dev.h | 41 ++----------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index 5e16a4f86b70..3cad4bce57bf 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -43,52 +43,15 @@ typedef void (*rte_dev_event_cb_fn)(const char *device_name, enum rte_dev_event_type event, void *cb_arg); -__attribute__((format(printf, 2, 0))) -static inline void -rte_pmd_debug_trace(const char *func_name, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - - { - char buffer[vsnprintf(NULL, 0, fmt, ap) + 1]; - - va_end(ap); - - va_start(ap, fmt); - vsnprintf(buffer, sizeof(buffer), fmt, ap); - va_end(ap); - - rte_log(RTE_LOG_ERR, RTE_LOGTYPE_PMD, "%s: %s", - func_name, buffer); - } -} - -/* - * Enable RTE_PMD_DEBUG_TRACE() when at least one component relying on the - * RTE_*_RET() macros defined below is compiled in debug mode. - */ -#if defined(RTE_LIBRTE_EVENTDEV_DEBUG) -#define RTE_PMD_DEBUG_TRACE(...) \ - rte_pmd_debug_trace(__func__, __VA_ARGS__) -#else -#define RTE_PMD_DEBUG_TRACE(...) (void)0 -#endif - /* Macros to check for invalid function pointers */ #define RTE_FUNC_PTR_OR_ERR_RET(func, retval) do { \ - if ((func) == NULL) { \ - RTE_PMD_DEBUG_TRACE("Function not supported\n"); \ + if ((func) == NULL) \ return retval; \ - } \ } while (0) #define RTE_FUNC_PTR_OR_RET(func) do { \ - if ((func) == NULL) { \ - RTE_PMD_DEBUG_TRACE("Function not supported\n"); \ + if ((func) == NULL) \ return; \ - } \ } while (0) /** From patchwork Tue Feb 26 21:34:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 50530 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D04C24CAB; Tue, 26 Feb 2019 22:34:38 +0100 (CET) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by dpdk.org (Postfix) with ESMTP id E40D44C91 for ; Tue, 26 Feb 2019 22:34:35 +0100 (CET) Received: by mail-pl1-f193.google.com with SMTP id m10so6835216plt.10 for ; Tue, 26 Feb 2019 13:34:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=H7dLRx04lCdMNEVK/4E/OgKhznqwB2w/DMz8Fv0/erQ=; b=bc/LT0n7IgRKX+QwLm57kVR5Kkfh8kl7qESW2AJgL3vPTStWr2uAhmXyCdU1VSxRL7 2zhQ3k10jKKsYMb2v3z6f7QUIgiI/FNZs5uyGYCgkhoqpgiXRWnBOk42+F1kGcwb6DyR Q5XbQzkv2Sqxo94otvwbeuREMzEsH/fWGd4krSl1qu47TeB/X/os20Q2DDDeBrlfYo7Z befxhCfsyk8qgaRhbYwiXeKRDqap6r3aVhCDX+tfnSFSWemOMzN5J9046j1VEkZ+1Nzw AWlGOHiCrkzBxlhyZK/CaD35tu785pgZnGh94RTusoUCouJOARf4u87ak0oQcGxpfKCA BKqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=H7dLRx04lCdMNEVK/4E/OgKhznqwB2w/DMz8Fv0/erQ=; b=Hz0tki114a/b8BatMu+Slx765qf0fG2oVBuc5AJ/m2ZvcpmFG8GeoQpYCLOY3cGdHX wkbrC/AtoGjBPqG6WLPJeNHhiOrdgz6JUFYN6g3lCjyByoH95kpQjJFb/bsgvcN8Z4SU 6uCYrgaQqu+1lX1oSJ+ATh6DrOMB9D76aWCtQRMR2uTgj8l7c44IsQByWNAgVeYyfDcN R9g/KoCNoWP8rRMEEbb/hQ0WIPkP6dBBqV6BV4jO0lh2cWpfYo2PIkWxXflmwk37S2Vr lnboHN4RZMxD80xCOc1I6o7KfwFkwSkMqDktR7F5kK5P096Mi7d5Pxnhc2d6C/IW5xNo Vp5g== X-Gm-Message-State: AHQUAuYmR9X9UNO27Y0g48RHuIov/Nni+R2gUifL1TNKLYyDW5UTBfbk UsEHk5M+/YV0lpg4vO4yQU1RNFURBCE= X-Google-Smtp-Source: AHgI3IYYE8bthvIXDKKzLJMsgZvaRs2kENtydjtoSiyd4eBnFPKpj8JI9MQi2ar2d7wu47PlnT6OHA== X-Received: by 2002:a17:902:bf05:: with SMTP id bi5mr11247774plb.259.1551216874225; Tue, 26 Feb 2019 13:34:34 -0800 (PST) Received: from shemminger-XPS-13-9360.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id h75sm22191108pfd.150.2019.02.26.13.34.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 13:34:33 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 26 Feb 2019 13:34:24 -0800 Message-Id: <20190226213424.10567-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190226213424.10567-1-stephen@networkplumber.org> References: <20190226213424.10567-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH 5/5] sfc: don't use RTE_LOGTYPE_PMD 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" The sfc driver was still using RTE_LOGTYPE_PMD which was superseded by local logging. Signed-off-by: Stephen Hemminger --- drivers/net/sfc/sfc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index 898603884fa0..2cd7126015fd 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -1115,12 +1115,12 @@ sfc_register_logtype(const struct rte_pci_addr *pci_addr, ++lt_prefix_str_size; /* Reserve space for prefix separator */ lt_str_size_max = lt_prefix_str_size + PCI_PRI_STR_SIZE + 1; } else { - return RTE_LOGTYPE_PMD; + return sfc_logtype_driver; } lt_str = rte_zmalloc("logtype_str", lt_str_size_max, 0); if (lt_str == NULL) - return RTE_LOGTYPE_PMD; + return sfc_logtype_driver; strncpy(lt_str, lt_prefix_str, lt_prefix_str_size); lt_str[lt_prefix_str_size - 1] = '.';