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 3FB2D41D32; Tue, 21 Feb 2023 20:04:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 18D1043043; Tue, 21 Feb 2023 20:03:04 +0100 (CET) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mails.dpdk.org (Postfix) with ESMTP id 6F0C642F82 for ; Tue, 21 Feb 2023 20:02:38 +0100 (CET) Received: by mail-pj1-f53.google.com with SMTP id i1-20020a17090ad34100b00234463de251so5899698pjx.3 for ; Tue, 21 Feb 2023 11:02:38 -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=5NA6mvX+cVJ8QnJL/IRAQX0yxV5V0Dus9MqtpxM1xKc=; b=pU7ATZO1GT5bHrP9OpbpvIZejwa6fkomtH3T6hFNV7QJPHTXxAvN+QD32YbScPNlyW xi7npFYyV9neBVbdoH+TNbY3UJfDVVnwLHD6eUDjao2m6uGDIoPcqSGaaQNvHv513RSg V2cGXGCXFg2NKuZrGcg4IxVBz0tlWZxWjEhH/9YZDcVEnn+5ZPeth0EFt2Sr97GhIOq4 LyKEAz1t8WqplMgXrExLLqylIK4A8HkL4rA7mLFV8D8PjzhPLndJEZvsq7uwVvaT67HL QQ9Q3nJttVlPGgLxV1R2dxU2k/uFMt5iYEGXLKjPffPRHkveOxYGyOzAwcHKgx5BvgPc 4ySg== 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=5NA6mvX+cVJ8QnJL/IRAQX0yxV5V0Dus9MqtpxM1xKc=; b=Lg3U/VZWK1GWxcwbKuCH3CfAXhVsWaD/Cd5QiJrCywd1r623boh+93leKRtxonDbBI AmoywJ2K24zZArrliEOvuHVTimFWPA5/4Xg9w7qtuVRx1+Ebd3UsFiFssT3bXfjgi3IV xlCgeviPW72EL3uMKYjMJ6WJ0tw39VfRr2QqaB1myaWyQkPMCNlRLdtUQBA96nrujGV7 9M4rqvGYNpw9q4xf1aGM9GAEzWvP5vKFpKcO1eRxg5YltyueZC6VpaSe7talJS5sXAS7 EDyxQdiDjhjyXo9ee5ZX/kGtN03IKfXzBSbl7R6yjvDDPQecDmOkoQbMMQs/CzcpXy0C HYxg== X-Gm-Message-State: AO0yUKWw5th3B86wVz6uXJuNnc//H5CRBjMBKu7uXnSTiRJGi7bb+gI/ lT5LfUlfd1rsrkFlUn++IkozJehLmdrd//73JC8= X-Google-Smtp-Source: AK7set8VQmmcr7oiGXYflNYNIgHHAppw8fsAi3jzETKfQIPKkkgx9ZRRuXtxcYhJTp13C7cY4NCtng== X-Received: by 2002:a17:902:d50d:b0:196:704e:2c9a with SMTP id b13-20020a170902d50d00b00196704e2c9amr9240513plg.22.1677006157391; Tue, 21 Feb 2023 11:02:37 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id jc4-20020a17090325c400b001991e59fde6sm10213018plb.216.2023.02.21.11.02.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 11:02:37 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Yipeng Wang , Sameh Gobriel , Bruce Richardson , Vladimir Medvedkin Subject: [PATCH v9 22/22] hash: convert RTE_LOGTYPE_HASH to dynamic type Date: Tue, 21 Feb 2023 11:02:08 -0800 Message-Id: <20230221190208.514276-23-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221190208.514276-1-stephen@networkplumber.org> References: <20230207204151.1503491-1-stephen@networkplumber.org> <20230221190208.514276-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 Use dynamic type for hash and add subtypes for crc and gfni. Signed-off-by: Stephen Hemminger --- lib/eal/common/eal_common_log.c | 1 - lib/eal/include/rte_log.h | 2 +- lib/hash/rte_cuckoo_hash.c | 5 +++++ lib/hash/rte_fbk_hash.c | 5 +++++ lib/hash/rte_thash.c | 3 +++ lib/hash/rte_thash_gfni.c | 3 +++ 6 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c index a3498d1a2faf..704924e822d0 100644 --- a/lib/eal/common/eal_common_log.c +++ b/lib/eal/common/eal_common_log.c @@ -350,7 +350,6 @@ struct logtype { static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_EAL, "lib.eal"}, {RTE_LOGTYPE_PMD, "pmd"}, - {RTE_LOGTYPE_HASH, "lib.hash"}, {RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"}, {RTE_LOGTYPE_EVENTDEV, "lib.eventdev"}, {RTE_LOGTYPE_USER1, "user1"}, diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h index 7473fd53505a..29db07881a5a 100644 --- a/lib/eal/include/rte_log.h +++ b/lib/eal/include/rte_log.h @@ -32,7 +32,7 @@ extern "C" { /* was RTE_LOGTYPE_MEMPOOL */ /* 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. */ + /* was RTE_LOGTYPE_HASH */ /* was RTE_LOGTYPE_LPM */ /* was RTE_LOGTYPE_KNI */ /* was RTE_LOGTYPE_ACL */ diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c index 829b79c89a27..e2b07bfbad71 100644 --- a/lib/hash/rte_cuckoo_hash.c +++ b/lib/hash/rte_cuckoo_hash.c @@ -24,6 +24,11 @@ #include #include "rte_hash.h" + +/* needs to be before rte_cuckoo_hash.h */ +RTE_LOG_REGISTER_DEFAULT(hash_logtype, INFO); +#define RTE_LOGTYPE_HASH hash_logtype + #include "rte_cuckoo_hash.h" /* Mask of all flags supported by this version */ diff --git a/lib/hash/rte_fbk_hash.c b/lib/hash/rte_fbk_hash.c index 538b23a4030a..b4c4c191abdc 100644 --- a/lib/hash/rte_fbk_hash.c +++ b/lib/hash/rte_fbk_hash.c @@ -8,6 +8,8 @@ #include #include + +#include #include #include #include @@ -18,6 +20,9 @@ #include "rte_fbk_hash.h" +RTE_LOG_REGISTER_SUFFIX(fbk_hash_logtype, fbk, INFO); +#define RTE_LOGTYPE_HASH fbk_hash_logtype + TAILQ_HEAD(rte_fbk_hash_list, rte_tailq_entry); static struct rte_tailq_elem rte_fbk_hash_tailq = { diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c index 0249883b8d07..c1fd2e34c9d4 100644 --- a/lib/hash/rte_thash.c +++ b/lib/hash/rte_thash.c @@ -13,6 +13,9 @@ #include #include +RTE_LOG_REGISTER_SUFFIX(thash_logtype, thash, INFO); +#define RTE_LOGTYPE_HASH thash_logtype + #define THASH_NAME_LEN 64 #define TOEPLITZ_HASH_LEN 32 diff --git a/lib/hash/rte_thash_gfni.c b/lib/hash/rte_thash_gfni.c index eb334185725c..35206d575153 100644 --- a/lib/hash/rte_thash_gfni.c +++ b/lib/hash/rte_thash_gfni.c @@ -10,6 +10,9 @@ #ifndef RTE_THASH_GFNI_DEFINED +RTE_LOG_REGISTER_SUFFIX(hash_gfni_logtype, gfni, INFO); +#define RTE_LOGTYPE_HASH hash_gfni_logtype + uint32_t rte_thash_gfni(const uint64_t *mtrx __rte_unused, const uint8_t *key __rte_unused, int len __rte_unused) -- 2.39.1