From patchwork Mon Dec 18 19:22:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135302 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 5AD574373D; Mon, 18 Dec 2023 20:26:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 65FC240E25; Mon, 18 Dec 2023 20:26:44 +0100 (CET) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mails.dpdk.org (Postfix) with ESMTP id 3DF42402D8 for ; Mon, 18 Dec 2023 20:26:43 +0100 (CET) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-5c6839373f8so2303584a12.0 for ; Mon, 18 Dec 2023 11:26:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927602; x=1703532402; 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=YyBqO/sb6UeQ4NeBuhZ1nXTlTFjLIN4jayiZCG0GWMs=; b=ETMSWg7u+hsEdbW5MCy15xv2cHajpOTmIV4a+7RkcEVBVrWCUg711Ewi0kqrnAeq2G /CTHA7rEL/jFxig1GCygGKM0G73xWWc9ZB/PBF6ordB5WxpRZfX4J+RhSrFUE6wGv0Q3 HPWhKIZr9sYry820va86Nw2w68tVTTE6GjNCbuPAz7soXjkVcs0pXhEcYmQsmLrxg6T4 NQa1EszSNsdUUnN8zLmn1yPpNE2mfIrIh4Ky3OwP1m7KMYAJo5yqH0/RwwDOLzBXReFy VE3wQLTOmCnvOuZYn8cEewDEUnnYuaLzxNYkM98hv5F80CJWe+kQsgIM862S+602qoiN oXog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927602; x=1703532402; 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=YyBqO/sb6UeQ4NeBuhZ1nXTlTFjLIN4jayiZCG0GWMs=; b=fChK4rbAqSkpf6ucuKRbTm40A2dRC7BjkbiEiLOMWbfatgtyNQHOpXzqMICNlUxHEf fzN+pV9Zn2wCpScN+TcKPBETCgbEGGl3mss2WHtA6rt7aa7XZfCinsnotySiLA0/1RX2 SxIFCJu4ksmMyTVe4kmzj3agnkidG0LreDvpR+5E+/RUilgXC3fIFmB8TMiR2QsFQuU0 p506dPqnig0G4xHTMn0ryITn1CSLWIbuEogxncbNEtdtened27K6hPvZBWNZdogkTFT5 tI1cfR6NrKSzKpkHKyfBTat+o7vg3uyCpJU5JtcuQO1S3xlBjH6O1udvnkvCUkO97iG1 +gLg== X-Gm-Message-State: AOJu0YxwA7F0BBn7HKZw/SfAjboDdptgtOi6O8ORFqYNpPwx3V045ymK Bpp0dwYK1VPUm3sb6MHvEziHFggHUU58tjZ1cY7o4A== X-Google-Smtp-Source: AGHT+IHEmZ1KDNRNw5nDxtxQYel1sEFef1Iv7I/FsN909PC3LGXIKUfllCx//Ilc2IC6f9BkFQZjCg== X-Received: by 2002:a17:90a:cc0a:b0:28b:6acb:855c with SMTP id b10-20020a17090acc0a00b0028b6acb855cmr3667926pju.27.1702927602261; Mon, 18 Dec 2023 11:26:42 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:41 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 01/17] common/sfc_efx: remove use of PMD logtype Date: Mon, 18 Dec 2023 11:22:17 -0800 Message-ID: <20231218192631.699267-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 This code was implemented in a slightly different manner than all the other logging code (for no good reason). Make it the same and handle errors in same way as other drivers. Signed-off-by: Stephen Hemminger --- drivers/common/sfc_efx/sfc_efx.c | 11 ++--------- drivers/common/sfc_efx/sfc_efx_log.h | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/common/sfc_efx/sfc_efx.c b/drivers/common/sfc_efx/sfc_efx.c index 2dc5545760b8..5eeffb065b0d 100644 --- a/drivers/common/sfc_efx/sfc_efx.c +++ b/drivers/common/sfc_efx/sfc_efx.c @@ -15,7 +15,7 @@ #include "sfc_efx_log.h" #include "sfc_efx.h" -uint32_t sfc_efx_logtype; +int sfc_efx_logtype; static int sfc_efx_kvarg_dev_class_handler(__rte_unused const char *key, @@ -117,11 +117,4 @@ sfc_efx_family(struct rte_pci_device *pci_dev, return rc; } -RTE_INIT(sfc_efx_register_logtype) -{ - int ret; - - ret = rte_log_register_type_and_pick_level("pmd.common.sfc_efx", - RTE_LOG_NOTICE); - sfc_efx_logtype = (ret < 0) ? RTE_LOGTYPE_PMD : ret; -} +RTE_LOG_REGISTER_DEFAULT(sfc_efx_logtype, NOTICE); diff --git a/drivers/common/sfc_efx/sfc_efx_log.h b/drivers/common/sfc_efx/sfc_efx_log.h index 694455c1b14e..1519ebdc175f 100644 --- a/drivers/common/sfc_efx/sfc_efx_log.h +++ b/drivers/common/sfc_efx/sfc_efx_log.h @@ -11,7 +11,7 @@ #define _SFC_EFX_LOG_H_ /** Generic driver log type */ -extern uint32_t sfc_efx_logtype; +extern int sfc_efx_logtype; /** Log message, add a prefix and a line break */ #define SFC_EFX_LOG(level, ...) \ From patchwork Mon Dec 18 19:22:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135303 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 67E9F4373D; Mon, 18 Dec 2023 20:26:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F0BD42DAC; Mon, 18 Dec 2023 20:26:45 +0100 (CET) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mails.dpdk.org (Postfix) with ESMTP id BC4BA402D8 for ; Mon, 18 Dec 2023 20:26:43 +0100 (CET) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1d3ac28ae81so14754775ad.0 for ; Mon, 18 Dec 2023 11:26:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927603; x=1703532403; 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=Nv8FTd4nIOkDpIrFZS5XqniknFq2wcwUf8nwWdOzVQw=; b=uTtXs3ZSLeCpGLgpmiXmdzt4QcJ7XQ4sprdQCUPydrN4O/iiIY7611YC/yduzFVyFI KTDzW0XIvyZE2Szp/Zwn9MdxReJvyc+4wgMEINUu8KQS4ME59Rf/YN5K/dA2rwGoq198 sj2rtprrF26mIAIZdf+Y8SI/i/AsZ1hDPzN9wsjZW5XO3eu/0YfnX1WGhkVoAW6pqMs9 CN/4JGDRrJ6/VoIpS4AZVweAIHwLFM6bKRjbXeDdBRgEhfLDlLsGgbsDtv8fPfidGTNB uIMO/GvBWW/t+Pm0SPzOCFlgOVgNkfs7tEK411yRXeVU9OYGMPiOW8xkXmIq8vmECJGy fPlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927603; x=1703532403; 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=Nv8FTd4nIOkDpIrFZS5XqniknFq2wcwUf8nwWdOzVQw=; b=UPtauB/KNIGIG0qQSePgZT5u0KWzYx7xMgThHLDZ7tmxPMv5qUcOvB7KhDJzrtdMVd ANzzIz69UM8fH9N6Ws+mVKYlGNsgXx06E46DvoDSuXVFXJny3kU0UFe4KBCjUqt+Bwz4 6k4vD9kwEyksdO2b1NqjsIvLS+QKXBXZG5up1aHkERnAzHuSRsIpHb3BvdQk0wvUdDFk 5j0LPj/Akhr+ddAzEnG/uGc8uzWVhDnTcZeIz44mG3iCcgEHdBdVU734cnnXUY4snoYs EBIaWuz2Ui07PrOvBe/0UrDZUSFsnEPhr0lVpN4Qy+ymIkxsy/GmvoCfRdcjIrh7/bnw Apeg== X-Gm-Message-State: AOJu0YxaB3h3O07th2iHfDq/whwARfW/+LzB/6rkQnSHhGiygEfUcQUt FgIC+3xxvSQgJWfobb2kKpwc73mEbcqNVdC2MeGfrw== X-Google-Smtp-Source: AGHT+IEf9REdlHhA6t9xWHG85gV0z145XXddQ1AGO09WI+iNTxJQV1LIC30MpJyx/i5t/mkvoHHg4A== X-Received: by 2002:a17:902:dacf:b0:1d3:d72e:ce33 with SMTP id q15-20020a170902dacf00b001d3d72ece33mr689775plx.107.1702927603004; Mon, 18 Dec 2023 11:26:43 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:42 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 02/17] mempool/dpaa2: use driver logtype not PMD Date: Mon, 18 Dec 2023 11:22:18 -0800 Message-ID: <20231218192631.699267-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 already has macros for logging, use them. Fixes: 7ed359909556 ("mempool/dpaa2: add functions for CMDIF") Signed-off-by: Stephen Hemminger --- drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c index 84371d5d1abb..4c9245cb814c 100644 --- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c +++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c @@ -293,7 +293,7 @@ rte_dpaa2_mbuf_pool_bpid(struct rte_mempool *mp) bp_info = mempool_to_bpinfo(mp); if (!(bp_info->bp_list)) { - RTE_LOG(ERR, PMD, "DPAA2 buffer pool not configured\n"); + DPAA2_MEMPOOL_ERR("DPAA2 buffer pool not configured"); return -ENOMEM; } @@ -307,7 +307,7 @@ rte_dpaa2_mbuf_from_buf_addr(struct rte_mempool *mp, void *buf_addr) bp_info = mempool_to_bpinfo(mp); if (!(bp_info->bp_list)) { - RTE_LOG(ERR, PMD, "DPAA2 buffer pool not configured\n"); + DPAA2_MEMPOOL_ERR("DPAA2 buffer pool not configured"); return NULL; } From patchwork Mon Dec 18 19:22:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135304 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 B462C4373D; Mon, 18 Dec 2023 20:27:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B94A142DBD; Mon, 18 Dec 2023 20:26:46 +0100 (CET) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mails.dpdk.org (Postfix) with ESMTP id AC87E410D0 for ; Mon, 18 Dec 2023 20:26:44 +0100 (CET) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-5c701bd9a3cso1607703a12.0 for ; Mon, 18 Dec 2023 11:26:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927604; x=1703532404; 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=uwbsWX2Ew2Xai4uqvaY0ZrANYDi5fODTCO5ci30KcQA=; b=JJa6kOa+ALP7oaTnTYf718m+YdiyoGoeMachZx7Pi7HSYCD2Y3kWFEDQlg4v4CF24g y53EF0zcSumiH2V9S93eg7NfJE1q8f6CLUIEjdqFuLLVivxu9GK7tigma97i44UwGx+I zyVU9+477GZt3eM0OCc7fnlEiRVBK725FWjJ+sTA1Ycl4ISBRt4iqF/a62Cw8sY+LOKg IBPRrgbGbUgphk3kszvEkG5kGRMCosi50CqCn1Kn+ma9l2EB+WERqSVsUSATwWRVs40g TUYoYPl94WefYxWiTTQR4XAedXWw9CJQaZkTYKThWMvhEKGYC4nbS+ujv/B3xAVPluLd 1LHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927604; x=1703532404; 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=uwbsWX2Ew2Xai4uqvaY0ZrANYDi5fODTCO5ci30KcQA=; b=aXp9e1KBt8i6173FGOJvaNVdMOtLHPqb0PcgCMZLPRJjTCVgjbv5y6pmOqHD7SqPYm 95V61xsT1iJp8p79IxDGLzpULP0mqSb44VcZF99J26/gtr1HF+aRJAVqipF5wlVQe6PC OvTHPnogYtg6bR2sv5hUIGCvNX0Gm6BRX/lbfzLijacDpInWA2xWHI8CVCRHvihz2uQ2 +qAcESWT3TTyno9tv5W4WsV3Wr6hV2k3ndQCaQ6lpbTUVTTwAhJkAHZw36KDhGxKX4Dh qRehb2kxG5I82rF5N/agg2Ej62eb9iWuF1MXQQ8Y1F8wtSbRMA9Sb5GqSRt2Neohd80b tHPw== X-Gm-Message-State: AOJu0YznGTq0i6om2QMrWSrq/ZRLK32lcgJHBPelwYhdD71Jzid5k26f bdy1aGfbTbV6IwmQqCvmSwdFBEYsVgGHN9vdzuUcsg== X-Google-Smtp-Source: AGHT+IHGZkyHEkW5f8mNBWExSX7M/HpPfao92AA9iFOJT6lYWlld106o2fOeZjgEFD+ib2gjFbe9GQ== X-Received: by 2002:a05:6300:808c:b0:194:3d1:91b2 with SMTP id ap12-20020a056300808c00b0019403d191b2mr1692790pzc.91.1702927603978; Mon, 18 Dec 2023 11:26:43 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:43 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 03/17] net/dpaa: use dedicated logtype not PMD Date: Mon, 18 Dec 2023 11:22:19 -0800 Message-ID: <20231218192631.699267-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 already has a logtype, but was not used in couple places. Fixes: 6b10d1f7bdea ("net/dpaa: update process specific device info") Fixes: c2c4f87b1259 ("net: add macro for MAC address print") Signed-off-by: Stephen Hemminger --- drivers/net/dpaa/dpaa_ethdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index ef4c06db6a4d..2b497694cb02 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -2096,8 +2096,8 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev) /* copy the primary mac address */ rte_ether_addr_copy(&fman_intf->mac_addr, ð_dev->data->mac_addrs[0]); - RTE_LOG(INFO, PMD, "net: dpaa: %s: " RTE_ETHER_ADDR_PRT_FMT "\n", - dpaa_device->name, RTE_ETHER_ADDR_BYTES(&fman_intf->mac_addr)); + DPAA_PMD_INFO("net: dpaa: %s: " RTE_ETHER_ADDR_PRT_FMT, + dpaa_device->name, RTE_ETHER_ADDR_BYTES(&fman_intf->mac_addr)); if (!fman_intf->is_shared_mac) { /* Configure error packet handling */ @@ -2166,7 +2166,7 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv, ret = dpaa_dev_init_secondary(eth_dev); if (ret != 0) { - RTE_LOG(ERR, PMD, "secondary dev init failed\n"); + DPAA_PMD_ERR("secondary dev init failed"); return ret; } @@ -2182,7 +2182,7 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv, if (!(default_q || fmc_q)) { if (dpaa_fm_init()) { - DPAA_PMD_ERR("FM init failed\n"); + DPAA_PMD_ERR("FM init failed"); return -1; } } From patchwork Mon Dec 18 19:22:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135305 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 5E54C4373D; Mon, 18 Dec 2023 20:27:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3F97442DDA; Mon, 18 Dec 2023 20:26:48 +0100 (CET) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mails.dpdk.org (Postfix) with ESMTP id 7B89E42DA3 for ; Mon, 18 Dec 2023 20:26:45 +0100 (CET) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1d3ae590903so10855475ad.1 for ; Mon, 18 Dec 2023 11:26:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927605; x=1703532405; 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=1Y949PQVoZ0MsGzQje0CViLo2gY8MRdgQrEma/yqLOA=; b=WuabAFqjgKRyH9fg7qQNmHkT8A+Ijfkg3zHF9Xg9mr+CAjl85TtBW8vCgcgwgTbtr6 2OTo76ABliJrSZ4D6urLjrbutehk5c5Z45qxBpQGFvzRgCM2/loXtwGIpo6a+O3OSr+u pnfmJPPyy+fQpe8UXTB+jLiW0B3d+7cgwa+gfnHViYCcyyIKPNzbWgkJN2yI/mUL62tu p3O1Fh41QtmP0vOjiBomEGbwNVQCsbh2k4twqDfE/cay0CbC7uaMgKWt+alBpVIBSOuT XEVUkCvjWn26fHTDGYNs/jtDH2x1fCj6gLNi7r77NqGLtI4X7rosWu+bfG1Vuutgxqsl dOHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927605; x=1703532405; 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=1Y949PQVoZ0MsGzQje0CViLo2gY8MRdgQrEma/yqLOA=; b=lxzBuyTmzgGCXbyDo2O0pn8rHjqTKT1ao7dLekYgCx3nsd+wul09HZnMIRiCZhpv8s m0sUrKOwIfo0bRP0UPSV+nS+QuyFaEsRwwgBBBbLTIr/74/Dy2WYGUkQlS3w9NpDi7Ap DWD6YMDF1kQ9xNhwrI6WW+vZX/j44cQGRJFgr2jC4ol9KL0R5/DIFgWxeG5FPVWPdbrp 5Qh1+9JBPAOodpG4SvMhNbJekV6BxC16CcEbLbm75ucmMX1j5LDmQJ6E+8lklb2QDO6Y yyYoDL8nlLVtoWYq6pPCnzwwbuNrB+XQRyVT0DfVS4ZdLbdGwQFdMaTyEocNZBBbFiWj 0qgQ== X-Gm-Message-State: AOJu0Yz6bOeT10vTua1c7G2gW6tD1+RD0ifi/S+7JVixrrMUTkyL8KUH VhJGR1Ztoo3ISKtiQRM1jNmSlZzPXXEMo0d6bVQwig== X-Google-Smtp-Source: AGHT+IEecHY9XmKv1BuSpYa06WszXED5C9fILp06M/eey6xxWBGcKbiU1JMKPGxze6qJWA65KEzZgA== X-Received: by 2002:a17:90a:6bc1:b0:28b:664a:807d with SMTP id w59-20020a17090a6bc100b0028b664a807dmr4380043pjj.25.1702927604687; Mon, 18 Dec 2023 11:26:44 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:44 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 04/17] net/dpaa2: used dedicated logtype not PMD Date: Mon, 18 Dec 2023 11:22:20 -0800 Message-ID: <20231218192631.699267-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 has a logtype, but was not being used in one place. Fixes: f023d059769f ("net/dpaa2: support recycle loopback port") Fixes: 72ec7a678e70 ("net/dpaa2: add soft parser driver") Signed-off-by: Stephen Hemminger --- drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_sparser.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 8e610b6bba30..91846fcd2f23 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -2851,7 +2851,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) return ret; } } - RTE_LOG(INFO, PMD, "%s: netdev created, connected to %s\n", + DPAA2_PMD_INFO("%s: netdev created, connected to %s", eth_dev->data->name, dpaa2_dev->ep_name); return 0; diff --git a/drivers/net/dpaa2/dpaa2_sparser.c b/drivers/net/dpaa2/dpaa2_sparser.c index 63463c4fbfd6..36a14526a5c5 100644 --- a/drivers/net/dpaa2/dpaa2_sparser.c +++ b/drivers/net/dpaa2/dpaa2_sparser.c @@ -181,7 +181,7 @@ int dpaa2_eth_load_wriop_soft_parser(struct dpaa2_dev_priv *priv, priv->ss_iova = (uint64_t)(DPAA2_VADDR_TO_IOVA(addr)); priv->ss_offset += sp_param.size; - RTE_LOG(INFO, PMD, "Soft parser loaded for dpni@%d\n", priv->hw_id); + DPAA2_PMD_INFO("Soft parser loaded for dpni@%d", priv->hw_id); rte_free(addr); return 0; @@ -234,6 +234,6 @@ int dpaa2_eth_enable_wriop_soft_parser(struct dpaa2_dev_priv *priv, } rte_free(param_addr); - RTE_LOG(INFO, PMD, "Soft parser enabled for dpni@%d\n", priv->hw_id); + DPAA2_PMD_INFO("Soft parser enabled for dpni@%d", priv->hw_id); return 0; } From patchwork Mon Dec 18 19:22:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135306 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 1BBF44373D; Mon, 18 Dec 2023 20:27:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5503842DD9; Mon, 18 Dec 2023 20:26:50 +0100 (CET) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mails.dpdk.org (Postfix) with ESMTP id 3539D4025E for ; Mon, 18 Dec 2023 20:26:46 +0100 (CET) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-28b6218d102so1581043a91.0 for ; Mon, 18 Dec 2023 11:26:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927605; x=1703532405; 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=uS5Ba8ZHzyrFAw4NaWR81b04okCnnLNgeNua0B6rZac=; b=x+boEMoe6XfZtO81MyKV+E68/Ll2qA346LV8gvmzfTOyf2vzEoAU8cAzHawiH71co6 I5L7KpKuFshghPp5LcpyfWCnfrMffSLQ7yJvSp3+xwI5g7WGxKWiTarMlI+TOJkbETba dycvxuEEg3iHfF/+tmdamboSo9xAypxicTk4QX40LE9pcCpjkpEkKQNk7UZyBj1WOJho IVya8ZNzsZVeVK8ggdOIrixC5osHwcRKvDKozNOhWH93pEHz4hppDKu/IDgFrNTdrv+t cjcgzSY3ACGLBEdtiq9e61oHHMdM9qahZs6xZeyKPd7eJGip4JaamNl+iWadafuP3PtN WM0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927605; x=1703532405; 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=uS5Ba8ZHzyrFAw4NaWR81b04okCnnLNgeNua0B6rZac=; b=Hnm28dBO/2I6NLbcOVnwKPA9ZCvK10/BD6vEgGBb+842/2hhqv+dlTE+sURWKoyRND ViDa4wP3HeCbvU41lJfJGLBhjwj9jzd2BYaL8XpVEZZqfb0UqVOEplvEFYYQWddG0Hhx hCnGBYbMOJ7KAfI8g52Qd/sMSOOJ8sHKhLGPZI+j0mktrtfmqw+TEwMdyS8ziRbpws5g e+khg/74j4CVHydMPYkvqIbUdn+rh4EyWrfwk7Wqm3AOZVCdiss2hz7Nqm4zPBb2b9Xx sFTvN9/cyqiAYKgZ0uZ+VOKmyrrb5wxMdACS4HytX32DCthrfZ7/wZ4gLFeRMAaqn+fc RW+Q== X-Gm-Message-State: AOJu0YzQHDTJzufyTNtXFGh/Uif1Vn0x+XMZP5gEIJi2JV5rjMtEYdb5 Qk/YBWvmZlsOeuloZCx0DiWP1GWCTsHtw1BTsuQFsA== X-Google-Smtp-Source: AGHT+IGJKbGr9KwDm0TxCsM7f4DULkEM7WfxA1x9ndkpkKplqIVrRYnTtEOQQLJitZOy42Yukr3czw== X-Received: by 2002:a17:90a:2a4f:b0:28b:6a9c:fff0 with SMTP id d15-20020a17090a2a4f00b0028b6a9cfff0mr1310988pjg.85.1702927605366; Mon, 18 Dec 2023 11:26:45 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:45 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 05/17] net/mvpp2: use dedicated logtype Date: Mon, 18 Dec 2023 11:22:21 -0800 Message-ID: <20231218192631.699267-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 Always use the dedicated logtype, not PMD. Fixes: 9e79d810911d ("net/mvpp2: support Tx scatter/gather") Signed-off-by: Stephen Hemminger --- drivers/net/mvpp2/mrvl_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c index c12364941d62..9a9279a8783a 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -415,10 +415,10 @@ mrvl_set_tx_function(struct rte_eth_dev *dev) /* Use a simple Tx queue (no offloads, no multi segs) if possible */ if (priv->multiseg) { - RTE_LOG(INFO, PMD, "Using multi-segment tx callback\n"); + MRVL_LOG(INFO, "Using multi-segment tx callback"); dev->tx_pkt_burst = mrvl_tx_sg_pkt_burst; } else { - RTE_LOG(INFO, PMD, "Using single-segment tx callback\n"); + MRVL_LOG(INFO, "Using single-segment tx callback"); dev->tx_pkt_burst = mrvl_tx_pkt_burst; } } From patchwork Mon Dec 18 19:22:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135307 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 0C9DD4373D; Mon, 18 Dec 2023 20:27:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6A94142DE2; Mon, 18 Dec 2023 20:26:51 +0100 (CET) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mails.dpdk.org (Postfix) with ESMTP id DC54C40E03 for ; Mon, 18 Dec 2023 20:26:46 +0100 (CET) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1d39e2f1089so18806935ad.1 for ; Mon, 18 Dec 2023 11:26:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927606; x=1703532406; 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=u986atT1BkRmtCNh10url9mKtsPhvh7P/VKgHCU2mrY=; b=Nv0i4VnhXFjOHbGtkTaitHoNX/lFsKSAWklAwseMJ63sNx3eORwclom1mvVHh2GE9T 4RaMKSy8mnKBq7Nv1jTgJlJV2uzbkeOjGuZFfqCYRTfrFaZPhmMFYE6cFovTyeHavykN 7S2FQv+1iGe8rAvvNBJetms/SLGYFolbdo5JXEGuyUoyG0fMDyk9PHPQQSrOBr1vfRWg ShXL7Lrowib+M3BSJVHlt/VUceXWgpaELzfYGuEMbjCDpcMOuKyMsnmz6hubgLb3AETl GTwX/j+4UPtPjcyDfdNOFrun/+q8KJMSsTGjIKj26Pl96mLr8FpUm7WFMF7Cqf00ZhpV bJJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927606; x=1703532406; 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=u986atT1BkRmtCNh10url9mKtsPhvh7P/VKgHCU2mrY=; b=T3HyZo8KljGCnY07zOEdtSg8Lyel/c6lwgQFCXp2k7prr81aRTa/1ajyqsOeL+6BLn Fv9fvVpczyCqo0D7TxhW1nzZPCo3aJzMla0hJaWVKn9BhrdccYxrxoomFgxolT3WV6bk 88gn/R3Zxt5BOuqTSQNe0Re332AaJ5DDciUdA1sLJk5yWX+dFm/EewUYNW7myPyeA9lL tQEUiHYTNDcPO0NbrEqmlLS2i4aDjvMQtsJkTOOfTU/ttzGwOnUVIbK7UmZiFYKANDVE fI8E3iXXg5WIIKm/ztA8n9UmhQUhnOnYWNv3QVNWeU9AgWPAQk4V2ObAljPUQKp9crHL fsDQ== X-Gm-Message-State: AOJu0YwfV8aMT4XalPVs2x37BlFBwVoENrRE/KONG2fAXngvdZROFFmd geDYeHwJdaU2xN5s1QBJfvnnpEvbsUxMFS5YggC0sw== X-Google-Smtp-Source: AGHT+IEm7xobuv0ORksYZN2E2SNj8Lf2FkLEQo1U7wRZvUNpCmdaFlXgN+x1zvD7GMu+6L4n9YNH+Q== X-Received: by 2002:a17:903:1c4:b0:1d3:6605:db01 with SMTP id e4-20020a17090301c400b001d36605db01mr9208948plh.64.1702927606174; Mon, 18 Dec 2023 11:26:46 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:45 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 06/17] net/vmxnet3: used dedicated logtype not PMD Date: Mon, 18 Dec 2023 11:22:22 -0800 Message-ID: <20231218192631.699267-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 has log macros, just not used in one place. Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt") Signed-off-by: Stephen Hemminger --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From patchwork Mon Dec 18 19:22:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135308 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 9FF934373D; Mon, 18 Dec 2023 20:27:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 90DE442DEA; Mon, 18 Dec 2023 20:26:52 +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 EA4EB42DD9 for ; Mon, 18 Dec 2023 20:26:47 +0100 (CET) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1d393e5d325so12993675ad.2 for ; Mon, 18 Dec 2023 11:26:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927607; x=1703532407; 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=G5N1AIBT91weaWqkVufYsM6FfbBx29meqmIvJCendiY=; b=i1PTAg7SsvttAN5Cbqvqq+CcVghTcKYJI4Wi3a/XNue3/d252k2NXX3e4YRi9VjBdx uI6VukpK4/KvwKXEuQFr/yfPLKrhc7B0Sj40Mf6tsy5J2PddtWZfQ6z1/xA0BLQlZinC rF3f1jkK10VbivzbuKjWkemn+T6TTYGW5ESRO38aOOQtTNRhRwjUH3eg6UGs61xL3xpG 3Rzm+kyzJ+/z/oCrtfkK57Y1Eiqji+GTHDwekWhShsqCcMQJDdXSVh2p4aq5xRXVcf3V PYMF02sOeBIbXmu69F7U/+7RcKw9BsGdZoFcDg6GmyjmDTBDJH0HzPi2GjEYFqVeot1j AQYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927607; x=1703532407; 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=G5N1AIBT91weaWqkVufYsM6FfbBx29meqmIvJCendiY=; b=w3C3cCSCKS73+7G73Vcy9HZKf/u9jF6HmbY70necHLeerA+RJ4B9nz4IWjnz6Z+jb+ wEK+lKJb+L8ycavxnnD0Ic3bTVQB417OuBOcccJgDQfTYSovzCsgr7EzAH7/uBxlS4eC 3r0n0iny5EsEdUg02qgTcSthfnHmBUsuSwF4ExQPofeqbmtf68Eb5r4hbw1g6rtXVj6f 3rur4tIf7D0XqWTeRMSGLkeo4dnDBTy2TpsAgHTVSSlEO/eonJnhkiayJ5juWXLagd1s Wka+zFDiw/GWYr/SP3mLQpapqlP4glyoOpPt3BHb9MT2nrMh8sDUuNFpZXSH4hfNVs+B NQbQ== X-Gm-Message-State: AOJu0YxQC35yfzRSFQUKxHM9PNOr2wGBRcXJW9GQTe52DIFhhy27+6hK 8OxuiJqwx31XkybTZ5Bca6tcReDvdRjLoHkxFewJ+w== X-Google-Smtp-Source: AGHT+IFBLiUyJUfsLPakRk/S/zvP0n4G5xQv8p4ifaQPQpvn8qG7X1jJWHgbVhin7Xifwg76Fny6YA== X-Received: by 2002:a17:902:ea04:b0:1d3:77b0:39ab with SMTP id s4-20020a170902ea0400b001d377b039abmr4321871plg.4.1702927607094; Mon, 18 Dec 2023 11:26:47 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:46 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 07/17] raw/cnxk: replace PMD logtype with dynamic type Date: Mon, 18 Dec 2023 11:22:23 -0800 Message-ID: <20231218192631.699267-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 Driver should not be using PMD logtype, they should have their own logtype. Signed-off-by: Stephen Hemminger --- drivers/common/cnxk/roc_platform.h | 16 ++++++----- drivers/raw/cnxk_bphy/cnxk_bphy.c | 3 ++- drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy_cgx_test.c | 31 +++++++++++----------- drivers/raw/cnxk_bphy/rte_pmd_bphy.h | 6 +++++ drivers/raw/cnxk_gpio/cnxk_gpio.c | 21 ++++++++------- drivers/raw/cnxk_gpio/cnxk_gpio.h | 5 ++++ drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c | 17 ++++++------ 8 files changed, 57 insertions(+), 44 deletions(-) diff --git a/drivers/common/cnxk/roc_platform.h b/drivers/common/cnxk/roc_platform.h index ba23b2e0d79e..9d2ea8f00965 100644 --- a/drivers/common/cnxk/roc_platform.h +++ b/drivers/common/cnxk/roc_platform.h @@ -265,11 +265,13 @@ extern int cnxk_logtype_tm; extern int cnxk_logtype_ree; extern int cnxk_logtype_dpi; +#define RTE_LOGTYPE_CNXK cnxk_logtype_base + #define plt_err(fmt, args...) \ - RTE_LOG(ERR, PMD, "%s():%u " fmt "\n", __func__, __LINE__, ##args) -#define plt_info(fmt, args...) RTE_LOG(INFO, PMD, fmt "\n", ##args) -#define plt_warn(fmt, args...) RTE_LOG(WARNING, PMD, fmt "\n", ##args) -#define plt_print(fmt, args...) RTE_LOG(INFO, PMD, fmt "\n", ##args) + RTE_LOG(ERR, CNXK, "%s():%u " fmt "\n", __func__, __LINE__, ##args) +#define plt_info(fmt, args...) RTE_LOG(INFO, CNXK, fmt "\n", ##args) +#define plt_warn(fmt, args...) RTE_LOG(WARNING, CNXK, fmt "\n", ##args) +#define plt_print(fmt, args...) RTE_LOG(INFO, CNXK, fmt "\n", ##args) #define plt_dump(fmt, ...) fprintf(stderr, fmt "\n", ##__VA_ARGS__) #define plt_dump_no_nl(fmt, ...) fprintf(stderr, fmt, ##__VA_ARGS__) @@ -296,11 +298,11 @@ extern int cnxk_logtype_dpi; /* Datapath logs */ #define plt_dp_err(fmt, args...) \ - RTE_LOG_DP(ERR, PMD, "%s():%u " fmt "\n", __func__, __LINE__, ##args) + RTE_LOG_DP(ERR, CNXK, "%s():%u " fmt "\n", __func__, __LINE__, ##args) #define plt_dp_info(fmt, args...) \ - RTE_LOG_DP(INFO, PMD, "%s():%u " fmt "\n", __func__, __LINE__, ##args) + RTE_LOG_DP(INFO, CNXK, "%s():%u " fmt "\n", __func__, __LINE__, ##args) #define plt_dp_dbg(fmt, args...) \ - RTE_LOG_DP(DEBUG, PMD, "%s():%u " fmt "\n", __func__, __LINE__, ##args) + RTE_LOG_DP(DEBUG, CNXK, "%s():%u " fmt "\n", __func__, __LINE__, ##args) #ifdef __cplusplus #define CNXK_PCI_ID(subsystem_dev, dev) \ diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy.c b/drivers/raw/cnxk_bphy/cnxk_bphy.c index 15dbc4c1a637..831f0d001adc 100644 --- a/drivers/raw/cnxk_bphy/cnxk_bphy.c +++ b/drivers/raw/cnxk_bphy/cnxk_bphy.c @@ -251,7 +251,7 @@ cnxk_bphy_irq_enqueue_bufs(struct rte_rawdev *dev, /* get rid of last response if any */ if (qp->rsp) { - RTE_LOG(WARNING, PMD, "Previous response got overwritten\n"); + CNXK_BPHY_LOG(ERR, "Previous response got overwritten"); rte_free(qp->rsp); } qp->rsp = rsp; @@ -410,3 +410,4 @@ static struct rte_pci_driver cnxk_bphy_rawdev_pmd = { RTE_PMD_REGISTER_PCI(bphy_rawdev_pci_driver, cnxk_bphy_rawdev_pmd); RTE_PMD_REGISTER_PCI_TABLE(bphy_rawdev_pci_driver, pci_bphy_map); RTE_PMD_REGISTER_KMOD_DEP(bphy_rawdev_pci_driver, "vfio-pci"); +RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_bphy, bphy, INFO); diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c b/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c index 2d8466ef918b..4358aeecc3e5 100644 --- a/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c +++ b/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c @@ -189,7 +189,7 @@ cnxk_bphy_cgx_process_buf(struct cnxk_bphy_cgx *cgx, unsigned int queue, /* get rid of last response if any */ if (qp->rsp) { - RTE_LOG(WARNING, PMD, "Previous response got overwritten\n"); + CNXK_BPHY_LOG(WARNING, "Previous response got overwritten"); rte_free(qp->rsp); } qp->rsp = rsp; diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy_cgx_test.c b/drivers/raw/cnxk_bphy/cnxk_bphy_cgx_test.c index a3021b4bb7db..f01d958661ad 100644 --- a/drivers/raw/cnxk_bphy/cnxk_bphy_cgx_test.c +++ b/drivers/raw/cnxk_bphy/cnxk_bphy_cgx_test.c @@ -57,62 +57,61 @@ cnxk_bphy_cgx_dev_selftest(uint16_t dev_id) if (ret) break; if (descs != 1) { - RTE_LOG(ERR, PMD, "Wrong number of descs reported\n"); + CNXK_BPHY_LOG(ERR, "Wrong number of descs reported"); ret = -ENODEV; break; } - RTE_LOG(INFO, PMD, "Testing queue %d\n", i); + CNXK_BPHY_LOG(INFO, "Testing queue %d", i); ret = rte_pmd_bphy_cgx_stop_rxtx(dev_id, i); if (ret) { - RTE_LOG(ERR, PMD, "Failed to stop rx/tx\n"); + CNXK_BPHY_LOG(ERR, "Failed to stop rx/tx"); break; } ret = rte_pmd_bphy_cgx_start_rxtx(dev_id, i); if (ret) { - RTE_LOG(ERR, PMD, "Failed to start rx/tx\n"); + CNXK_BPHY_LOG(ERR, "Failed to start rx/tx"); break; } ret = rte_pmd_bphy_cgx_set_link_state(dev_id, i, false); if (ret) { - RTE_LOG(ERR, PMD, "Failed to set link down\n"); + CNXK_BPHY_LOG(ERR, "Failed to set link down"); break; } ret = cnxk_bphy_cgx_link_cond(dev_id, i, 0); if (ret != 0) - RTE_LOG(ERR, PMD, - "Timed out waiting for a link down\n"); + CNXK_BPHY_LOG(ERR, "Timed out waiting for a link down"); ret = rte_pmd_bphy_cgx_set_link_state(dev_id, i, true); if (ret) { - RTE_LOG(ERR, PMD, "Failed to set link up\n"); + CNXK_BPHY_LOG(ERR, "Failed to set link up"); break; } ret = cnxk_bphy_cgx_link_cond(dev_id, i, 1); if (ret != 1) - RTE_LOG(ERR, PMD, "Timed out waiting for a link up\n"); + CNXK_BPHY_LOG(ERR, "Timed out waiting for a link up"); ret = rte_pmd_bphy_cgx_intlbk_enable(dev_id, i); if (ret) { - RTE_LOG(ERR, PMD, "Failed to enable internal lbk\n"); + CNXK_BPHY_LOG(ERR, "Failed to enable internal lbk"); break; } ret = rte_pmd_bphy_cgx_intlbk_disable(dev_id, i); if (ret) { - RTE_LOG(ERR, PMD, "Failed to disable internal lbk\n"); + CNXK_BPHY_LOG(ERR, "Failed to disable internal lbk"); break; } ret = rte_pmd_bphy_cgx_ptp_rx_enable(dev_id, i); /* ptp not available on RPM */ if (ret < 0 && ret != -ENOTSUP) { - RTE_LOG(ERR, PMD, "Failed to enable ptp\n"); + CNXK_BPHY_LOG(ERR, "Failed to enable ptp"); break; } ret = 0; @@ -120,27 +119,27 @@ cnxk_bphy_cgx_dev_selftest(uint16_t dev_id) ret = rte_pmd_bphy_cgx_ptp_rx_disable(dev_id, i); /* ptp not available on RPM */ if (ret < 0 && ret != -ENOTSUP) { - RTE_LOG(ERR, PMD, "Failed to disable ptp\n"); + CNXK_BPHY_LOG(ERR, "Failed to disable ptp"); break; } ret = 0; ret = rte_pmd_bphy_cgx_get_supported_fec(dev_id, i, &fec); if (ret) { - RTE_LOG(ERR, PMD, "Failed to get supported FEC\n"); + CNXK_BPHY_LOG(ERR, "Failed to get supported FEC"); break; } ret = rte_pmd_bphy_cgx_set_fec(dev_id, i, fec); if (ret) { - RTE_LOG(ERR, PMD, "Failed to set FEC to %d\n", fec); + CNXK_BPHY_LOG(ERR, "Failed to set FEC to %d", fec); break; } fec = CNXK_BPHY_CGX_ETH_LINK_FEC_NONE; ret = rte_pmd_bphy_cgx_set_fec(dev_id, i, fec); if (ret) { - RTE_LOG(ERR, PMD, "Failed to disable FEC\n"); + CNXK_BPHY_LOG(ERR, "Failed to disable FEC"); break; } } diff --git a/drivers/raw/cnxk_bphy/rte_pmd_bphy.h b/drivers/raw/cnxk_bphy/rte_pmd_bphy.h index 9d8d0285581b..7a7d9f6fa66f 100644 --- a/drivers/raw/cnxk_bphy/rte_pmd_bphy.h +++ b/drivers/raw/cnxk_bphy/rte_pmd_bphy.h @@ -26,6 +26,12 @@ extern "C" { #endif +extern int cnxk_logtype_bphy; + +#define CNXK_BPHY_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, cnxk_logtype_bphy, \ + "%s(): " fmt "\n", __func__, ## args) + /** Available message types */ enum cnxk_bphy_cgx_msg_type { /** Type used to obtain link information */ diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio.c b/drivers/raw/cnxk_gpio/cnxk_gpio.c index 3c4d79e4810e..329ac28a2736 100644 --- a/drivers/raw/cnxk_gpio/cnxk_gpio.c +++ b/drivers/raw/cnxk_gpio/cnxk_gpio.c @@ -215,13 +215,13 @@ cnxk_gpio_parse_allowlist(struct cnxk_gpiochip *gpiochip, char *allowlist) errno = 0; val = strtol(token, NULL, 10); if (errno) { - RTE_LOG(ERR, PMD, "failed to parse %s\n", token); + CNXK_GPIO_LOG(ERR, "failed to parse %s", token); ret = -errno; goto out; } if (val < 0 || val >= gpiochip->num_gpios) { - RTE_LOG(ERR, PMD, "gpio%d out of 0-%d range\n", val, + CNXK_GPIO_LOG(ERR, "gpio%d out of 0-%d range", val, gpiochip->num_gpios - 1); ret = -EINVAL; goto out; @@ -231,7 +231,7 @@ cnxk_gpio_parse_allowlist(struct cnxk_gpiochip *gpiochip, char *allowlist) if (list[i] != val) continue; - RTE_LOG(WARNING, PMD, "gpio%d already allowed\n", val); + CNXK_GPIO_LOG(WARNING, "gpio%d already allowed", val); break; } if (i == queue) @@ -398,7 +398,7 @@ cnxk_gpio_queue_setup(struct rte_rawdev *dev, uint16_t queue_id, return ret; } } else { - RTE_LOG(WARNING, PMD, "using existing gpio%d\n", gpio->num); + CNXK_GPIO_LOG(WARNING, "using existing gpio%d", gpio->num); } gpiochip->gpios[num] = gpio; @@ -647,7 +647,7 @@ cnxk_gpio_process_buf(struct cnxk_gpio *gpio, struct rte_rawdev_buf *rbuf) /* get rid of last response if any */ if (gpio->rsp) { - RTE_LOG(WARNING, PMD, "previous response got overwritten\n"); + CNXK_GPIO_LOG(WARNING, "previous response got overwritten"); rte_free(gpio->rsp); } gpio->rsp = rsp; @@ -741,7 +741,7 @@ cnxk_gpio_probe(struct rte_vdev_device *dev) cnxk_gpio_format_name(name, sizeof(name)); rawdev = rte_rawdev_pmd_allocate(name, sizeof(*gpiochip), rte_socket_id()); if (!rawdev) { - RTE_LOG(ERR, PMD, "failed to allocate %s rawdev\n", name); + CNXK_GPIO_LOG(ERR, "failed to allocate %s rawdev", name); return -ENOMEM; } @@ -770,7 +770,7 @@ cnxk_gpio_probe(struct rte_vdev_device *dev) snprintf(buf, sizeof(buf), "%s/gpiochip%d/base", CNXK_GPIO_CLASS_PATH, gpiochip->num); ret = cnxk_gpio_read_attr_int(buf, &gpiochip->base); if (ret) { - RTE_LOG(ERR, PMD, "failed to read %s\n", buf); + CNXK_GPIO_LOG(ERR, "failed to read %s", buf); goto out; } @@ -778,20 +778,20 @@ cnxk_gpio_probe(struct rte_vdev_device *dev) snprintf(buf, sizeof(buf), "%s/gpiochip%d/ngpio", CNXK_GPIO_CLASS_PATH, gpiochip->num); ret = cnxk_gpio_read_attr_int(buf, &gpiochip->num_gpios); if (ret) { - RTE_LOG(ERR, PMD, "failed to read %s\n", buf); + CNXK_GPIO_LOG(ERR, "failed to read %s", buf); goto out; } gpiochip->num_queues = gpiochip->num_gpios; ret = cnxk_gpio_parse_allowlist(gpiochip, params->allowlist); if (ret) { - RTE_LOG(ERR, PMD, "failed to parse allowed gpios\n"); + CNXK_GPIO_LOG(ERR, "failed to parse allowed gpios"); goto out; } gpiochip->gpios = rte_calloc(NULL, gpiochip->num_gpios, sizeof(struct cnxk_gpio *), 0); if (!gpiochip->gpios) { - RTE_LOG(ERR, PMD, "failed to allocate gpios memory\n"); + CNXK_GPIO_LOG(ERR, "failed to allocate gpios memory"); ret = -ENOMEM; goto out; } @@ -851,3 +851,4 @@ RTE_PMD_REGISTER_VDEV(cnxk_gpio, cnxk_gpio_drv); RTE_PMD_REGISTER_PARAM_STRING(cnxk_gpio, "gpiochip= " "allowlist="); +RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_gpio, gpio, INFO); diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio.h b/drivers/raw/cnxk_gpio/cnxk_gpio.h index e62f78a7604a..336d7ac373d7 100644 --- a/drivers/raw/cnxk_gpio/cnxk_gpio.h +++ b/drivers/raw/cnxk_gpio/cnxk_gpio.h @@ -5,6 +5,11 @@ #ifndef _CNXK_GPIO_H_ #define _CNXK_GPIO_H_ +extern int cnxk_logtype_gpio; + +#define CNXK_GPIO_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, cnxk_logtype_gpio, fmt "\n", ## args) + struct cnxk_gpiochip; struct cnxk_gpio { diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c b/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c index 10742b5dc48a..2f3973a7b5e6 100644 --- a/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c +++ b/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c @@ -56,7 +56,7 @@ cnxk_gpio_read_attr(char *attr, char *val) #define CNXK_GPIO_ERR_STR(err, str, ...) do { \ if (err) { \ - RTE_LOG(ERR, PMD, "%s:%d: " str " (%d)\n", __func__, __LINE__, \ + CNXK_GPIO_LOG(ERR, "%s:%d: " str " (%d)", __func__, __LINE__, \ ##__VA_ARGS__, err); \ goto out; \ } \ @@ -330,30 +330,29 @@ cnxk_gpio_selftest(uint16_t dev_id) for (i = 0; i < queues; i++) { ret = rte_rawdev_queue_conf_get(dev_id, i, &conf, sizeof(conf)); if (ret) { - RTE_LOG(ERR, PMD, - "failed to read queue configuration (%d)\n", + CNXK_GPIO_LOG(ERR, "failed to read queue configuration (%d)", ret); goto out; } - RTE_LOG(INFO, PMD, "testing queue%d (gpio%d)\n", i, conf.gpio); + CNXK_GPIO_LOG(INFO, "testing queue%d (gpio%d)", i, conf.gpio); if (conf.size != 1) { - RTE_LOG(ERR, PMD, "wrong queue size received\n"); + CNXK_GPIO_LOG(ERR, "wrong queue size received"); ret = -EIO; goto out; } ret = rte_rawdev_queue_setup(dev_id, i, NULL, 0); if (ret) { - RTE_LOG(ERR, PMD, "failed to setup queue (%d)\n", ret); + CNXK_GPIO_LOG(ERR, "failed to setup queue (%d)", ret); goto out; } gpio = gpiochip->gpios[conf.gpio]; snprintf(buf, sizeof(buf), CNXK_GPIO_PATH_FMT, gpio->num); if (!cnxk_gpio_attr_exists(buf)) { - RTE_LOG(ERR, PMD, "%s does not exist\n", buf); + CNXK_GPIO_LOG(ERR, "%s does not exist", buf); ret = -ENOENT; goto release; } @@ -371,13 +370,13 @@ cnxk_gpio_selftest(uint16_t dev_id) ret2 = ret; ret = rte_rawdev_queue_release(dev_id, i); if (ret) { - RTE_LOG(ERR, PMD, "failed to release queue (%d)\n", + CNXK_GPIO_LOG(ERR, "failed to release queue (%d)", ret); break; } if (cnxk_gpio_attr_exists(buf)) { - RTE_LOG(ERR, PMD, "%s still exists\n", buf); + CNXK_GPIO_LOG(ERR, "%s still exists", buf); ret = -EIO; break; } From patchwork Mon Dec 18 19:22:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135309 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 D4ECE4373D; Mon, 18 Dec 2023 20:27:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A369A42DEF; Mon, 18 Dec 2023 20:26:53 +0100 (CET) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mails.dpdk.org (Postfix) with ESMTP id 9347542DD9 for ; Mon, 18 Dec 2023 20:26:48 +0100 (CET) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1d39e2f1089so18807135ad.1 for ; Mon, 18 Dec 2023 11:26:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927608; x=1703532408; 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=88ZbJBoD4XtnzuZ+N1nJEVABLyhW3zqfw6LEMcKImgk=; b=xh8MeDvrbrO6OT9KPK+GUhGflCUkW6XJFrXLwkEsNPV3xKf5JhudQ9ZihYp9hIjszJ oZcfQgFzKwwo0kVVjGG/7fsoBSYaktScvbNsKt0c2xc8AVxiPf77eRH1uQkcoSu2A2n1 6YccT4MlOU6FmpF1W2DZoOntz1GAAmunMerICX92k6Tu3DkACNdC7c0kjp0++WzW7bat DAu53nGNjG/SnysheDZF2FWmwB71yMErp0vBFOYZgIjcSxKuQT1946ygPamb7AimFW9r tnoxQRRdjTwacYHCw0Xnzxs4D4havD98wAf6yaBpfpCIxCyHidfh7mkOCaqCmJzZRew2 7cHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927608; x=1703532408; 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=88ZbJBoD4XtnzuZ+N1nJEVABLyhW3zqfw6LEMcKImgk=; b=BW8yjMzgm8LVFo9xRbh+czkVtoIKAzhOc+qR2DDYjFBrTKvBAx9WiZdacNxMxjACHi jhUbHIEXyK/EARGC3cFknqiizGgSSa8cQao5GDk57iejEz7tEnpABO1Fsx4o9DWfIlJd Ual2G6hMm7qw/C6MitPWRUZX8GH7ONkvWnR96u5Y24vNjBOnuqXlUdkYrMGRevI25JcM +SV2L80uFr5KQMobK9M9a7y+JTgCqnFWwV8G4HTMA5j2YTfvUxiarQxAqGfhus/97mt+ MlNngVDjyjN/S1th5u1bzql8QCljW18/gTnH6pPv8tesqymYnYvjcfAlzKEexL0ZSgrK ParQ== X-Gm-Message-State: AOJu0YwNoQrmApyd0llVKkiS+i7qzgXrEVLgJDxX2kzeHg9s7Ms5BOds rr+zL2bH3FpT0o2nH9HXfXD9Ma0XOzVrjCADVzI/Cw== X-Google-Smtp-Source: AGHT+IFaUXyMq4uVdJkNKjeyU113eCQ/v4d/ZO1zWx6N7QPhheqeozVmOGO+Wb4RdgKVEUBLAwW9jA== X-Received: by 2002:a17:902:d549:b0:1d0:6ffd:9e22 with SMTP id z9-20020a170902d54900b001d06ffd9e22mr20459227plf.116.1702927607898; Mon, 18 Dec 2023 11:26:47 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:47 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 08/17] crypto/scheduler: replace use of logtype PMD Date: Mon, 18 Dec 2023 11:22:24 -0800 Message-ID: <20231218192631.699267-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 Driver has logging macro but not used everywhere. Fixes: 6760463c9f26 ("crypto/scheduler: add mode-specific threshold parameter") Signed-off-by: Stephen Hemminger --- drivers/crypto/scheduler/scheduler_pmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/scheduler/scheduler_pmd.c b/drivers/crypto/scheduler/scheduler_pmd.c index 589d092d7457..aaf2dcdb57ec 100644 --- a/drivers/crypto/scheduler/scheduler_pmd.c +++ b/drivers/crypto/scheduler/scheduler_pmd.c @@ -197,8 +197,8 @@ cryptodev_scheduler_create(const char *name, return -EINVAL; } - RTE_LOG(INFO, PMD, " Sched mode param (%s = %s)\n", - param_name, param_val); + CR_SCHED_LOG(INFO, " Sched mode param (%s = %s)\n", + param_name, param_val); } } From patchwork Mon Dec 18 19:22:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135310 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 A5FC14373D; Mon, 18 Dec 2023 20:27:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B883D42DF3; Mon, 18 Dec 2023 20:26:54 +0100 (CET) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mails.dpdk.org (Postfix) with ESMTP id 6094A42DD9 for ; Mon, 18 Dec 2023 20:26:49 +0100 (CET) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-6d267461249so2062898b3a.3 for ; Mon, 18 Dec 2023 11:26:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927608; x=1703532408; 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=5DFqFzsaRdJASZzwcyvtGPWWuOUL4czYfaLuijsZvIw=; b=M41isxm+1S3Qhd8PKl2GQ1r3cucwAQRei3kPGk8UBNMb/k6oLGVnw+bJ2Z7cr3vN6l mphzDGw0PEyNsLnhtI3zB2gqtf8FVJ0AOvy74FpXboJUVw1ICX6VW8+6NMLi7/ff85fL 0bUulFpPFXtLsFPKkTesYqgTMP6G5i6aAFhatOL5NZApK0clNPuQcsksSLpcQbYZ5UTs 6VZKWAFZvJ1Q+4BC0IuO3WS7HKeunuWkWRoGVRj/P2MYSrkTwt2Bmdr+UyRD01kPVxGo B1e+peDt7m0o/L8Ph1kcmeOBD1+9nbemFeDyTWmqdrdWp5fKYtfbaeMaTrmyWADbxSqE pRfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927608; x=1703532408; 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=5DFqFzsaRdJASZzwcyvtGPWWuOUL4czYfaLuijsZvIw=; b=Y2oEH3hHzJD8zl2p6i+Q1/M41T07rT1Ii5U1TKvnHK/a2FT+VbG6wotDYMQ0mzgbNN OVZw2NkXbgorbfgq7NEZnmlgHlkz1SNgXvoRLlqP4onfWxz86Nzv43jjlCskL7RSvJOE 9RwWwOuZqUfVD36rXKHu6b1Xcjn+0HEgtyioS++GVowqvTTJv9vSi3YxD9Jkun7UQXVv Ny6+2ddC/Fw0SsVXAoIo4N2oVtT+R24WYV+0vO0S3MJXVNjme2+/4pJnBhpV5X/SgzLW b8J5TGmbMsQYr+4v7MxwqPCH7ZRr9dtFQFxL/wFlKx6S8JqPMelu0kplsnVQkCPbr/hU 0p5A== X-Gm-Message-State: AOJu0YzACg5Qay0TjTZM8yYH+5A7iM5kCYN5WFRqgj7wWxAiqs6PS8rr GUVVfVgSsAjd2GGSPzsP0xjppXusqvNnuRLWG7DIiQ== X-Google-Smtp-Source: AGHT+IFygTpfRH+nqr1QfXHS0sqXtna9E4KIG1BswcD71fVdRkljvWVQkkxYjs42Vyr0icbQ7lmPIg== X-Received: by 2002:a05:6a20:7fa6:b0:18f:fbe4:ca80 with SMTP id d38-20020a056a207fa600b0018ffbe4ca80mr7757598pzj.63.1702927608564; Mon, 18 Dec 2023 11:26:48 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:48 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 09/17] crypto/ccp: do not use PMD logtype Date: Mon, 18 Dec 2023 11:22:25 -0800 Message-ID: <20231218192631.699267-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 This driver has logging macros but not used consistently. Fixes: ef4b04f87fa6 ("crypto/ccp: support device init") Signed-off-by: Stephen Hemminger --- drivers/crypto/ccp/rte_ccp_pmd.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c index a5271d72273d..46a9275e3743 100644 --- a/drivers/crypto/ccp/rte_ccp_pmd.c +++ b/drivers/crypto/ccp/rte_ccp_pmd.c @@ -194,8 +194,7 @@ cryptodev_ccp_remove(struct rte_pci_device *pci_dev) ccp_pmd_init_done = 0; - RTE_LOG(INFO, PMD, "Closing ccp device %s on numa socket %u\n", - name, rte_socket_id()); + CCP_LOG_INFO("Closing ccp device %s on numa socket %u", name, rte_socket_id()); return rte_cryptodev_pmd_destroy(dev); } @@ -228,7 +227,7 @@ cryptodev_ccp_create(const char *name, } cryptodev_cnt++; - CCP_LOG_DBG("CCP : Crypto device count = %d\n", cryptodev_cnt); + CCP_LOG_DBG("CCP : Crypto device count = %d", cryptodev_cnt); dev->device = &pci_dev->device; dev->device->driver = &pci_drv->driver; dev->driver_id = ccp_cryptodev_driver_id; @@ -279,7 +278,7 @@ cryptodev_ccp_probe(struct rte_pci_driver *pci_drv __rte_unused, }; if (ccp_pmd_init_done) { - RTE_LOG(INFO, PMD, "CCP PMD already initialized\n"); + CCP_LOG_INFO("CCP PMD already initialized"); return -EFAULT; } rte_pci_device_name(&pci_dev->addr, name, sizeof(name)); @@ -288,11 +287,11 @@ cryptodev_ccp_probe(struct rte_pci_driver *pci_drv __rte_unused, init_params.def_p.max_nb_queue_pairs = CCP_PMD_MAX_QUEUE_PAIRS; - RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name, + CCP_LOG_INFO("Initialising %s on NUMA node %d", name, init_params.def_p.socket_id); - RTE_LOG(INFO, PMD, "Max number of queue pairs = %d\n", + CCP_LOG_INFO("Max number of queue pairs = %d", init_params.def_p.max_nb_queue_pairs); - RTE_LOG(INFO, PMD, "Authentication offload to %s\n", + CCP_LOG_INFO("Authentication offload to %s", ((init_params.auth_opt == 0) ? "CCP" : "CPU")); rte_pci_device_name(&pci_dev->addr, name, sizeof(name)); From patchwork Mon Dec 18 19:22:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135311 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 B34C24373D; Mon, 18 Dec 2023 20:27:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 49E6942DF2; Mon, 18 Dec 2023 20:26:56 +0100 (CET) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mails.dpdk.org (Postfix) with ESMTP id 153AE42DD9 for ; Mon, 18 Dec 2023 20:26:50 +0100 (CET) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1d3536cd414so29422295ad.2 for ; Mon, 18 Dec 2023 11:26:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927609; x=1703532409; 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=oJcAhXq40BJ8MzPRp2hHgJeOrpLwi0Gk4FjpICJuEMA=; b=U8gJsAwGBhmAPT0ZnWEaNbSPP3EGURrYHOieaNXSk8ldZd+4mbJ49rJPC758l5WA6L W5E/jUFQxLEjsnGbSq4MQ5wVChsdKC4pX2xFnZJkw8Yr8DViFaVzvNW7SHL8xVhdr/N1 g+XXaQO0HdEB6Ced+HHod2XD2unjv0b4HjAMae+uqhu4LkO5T5826vP9kGiO9UjCUjH1 AtIfg5rmI8x4kY4WQiXo/gHk7vQ3rviDRDPyx95WCmVXIvcF1ZH6kWW35845hVOwcQl8 7rugLw8KX1eCuLPkSQaQy+Jig23KfGUNGSh6zh2tJB8vYPJY/qXj7RYrOdtkB2dSm6RD pr6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927609; x=1703532409; 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=oJcAhXq40BJ8MzPRp2hHgJeOrpLwi0Gk4FjpICJuEMA=; b=pCTX/ulCuLPg2W3p/gNycjbktAoGexwy0dISuXpOz2P7+wuteRh6MdwEeAHogl0Z/5 phrNyAjfpkzEZ2HL5tD8WGpQIroAneDJSig3LwrDLxA7dx+j0N1PZfj40Bnw+DT0bo5H FHn+Klrb8qrkKMIn6SDT8TycdXOJSRhDIW36NPOthyjEoMPDyIKT4981bppr2E8V2ArN 52momfcMd7LlpUve6T+RJWH07utzDIU6JfucZpwvO84Y3zKETj2EGEBEVjIcStk87heh xVKRIEh7twa/VxOem0WeGFhH2H/YWxKlgS1L+9h5jZ5qlU47no7zVX6wrE6vU08TykHl rSNg== X-Gm-Message-State: AOJu0YxriF+qFcBvB/ToHl3VJlKRKcJUzO264Z/aGlVa27U1Gex5pYMU lWonSnDpSzUMGG9NpHrJXUSm5rLvNCAV+KLHj5kKjg== X-Google-Smtp-Source: AGHT+IFFELKQfNJxe5uYAqYcPHm0g75GtejY1+32KXsby3S14ADTUB9qgPA2u3GjCM6Ye7MVbsW/gg== X-Received: by 2002:a17:903:1105:b0:1d0:c502:e09d with SMTP id n5-20020a170903110500b001d0c502e09dmr18479938plh.99.1702927609352; Mon, 18 Dec 2023 11:26:49 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:48 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 10/17] crypto/caam_jr: use dedicated logtype Date: Mon, 18 Dec 2023 11:22:26 -0800 Message-ID: <20231218192631.699267-11-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 has macro and logtype but not used in a couple places. Fixes: af7c9b5e9ce7 ("crypto/caam_jr: introduce basic driver") Signed-off-by: Stephen Hemminger --- drivers/crypto/caam_jr/caam_jr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c index b55258689b49..7b42ca529e9f 100644 --- a/drivers/crypto/caam_jr/caam_jr.c +++ b/drivers/crypto/caam_jr/caam_jr.c @@ -309,7 +309,7 @@ caam_jr_prep_cdb(struct caam_jr_session *ses) cdb = caam_jr_dma_mem_alloc(L1_CACHE_BYTES, sizeof(struct sec_cdb)); if (!cdb) { - CAAM_JR_ERR("failed to allocate memory for cdb\n"); + CAAM_JR_ERR("failed to allocate memory for cdb"); return -1; } @@ -2346,7 +2346,7 @@ caam_jr_dev_init(const char *name, rte_cryptodev_pmd_probing_finish(dev); - RTE_LOG(INFO, PMD, "%s cryptodev init\n", dev->data->name); + CAAM_JR_INFO("%s cryptodev init\n", dev->data->name); return 0; @@ -2386,8 +2386,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev) ret = of_init(); if (ret) { - RTE_LOG(ERR, PMD, - "of_init failed\n"); + CAAM_JR_ERR("of_init failed\n"); return -EINVAL; } /* if sec device version is not configured */ @@ -2407,8 +2406,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev) } #ifdef RTE_LIBRTE_PMD_CAAM_JR_BE if (rta_get_sec_era() > RTA_SEC_ERA_8) { - RTE_LOG(ERR, PMD, - "CAAM is compiled in BE mode for device with sec era > 8???\n"); + CAAM_JR_ERR("CAAM is compiled in BE mode for device with sec era > 8???\n"); return -EINVAL; } #endif From patchwork Mon Dec 18 19:22:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135312 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 BF71B4373D; Mon, 18 Dec 2023 20:28:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5EC5D42E03; Mon, 18 Dec 2023 20:26:57 +0100 (CET) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mails.dpdk.org (Postfix) with ESMTP id 07BDB42DE1 for ; Mon, 18 Dec 2023 20:26:51 +0100 (CET) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-28b79d1ebd6so802716a91.1 for ; Mon, 18 Dec 2023 11:26:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927610; x=1703532410; 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=DZqEUKrXA9Lfv8XBFKRDWUAzzrBbWhs7lZ3yDBSTDl8=; b=2EyKyvB4aFnQe96727C7MOGid1IzDYl7gXlhaDP9nyn+k9MunCH/YJ13dhg7X+Ahut iU0So3hP1SM/KL9bblYusQ+0z2nvn/xA0Yi65h5vAUmvldlTj5Eu2hmuujx8UixL9BaV BWSRPp3eu3lRrkEymC+8ApUYtfvotMlxU8KuyTCqK8uvMNLgDtEs5ETcPsEcJGGLZUp+ Mv8fQjuehi6vTTjUkQpNjRPYv86flDNZqfGdLgEhha41wf+kICQKWzQycPe2mxMZT74B UnhrhAPv1fxNvHLcB5bropQijNS9FZGix+OQkfmudAovWH6flYBiKWZIULY34lGwTkUM CGNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927610; x=1703532410; 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=DZqEUKrXA9Lfv8XBFKRDWUAzzrBbWhs7lZ3yDBSTDl8=; b=FPPMJtuxF/gxTkx5mAQ3RS47VzKUOgcvff3TImfxGVpknwtRALJorEmFm8ZU/z8oY5 NhCRyI/eQnGvbZ/kmTH8GMUaFmbspqKdcn8fJRzOBxK4u650FUISdPQhxac4fUnl+Q13 ozyb748nuqI4oFTvqszxGsgnoqeOns99VAn9FkRPB1t9HS7SOqJlSwXpye4wCckYKK2S QTvf4KcDO2kynYVfMoUkLQjH2B5YRQ0PDj0Of6URvx+cQ9aoRFRW6BPyM1B96AxlRbpf ubOkcnMYmUiaxcXBxlvRy4rU98YgSDK5UJMLO+rrnKJ2A67vxdvS8GCw92rY9FPG1KIv G6TA== X-Gm-Message-State: AOJu0YzFWTD7R4bjtTM7Mr27ifYGIovypSzOecOBRQWGwl+C5rindmU9 AJyNya6TNBV7/hWk+Gfm/YoBGuXcobV7WZyXLKxB/g== X-Google-Smtp-Source: AGHT+IH7TzYihPoaxMGpp1iJ+PMiHO+3l0Zbh2jUt/n/iW405mfykS63nz8Twckt9iz+nrZSWRa5DQ== X-Received: by 2002:a17:90b:e88:b0:28b:790f:35b2 with SMTP id fv8-20020a17090b0e8800b0028b790f35b2mr892353pjb.44.1702927610281; Mon, 18 Dec 2023 11:26:50 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:49 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 11/17] crypto/dpaa_sec, crypto/dpaa2_sec: use dedicated logtype Date: Mon, 18 Dec 2023 11:22:27 -0800 Message-ID: <20231218192631.699267-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 A couple of messages were using RTE_LOGTYPE_PMD when dedicated logtype was already available. Fixes: fe3688ba7950 ("crypto/dpaa_sec: support event crypto adapter") Fixes: bffc7d561c81 ("crypto/dpaa2_sec: support event crypto adapter") Signed-off-by: Stephen Hemminger --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 6 +++--- drivers/crypto/dpaa_sec/dpaa_sec.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index bb5a2c629e53..1cae6c45059e 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -4153,7 +4153,7 @@ dpaa2_sec_eventq_attach(const struct rte_cryptodev *dev, ret = dpseci_set_opr(dpseci, CMD_PRI_LOW, priv->token, qp_id, OPR_OPT_CREATE, &ocfg); if (ret) { - RTE_LOG(ERR, PMD, "Error setting opr: ret: %d\n", ret); + DPAA2_SEC_ERR("Error setting opr: ret: %d", ret); return ret; } qp->tx_vq.cb_eqresp_free = dpaa2_sec_free_eqresp_buf; @@ -4163,7 +4163,7 @@ dpaa2_sec_eventq_attach(const struct rte_cryptodev *dev, ret = dpseci_set_rx_queue(dpseci, CMD_PRI_LOW, priv->token, qp_id, &cfg); if (ret) { - RTE_LOG(ERR, PMD, "Error in dpseci_set_queue: ret: %d\n", ret); + DPAA2_SEC_ERR("Error in dpseci_set_queue: ret: %d", ret); return ret; } @@ -4188,7 +4188,7 @@ dpaa2_sec_eventq_detach(const struct rte_cryptodev *dev, ret = dpseci_set_rx_queue(dpseci, CMD_PRI_LOW, priv->token, qp_id, &cfg); if (ret) - RTE_LOG(ERR, PMD, "Error in dpseci_set_queue: ret: %d\n", ret); + DPAA2_SEC_ERR("Error in dpseci_set_queue: ret: %d", ret); return ret; } diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index a301e8edb2a4..3008ca4dc2f7 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -3518,7 +3518,7 @@ dpaa_sec_eventq_detach(const struct rte_cryptodev *dev, qman_oos_fq(&qp->outq); ret = qman_init_fq(&qp->outq, 0, &opts); if (ret) - RTE_LOG(ERR, PMD, "Error in qman_init_fq: ret: %d\n", ret); + DPAA_SEC_ERR("Error in qman_init_fq: ret: %d\n", ret); qp->outq.cb.dqrr = NULL; return ret; @@ -3709,7 +3709,7 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev) dpaa_sec_get_devargs(cryptodev->device->devargs, DRIVER_DUMP_MODE); - RTE_LOG(INFO, PMD, "%s cryptodev init\n", cryptodev->data->name); + DPAA_SEC_INFO("%s cryptodev init\n", cryptodev->data->name); return 0; init_error: From patchwork Mon Dec 18 19:22:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135313 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 A4F2C4373D; Mon, 18 Dec 2023 20:28:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7230942E07; Mon, 18 Dec 2023 20:26:58 +0100 (CET) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mails.dpdk.org (Postfix) with ESMTP id A74A842DE6 for ; Mon, 18 Dec 2023 20:26:51 +0100 (CET) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1d39afa1eecso20359745ad.2 for ; Mon, 18 Dec 2023 11:26:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927611; x=1703532411; 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=mFYvlUXEXApkupC8KfKMn2g34v2z4fWX+lksJVOV0CQ=; b=D4jj5PztnIMxYfDpALcd9qz7gaHrj+v5B4VGusjC21IVH70DkYSutreRUBrBGR8Sd7 Y+YdOpOpsojwIth0IBfS7XEIinvT8egzqLcUVIKEi20B1u0xQezkvE0jFhppw1scDQRw KEFDxvOWrfbVLkV2hGhwJ7PX+RTcRZDJs/d1EVt36RO4MLlIIvexOSfYMM1s1JLk2953 lweV317LtS51lqVljo5kSBztLAIkfTUP4szPxDWRhjDqiFWxEFHJEuqjvNfe9P0P4+Tg HeeWcsHcibJeQEXTVLpOffLzmspsiwOha4IChDaXd4Rui7eMkdh8eOKHmUBCrbsca26e mQsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927611; x=1703532411; 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=mFYvlUXEXApkupC8KfKMn2g34v2z4fWX+lksJVOV0CQ=; b=ngCOZzfruSUcLiajSHn0nCR81k3kjqCZ67FLPKLyObxokQImGay2hKsZory7bnqiyS hXuRau1/ocuMl+19rGV0hc21eEE2OGaYkygqn58OaBXjnG8E98vzzsg8XuojqB0rp1Bx 4hndmsL+1GI7H7Gxq7KyBTjdPoz4k1o1eawUlasTsCkfr34VPQoJqqoKOIcGwzio+a61 K1s4sq73WPFZSTabjouhPPFTWHeQaFeYbwJsRQxqkLKDWONt1PvFg1N0Ery0zWgX6C4N DZ7mLTHPJQBGAZZACoQYYItCst5/ICWMZmfEHjzW7BMuJZb0x8NmsWTLk+UjUpOKAkwX 8hHg== X-Gm-Message-State: AOJu0YzVPHnPc6ZuNDfWV1EHs3OYtLptzSQIXQ8HXIKeSk2DK4K2z85D jEb0YmC+6mZS+8VR4hcuAqdTedChACwrAacErViAFw== X-Google-Smtp-Source: AGHT+IH4h7h6XT1xjR2uP37b24iaCOs6v7IFmPXPARVkmuPQLZ6q0XPY33Y69rsDD/P+QpHo3vnOuA== X-Received: by 2002:a17:902:900b:b0:1d0:6ffe:a28 with SMTP id a11-20020a170902900b00b001d06ffe0a28mr15314251plp.134.1702927610953; Mon, 18 Dec 2023 11:26:50 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:50 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 12/17] event/dlb2: use dedicated logtype Date: Mon, 18 Dec 2023 11:22:28 -0800 Message-ID: <20231218192631.699267-13-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 Driver was using RTE_LOGTYPE_PMD when it had its own logtype. Fixes: 5433956d5185 ("event/dlb2: add eventdev probe") Signed-off-by: Stephen Hemminger --- drivers/event/dlb2/dlb2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c index 050ace0904b4..5a16123f0af9 100644 --- a/drivers/event/dlb2/dlb2.c +++ b/drivers/event/dlb2/dlb2.c @@ -4741,9 +4741,8 @@ dlb2_parse_params(const char *params, struct rte_kvargs *kvlist = rte_kvargs_parse(params, args); if (kvlist == NULL) { - RTE_LOG(INFO, PMD, - "Ignoring unsupported parameters when creating device '%s'\n", - name); + DLB2_LOG_INFO("Ignoring unsupported parameters when creating device '%s'\n", + name); } else { int ret = rte_kvargs_process(kvlist, NUMA_NODE_ARG, set_numa_node, From patchwork Mon Dec 18 19:22:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135314 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 E020F4373D; Mon, 18 Dec 2023 20:28:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 85DB142E0A; Mon, 18 Dec 2023 20:26:59 +0100 (CET) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mails.dpdk.org (Postfix) with ESMTP id 6499D42DE6 for ; Mon, 18 Dec 2023 20:26:52 +0100 (CET) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1d3b8184a84so6850175ad.1 for ; Mon, 18 Dec 2023 11:26:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927611; x=1703532411; 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=ppcqcS1MmO2ZFFCoO+/RFWoPq6LDB6k65shce7sep6o=; b=DmxSAozfosvX8mFNQSKY3umcqbaHPcX81n4ZvFSC9CLTTurXo2r6KYgWm4WJ6W1lFC BYesYl7XTnpxPFuIprZ6NaCJ4oYyFDv4YlYNUJWiJfKcOFyJxbEPVB8AWlW/v+hv1Q9T SRQcbkQgvoa/hZc8r9o+cdx09lEJpu36LtPl18ELdYK1V50L0CHj2WvKURX+SzHcudqK nsu6LYAaSIgvpmqnJYc8tprvAbBN3AespPy5Iq9QKdxgQfIbxahemxg3t5vylVvIenFl wbHP9ltLYvVHQcZHz4Jq3gTbdKGifT6yBYQq2yB50/DeHlMYYkBMAJWXXi/eUH01Ihna cjig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927611; x=1703532411; 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=ppcqcS1MmO2ZFFCoO+/RFWoPq6LDB6k65shce7sep6o=; b=lpKUMsSEp9NoA1SoNZ2EIdadnf65Xr6efiBrywktuyhBBqKB+/sN2UqLpxN0Ke3WZ7 GbX9fIrTbdBAZNoF4nGRlb1DqNySuQ57WmAMsq78WpUyj8y7xDk7Gi10XljUzwoEdHra tAuRZr+T3jBPAJfAmlODcepRckNYs5V8ewedWXJhIMGp67fFGLai3qVYtAC5HtIZ7Ei7 KZ/Tnsd2GGzSwF1Ju+tus5K8Yv7CBYbKwiNno8mEYAtVxVHF9ZERzOnFacMWnAiUiFdT Al7ZS8Eb3edv3JeRY/V+cpKBgss9Cw6cBX0WrCt1Kl//7ZDc1tBdvcLQHzyP8RLODfLn B3aA== X-Gm-Message-State: AOJu0YwOpgiS8c0cBW5r8ycclFHLjxABhTDMtpjkyQBgtfhz64pJTZ/g tJdJDGMSETt5IitIkivijZnayU15JsOErU6lcYUo9Q== X-Google-Smtp-Source: AGHT+IHv8P4meJ5piyg2C8VNxVsoEKZk8EHBFwmNi7QWeKVx3rLzfMHkVtwVTrZjuFyN2esKjp7qaA== X-Received: by 2002:a17:902:b706:b0:1cf:9790:f244 with SMTP id d6-20020a170902b70600b001cf9790f244mr7851973pls.47.1702927611657; Mon, 18 Dec 2023 11:26:51 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:51 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 13/17] event/dpaa, event/dpaa2: use dedicated logtype Date: Mon, 18 Dec 2023 11:22:29 -0800 Message-ID: <20231218192631.699267-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 Do not use RTE_LOGTYPE_PMD. Fixes: b0f66a68ca74 ("event/dpaa: support crypto adapter") Fixes: 4ab57b042e7c ("event/dpaa2: affine portal at runtime during I/O") Signed-off-by: Stephen Hemminger Signed-off-by: Stephen Hemminger --- drivers/event/dpaa/dpaa_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_eventdev.c | 4 ++-- drivers/event/dpaa2/dpaa2_eventdev_selftest.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c index 46a9b88c73ae..a8e5c3421df1 100644 --- a/drivers/event/dpaa/dpaa_eventdev.c +++ b/drivers/event/dpaa/dpaa_eventdev.c @@ -1025,7 +1025,7 @@ dpaa_event_dev_create(const char *name, const char *params, struct rte_vdev_devi eventdev->txa_enqueue = dpaa_eventdev_txa_enqueue; eventdev->txa_enqueue_same_dest = dpaa_eventdev_txa_enqueue_same_dest; - RTE_LOG(INFO, PMD, "%s eventdev added", name); + DPAA_EVENTDEV_INFO("%s eventdev added", name); /* For secondary processes, the primary has done all the work */ if (rte_eal_process_type() != RTE_PROC_PRIMARY) diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index dd4e64395fe5..85c2dbd998dd 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -1141,7 +1141,7 @@ dpaa2_eventdev_create(const char *name, struct rte_vdev_device *vdev) priv->max_event_queues++; } while (dpcon_dev && dpci_dev); - RTE_LOG(INFO, PMD, "%s eventdev created\n", name); + DPAA2_EVENTDEV_INFO("%s eventdev created", name); done: event_dev_probing_finish(eventdev); @@ -1178,7 +1178,7 @@ dpaa2_eventdev_destroy(const char *name) } priv->max_event_queues = 0; - RTE_LOG(INFO, PMD, "%s eventdev cleaned\n", name); + DPAA2_EVENTDEV_INFO("%s eventdev cleaned", name); return 0; } diff --git a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c b/drivers/event/dpaa2/dpaa2_eventdev_selftest.c index 427aff4b1111..9d4938efe6aa 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c +++ b/drivers/event/dpaa2/dpaa2_eventdev_selftest.c @@ -774,15 +774,15 @@ static void dpaa2_test_run(int (*setup)(void), void (*tdown)(void), int (*test)(void), const char *name) { if (setup() < 0) { - RTE_LOG(INFO, PMD, "Error setting up test %s", name); + DPAA2_EVENTDEV_INFO("Error setting up test %s", name); unsupported++; } else { if (test() < 0) { failed++; - RTE_LOG(INFO, PMD, "%s Failed\n", name); + DPAA2_EVENTDEV_INFO("%s Failed", name); } else { passed++; - RTE_LOG(INFO, PMD, "%s Passed", name); + DPAA2_EVENTDEV_INFO("%s Passed", name); } } From patchwork Mon Dec 18 19:22:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135315 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 92ED84373D; Mon, 18 Dec 2023 20:28:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9F4C042E0F; Mon, 18 Dec 2023 20:27:00 +0100 (CET) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mails.dpdk.org (Postfix) with ESMTP id 525BB42DED for ; Mon, 18 Dec 2023 20:26:53 +0100 (CET) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1d3ce28ac3cso9503785ad.0 for ; Mon, 18 Dec 2023 11:26:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927612; x=1703532412; 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=IfEBZNx5o1grAD5H8WxbgdgKmhV0o98XWrLO5UjgMBA=; b=xE51+CHffYUec3qtjKFMmNWqShv4lqWdXDtDObygAIuAqlM3ZAg0asVTCPLArnXFg5 Yck2oSx86cWgMGGcO9oGhikRnkZ0kEjAuqVwVyQXSHera4MbhMlDMhkZd6+uuJVNf8+t Ibx1aOdJt5nEV/4qZoU45ytmXY2S+rgC/RNtDb0zdgPo3h0AyGIeGUCobY2SgCX4pKCW j2GRSb5XKkQP1fcJV3vXt/aMxSv6pDVE6qKVfyFJPe0Yja+p3O78mQqLRU5k5WbpquBJ 3BIhewWvAes9E82ABkQJ63No6UZ/QueeKYLvHet5jr4mfGn9VFt90cLb0KF5P/5kb+vC gmTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927612; x=1703532412; 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=IfEBZNx5o1grAD5H8WxbgdgKmhV0o98XWrLO5UjgMBA=; b=ajLgLaTVTQgCY9SEDC3j/Lj1V/+g9/0vheJsVh9vBiLq7x8tJ+FEhgimRCV2sJHjEj Uh851gQzzSmzaSVujRX4RaXk1KKbC8yw1JgpFSo6UaLhEv5zKgHBbdCL24EZknUIZk3N D/fNk6kD1uLdYs3wRVQ9DuVeVWTFNdMkq08yW6SJfzi+mMfCNA5fY1GJASqvJ76tgkpJ 7SihICXfXlwfhd97Nsei8ZuvKudkGShGbOZlu9rIiIIIgeQKBOE63Iyv0hz0ruGyOTah iG/Os8J65cqpI2FdgAucbuoXLrcK6nXKz/jgNeGdFdqIL5+QAvryuzm8Iyf28NJG50RI 1Qfw== X-Gm-Message-State: AOJu0YwfIG0SJ2/Hmb3QM9ML/+CVedgbh8lA77WjDmcJxdYfnQkD5UXw AwzJogh/YwBZg4lErlH09ddQSlqoL3aOx7qbw7kUPw== X-Google-Smtp-Source: AGHT+IEbmrAR7ymdmNM2aug11mVWvnmrbR8/7Q/TeX7kY2T0wx0LCGW1Rlk1tp28lY0trnd56tTbxA== X-Received: by 2002:a17:902:e804:b0:1d0:6ffd:835b with SMTP id u4-20020a170902e80400b001d06ffd835bmr8877483plg.102.1702927612575; Mon, 18 Dec 2023 11:26:52 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:52 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 14/17] event/skeleton: replace logtype PMD with dynamic type Date: Mon, 18 Dec 2023 11:22:30 -0800 Message-ID: <20231218192631.699267-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 skeleton is supposed to match current best practices. Change it to use dynamic logtype. Signed-off-by: Stephen Hemminger --- drivers/event/skeleton/skeleton_eventdev.c | 3 ++- drivers/event/skeleton/skeleton_eventdev.h | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/event/skeleton/skeleton_eventdev.c b/drivers/event/skeleton/skeleton_eventdev.c index 7df032b7daa1..df50d2e4e4ff 100644 --- a/drivers/event/skeleton/skeleton_eventdev.c +++ b/drivers/event/skeleton/skeleton_eventdev.c @@ -457,7 +457,7 @@ skeleton_eventdev_probe(struct rte_vdev_device *vdev) const char *name; name = rte_vdev_device_name(vdev); - RTE_LOG(INFO, PMD, "Initializing %s on NUMA node %d\n", name, + PMD_DRV_LOG(INFO, "Initializing %s on NUMA node %d\n", name, rte_socket_id()); return skeleton_eventdev_create(name, rte_socket_id(), vdev); } @@ -479,3 +479,4 @@ static struct rte_vdev_driver vdev_eventdev_skeleton_pmd = { }; RTE_PMD_REGISTER_VDEV(EVENTDEV_NAME_SKELETON_PMD, vdev_eventdev_skeleton_pmd); +RTE_LOG_REGISTER_DEFAULT(skeleton_eventdev_logtype, INFO); diff --git a/drivers/event/skeleton/skeleton_eventdev.h b/drivers/event/skeleton/skeleton_eventdev.h index 9193f45f4782..9c1ed4ec5755 100644 --- a/drivers/event/skeleton/skeleton_eventdev.h +++ b/drivers/event/skeleton/skeleton_eventdev.h @@ -8,9 +8,12 @@ #include #include +extern int skeleton_eventdev_logtype; + #ifdef RTE_LIBRTE_PMD_SKELETON_EVENTDEV_DEBUG #define PMD_DRV_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) + rte_log(RTE_LOG_ ## level, skeleton_eventdev_logtype, \ + "%s(): " fmt "\n", __func__, ## args) #define PMD_DRV_FUNC_TRACE() PMD_DRV_LOG(DEBUG, ">>") #else #define PMD_DRV_LOG(level, fmt, args...) do { } while (0) @@ -18,7 +21,8 @@ #endif #define PMD_DRV_ERR(fmt, args...) \ - RTE_LOG(ERR, PMD, "%s(): " fmt "\n", __func__, ## args) + rte_log(RTE_LOG_ERR, skeleton_eventdev_logtype, \ + "%s(): " fmt "\n", __func__, ## args) struct skeleton_eventdev { uintptr_t reg_base; From patchwork Mon Dec 18 19:22:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135316 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 D57CE4373D; Mon, 18 Dec 2023 20:28:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA80842E15; Mon, 18 Dec 2023 20:27:01 +0100 (CET) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mails.dpdk.org (Postfix) with ESMTP id 59DAA42DF4 for ; Mon, 18 Dec 2023 20:26:54 +0100 (CET) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1d3ab37d0d1so8190075ad.0 for ; Mon, 18 Dec 2023 11:26:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927613; x=1703532413; 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=AXqY9tm56NIkHBlZ4D/qsJ18O3y92AEmnbPnLiJvu4M=; b=q38fyhB+DiGgKpnbMid6oywCBXl6arb+aN8emit/+j+0sSlXPphQ+hCe3WZ3OLSBSK LcsgAOqh701qjuZLWWrp6Xsy4tJRicqxM+lQ+rM/4iCIR/CXQ6mTYWkVWHqfCiHdiyUt IV8bH9Wl2CiFr2DDkR2I37esxsN28tXYQIIyqhBh2+QrP081eqgOR6GxiyQw/q36QiKO VDA7aYWMDcitpgUkc4fUblxjg+ewsB3Wu1WRYv9T4A57P/aP4BKzJ3sppqk/7IoMQLIJ NZIH4KZAy8y4Zlo7JANYpB7LHiWyaY6ZK/2Ht4MtXJzWFBLUQoEE8nj5yF3MbpAPWWSl Ffyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927613; x=1703532413; 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=AXqY9tm56NIkHBlZ4D/qsJ18O3y92AEmnbPnLiJvu4M=; b=DpNxb5IIiUOQlvN98IH1jmDVtUg648W9Zr+NrlwmbsdCGHC0kQXZykiexaz0D7QgsH gE5Nsd7bmTNQiPYgfmLF73hZEfmq9G0bCmVPlDIn0Qo8yVxb5/+NHit3yby7qZVH0SBX 8Vycr1xADDU7+RC0Bmgr6+GSvA6bTeGGwqAduC47Yy7cIQd+lI4YN0G6jQu2tGd1sBKc UBuIYXPaUPc6PYZCWG/KfPNn7plSxwNvHnsxoz5dNyqyzhcODVAtkB2fA7Bjl3id1SMQ qWqYIGO6NtxqW/ZJq8HNgU31blTf2uBPbGCCRMBx98eLr79EBmksCnAetdHn/CJb6UMu xPiw== X-Gm-Message-State: AOJu0Yzdfg7xKY5I2YpX69UOcw73QcaCxpnWoLtCkekn0PJxDD4ntF/h b8xL4sNt0UVXc8odFmkTqu1sKzNlClAx8uPgen52xQ== X-Google-Smtp-Source: AGHT+IFvVcFUiR+B2U2IGR9qj14GfDl6NHwtiSTiWqOznyAj3y8j6HMGwfMw7Cw8U0TfL1xmYmb+3w== X-Received: by 2002:a17:902:7c02:b0:1d0:9609:382e with SMTP id x2-20020a1709027c0200b001d09609382emr7353481pll.21.1702927613509; Mon, 18 Dec 2023 11:26:53 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:53 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 15/17] net/nfb: use dynamic logtype Date: Mon, 18 Dec 2023 11:22:31 -0800 Message-ID: <20231218192631.699267-16-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 All drivers should be using dynamic logtype. Fixes: 6435f9a0ac22 ("net/nfb: add new netcope driver") Signed-off-by: Stephen Hemminger --- drivers/net/nfb/nfb.h | 5 +++++ drivers/net/nfb/nfb_ethdev.c | 24 ++++++++++-------------- drivers/net/nfb/nfb_rx.c | 9 ++++----- drivers/net/nfb/nfb_rx.h | 2 +- drivers/net/nfb/nfb_tx.c | 9 ++++----- drivers/net/nfb/nfb_tx.h | 2 +- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/drivers/net/nfb/nfb.h b/drivers/net/nfb/nfb.h index 7dc5bd29e44c..45226ee3d938 100644 --- a/drivers/net/nfb/nfb.h +++ b/drivers/net/nfb/nfb.h @@ -12,6 +12,11 @@ #include #include +extern int nfb_logtype; +#define NFB_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, nfb_logtype, "%s(): " fmt "\n", \ + __func__, ## args) + #include "nfb_rx.h" #include "nfb_tx.h" diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c index defd118bd0ee..e533144efe5d 100644 --- a/drivers/net/nfb/nfb_ethdev.c +++ b/drivers/net/nfb/nfb_ethdev.c @@ -12,11 +12,9 @@ #include #include +#include "nfb.h" #include "nfb_stats.h" -#include "nfb_rx.h" -#include "nfb_tx.h" #include "nfb_rxmode.h" -#include "nfb.h" /** * Default MAC addr @@ -192,8 +190,7 @@ nfb_eth_dev_configure(struct rte_eth_dev *dev __rte_unused) (&nfb_timestamp_dynfield_offset, &nfb_timestamp_rx_dynflag); if (ret != 0) { - RTE_LOG(ERR, PMD, "Cannot register Rx timestamp" - " field/flag %d\n", ret); + NFB_LOG(ERR, "Cannot register Rx timestamp field/flag %d", ret); nfb_close(internals->nfb); return -rte_errno; } @@ -520,7 +517,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) struct rte_ether_addr eth_addr_init; struct rte_kvargs *kvlist; - RTE_LOG(INFO, PMD, "Initializing NFB device (" PCI_PRI_FMT ")\n", + NFB_LOG(INFO, "Initializing NFB device (" PCI_PRI_FMT ")", pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function); @@ -536,7 +533,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) kvlist = rte_kvargs_parse(dev->device->devargs->args, VALID_KEYS); if (kvlist == NULL) { - RTE_LOG(ERR, PMD, "Failed to parse device arguments %s", + NFB_LOG(ERR, "Failed to parse device arguments %s", dev->device->devargs->args); rte_kvargs_free(kvlist); return -EINVAL; @@ -551,14 +548,14 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) */ internals->nfb = nfb_open(internals->nfb_dev); if (internals->nfb == NULL) { - RTE_LOG(ERR, PMD, "nfb_open(): failed to open %s", + NFB_LOG(ERR, "nfb_open(): failed to open %s", internals->nfb_dev); return -EINVAL; } data->nb_rx_queues = ndp_get_rx_queue_available_count(internals->nfb); data->nb_tx_queues = ndp_get_tx_queue_available_count(internals->nfb); - RTE_LOG(INFO, PMD, "Available NDP queues RX: %u TX: %u\n", + NFB_LOG(INFO, "Available NDP queues RX: %u TX: %u\n", data->nb_rx_queues, data->nb_tx_queues); nfb_nc_rxmac_init(internals->nfb, @@ -583,7 +580,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) data->mac_addrs = rte_zmalloc(data->name, sizeof(struct rte_ether_addr) * mac_count, RTE_CACHE_LINE_SIZE); if (data->mac_addrs == NULL) { - RTE_LOG(ERR, PMD, "Could not alloc space for MAC address!\n"); + NFB_LOG(ERR, "Could not alloc space for MAC address"); nfb_close(internals->nfb); return -EINVAL; } @@ -601,8 +598,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; - RTE_LOG(INFO, PMD, "NFB device (" - PCI_PRI_FMT ") successfully initialized\n", + NFB_LOG(INFO, "NFB device (" PCI_PRI_FMT ") successfully initialized", pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function); @@ -626,8 +622,7 @@ nfb_eth_dev_uninit(struct rte_eth_dev *dev) nfb_eth_dev_close(dev); - RTE_LOG(INFO, PMD, "NFB device (" - PCI_PRI_FMT ") successfully uninitialized\n", + NFB_LOG(INFO, "NFB device (" PCI_PRI_FMT ") successfully uninitialized", pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function); @@ -690,3 +685,4 @@ static struct rte_pci_driver nfb_eth_driver = { RTE_PMD_REGISTER_PCI(RTE_NFB_DRIVER_NAME, nfb_eth_driver); RTE_PMD_REGISTER_PCI_TABLE(RTE_NFB_DRIVER_NAME, nfb_pci_id_table); RTE_PMD_REGISTER_KMOD_DEP(RTE_NFB_DRIVER_NAME, "* nfb"); +RTE_LOG_REGISTER_DEFAULT(nfb_logtype, NOTICE); diff --git a/drivers/net/nfb/nfb_rx.c b/drivers/net/nfb/nfb_rx.c index 8a9b232305f2..a20f7b9b4b41 100644 --- a/drivers/net/nfb/nfb_rx.c +++ b/drivers/net/nfb/nfb_rx.c @@ -6,7 +6,6 @@ #include -#include "nfb_rx.h" #include "nfb.h" uint64_t nfb_timestamp_rx_dynflag; @@ -19,7 +18,7 @@ nfb_eth_rx_queue_start(struct rte_eth_dev *dev, uint16_t rxq_id) int ret; if (rxq->queue == NULL) { - RTE_LOG(ERR, PMD, "RX NDP queue is NULL!\n"); + NFB_LOG(ERR, "RX NDP queue is NULL"); return -EINVAL; } @@ -40,7 +39,7 @@ nfb_eth_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rxq_id) int ret; if (rxq->queue == NULL) { - RTE_LOG(ERR, PMD, "RX NDP queue is NULL!\n"); + NFB_LOG(ERR, "RX NDP queue is NULL"); return -EINVAL; } @@ -70,8 +69,8 @@ nfb_eth_rx_queue_setup(struct rte_eth_dev *dev, RTE_CACHE_LINE_SIZE, socket_id); if (rxq == NULL) { - RTE_LOG(ERR, PMD, "rte_zmalloc_socket() failed for rx queue id " - "%" PRIu16 "!\n", rx_queue_id); + NFB_LOG(ERR, "rte_zmalloc_socket() failed for rx queue id %" PRIu16, + rx_queue_id); return -ENOMEM; } diff --git a/drivers/net/nfb/nfb_rx.h b/drivers/net/nfb/nfb_rx.h index b618682e1393..2802f17091a0 100644 --- a/drivers/net/nfb/nfb_rx.h +++ b/drivers/net/nfb/nfb_rx.h @@ -156,7 +156,7 @@ nfb_eth_ndp_rx(void *queue, struct rte_mbuf *mbufs[nb_pkts]; if (unlikely(ndp->queue == NULL || nb_pkts == 0)) { - RTE_LOG(ERR, PMD, "RX invalid arguments!\n"); + NFB_LOG(ERR, "RX invalid arguments"); return 0; } diff --git a/drivers/net/nfb/nfb_tx.c b/drivers/net/nfb/nfb_tx.c index d49fc324e76b..0cc2f596301a 100644 --- a/drivers/net/nfb/nfb_tx.c +++ b/drivers/net/nfb/nfb_tx.c @@ -4,7 +4,6 @@ * All rights reserved. */ -#include "nfb_tx.h" #include "nfb.h" int @@ -14,7 +13,7 @@ nfb_eth_tx_queue_start(struct rte_eth_dev *dev, uint16_t txq_id) int ret; if (txq->queue == NULL) { - RTE_LOG(ERR, PMD, "RX NDP queue is NULL!\n"); + NFB_LOG(ERR, "RX NDP queue is NULL"); return -EINVAL; } @@ -35,7 +34,7 @@ nfb_eth_tx_queue_stop(struct rte_eth_dev *dev, uint16_t txq_id) int ret; if (txq->queue == NULL) { - RTE_LOG(ERR, PMD, "TX NDP queue is NULL!\n"); + NFB_LOG(ERR, "TX NDP queue is NULL"); return -EINVAL; } @@ -62,8 +61,8 @@ nfb_eth_tx_queue_setup(struct rte_eth_dev *dev, RTE_CACHE_LINE_SIZE, socket_id); if (txq == NULL) { - RTE_LOG(ERR, PMD, "rte_zmalloc_socket() failed for tx queue id " - "%" PRIu16 "!\n", tx_queue_id); + NFB_LOG(ERR, "rte_zmalloc_socket() failed for tx queue id %" PRIu16, + tx_queue_id); return -ENOMEM; } diff --git a/drivers/net/nfb/nfb_tx.h b/drivers/net/nfb/nfb_tx.h index 910020e9e96f..f107cf914bbd 100644 --- a/drivers/net/nfb/nfb_tx.h +++ b/drivers/net/nfb/nfb_tx.h @@ -140,7 +140,7 @@ nfb_eth_ndp_tx(void *queue, return 0; if (unlikely(ndp->queue == NULL)) { - RTE_LOG(ERR, PMD, "TX invalid arguments!\n"); + NFB_LOG(ERR, "TX invalid arguments"); return 0; } From patchwork Mon Dec 18 19:22:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135317 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 EED394373D; Mon, 18 Dec 2023 20:28:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 386F142E1F; Mon, 18 Dec 2023 20:27:03 +0100 (CET) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mails.dpdk.org (Postfix) with ESMTP id 1B89642DF6 for ; Mon, 18 Dec 2023 20:26:55 +0100 (CET) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1d389fb3f64so14424035ad.1 for ; Mon, 18 Dec 2023 11:26:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927614; x=1703532414; 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=+8K8aM/eDl/j95kjfXB1e7jWZldW/p4FDToC2O3/f8Y=; b=L+aEM59h0e2VgPGft45yabyxxJHX6egm/IzjyrQr2R6QcYwJIRbmm+xC5Eu5R0e50A SdH21MNvb/xQB/eOPNPurG5XdVtSgi6HwQXeMpsrrTxARg70Ki9Lx5pjm7XtaUEv/BOC 8b2aLCmvP9C3fdr6qNKrMcQvH+VKdkBLCD9KJgUR11JwLMvK1qV9fH28pVIVJrNcCGKe x/Af1v05ZLd09Keq2sNxNTecx2er4YHSfSEsfFbYa6mQsJQFbW5T7/AJhUfzFoI+boep BYPJfHfNhPjBXyrA99l/twPc35o5yS2tRRSYaQS010wPN+D9DYyTFYKAYQf6vY/lIapt m32A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927614; x=1703532414; 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=+8K8aM/eDl/j95kjfXB1e7jWZldW/p4FDToC2O3/f8Y=; b=aEz3jcKgrqbEwfIKs22CxNysIjRznUvQCKBAFl5ivmkEcjgB2VAXvTJ8mfV6o06gyk xhbySeFGFBDoKlLFJoq2eagBn075qPREEQJBAOL/X3iXQee+F8b95aWdbuzK9jirsN5C 0nSRx+IdZUikv4k4Lgous7+kVVIqPooHv9pLbvi/9bWv+W3RX1HT+SL1Z33L3LHLKNy1 RwHjFHZyYmtj/nITEwEu6M0EVywnJbEq3bse052IyKTs2geEiNoDXFnLDZq0Vyu9B0gN bvWGEaT/ijvDIWhGPV1h58kDRa/Mp/qfWH2bgaSiL3w3KO68BE065i5w1VQW9H7zihx+ RSYA== X-Gm-Message-State: AOJu0YyqFYdJIg4DVmZZinCOz21rjlYayuKBwas7uwTYnkvIpPT5XlYN bP6bnF7ZlQTixURoSCI/MGh7uQYIvzom71rgVYAiJA== X-Google-Smtp-Source: AGHT+IF34nrctfoSwX+YEiL1fn7F2wXP1QOEm8xTeLlmkpPJFZEJlt4xVs8mvWfLZ8oF7Bk1x7O3Iw== X-Received: by 2002:a17:902:ca0b:b0:1d3:8b14:6098 with SMTP id w11-20020a170902ca0b00b001d38b146098mr2047333pld.49.1702927614293; Mon, 18 Dec 2023 11:26:54 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:53 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 16/17] examples/fips_validation: replace use of PMD logtype Date: Mon, 18 Dec 2023 11:22:32 -0800 Message-ID: <20231218192631.699267-17-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 Replace PMD with USER1 since that is already used in main Fixes: 41d561cbdd24 ("examples/fips_validation: add power on self test") Signed-off-by: Stephen Hemminger --- examples/fips_validation/fips_dev_self_test.c | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/fips_validation/fips_dev_self_test.c b/examples/fips_validation/fips_dev_self_test.c index b17f664a5eda..667f5da4e7d9 100644 --- a/examples/fips_validation/fips_dev_self_test.c +++ b/examples/fips_validation/fips_dev_self_test.c @@ -1032,7 +1032,7 @@ prepare_cipher_xform(uint8_t dev_id, cap = rte_cryptodev_sym_capability_get(dev_id, &cap_idx); if (!cap) { - RTE_LOG(ERR, PMD, "Failed to get capability for cdev %u\n", + RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n", dev_id); return -EACCES; } @@ -1040,7 +1040,7 @@ prepare_cipher_xform(uint8_t dev_id, if (rte_cryptodev_sym_capability_check_cipher(cap, cipher_xform->key.length, cipher_xform->iv.length) != 0) { - RTE_LOG(ERR, PMD, "PMD %s key length %u IV length %u\n", + RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n", rte_cryptodev_name_get(dev_id), cipher_xform->key.length, cipher_xform->iv.length); @@ -1088,7 +1088,7 @@ prepare_auth_xform(uint8_t dev_id, cap = rte_cryptodev_sym_capability_get(dev_id, &cap_idx); if (!cap) { - RTE_LOG(ERR, PMD, "Failed to get capability for cdev %u\n", + RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n", dev_id); return -EACCES; } @@ -1096,7 +1096,7 @@ prepare_auth_xform(uint8_t dev_id, if (rte_cryptodev_sym_capability_check_auth(cap, auth_xform->key.length, auth_xform->digest_length, 0) != 0) { - RTE_LOG(ERR, PMD, "PMD %s key length %u Digest length %u\n", + RTE_LOG(ERR, USER1, "PMD %s key length %u Digest length %u\n", rte_cryptodev_name_get(dev_id), auth_xform->key.length, auth_xform->digest_length); @@ -1147,7 +1147,7 @@ prepare_aead_xform(uint8_t dev_id, cap = rte_cryptodev_sym_capability_get(dev_id, &cap_idx); if (!cap) { - RTE_LOG(ERR, PMD, "Failed to get capability for cdev %u\n", + RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n", dev_id); return -EACCES; } @@ -1156,7 +1156,7 @@ prepare_aead_xform(uint8_t dev_id, aead_xform->key.length, aead_xform->digest_length, aead_xform->aad_length, aead_xform->iv.length) != 0) { - RTE_LOG(ERR, PMD, + RTE_LOG(ERR, USER1, "PMD %s key_len %u tag_len %u aad_len %u iv_len %u\n", rte_cryptodev_name_get(dev_id), aead_xform->key.length, @@ -1195,7 +1195,7 @@ prepare_cipher_op(struct rte_crypto_op *op, dst = (uint8_t *)rte_pktmbuf_append(mbuf, len); if (!dst) { - RTE_LOG(ERR, PMD, "Error %i: MBUF too small\n", -ENOMEM); + RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n", -ENOMEM); return -ENOMEM; } @@ -1219,7 +1219,7 @@ prepare_auth_op(struct rte_crypto_op *op, uint8_t *dst; if (vec->input.len + vec->digest.len > RTE_MBUF_MAX_NB_SEGS) { - RTE_LOG(ERR, PMD, "Error %i: Test data too long (%u).\n", + RTE_LOG(ERR, USER1, "Error %i: Test data too long (%u).\n", -ENOMEM, vec->input.len + vec->digest.len); return -ENOMEM; } @@ -1229,7 +1229,7 @@ prepare_auth_op(struct rte_crypto_op *op, dst = (uint8_t *)rte_pktmbuf_append(mbuf, vec->input.len + vec->digest.len); if (!dst) { - RTE_LOG(ERR, PMD, "Error %i: MBUF too small\n", -ENOMEM); + RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n", -ENOMEM); return -ENOMEM; } @@ -1274,7 +1274,7 @@ prepare_aead_op(struct rte_crypto_op *op, memcpy(iv, vec->iv.data, vec->iv.len); if (len + vec->digest.len > RTE_MBUF_MAX_NB_SEGS) { - RTE_LOG(ERR, PMD, "Error %i: Test data too long (%u).\n", + RTE_LOG(ERR, USER1, "Error %i: Test data too long (%u).\n", -ENOMEM, len + vec->digest.len); return -ENOMEM; } @@ -1282,7 +1282,7 @@ prepare_aead_op(struct rte_crypto_op *op, dst = (uint8_t *)rte_pktmbuf_append(mbuf, RTE_ALIGN_CEIL(len + vec->digest.len, 16)); if (!dst) { - RTE_LOG(ERR, PMD, "Error %i: MBUF too small\n", -ENOMEM); + RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n", -ENOMEM); return -ENOMEM; } @@ -1303,7 +1303,7 @@ prepare_aead_op(struct rte_crypto_op *op, dst = rte_malloc(NULL, len, 16); if (!dst) { - RTE_LOG(ERR, PMD, "Error %i: Not enough memory\n", -ENOMEM); + RTE_LOG(ERR, USER1, "Error %i: Not enough memory\n", -ENOMEM); return -ENOMEM; } @@ -1474,24 +1474,24 @@ run_single_test(uint8_t dev_id, ret = test_ops->prepare_xform(dev_id, &xform, vec, dir, key, negative_test); if (ret < 0) { - RTE_LOG(ERR, PMD, "Error %i: Prepare Xform\n", ret); + RTE_LOG(ERR, USER1, "Error %i: Prepare Xform\n", ret); return ret; } sess = rte_cryptodev_sym_session_create(dev_id, &xform, env->sess_pool); if (!sess) { - RTE_LOG(ERR, PMD, "Error %i: Init session\n", ret); + RTE_LOG(ERR, USER1, "Error %i: Init session\n", ret); return ret; } ret = test_ops->prepare_op(env->op, env->mbuf, sess, dir, vec); if (ret < 0) { - RTE_LOG(ERR, PMD, "Error %i: Prepare op\n", ret); + RTE_LOG(ERR, USER1, "Error %i: Prepare op\n", ret); return ret; } if (rte_cryptodev_enqueue_burst(dev_id, 0, &env->op, 1) < 1) { - RTE_LOG(ERR, PMD, "Error: Failed enqueue\n"); + RTE_LOG(ERR, USER1, "Error: Failed enqueue\n"); return ret; } @@ -1622,7 +1622,7 @@ fips_dev_self_test(uint8_t dev_id, ret = fips_dev_auto_test_init(dev_id, &env); if (ret < 0) { - RTE_LOG(ERR, PMD, "Failed to init self-test for PMD %u\n", + RTE_LOG(ERR, USER1, "Failed to init self-test for PMD %u\n", dev_id); return ret; } @@ -1644,7 +1644,7 @@ fips_dev_self_test(uint8_t dev_id, negative_test = 0; } - RTE_LOG(INFO, PMD, "Testing (ID %u) %s %s%s...\n", + RTE_LOG(INFO, USER1, "Testing (ID %u) %s %s%s...\n", i, vec->name, j == self_test_dir_enc_auth_gen ? @@ -1658,18 +1658,18 @@ fips_dev_self_test(uint8_t dev_id, if (!negative_test) break; ret = -1; - RTE_LOG(ERR, PMD, "PMD %u Failed test %s %s\n", + RTE_LOG(ERR, USER1, "PMD %u Failed test %s %s\n", dev_id, vec->name, j == self_test_dir_enc_auth_gen ? "Encrypt" : "Decrypt"); goto error_exit; case -EACCES: - RTE_LOG(ERR, PMD, "Not supported by %s. Skip\n", + RTE_LOG(ERR, USER1, "Not supported by %s. Skip\n", rte_cryptodev_name_get(dev_id)); ret = 0; break; default: - RTE_LOG(ERR, PMD, "PMD %u Failed test %s %s\n", + RTE_LOG(ERR, USER1, "PMD %u Failed test %s %s\n", dev_id, vec->name, j == self_test_dir_enc_auth_gen ? "Encrypt" : "Decrypt"); @@ -1682,7 +1682,7 @@ fips_dev_self_test(uint8_t dev_id, fips_dev_auto_test_uninit(dev_id, &env); if (ret == 0) { - RTE_LOG(INFO, PMD, "PMD %u finished self-test successfully\n", + RTE_LOG(INFO, USER1, "PMD %u finished self-test successfully\n", dev_id); } From patchwork Mon Dec 18 19:22: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: 135318 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 846CE4373D; Mon, 18 Dec 2023 20:28:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 40A6242E25; Mon, 18 Dec 2023 20:27:04 +0100 (CET) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mails.dpdk.org (Postfix) with ESMTP id AD44442DF6 for ; Mon, 18 Dec 2023 20:26:55 +0100 (CET) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1d3b60c5054so10330815ad.2 for ; Mon, 18 Dec 2023 11:26:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702927615; x=1703532415; 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=4OMFrp4EDLBFSNpf4X4Tbs2FNhxEBfmVsajYs66cWfg=; b=VSMH0TEDbX6x24QZI+rGsM4JXvuZfnyEnVcNUg9cl+D83SDc8cfmjYDcMRzNDwT+Tj CdeQunj1JyF8mvyzd0/h8k5bByQwWE0ApfpSdmSbVD/Gt0VBlkGGoDYSI3Q9Fl114vtc V3JRBYhQKUVWxmlWKChxdkzKTJUEtpQ2IUnMUYAhjkEwLHx2te/ZEkWQ6fjd+toVfbbH SV4CR/+1zp/+646yZi+S1kgdzw3S8PQNf9MVMUJHREr5FSENNTFFw38xCyv/MMCvCoz6 B5gyYRNUPPWY3XVmsOIYkgkVIcDwF/TIzrTSJ115SIpT8wfJYu/cr/tEOHdM5az3eX0I MUyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702927615; x=1703532415; 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=4OMFrp4EDLBFSNpf4X4Tbs2FNhxEBfmVsajYs66cWfg=; b=wLZkAp+eu/RIDYC2NNrSYUaFNilYvimEnrdvrVRJB5n1IesYBT7vWi10ajcxQVAbcN +ShGfmMlUfD5/icvmoVwevVqNY6kShdQEE/VsKpBEfuh6JYqHGIxryX+AaIuNeczoQoV 0M5xbuvN1CLcNDHmtOMnzLRDONss2atNbVj/IRFu2DpT9hpMkpaRvl1Pawk24tXkFf+k lWleLawi+NQpaKntamgCBmWgMCFrb7lvH7Rr7ThRD6Fl9oQl1DG7A0cM39A2r2KoZFFa 5RGWfoWywfBLY67XCdWd9DEgFm2eqSZzRHT3vLFIvdvpZumDIUmRQIAWrFRN/zUUMGLr xZ8w== X-Gm-Message-State: AOJu0YyD2OZ9lTcAVRekEG4NON4MNLNxJl6J/1F7iabCL8LHt/yC/ZFt vJGOJ3QdnlBEtoui6JEDdeGPJ6JFvP++SqratcsqTw== X-Google-Smtp-Source: AGHT+IGxAVDz2198hqe+sEGdYlZFNPXjVT29wjGZdc0koeCDnoXrE0oRqH2F5NtAkVlGc4Xu5oOq8A== X-Received: by 2002:a17:902:d4c7:b0:1d3:ac1e:6ad5 with SMTP id o7-20020a170902d4c700b001d3ac1e6ad5mr1104375plg.72.1702927614983; Mon, 18 Dec 2023 11:26:54 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p17-20020a170903249100b001cfbe348ca5sm19410284plw.187.2023.12.18.11.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:26:54 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v4 17/17] log: mark PMD logtype as deprecated Date: Mon, 18 Dec 2023 11:22:33 -0800 Message-ID: <20231218192631.699267-18-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218192631.699267-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231218192631.699267-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 This is temporary patch to help find all misue use of PMD logtype --- lib/log/log.c | 3 +++ lib/log/rte_log.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/log/log.c b/lib/log/log.c index ab06132a98a1..09a31a62c0fd 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -352,6 +352,9 @@ struct logtype { static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_EAL, "lib.eal"}, +/* avoid deprecated warning */ +#undef RTE_LOGTYPE_PMD +#define RTE_LOGTYPE_PMD 5 {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_PORT, "lib.port"}, {RTE_LOGTYPE_TABLE, "lib.table"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index 3394746103d4..4d207b8da2cd 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -31,7 +31,7 @@ extern "C" { /* was RTE_LOGTYPE_RING */ /* was RTE_LOGTYPE_MEMPOOL */ /* was RTE_LOGTYPE_TIMER */ -#define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */ +#define RTE_LOGTYPE_PMD RTE_DEPRECATED(RTE_LOGTYPE_PMD) 5 /* was RTE_LOGTYPE_HASH */ /* was RTE_LOGTYPE_LPM */ /* was RTE_LOGTYPE_KNI */