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 A9A69430C3; Mon, 21 Aug 2023 18:12:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 23852432BD; Mon, 21 Aug 2023 18:10:18 +0200 (CEST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mails.dpdk.org (Postfix) with ESMTP id 4992643295 for ; Mon, 21 Aug 2023 18:10:12 +0200 (CEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1bdca7cc28dso27171385ad.1 for ; Mon, 21 Aug 2023 09:10:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692634211; x=1693239011; 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=dp2sKZAUJiFJEpSNsnpsQCoeXrioe+3xH+HBOtAZGp4=; b=dX/D9A79Dj7putfkd/fyo+uwhIinVi3YZ/+tqa8kA2CH1J5GKBjjflyeRAPuYlqEdn 6TiisrYOFoodHt5IDxdEA6ox6J/OYiitr8xve/Ta8kxFCRUUqpUuDmsGdWAmY74KjUYc dkqK5YmXTtUpHj3qOfI5GLw27dbky8f7li5QntodLTKE71qwSEwSBaYK3GtGLbO0o+mq aF/vboKOyB6BNEiraKuKQ9PdD2uXVvMiN1mQRUzPbV1MdsYWe4EjktfWfN+DMhqFdhgU Nz9VWbmkPdOLzETJiE+/fzElwPQEPx3afRy814mG5Y0iR/jF0GMsif55xdbTXcm/FS+D qdxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692634211; x=1693239011; 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=dp2sKZAUJiFJEpSNsnpsQCoeXrioe+3xH+HBOtAZGp4=; b=foeOOnfludnN3jRO9cXUENfFa6vGytFSCzX3TH2ynnwcHlZBPutakT4Lxve6HWr5D0 boa5+tTz72y48fliyEA/fQB+FOeKrwTBQofPEiIXZR+HKG0P4LQYfgfSJdkwTcK59mEP d5XCn/lgTyf2rtwJuPLq7p/lpDW1SKiQYGsWt9j+u7bNgC81Eice2TsE0gGj5w9QCwed 6RzI4RLGTAoyQ8+E+RIeB5Tmv2RvLk3Mye7FcquKV57Kh5656xQe2+HZhbx7KbosACGu gKYfhIH1Uctteb16ZQxx2HZLBXYrBvK891jLz229oly3w17jqa8mnlFNQX9MBQibRdU8 MgYQ== X-Gm-Message-State: AOJu0Yyq/pKoQf8aPEXanoDjFaoAnerp5gAMjsSOKHeByhLsBLWSnMr6 OplRsv2o2WfDIkpdB7eLb+pMJfJ8voXVqTRyrBjFrhPX X-Google-Smtp-Source: AGHT+IEDLg2l2ccnPGDJrYyb6qFA5M/QvhuBSauBwhJfVduMvoRYoBm73r1eYWWdzuIkve7/doutlA== X-Received: by 2002:a17:902:d511:b0:1bb:ffcc:8eba with SMTP id b17-20020a170902d51100b001bbffcc8ebamr9170156plg.58.1692634211282; Mon, 21 Aug 2023 09:10:11 -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.10.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 09:10:10 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Yipeng Wang , Sameh Gobriel , Bruce Richardson , Vladimir Medvedkin Subject: [PATCH v13 18/21] hash: convert RTE_LOGTYPE_HASH to dynamic type Date: Mon, 21 Aug 2023 09:09:18 -0700 Message-Id: <20230821160921.383832-19-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 Use dynamic type for hash and add subtypes for crc and gfni. Signed-off-by: Stephen Hemminger --- 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 +++ lib/log/log.c | 1 - lib/log/rte_log.h | 2 +- 6 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c index d92a903bb39b..98d4366770d4 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 2228af576bb9..fbee0b2188e5 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) diff --git a/lib/log/log.c b/lib/log/log.c index c089fc66affe..3ce9300754dd 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -353,7 +353,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_TABLE, "lib.table"}, {RTE_LOGTYPE_PIPELINE, "lib.pipeline"}, {RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index b11aec69af78..4d1b892ab689 100644 --- a/lib/log/rte_log.h +++ b/lib/log/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 */ -- 2.39.2