From patchwork Wed Dec 13 01:42:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135091 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7C1EA436D8; Wed, 13 Dec 2023 02:47:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3BA1842E83; Wed, 13 Dec 2023 02:47:00 +0100 (CET) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mails.dpdk.org (Postfix) with ESMTP id 5318E42E7F for ; Wed, 13 Dec 2023 02:46:56 +0100 (CET) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-53fbf2c42bfso5283224a12.3 for ; Tue, 12 Dec 2023 17:46:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702432015; x=1703036815; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8KMWLxgpL7CiEgDevb64icPRPun/dOp8dbc7DR4gSgA=; b=OFO0a/N493bF8eZTZy+XpWka6ZlU+G5ojDBs7+jS9H4S76fvNQzoqTnOLKI9QmukQ3 xVuduDKJ5pmUbJMZRNAwc9acVMsR0BbXQLQxDOZlDSUxvbR5z5sKxPp/vk07MTbnlUh9 lv27+hweFHwcU8+kx3vSJsoQ4X0VnRFPSpIGYi65Y3VUZi71MJ6+3L9Z4YXeVkuA85m4 /nkJJBd0/+zxJzSUZbz0o0njnGeCh3UpwTNcp+RIpzNiPSnq0pJCz2mUBnOzoIT8BuXx /3Z/jKYfxPVDH6wonEPwJrX5MdjKSkbrlzi0K2FSvg+FnOUEAlxkCzw5nO+DlrkYW5tp Zt2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702432015; x=1703036815; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8KMWLxgpL7CiEgDevb64icPRPun/dOp8dbc7DR4gSgA=; b=MnSmclJ9IHZFA6aFke8/r2+AqXZdh/LJMNfwYE5dGLzh5o7BM2Hrr9DDfI/XcAUIgv BdNnwKsEsqqZwvpH9blwVe4VwB3/9KIWxytJgL+oN9VamSlDxBlu9nD6Nt45FgTI2dxA kz1+M8Yv3zNWf3TllG17kjmV/F35Lb5z0kFIA74KvJV32QyiTEMod1lRjM9UuuU9RVoJ GXOQBohpeVNsdDGLOEa0jtEZuyyw6POzdNRd3ReYORSErThA75NZvXqhsXiBjPcRbYRU PDzWNtIGfAym9OXJgRB0yC+NWt5Knn9wtlRuZMTHNyX41Jy4Cot0m6nd5mgnacj3G8Pj kTgA== X-Gm-Message-State: AOJu0Yy1acJZ7ArcRPeaVQWZvaFcUcJltx7SFsrQllJWcPHMQ0MJ5bHk fDVxqJgsK8CX+cf3K7Um0QLdrUvUkW7a74GU7L+A1A== X-Google-Smtp-Source: AGHT+IFC+SGPSP5J6y8QkXHEBYaKeNCONGh8H+dutFr0U6xBCUJin+Cj5Amd+s4xUN4j+2VzV2GK8Q== X-Received: by 2002:a05:6a21:6da1:b0:18f:97c:6142 with SMTP id wl33-20020a056a216da100b0018f097c6142mr10021428pzb.63.1702432015479; Tue, 12 Dec 2023 17:46:55 -0800 (PST) Received: from hermes.lan (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id f7-20020aa79d87000000b006ce5b4ade28sm8988375pfq.174.2023.12.12.17.46.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 17:46:55 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jochen Behrens Subject: [PATCH 17/26] net/vmxnet3: do not use PMD logtype Date: Tue, 12 Dec 2023 17:42:33 -0800 Message-ID: <20231213014408.612051-18-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231213014408.612051-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The driver used a slightly different (and older) format for datapath logs. Remove PMD logtype here. Signed-off-by: Stephen Hemminger --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +- drivers/net/vmxnet3/vmxnet3_logs.h | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index e49191718aea..4fd704045fc4 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -1919,7 +1919,7 @@ vmxnet3_interrupt_handler(void *param) if (events == 0) goto done; - RTE_LOG(DEBUG, PMD, "Reading events: 0x%X", events); + PMD_DRV_LOG(DEBUG, "Reading events: 0x%X", events); vmxnet3_process_events(dev); done: vmxnet3_enable_intr(hw, *eventIntrIdx); diff --git a/drivers/net/vmxnet3/vmxnet3_logs.h b/drivers/net/vmxnet3/vmxnet3_logs.h index 74154e3a1a6d..058d704f82c9 100644 --- a/drivers/net/vmxnet3/vmxnet3_logs.h +++ b/drivers/net/vmxnet3/vmxnet3_logs.h @@ -11,28 +11,32 @@ extern int vmxnet3_logtype_init; "%s(): " fmt "\n", __func__, ## args) #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") +extern int vmxnet3_logtype_driver; + #ifdef RTE_LIBRTE_VMXNET3_DEBUG_RX #define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) + rte_log(RTE_LOG_ ## level, vmxnet3_logtype_driver, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_RX_LOG(level, fmt, args...) do { } while(0) #endif #ifdef RTE_LIBRTE_VMXNET3_DEBUG_TX #define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) + rte_log(RTE_LOG_ ## level, vmxnet3_logtype_driver, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_TX_LOG(level, fmt, args...) do { } while(0) #endif #ifdef RTE_LIBRTE_VMXNET3_DEBUG_TX_FREE #define PMD_TX_FREE_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) + rte_log(RTE_LOG_ ## level, vmxnet3_logtype_driver, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0) #endif -extern int vmxnet3_logtype_driver; #define PMD_DRV_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, vmxnet3_logtype_driver, \ "%s(): " fmt "\n", __func__, ## args)