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 71C08430C3; Mon, 21 Aug 2023 18:10:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB1544327B; Mon, 21 Aug 2023 18:10:01 +0200 (CEST) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mails.dpdk.org (Postfix) with ESMTP id BB52243272 for ; Mon, 21 Aug 2023 18:09:58 +0200 (CEST) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1bdb7b0c8afso18640305ad.3 for ; Mon, 21 Aug 2023 09:09:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692634197; x=1693238997; 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=bpgY5jMWYUqWWnDZ2zy91qSrFZg8i5EccFuswJwYt5M=; b=gD5/IsF+RY/EfLy4HuP2/7ZDBfYQ3avWzqEjirBJ44f6ojXdPIEGsPYHzaokL0QrOk C+q99kmoZF2sJ+Zap34qrEFx3Ipwf5/UuzRj2b8/yo912y9wHTVVwIyqDTDRVYQZa3ND KzuD3pxZNMtP3o7shKcw8wM9kglqltOHvkMvlbWV0KF5s1vDlHrbJy2u/85NqilYTH8E KW+bUW5MXjKC+6i1OM5OToGPfX3h+CQCOJcDnXxP6LRhdTKUtSzoLRjvvMA5aybd9bSD z9v96oTrKsNROnSxsrRz1RXr5m9gK6XTAgGv5ZNGLEu4/6mSjyNuQsHd+8VlIXIaRZE3 JAvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692634197; x=1693238997; 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=bpgY5jMWYUqWWnDZ2zy91qSrFZg8i5EccFuswJwYt5M=; b=B1AV3tz27gXhVo3C++t0X669Ol/6f6skCY3I3ZdEZ9K+NpNnzmCDKrqWDnnqmSRHya PE0HxFV3uAVSao1J8wsaBtG4QoOyEe8btNFAixJKkDEqb+A8SqSm/GeZLPSr+lccSK8b uo1E7n6I4vqmmJxK4IWpX3dQKfU+hetZ1wD7ulHP4O9YWcEf4vGeswByUottBnCsrOSW NedyDzSo2j6kxmjjQV3nuGLLba2WIZ+Ugj05mdvYWdd9QFad+ZkkbGTvOvRV1zY8eO3c 6h6oCJsFJomygSJjpgPoSg/3baPrpQRwBpUemZN6YQVZWUEST9fAxHyR5X+yaeOL2TYT n+BA== X-Gm-Message-State: AOJu0YxeOYImER5l+3s+fw5XjdFFpZlTkh9bIoQ8D7Xy/uhkuuWFdACB plm9xgRWQIB5x6632yo9ShqQtyHX1qraER5++hqZgVyz X-Google-Smtp-Source: AGHT+IEbn0czPOZ8R2ICSNxpbLusf/vMHixXpoodOYgyx6jB+4mGC+pClQ3T1+MSsOZ8bBqVPQUTMA== X-Received: by 2002:a17:902:d507:b0:1b3:8862:9823 with SMTP id b7-20020a170902d50700b001b388629823mr5323140plg.28.1692634197416; Mon, 21 Aug 2023 09:09:57 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id i1-20020a17090332c100b001bf2dcfe352sm7208159plr.234.2023.08.21.09.09.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 09:09:56 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Konstantin Ananyev Subject: [PATCH v13 06/21] acl: convert RTE_LOGTYPE_ACL to dynamic type Date: Mon, 21 Aug 2023 09:09:06 -0700 Message-Id: <20230821160921.383832-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230821160921.383832-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20230821160921.383832-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 Get rid of RTE_LOGTYPE_ACL and RTE_LOGTYPE_MALLOC. For ACL library use a dynamic type. The one message using RTE_LOGTYPE_MALLOC should have been under the ACL logtype anyway. The test code should not have been using fixed log type so just change that to stderr. Signed-off-by: Stephen Hemminger --- app/test/test_acl.c | 2 +- lib/acl/acl.h | 1 + lib/acl/acl_bld.c | 3 +++ lib/acl/acl_gen.c | 1 + lib/acl/acl_log.h | 6 ++++++ lib/acl/rte_acl.c | 3 +++ lib/acl/tb_mem.c | 3 ++- lib/log/log.c | 2 -- lib/log/rte_log.h | 4 ++-- 9 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 lib/acl/acl_log.h diff --git a/app/test/test_acl.c b/app/test/test_acl.c index 623f34682e69..7de54d4c8901 100644 --- a/app/test/test_acl.c +++ b/app/test/test_acl.c @@ -154,7 +154,7 @@ rte_acl_ipv4vlan_add_rules(struct rte_acl_ctx *ctx, for (i = 0; i != num; i++) { rc = acl_ipv4vlan_check_rule(rules + i); if (rc != 0) { - RTE_LOG(ERR, ACL, "%s: rule #%u is invalid\n", + fprintf(stderr, "%s: rule #%u is invalid\n", __func__, i + 1); return rc; } diff --git a/lib/acl/acl.h b/lib/acl/acl.h index c8e4e72fabfb..baed9513cb31 100644 --- a/lib/acl/acl.h +++ b/lib/acl/acl.h @@ -225,6 +225,7 @@ int rte_acl_classify_altivec(const struct rte_acl_ctx *ctx, const uint8_t **data, uint32_t *results, uint32_t num, uint32_t categories); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/lib/acl/acl_bld.c b/lib/acl/acl_bld.c index 2816632803bd..22d909309a4c 100644 --- a/lib/acl/acl_bld.c +++ b/lib/acl/acl_bld.c @@ -3,8 +3,11 @@ */ #include +#include + #include "tb_mem.h" #include "acl.h" +#include "acl_log.h" #define ACL_POOL_ALIGN 8 #define ACL_POOL_ALLOC_MIN 0x800000 diff --git a/lib/acl/acl_gen.c b/lib/acl/acl_gen.c index 25e75fec3534..03a47ea231ec 100644 --- a/lib/acl/acl_gen.c +++ b/lib/acl/acl_gen.c @@ -4,6 +4,7 @@ #include #include "acl.h" +#include "acl_log.h" #define QRANGE_MIN ((uint8_t)INT8_MIN) diff --git a/lib/acl/acl_log.h b/lib/acl/acl_log.h new file mode 100644 index 000000000000..6147116d8d12 --- /dev/null +++ b/lib/acl/acl_log.h @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +#include + +extern int acl_logtype; +#define RTE_LOGTYPE_ACL acl_logtype diff --git a/lib/acl/rte_acl.c b/lib/acl/rte_acl.c index a61c3ba188da..650d52a97c32 100644 --- a/lib/acl/rte_acl.c +++ b/lib/acl/rte_acl.c @@ -8,6 +8,9 @@ #include #include "acl.h" +#include "acl_log.h" + +RTE_LOG_REGISTER_DEFAULT(acl_logtype, INFO); TAILQ_HEAD(rte_acl_list, rte_tailq_entry); diff --git a/lib/acl/tb_mem.c b/lib/acl/tb_mem.c index f14d7b4fa26e..6a9d96aaeda2 100644 --- a/lib/acl/tb_mem.c +++ b/lib/acl/tb_mem.c @@ -3,6 +3,7 @@ */ #include "tb_mem.h" +#include "acl_log.h" /* * Memory management routines for temporary memory. @@ -25,7 +26,7 @@ tb_pool(struct tb_mem_pool *pool, size_t sz) size = sz + pool->alignment - 1; block = calloc(1, size + sizeof(*pool->block)); if (block == NULL) { - RTE_LOG(ERR, MALLOC, "%s(%zu)\n failed, currently allocated " + RTE_LOG(ERR, ACL, "%s(%zu)\n failed, currently allocated " "by pool: %zu bytes\n", __func__, sz, pool->alloc); siglongjmp(pool->fail, -ENOMEM); return NULL; diff --git a/lib/log/log.c b/lib/log/log.c index 718922b5e5ac..6f04f75f9a25 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -352,13 +352,11 @@ struct logtype { static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_EAL, "lib.eal"}, - {RTE_LOGTYPE_MALLOC, "lib.malloc"}, {RTE_LOGTYPE_RING, "lib.ring"}, {RTE_LOGTYPE_MEMPOOL, "lib.mempool"}, {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_HASH, "lib.hash"}, {RTE_LOGTYPE_LPM, "lib.lpm"}, - {RTE_LOGTYPE_ACL, "lib.acl"}, {RTE_LOGTYPE_POWER, "lib.power"}, {RTE_LOGTYPE_METER, "lib.meter"}, {RTE_LOGTYPE_SCHED, "lib.sched"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index 8cab1f11f7b8..04dfb3443ea4 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -27,7 +27,7 @@ extern "C" { /* SDK log type */ #define RTE_LOGTYPE_EAL 0 /**< Log related to eal. */ -#define RTE_LOGTYPE_MALLOC 1 /**< Log related to malloc. */ + /* was RTE_LOGTYPE_MALLOC */ #define RTE_LOGTYPE_RING 2 /**< Log related to ring. */ #define RTE_LOGTYPE_MEMPOOL 3 /**< Log related to mempool. */ /* was RTE_LOGTYPE_TIMER */ @@ -35,7 +35,7 @@ extern "C" { #define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */ #define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */ /* was RTE_LOGTYPE_KNI */ -#define RTE_LOGTYPE_ACL 9 /**< Log related to ACL. */ + /* was RTE_LOGTYPE_ACL */ #define RTE_LOGTYPE_POWER 10 /**< Log related to power. */ #define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */ #define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */ -- 2.39.2