From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 36123433FD; Tue, 5 Dec 2023 03:15:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E55CB42DD1; Tue, 5 Dec 2023 03:14:04 +0100 (CET) Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by mails.dpdk.org (Postfix) with ESMTP id 09C8342D45 for ; Tue, 5 Dec 2023 03:14:00 +0100 (CET) Received: by mail-oi1-f181.google.com with SMTP id 5614622812f47-3b845ba9ba9so3213650b6e.3 for ; Mon, 04 Dec 2023 18:13:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742439; x=1702347239; 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=4/myHYbjXFiJxl7OvS6hCJ2kjzFHmGbdNlLVvZOdq3I=; b=kfzmwZBFkcMBSeiAK5yWY9uFiIg7RCDlyoDzkHX2+lnYV7bLG5QXSPqCdqAknXKezk QILPM59f9wtcN87Pyf2hU4wz5Q1Vh/AvvwCnEGXPTj5WsGtT8sDMTTDfiaZMLEV6k3Y+ 3ORpie0tJEWZN0dvjGSYW3qI9qlWzOefBNx6kS6IOZfxlkXKCuoprUpXAo2QkYvhZb0W 5bOjhUPdCvqIcSx8FuyHMpnca74OWswj0hPw9DSfWhO7Ozvpn8RzxFRQahH7DJ+3jLwy XP6g0YxzjbAfS44csYPIwnHRqxr8zmk2129q2ShbHxDudCVEcjHQi5hciB3YEBlbbBu+ 2ydQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742439; x=1702347239; 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=4/myHYbjXFiJxl7OvS6hCJ2kjzFHmGbdNlLVvZOdq3I=; b=EEYJ/BRPB9V0qJR7u2pwmrq6IBjimIUd/ljPgJtXdeXigC6mdQA+jvPNCtfnHOXA8Q YYxFE7mFOpnMwrP/37jaqpz8X53qIsPJ0vXTNQNvVAXbIuuQ7AQY7ELn+aVS2bZ7g2EG wHZ8AoSiZqsXZAbugL91PKjHOqbZBxWdws733ROKojc1RYBNT4xcqp/BUxCCn3eP/Mpk 2TSPlPqOHGTI3KxzaD6OmInuef32UXbsBtug9ovx7fFFBmTr5VE3bWU1NGD5HHEQLgxp bIiPSMY+yh1SCdgy6JmD70hlgkkiEp510k4yQ9ZY7i8xBlFBOTfV8ZulU0w4Pr2704+R SWjQ== X-Gm-Message-State: AOJu0Yx5O9fLaVa5nsZXoqd2ZeLCbZdk8+oD1mJVINTPlnTKaFEPRxS+ A4KG1XgLlegesJ/BbS1jMUIkqYE7N3uaQ3pbono= X-Google-Smtp-Source: AGHT+IFEhPacEGY0WXqjQNSeVljlgu+asurG0IqvRwOBN7ihVuBUhCNUITuI0orex5pl9gUo/31hbA== X-Received: by 2002:a05:6808:200d:b0:3b8:b2f1:8b44 with SMTP id q13-20020a056808200d00b003b8b2f18b44mr5652358oiw.71.1701742439436; Mon, 04 Dec 2023 18:13:59 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:59 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Vladimir Medvedkin , Bruce Richardson Subject: [PATCH 12/18] lpm: convert RTE_LOGTYPE_LPM to dynamic types Date: Mon, 4 Dec 2023 18:09:50 -0800 Message-ID: <20231205021330.260017-13-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Split lpm and lpm6 into separate log types since they are in different files and user may want to change log levels for IPv4 vs IPv6. For rib and fib libraries give them own types as well. Signed-off-by: Stephen Hemminger --- lib/fib/fib_log.h | 4 ++++ lib/fib/rte_fib.c | 3 +++ lib/fib/rte_fib6.c | 2 ++ lib/log/log.c | 1 - lib/log/rte_log.h | 2 +- lib/lpm/lpm_log.h | 4 ++++ lib/lpm/rte_lpm.c | 3 +++ lib/lpm/rte_lpm6.c | 1 + lib/rib/rib_log.h | 4 ++++ lib/rib/rte_rib.c | 3 +++ lib/rib/rte_rib6.c | 3 +++ 11 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 lib/fib/fib_log.h create mode 100644 lib/lpm/lpm_log.h create mode 100644 lib/rib/rib_log.h diff --git a/lib/fib/fib_log.h b/lib/fib/fib_log.h new file mode 100644 index 000000000000..c731c820f621 --- /dev/null +++ b/lib/fib/fib_log.h @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +extern int fib_logtype; +#define RTE_LOGTYPE_LPM fib_logtype diff --git a/lib/fib/rte_fib.c b/lib/fib/rte_fib.c index 0c3b20e00a5a..f88e71a59d5a 100644 --- a/lib/fib/rte_fib.c +++ b/lib/fib/rte_fib.c @@ -17,6 +17,9 @@ #include #include "dir24_8.h" +#include "fib_log.h" + +RTE_LOG_REGISTER_DEFAULT(fib_logtype, INFO); TAILQ_HEAD(rte_fib_list, rte_tailq_entry); static struct rte_tailq_elem rte_fib_tailq = { diff --git a/lib/fib/rte_fib6.c b/lib/fib/rte_fib6.c index 28c69b38999f..ab1d9604796f 100644 --- a/lib/fib/rte_fib6.c +++ b/lib/fib/rte_fib6.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -17,6 +18,7 @@ #include #include "trie.h" +#include "fib_log.h" TAILQ_HEAD(rte_fib6_list, rte_tailq_entry); static struct rte_tailq_elem rte_fib6_tailq = { diff --git a/lib/log/log.c b/lib/log/log.c index f118e4c7fbaa..95e0ba1c6b51 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -354,7 +354,6 @@ static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_EAL, "lib.eal"}, {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_HASH, "lib.hash"}, - {RTE_LOGTYPE_LPM, "lib.lpm"}, {RTE_LOGTYPE_METER, "lib.meter"}, {RTE_LOGTYPE_SCHED, "lib.sched"}, {RTE_LOGTYPE_PORT, "lib.port"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index b0421a35954d..8d34ac902b39 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -33,7 +33,7 @@ extern "C" { /* was RTE_LOGTYPE_TIMER */ #define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */ #define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */ -#define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */ + /* was RTE_LOGTYPE_LPM */ /* was RTE_LOGTYPE_KNI */ /* was RTE_LOGTYPE_ACL */ /* was RTE_LOGTYPE_POWER */ diff --git a/lib/lpm/lpm_log.h b/lib/lpm/lpm_log.h new file mode 100644 index 000000000000..a0621b70a5fe --- /dev/null +++ b/lib/lpm/lpm_log.h @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +extern int lpm_logtype; +#define RTE_LOGTYPE_LPM lpm_logtype diff --git a/lib/lpm/rte_lpm.c b/lib/lpm/rte_lpm.c index cdcd1b7f9e47..0ca82147866a 100644 --- a/lib/lpm/rte_lpm.c +++ b/lib/lpm/rte_lpm.c @@ -18,6 +18,9 @@ #include #include "rte_lpm.h" +#include "lpm_log.h" + +RTE_LOG_REGISTER_DEFAULT(lpm_logtype, INFO); TAILQ_HEAD(rte_lpm_list, rte_tailq_entry); diff --git a/lib/lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c index 8d21aeddb83c..873cc8bc267d 100644 --- a/lib/lpm/rte_lpm6.c +++ b/lib/lpm/rte_lpm6.c @@ -20,6 +20,7 @@ #include #include "rte_lpm6.h" +#include "lpm_log.h" #define RTE_LPM6_TBL24_NUM_ENTRIES (1 << 24) #define RTE_LPM6_TBL8_GROUP_NUM_ENTRIES 256 diff --git a/lib/rib/rib_log.h b/lib/rib/rib_log.h new file mode 100644 index 000000000000..f3ee513ca854 --- /dev/null +++ b/lib/rib/rib_log.h @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +extern int rib_logtype; +#define RTE_LOGTYPE_LPM rib_logtype diff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c index 486e8216dfeb..251d0d4ef19e 100644 --- a/lib/rib/rte_rib.c +++ b/lib/rib/rte_rib.c @@ -16,6 +16,9 @@ #include +RTE_LOG_REGISTER_DEFAULT(rib_logtype, INFO); +#define RTE_LOGTYPE_LPM rib_logtype + TAILQ_HEAD(rte_rib_list, rte_tailq_entry); static struct rte_tailq_elem rte_rib_tailq = { .name = "RTE_RIB", diff --git a/lib/rib/rte_rib6.c b/lib/rib/rte_rib6.c index 94ff434978b2..ad3d48ab8e1a 100644 --- a/lib/rib/rte_rib6.c +++ b/lib/rib/rte_rib6.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -16,6 +17,8 @@ #include +#include "rib_log.h" + #define RTE_RIB_VALID_NODE 1 #define RIB6_MAXDEPTH 128 /* Maximum length of a RIB6 name. */ -- 2.42.0