From patchwork Tue Feb 21 18:55:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 124306 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 01AC641D31; Tue, 21 Feb 2023 19:56:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D748241133; Tue, 21 Feb 2023 19:56:00 +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 2F1A940691 for ; Tue, 21 Feb 2023 19:55:58 +0100 (CET) Received: by mail-pj1-f50.google.com with SMTP id d1-20020a17090a3b0100b00229ca6a4636so6207736pjc.0 for ; Tue, 21 Feb 2023 10:55:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; 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=V9Fgv9pn9Mh6JrbFl9Q/tkwtdGEGVwXHhKwwcv4gMUM=; b=WiQQk3S1M+2pBP/8IbpVqo3SYhbXMtZrWxhO90CoOVFFe943slXmboEk/Lkyebwabf T4hzsZ3P0GS3XDVAYFYDMdLixc+xtNV9YQ1b+epRLP2lxiE9P8106W5jyPv1mI3gzI8h PU4VmtB/smVEqUVENAZ5AEOyeyR+nIH1x7iPhsPXwlQ5UPVhKvQD3H7w2EGurkuXw2FK /1GFsOvVKxn+B1MPcxYyzArteqWJ5t7hsCUtHDAm5vNeq9TdTkElBYGnWkmpwPsqQwPL Zv827G7eowhzGmT4lXSaPQSL4IpuV6HMLw/dWjSupBCEUVpFkqqjaIBzpHltHlBIJGwS pt3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=V9Fgv9pn9Mh6JrbFl9Q/tkwtdGEGVwXHhKwwcv4gMUM=; b=E5deY0CTVDEFJqC83zuCx/0ptV7f5VHJOLyKjDrfj+3/FRJF57HmBX0tatCHN2nE0p jRLzhwGch/sm7et/YRZwzdJqoXBe+RAvzxVe381/LlXDL8Odnpx+QOB5kx2TEEEjL6/x Np9hbnU5h5gR5JV5WeHNHqAZichtAOKcd1cDPihIxZ88icIdr54PY0hhirwqRBwq3sRz KSudochb3JYluOSCpNq9K+kPGVPxaY0IWTfEUVONKIHga9vxXmSjjkXvo2FaeuX0wNpW 2sDdfZoDtn3tgvXg8w6ecH9mvWIqjRvjw402wNsY8wO1fi+e4zc6T4wJrSplhVYiqkOq eduw== X-Gm-Message-State: AO0yUKU5ui/EJdIlEq6U2PG/ZykYpZzSMDfabIQKkhWx+I/wxuqyVF51 hn1qpLLaXhOCfrKla0/psjAFtomakg+nOcEfyfE= X-Google-Smtp-Source: AK7set+2CEVnzuFPXIFbHVfNK9BLhYyPqpZz70Tq/doJrw9XDTGwa8tf6IXl8vOHlChPMJEkG8EBdA== X-Received: by 2002:a17:902:d2c4:b0:196:3db5:c08b with SMTP id n4-20020a170902d2c400b001963db5c08bmr8220475plc.69.1677005757032; Tue, 21 Feb 2023 10:55:57 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id iz15-20020a170902ef8f00b00189c4b8ca21sm6357895plb.18.2023.02.21.10.55.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 10:55:56 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Konstantin Ananyev Subject: [PATCH v7 1/5] ip_frag: use a dynamic logtype Date: Tue, 21 Feb 2023 10:55:49 -0800 Message-Id: <20230221185553.513432-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221185553.513432-1-stephen@networkplumber.org> References: <0230208044825.1682620-1-stephen@networkplumber.org> <20230221185553.513432-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 DPDK libraries should not be reusing RTE_LOGTYPE_USER1 in lieu of doing proper logtype registration. Acked-by: Konstantin Ananyev Fixes: 416707812c03 ("ip_frag: refactor reassembly code into a proper library") Signed-off-by: Stephen Hemminger --- lib/ip_frag/ip_frag_common.h | 5 ++++- lib/ip_frag/rte_ip_frag_common.c | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/ip_frag/ip_frag_common.h b/lib/ip_frag/ip_frag_common.h index 9c0dbdeb6eb9..95f1689d476d 100644 --- a/lib/ip_frag/ip_frag_common.h +++ b/lib/ip_frag/ip_frag_common.h @@ -8,9 +8,12 @@ #include "rte_ip_frag.h" #include "ip_reassembly.h" +extern int ipfrag_logtype; +#define RTE_LOGTYPE_IPFRAG ipfrag_logtype + /* logging macros. */ #ifdef RTE_LIBRTE_IP_FRAG_DEBUG -#define IP_FRAG_LOG(lvl, fmt, args...) RTE_LOG(lvl, USER1, fmt, ##args) +#define IP_FRAG_LOG(lvl, fmt, args...) RTE_LOG(lvl, IPFRAG, fmt, ##args) #else #define IP_FRAG_LOG(lvl, fmt, args...) do {} while(0) #endif /* IP_FRAG_DEBUG */ diff --git a/lib/ip_frag/rte_ip_frag_common.c b/lib/ip_frag/rte_ip_frag_common.c index c1de2e81b6d0..eed399da6bc5 100644 --- a/lib/ip_frag/rte_ip_frag_common.c +++ b/lib/ip_frag/rte_ip_frag_common.c @@ -7,6 +7,8 @@ #include +RTE_LOG_REGISTER_DEFAULT(ipfrag_logtype, INFO); + #include "ip_frag_common.h" #define IP_FRAG_HASH_FNUM 2 @@ -52,20 +54,20 @@ rte_ip_frag_table_create(uint32_t bucket_num, uint32_t bucket_entries, if (rte_is_power_of_2(bucket_entries) == 0 || nb_entries > UINT32_MAX || nb_entries == 0 || nb_entries < max_entries) { - RTE_LOG(ERR, USER1, "%s: invalid input parameter\n", __func__); + RTE_LOG(ERR, IPFRAG, "%s: invalid input parameter\n", __func__); return NULL; } sz = sizeof (*tbl) + nb_entries * sizeof (tbl->pkt[0]); if ((tbl = rte_zmalloc_socket(__func__, sz, RTE_CACHE_LINE_SIZE, socket_id)) == NULL) { - RTE_LOG(ERR, USER1, + RTE_LOG(ERR, IPFRAG, "%s: allocation of %zu bytes at socket %d failed do\n", __func__, sz, socket_id); return NULL; } - RTE_LOG(INFO, USER1, "%s: allocated of %zu bytes at socket %d\n", + RTE_LOG(INFO, IPFRAG, "%s: allocated of %zu bytes at socket %d\n", __func__, sz, socket_id); tbl->max_cycles = max_cycles; From patchwork Tue Feb 21 18:55:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 124307 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 93F2541D31; Tue, 21 Feb 2023 19:56:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A88542D1A; Tue, 21 Feb 2023 19:56:02 +0100 (CET) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mails.dpdk.org (Postfix) with ESMTP id B935B40691 for ; Tue, 21 Feb 2023 19:55:58 +0100 (CET) Received: by mail-pj1-f48.google.com with SMTP id y2so1833622pjg.3 for ; Tue, 21 Feb 2023 10:55:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; 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=GAlRbq3o7ovDqkKTT41WAN/GYRy/jddESUXIeIkPiqg=; b=yDd6gmDk7ibuaZqPynYtvXktRacWTO8NqpfKh4/yQZ/aIfbac745Ktq8oZsFFe8GpG k1h4DZkX3YN1ZaDTVDmuVfW/Wfirea5aYGbDBhkKdR5G6KP8IhY3dCS5ZDpfQAzF+fFT jaogLc1zh/Qny0wcI+RX1aQ+hm8kTjAOqitcmyaovYC6sgtpLjBGY2Xz1VVwAXXbHqTv fBZjW91c+qMgj60TRS5RpQ14ffCN9v0NX+eyUWgh05nGBFLP1HmezSa2E8pFFRPH94Vw XB9A0bSyslmT72FsL4GL5xv9xFRiavQUf4W+tZm5hhXBkpMaPSU94hwuc8KVB9qU1cL1 EWDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=GAlRbq3o7ovDqkKTT41WAN/GYRy/jddESUXIeIkPiqg=; b=gSWwuDimayTvJbjHZ2mVvWWpmP4/seUA/rc5VVOSPycbAwxk+gr5cI2Dl26zFfKgyN 5XK5z9Am899tynMaUEwnvYnIXP+GXbtEsZBhivcRMyxeyN2kY8LR/NxD1YROI5Xb0FnP MyGN5JjmtQr3so9pne5JVTIdbTyrDQKaSeBw8FKlBF8ycpi8ybkrp1CqZTZtYUhNhFkn /Vs6GxYU4ZA38OYbb6aX50XmuIZ3QmPq4vGIe5MoHGBdE8oWp3rJyY6P0c7Kp0FPqpvx C9jqPsrQ/PQFKDRW4/T+BrloVd4fjdBn+39CxKRhRaL7axyWTmoJ3xC5MJkFptmtO+pw VlIg== X-Gm-Message-State: AO0yUKUaokwYKue/VNYjjiKjcSdkM8x+jjKDU60xWOCcF1wZaT0QZab3 WQGiRl4XkGGOl9N7jSkLH4cOyVB2aFOSFIoMLLs= X-Google-Smtp-Source: AK7set8TQ10Kn80G7bfpkuL475YEtEzhmmDRflhQI6GDAyCRL38Xt/jZMlEgCciFPF04dIiCnVDOkg== X-Received: by 2002:a17:902:c410:b0:199:2e01:13fb with SMTP id k16-20020a170902c41000b001992e0113fbmr5638419plk.20.1677005757976; Tue, 21 Feb 2023 10:55:57 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id iz15-20020a170902ef8f00b00189c4b8ca21sm6357895plb.18.2023.02.21.10.55.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 10:55:57 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , sergio.gonzalez.monroy@intel.com Subject: [PATCH v7 2/5] reorder: use a dynamic logtype Date: Tue, 21 Feb 2023 10:55:50 -0800 Message-Id: <20230221185553.513432-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221185553.513432-1-stephen@networkplumber.org> References: <0230208044825.1682620-1-stephen@networkplumber.org> <20230221185553.513432-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 Libraries should not be reusing RTE_LOGTYPE_USER1 instead of doing proper logtype registration. Fixes: b70b56032bff ("reorder: new library") Cc: sergio.gonzalez.monroy@intel.com Signed-off-by: Stephen Hemminger --- lib/reorder/rte_reorder.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/reorder/rte_reorder.c b/lib/reorder/rte_reorder.c index 6e029c9e02fd..7a3a97972cb7 100644 --- a/lib/reorder/rte_reorder.c +++ b/lib/reorder/rte_reorder.c @@ -15,6 +15,9 @@ #include "rte_reorder.h" +RTE_LOG_REGISTER_DEFAULT(reorder_logtype, INFO); +#define RTE_LOGTYPE_REORDER reorder_logtype + TAILQ_HEAD(rte_reorder_list, rte_tailq_entry); static struct rte_tailq_elem rte_reorder_tailq = { @@ -26,9 +29,6 @@ EAL_REGISTER_TAILQ(rte_reorder_tailq) #define RTE_REORDER_PREFIX "RO_" #define RTE_REORDER_NAMESIZE 32 -/* Macros for printing using RTE_LOG */ -#define RTE_LOGTYPE_REORDER RTE_LOGTYPE_USER1 - #define RTE_REORDER_SEQN_DYNFIELD_NAME "rte_reorder_seqn_dynfield" int rte_reorder_seqn_dynfield_offset = -1; From patchwork Tue Feb 21 18:55:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 124308 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 2E2FE41D31; Tue, 21 Feb 2023 19:56:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3C31742D3F; Tue, 21 Feb 2023 19:56:03 +0100 (CET) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mails.dpdk.org (Postfix) with ESMTP id D9C7C40E0F for ; Tue, 21 Feb 2023 19:55:59 +0100 (CET) Received: by mail-pl1-f169.google.com with SMTP id ky4so7301050plb.3 for ; Tue, 21 Feb 2023 10:55:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; 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=R9wIe9qMWy4gg4mMTnDLAbpI5lNgUox8Qod56/q4hzk=; b=J7ZaNfx6u+oqV6mW8ULvkZfuKGj/IeH2Tcg8gjnqTpWr9oPZ1hPNLuoO53M7xAoY2h BpvcaQotCvyKlTOSruDvkefzu736whUTMB0ylFdf8T9+aGcxu2tOqUKkHzB1agzyMkVM +EbQi68k22sxf1HV6Nqhu2Md8lfivs80J/cezHW1Qy7B8A08uKsR+kzUY1ehQPf7TGYF s5IOc1ncj52J5ZanCWccot7s5aJmMZlg4UkLv6waeIAXJOFEBrsHlBk3UyoZVL3nI7uJ /jV4lJjFXrufH/3ayjA4+xRInlgdYw1fsuRL2/sF9BzF9zkkG0H9JAB9xJXJI29QA3AR Nk2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=R9wIe9qMWy4gg4mMTnDLAbpI5lNgUox8Qod56/q4hzk=; b=IH5H250UbKRZLC52t6gFfWbDqkguilGZOSSe+GRK9PxGZuOoUPRyDJNaWq87OOSxRD 2KupCMH9iCD0VS20cxEN/yE834oqdrhSKzn9+/bqtYNQtbDHja3krx3FMfewIHLxKk92 +Jbcrg8LmZDXQAeexW22HExMz7DPkqMs6Wp2rlfziy2WNn21wflKtaROFsu2ZAPVfRI+ OZtWeATnQXc75Ie+V50oZ6ZlPDkpWxIHcjDfUNxYNeNe/DPPudKOnZSht3xbQ2tt92Hc vtQhSt6BsreCFuUuKBfFjJtZWc8CaTObZ1wdFaZ4kP+788hYdaybGJ5pGSUUFwvfkouj 6cqQ== X-Gm-Message-State: AO0yUKX0a0+I8SKTae9yMwH2jie9wZHl56bT9QnCsYDxghR5CqJM+sp9 F5kjnCXxXgkubyQfDn5onWlfw6SGKdGGvzPEnd0= X-Google-Smtp-Source: AK7set//o/8H/3zIZ0dyGI1FDpSaKwMx4dSqmnrPJNqXpDtAzvmESKsu4cMfJdUJvLldv9Y7s/YIKQ== X-Received: by 2002:a17:903:687:b0:19a:7548:da22 with SMTP id ki7-20020a170903068700b0019a7548da22mr4680514plb.50.1677005758828; Tue, 21 Feb 2023 10:55:58 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id iz15-20020a170902ef8f00b00189c4b8ca21sm6357895plb.18.2023.02.21.10.55.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 10:55:58 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , reshma.pattan@intel.com Subject: [PATCH v7 3/5] latencystats: use dynamic logtype Date: Tue, 21 Feb 2023 10:55:51 -0800 Message-Id: <20230221185553.513432-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221185553.513432-1-stephen@networkplumber.org> References: <0230208044825.1682620-1-stephen@networkplumber.org> <20230221185553.513432-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 Libraries should not reuse RTE_LOGTYPE_USER1 for their logging. Instead they should register their own type. Fixes: 5cd3cac9ed22 ("latency: added new library for latency stats") Cc: reshma.pattan@intel.com Signed-off-by: Stephen Hemminger --- lib/latencystats/rte_latencystats.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/latencystats/rte_latencystats.c b/lib/latencystats/rte_latencystats.c index 8985a377db4e..f3c1746cca00 100644 --- a/lib/latencystats/rte_latencystats.c +++ b/lib/latencystats/rte_latencystats.c @@ -26,7 +26,8 @@ latencystat_cycles_per_ns(void) } /* Macros for printing using RTE_LOG */ -#define RTE_LOGTYPE_LATENCY_STATS RTE_LOGTYPE_USER1 +RTE_LOG_REGISTER_DEFAULT(latencystat_logtype, INFO); +#define RTE_LOGTYPE_LATENCY_STATS latencystat_logtype static uint64_t timestamp_dynflag; static int timestamp_dynfield_offset = -1; From patchwork Tue Feb 21 18:55:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 124309 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 D3D5D41D31; Tue, 21 Feb 2023 19:56:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DCAF42D4F; Tue, 21 Feb 2023 19:56:04 +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 0A20342686 for ; Tue, 21 Feb 2023 19:56:01 +0100 (CET) Received: by mail-pl1-f179.google.com with SMTP id q5so6125932plh.9 for ; Tue, 21 Feb 2023 10:56:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; 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=EWSti6I610aY/zrXwz1fAaQCcJ+TcjQSaklsLO7Yh4Q=; b=vhOpyJr8ThOLzPEMReLKVCwbP6DADPmzqk6vt0gFmh3i80DuDRDtEcgVfJruyDY8NZ dM9e3XxwqiNXZXXkhCFBAI49jeTP3bbYs7hcEmYnTfOPS6Nra7BVLK/RpEmTGsSjxvVv rE82hct9ZBN7azEUZCb2EEm1Z4dkK3UgyeGmCD7JqEFukPszUEOC3wuA+iQW6eq4Q1X0 RM2XdL49BBQROzpp5UsTtPZ6OyKQGiOJe1t3Ue2UjFZQ5sdgmTl4GkPxtQKg+iyCkGBD /6f49gLJ6RwMRaE7PIQXPdxzvTDm3Wy5mtZzXlhjO4CVb5o1YHZ6iipq0CX/6PuJCY8D nDyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=EWSti6I610aY/zrXwz1fAaQCcJ+TcjQSaklsLO7Yh4Q=; b=Bbn4nIEzxeKVN1p37s1NSA2lvF5IiUXYQGSKaDXx+e5vaLHGPdD0NF9iqTf2vIQ0oO bZ3VYSoV8zGD7/3vE4EfeRBjL5tYCs1Yi0N/Z19bzJiLKuAIZngQ10jOYQ70xqZWx2k4 n34NuBSHWuwm7oe4oX7HqqgbxMKS6TwH+zWvV7UKWy6B6XpaQyl6e62EidbbEN1iK70F f/9hkP0LfqsDHf7ulO87SMmKs4w3VR54+SlBaMhmqFEnmQ0UTvWgS2uYP1lGlG/BAFl/ kS5OdOjautIpz/PqNsTr28tKBy5+4igBnJrdfSAq4bEdmSL0cqBG/L/7UGIPx7IXmbCN 15Yw== X-Gm-Message-State: AO0yUKXM84MoCOqgy/9g3BMbiPuegm7rDpkrEC19sqkXYPBUpvdbUL8g glQByiMNYlW2bIQmCHwoLMemoJhAwsAD5ZN0Ixw= X-Google-Smtp-Source: AK7set80CG4oA+tsXhWyg6mFCy95ChE7vpqyD2jiU8Jj3Nzzpfc9xu3XikXySscqGT5NCU6XG1ODAA== X-Received: by 2002:a17:903:32cf:b0:19a:b7c0:f097 with SMTP id i15-20020a17090332cf00b0019ab7c0f097mr8176870plr.57.1677005759904; Tue, 21 Feb 2023 10:55:59 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id iz15-20020a170902ef8f00b00189c4b8ca21sm6357895plb.18.2023.02.21.10.55.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 10:55:59 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Chenbo Xia , Maxime Coquelin Subject: [PATCH v7 4/5] vhost: use logtype instead of RTE_LOGTYPE_USER1 Date: Tue, 21 Feb 2023 10:55:52 -0800 Message-Id: <20230221185553.513432-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221185553.513432-1-stephen@networkplumber.org> References: <0230208044825.1682620-1-stephen@networkplumber.org> <20230221185553.513432-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 Fix instances of USER1 logtype in fdset and crypto sections. Acked-by: Chenbo Xia Reviewed-by: Maxime Coquelin Signed-off-by: Stephen Hemminger --- lib/vhost/fd_man.c | 4 ++-- lib/vhost/vhost_crypto.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/vhost/fd_man.c b/lib/vhost/fd_man.c index 1876fada3354..46037d02784e 100644 --- a/lib/vhost/fd_man.c +++ b/lib/vhost/fd_man.c @@ -10,8 +10,8 @@ #include "fd_man.h" - -#define RTE_LOGTYPE_VHOST_FDMAN RTE_LOGTYPE_USER1 +RTE_LOG_REGISTER_SUFFIX(vhost_fdset_logtype, fdset, INFO); +#define RTE_LOGTYPE_VHOST_FDMAN vhost_fdset_logtype #define FDPOLLERR (POLLERR | POLLHUP | POLLNVAL) diff --git a/lib/vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c index f02bf865c349..fa49ffa07099 100644 --- a/lib/vhost/vhost_crypto.c +++ b/lib/vhost/vhost_crypto.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include @@ -16,22 +17,21 @@ #define IV_OFFSET (sizeof(struct rte_crypto_op) + \ sizeof(struct rte_crypto_sym_op)) -#ifdef RTE_LIBRTE_VHOST_DEBUG +RTE_LOG_REGISTER_SUFFIX(vhost_crypto_logtype, crypto, INFO); +#define RTE_LOGTYPE_VHOST_CRYPTO vhost_crypto_logtype + #define VC_LOG_ERR(fmt, args...) \ - RTE_LOG(ERR, USER1, "[%s] %s() line %u: " fmt "\n", \ - "Vhost-Crypto", __func__, __LINE__, ## args) + RTE_LOG(ERR, VHOST_CRYPTO, "%s() line %u: " fmt "\n", \ + __func__, __LINE__, ## args) #define VC_LOG_INFO(fmt, args...) \ - RTE_LOG(INFO, USER1, "[%s] %s() line %u: " fmt "\n", \ - "Vhost-Crypto", __func__, __LINE__, ## args) + RTE_LOG(INFO, VHOST_CRYPTO, "%s() line %u: " fmt "\n", \ + __func__, __LINE__, ## args) +#ifdef RTE_LIBRTE_VHOST_DEBUG #define VC_LOG_DBG(fmt, args...) \ - RTE_LOG(DEBUG, USER1, "[%s] %s() line %u: " fmt "\n", \ - "Vhost-Crypto", __func__, __LINE__, ## args) + RTE_LOG(DEBUG, VHOST_CRYPTO, "%s() line %u: " fmt "\n", \ + __func__, __LINE__, ## args) #else -#define VC_LOG_ERR(fmt, args...) \ - RTE_LOG(ERR, USER1, "[VHOST-Crypto]: " fmt "\n", ## args) -#define VC_LOG_INFO(fmt, args...) \ - RTE_LOG(INFO, USER1, "[VHOST-Crypto]: " fmt "\n", ## args) #define VC_LOG_DBG(fmt, args...) #endif From patchwork Tue Feb 21 18:55:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 124310 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 3AF0E41D31; Tue, 21 Feb 2023 19:56:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1270E42DA4; Tue, 21 Feb 2023 19:56:06 +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 EA8DE42C4D for ; Tue, 21 Feb 2023 19:56:01 +0100 (CET) Received: by mail-pl1-f176.google.com with SMTP id h14so6267941plf.10 for ; Tue, 21 Feb 2023 10:56:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; 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=XQmC9K3TeXMgFqeLevvNO7XT0CzfA3gO5d2+9bnbNsc=; b=0hjZNGjFl+dLLODL0nMUW/B300YlMXGUJK9HoF/kReNc+fIXDobQryQZbUGZQCaJpf pjp+I02ipECJE7dCEKadOUnhsgI8916D/k0rnA1KuKvGSqL9eM9IcXvtPI58kj3VPU99 mD/fxvIfzIsKPCGrCQP9DAI9iu19HoVSasF8AZhBgH6iv0HMnRD1/NHKAm9jCyCzhELa lJlthEPiV+qadGnjxJjOAiVyiyC/d8XinIiUu+tCx9TaPq2gaJK6UQIG6TynS/lr9C7C qyZnT6S0/MRb9WgyvBReIAO6rF8kqRIZ8YSr7d2+faygyEwO8QllPnEI3b2YAO85A1T6 DN8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=XQmC9K3TeXMgFqeLevvNO7XT0CzfA3gO5d2+9bnbNsc=; b=U3VhjsTtuSf6T8uyanEvyTN8cfHQV1jvw/0FRVPusmYdrmexbCJW/B4K6tvom2kpf9 dywDTGI6b7bMjiEg4pwaxul6XFBuUE5RCfxIIbvWHKra2Px13tggdnCnUxr903AKmGpQ IJbiOR6TPu1QwTS8wPbaEEgyylBNS3hXVOmFZcBLd4F1lQnwHfHejnzp111brI6cGJJx SpElyyAkExUHec38MtNJBI5XdwD5S9hQGnIhXsrhaB7cahEEeqjMmi15DyrPgRxvD0qB FN1HkMVkmsQ1AuZ8qJwf+Su2hNHP2/LhgMOyVaba1wEPD8lcdEpxbY99yiIuqUlh0n8T /k0A== X-Gm-Message-State: AO0yUKXse42r292QToAKrT89GVPDCQGau4GGPhYwM9G4j3aQG4a0oDhV 6OIPzhIwj4PcPkQ1hMdvkWxiAWThf3sz/VLMnTM= X-Google-Smtp-Source: AK7set/sfHbxFQjMvGspmXULjtqaBfjvO0Zr8eh1siSr2gWG81VwNZaqqOvOyY7pXiaW0dIaFkb+dg== X-Received: by 2002:a17:903:846:b0:19a:ad29:900f with SMTP id ks6-20020a170903084600b0019aad29900fmr5973886plb.58.1677005760895; Tue, 21 Feb 2023 10:56:00 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id iz15-20020a170902ef8f00b00189c4b8ca21sm6357895plb.18.2023.02.21.10.56.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 10:56:00 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , kai.ji@intel.com Subject: [PATCH v7 5/5] ipsec: fix usage of RTE_LOGTYPE_USER1 Date: Tue, 21 Feb 2023 10:55:53 -0800 Message-Id: <20230221185553.513432-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221185553.513432-1-stephen@networkplumber.org> References: <0230208044825.1682620-1-stephen@networkplumber.org> <20230221185553.513432-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 There already is a logtype in this driver, use it! Fixes: b35848bc01f6 ("crypto/ipsec_mb: add multi-process IPC request handler") Cc: kai.ji@intel.com Signed-off-by: Stephen Hemminger --- drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c index 3e52f9567401..e9eb0d15b794 100644 --- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c +++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c @@ -7,6 +7,7 @@ #include #include +#include #include "ipsec_mb_private.h" @@ -125,7 +126,7 @@ ipsec_mb_secondary_qp_op(int dev_id, int qp_id, qp_req_msg.num_fds = 0; ret = rte_mp_request_sync(&qp_req_msg, &qp_resp, &ts); if (ret) { - RTE_LOG(ERR, USER1, "Create MR request to primary process failed."); + IPSEC_MB_LOG(ERR, "Create MR request to primary process failed."); return -1; } qp_resp_msg = &qp_resp.msgs[0];