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 6138042868; Thu, 30 Mar 2023 01:42:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8958C42D3D; Thu, 30 Mar 2023 01:41:25 +0200 (CEST) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mails.dpdk.org (Postfix) with ESMTP id ABB9142D69 for ; Thu, 30 Mar 2023 01:41:17 +0200 (CEST) Received: by mail-pj1-f52.google.com with SMTP id x15so15632131pjk.2 for ; Wed, 29 Mar 2023 16:41:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; t=1680133276; 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=KG1l4G35s0adQWHb2a8klPUSGEkiLy1z+c3HlBssSyQ=; b=ZTtSJYswPqMLwH/bNWSNFUd/D4k5f86oNEwpAh09jXATL0KLsnB1+5Aou/u8scAuUs fz1v/77rv26T99zSaEeeio8/F0f9odrFZNkf1sqPiTOIrCqRHN5WW3SM02YtBId/yseH LsxwSFXaJYqxxtj3i3r1qi+BOZ3f9ppKeEcAycZHq1y3iwb12FpSjjtyY2Wnvc0UgoSU PQfkOBuuw1T9Mz6RBUj+ZAMMulCoZkozRHbadVEjlidVrKxtC6OT1JcrJbGWr9Ul+cza 0xI43weLWxHpRBtXK1ayBmA2mHTD5KZ7zCgeDcSVJ7Vfu4QoU4AEQqMAgWxO0zVieytc SF8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680133276; 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=KG1l4G35s0adQWHb2a8klPUSGEkiLy1z+c3HlBssSyQ=; b=c1yx+tYYaQny3WGPSYZJBCLrvB2Tq8lYRubchaQSafupDfvm7wCDkM8BKgyA60JRqZ eRLV6i3Sswmfcx0KuXJNC2MYm75eaPNErehHQH2kGnLkfP+9ZvkEdIbxy7IdmJIzFeyc tO7eTdXbfbPEHnS1xFBJUZL42fgZW+ARfetIw8CEjvMznJQ11HYNgo+JwiSA1g6L0+sd 1M1qJ1EOrhAL+6usz+8IHIY1YW+DPIlpikMDYsO4r2dXvJI+biTMZGO3KTB2HtvODnUI mKbjavW4sm+M1Ul0obFVkY6XmgkUHUH/GWRgtlAp6g9lGLu56UCtlwzDPwpVUyjoTQF+ nYxA== X-Gm-Message-State: AAQBX9eFvXVdm+C3GzGVRo04MeBDiowDUd/6juxBdQUlHrWtrxpVen6Y bM1w/2/jy5Xyn6WsgOwGzWGkcf3QrrNCz25EtLgjBw== X-Google-Smtp-Source: AKy350bjrBb+Mt9Z7SWN7W38c2rHuL1/7TDmC9wydCjHvwLgE2XE/J2JgKIYY+CWXcCB1mFz3vo7WQ== X-Received: by 2002:a17:903:24d:b0:1a2:4efa:fcc0 with SMTP id j13-20020a170903024d00b001a24efafcc0mr13323078plh.1.1680133276537; Wed, 29 Mar 2023 16:41:16 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id f10-20020a17090274ca00b0019c2b1c4db1sm23360095plt.239.2023.03.29.16.41.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 16:41:15 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Yipeng Wang , Sameh Gobriel , Bruce Richardson , Vladimir Medvedkin Subject: [PATCH v12 17/22] hash: move rte_thash_gfni stubs out of header file Date: Wed, 29 Mar 2023 16:40:44 -0700 Message-Id: <20230329234049.11071-18-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230329234049.11071-1-stephen@networkplumber.org> References: <20230329234049.11071-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 Having stubs in header file makes it harder to update RTE_LOG(). Also modify to only print warning once. Signed-off-by: Stephen Hemminger --- lib/hash/meson.build | 8 ++++++- lib/hash/rte_thash_gfni.c | 47 +++++++++++++++++++++++++++++++++++++++ lib/hash/rte_thash_gfni.h | 30 ++++++++----------------- lib/hash/version.map | 4 ++++ 4 files changed, 67 insertions(+), 22 deletions(-) create mode 100644 lib/hash/rte_thash_gfni.c diff --git a/lib/hash/meson.build b/lib/hash/meson.build index 2f757d45f9bc..e56ee8572564 100644 --- a/lib/hash/meson.build +++ b/lib/hash/meson.build @@ -17,7 +17,13 @@ indirect_headers += files( 'rte_thash_x86_gfni.h', ) -sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c', 'rte_thash.c') +sources = files( + 'rte_cuckoo_hash.c', + 'rte_fbk_hash.c', + 'rte_thash.c', + 'rte_thash_gfni.c' +) + deps += ['net'] deps += ['ring'] deps += ['rcu'] diff --git a/lib/hash/rte_thash_gfni.c b/lib/hash/rte_thash_gfni.c new file mode 100644 index 000000000000..eb334185725c --- /dev/null +++ b/lib/hash/rte_thash_gfni.c @@ -0,0 +1,47 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2021 Intel Corporation + */ + +#include + +#include +#include +#include + +#ifndef RTE_THASH_GFNI_DEFINED + +uint32_t +rte_thash_gfni(const uint64_t *mtrx __rte_unused, + const uint8_t *key __rte_unused, int len __rte_unused) +{ + static bool warned; + + if (!warned) { + warned = true; + RTE_LOG(ERR, HASH, + "%s is undefined under given arch\n", __func__); + } + + return 0; +} + +void +rte_thash_gfni_bulk(const uint64_t *mtrx __rte_unused, + int len __rte_unused, uint8_t *tuple[] __rte_unused, + uint32_t val[], uint32_t num) +{ + unsigned int i; + + static bool warned; + + if (!warned) { + warned = true; + RTE_LOG(ERR, HASH, + "%s is undefined under given arch\n", __func__); + } + + for (i = 0; i < num; i++) + val[i] = 0; +} + +#endif diff --git a/lib/hash/rte_thash_gfni.h b/lib/hash/rte_thash_gfni.h index ef90faa302d1..4fc92984077e 100644 --- a/lib/hash/rte_thash_gfni.h +++ b/lib/hash/rte_thash_gfni.h @@ -9,13 +9,14 @@ extern "C" { #endif +#include + #include -#include +#include +#include #ifdef RTE_ARCH_X86 - #include - #endif #ifndef RTE_THASH_GFNI_DEFINED @@ -38,13 +39,8 @@ extern "C" { * Calculated Toeplitz hash value. */ __rte_experimental -static inline uint32_t -rte_thash_gfni(const uint64_t *mtrx __rte_unused, - const uint8_t *key __rte_unused, int len __rte_unused) -{ - RTE_LOG(ERR, HASH, "%s is undefined under given arch\n", __func__); - return 0; -} +uint32_t +rte_thash_gfni(const uint64_t *mtrx, const uint8_t *key, int len); /** * Bulk implementation for Toeplitz hash. @@ -67,17 +63,9 @@ rte_thash_gfni(const uint64_t *mtrx __rte_unused, * Number of tuples to hash. */ __rte_experimental -static inline void -rte_thash_gfni_bulk(const uint64_t *mtrx __rte_unused, - int len __rte_unused, uint8_t *tuple[] __rte_unused, - uint32_t val[], uint32_t num) -{ - unsigned int i; - - RTE_LOG(ERR, HASH, "%s is undefined under given arch\n", __func__); - for (i = 0; i < num; i++) - val[i] = 0; -} +void +rte_thash_gfni_bulk(const uint64_t *mtrx, int len, uint8_t *tuple[], + uint32_t val[], uint32_t num); #endif /* RTE_THASH_GFNI_DEFINED */ diff --git a/lib/hash/version.map b/lib/hash/version.map index bdcebd19c29b..f03b047b2eec 100644 --- a/lib/hash/version.map +++ b/lib/hash/version.map @@ -51,4 +51,8 @@ EXPERIMENTAL { rte_thash_complete_matrix; rte_thash_get_gfni_matrices; rte_thash_gfni_supported; + + # added in 22.07 + rte_thash_gfni; + rte_thash_gfni_bulk; }; -- 2.39.2