From patchwork Wed Dec 13 04:16:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135121 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 2FD8E436D9; Wed, 13 Dec 2023 05:21:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3F25942F0F; Wed, 13 Dec 2023 05:19:43 +0100 (CET) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mails.dpdk.org (Postfix) with ESMTP id 6454642EEE for ; Wed, 13 Dec 2023 05:19:39 +0100 (CET) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1d0b2752dc6so57425815ad.3 for ; Tue, 12 Dec 2023 20:19:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702441178; x=1703045978; 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=tVcPQ0LyDX8TcK9GlY0G2I+iN/ftOTHL3sxi79SyqfF/76zoGjbieDDkV018WyxY50 Hi1T7rg4L0JBdVIQiMNHki1KQ6cU9/scQ1YpGVuS+m7tHfosZBZrY0ADvFd2Q1VZ2tyy BwQh2suVxjcYNsLJNKhuxb0BoAiJfPgfL79l8svo0HW2HLQiASqeAvZFELQAidbx3x0e C4ZTkelrRBtgxQxcjIi3MmO4D7oFTFk/lHWZvVJm5q8E2SdorwOdvHGR3UGI4ZKm3aS3 w2qh00feNeSGzzAZnnr0FcGy16PfUEb0KZBXDu0f1Idqm+hfmjc9OZuzNrd8PaZGE4ZQ SMqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702441178; x=1703045978; 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=MIeVmL/J1f8ASmlmOTCK22gpgynNDcLNUN0Dqy5oUQxuMX8kMpqlDu8y7R5BNo5KfE 8hZKo2T9ujL5i7hOPBX3b8zh+i2OCTRAKWTDvB2pqkQjDgXnCAjRG9nJ/8E3GESTyjJd Rkn7tpqjAWHuUpLNxei28YJYPGwT1ciDA1Io0p6wdsrljgUeSRGLe7ujrwxzCI/RsKLe qQ7JyV1ou1yAaXWvsbrx9sdd9KiXegmC57SUQlxjKYsd7Gs+VgnejBc+uJwxLw5+fu/6 6OOXjwHFQtrS+V/fBcN2LwyrKSfcAm4uZY6dF7vhSTlmu3RF2ASQUhp5CEh2hvGH1Gsi M/rA== X-Gm-Message-State: AOJu0YyB7RUJyPTX/YY5433EnVonNbqg99yu9B3N/fCGzN1PGnFKCIuD fjN82z60rS7lFFV86hmhr/psvLygj8la02RcAho= X-Google-Smtp-Source: AGHT+IG/AUCzNRdZ4DmUe6LiM8bPHdCQxE/T14i8NGYPP7e9povC2O0EtFeSjzzvs5+ICAhFiC7Vaw== X-Received: by 2002:a17:902:e9cd:b0:1d0:8fad:f187 with SMTP id 13-20020a170902e9cd00b001d08fadf187mr6386695plk.48.1702441178613; Tue, 12 Dec 2023 20:19:38 -0800 (PST) Received: from hermes.lan (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p12-20020a170902e74c00b001d077da4ac4sm9340888plf.212.2023.12.12.20.19.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 20:19:38 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jochen Behrens Subject: [PATCH v2 16/25] net/vmxnet3: do not use PMD logtype Date: Tue, 12 Dec 2023 20:16:43 -0800 Message-ID: <20231213041920.729403-17-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231213041920.729403-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231213041920.729403-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)