From patchwork Sat Apr 27 19:54:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QWJkdWxsYWggw5ZtZXIgWWFtYcOn?= X-Patchwork-Id: 139715 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A913D43EDE; Sat, 27 Apr 2024 21:54:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0791940151; Sat, 27 Apr 2024 21:54:26 +0200 (CEST) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by mails.dpdk.org (Postfix) with ESMTP id 96858400D7 for ; Sat, 27 Apr 2024 21:54:24 +0200 (CEST) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-51acb95b892so4041353e87.2 for ; Sat, 27 Apr 2024 12:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714247664; x=1714852464; 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=cUPp4htGY/guHSYMkkZM21kwHQzaH8OBz4wwJ+ODHh8=; b=CiooP6yCFGE1yJCCM8/xDa0+IYu1hjWvSL4YYBmD074zVC1IYY+Bg7gUkwcesz2Bjl n+6MGdfOVt5X63IDscTTrbTPkOBzY/YRLu7pgPHFTEs3dsLZm72YJISZQ4WAqmlfRl9L Wqr9UMCGiBzcKc938pwsCRjDm5bF5FNdRqRuNIMdyNVeythRS9upKg389rfDoFNWMp8Z +DsFl8yHKs8oFG3ehMW5qm1I13xiCrudzgsxySlLZLXu3s+m7SvjVBXFXGdAuHPlQuDE 2gtqQlf79HpnMK7ZUupVNARjHla1mjtfBNt8ULpspJWDPsiAUG4P8prO5Eq4ovJJVh6r 9RAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714247664; x=1714852464; 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=cUPp4htGY/guHSYMkkZM21kwHQzaH8OBz4wwJ+ODHh8=; b=rwq93luf+c4aGn01YPGFE8lznu/joSKYeeex0Kk858vX9XieJk2enu3/gEOeQoU5Z5 5XySo4CussIeLiSJMCQUdiTrMg5K1Jk268rNDQctnjgM/oZabJCti07Q7xwaYxAYA6yE k2uTbtESxMP9TsjQHlCV3EtsF4ypjXWBRCQy1Fpho9x/WD0aKy8V3jHjdV95RsphvGvj Vz/ZXzZsxO29bKDPLcW+ek53ym2W0B+p+pC5UTN1apqsaIeT79pfolVXBZKDxI1gQXZm tAPA4AUHuuulGKX67UdICcfMYj/adUDSnfQhj+zc35PDy/Kll/QV0iJjNtcLbI3VP2p6 I0HQ== X-Gm-Message-State: AOJu0Yzls0zwgHh5qS81hXD1z+kvabHFljqvfZ2JZ5V3pH0BH6du9EBj 5hf/MpJpSPzgzyeKdUE+dxPDwMnD9nCPPPH504uP8bGMTLF99E+LTYVi9A== X-Google-Smtp-Source: AGHT+IEJl5qDMnmszokkhZR70Xe/gwChKqEs1v7bwLXG9kS/5IqYIBWFFLPsyH2BVTnjiStFIdjWKA== X-Received: by 2002:a05:6512:3af:b0:51a:a65b:ae14 with SMTP id v15-20020a05651203af00b0051aa65bae14mr4544933lfp.25.1714247663435; Sat, 27 Apr 2024 12:54:23 -0700 (PDT) Received: from dcu.otaknetworks.com ([212.156.37.190]) by smtp.gmail.com with ESMTPSA id c27-20020a170906d19b00b00a5557bc8920sm11980482ejz.54.2024.04.27.12.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Apr 2024 12:54:22 -0700 (PDT) From: =?utf-8?b?QWJkdWxsYWggw5ZtZXIgWWFtYcOn?= To: dev@dpdk.org Cc: stephen@networkplumber.org, =?utf-8?b?QWJkdWxsYWggw5ZtZXIgWWFtYcOn?= Subject: [PATCH v5] lib/hash: add defer queue reclaim API Date: Sat, 27 Apr 2024 19:54:18 +0000 Message-Id: <20240427195418.1034591-1-aomeryamac@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 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 This patch adds a new feature to the hash library to allow the user to reclaim the defer queue. This is useful when the user wants to force reclaim resources that are not being used. This API is only available if the RCU is enabled. Signed-off-by: Abdullah Ömer Yamaç --- app/test/test_hash.c | 90 ++++++++++++++++++++++++++++++++++++++ lib/hash/rte_cuckoo_hash.c | 21 +++++++++ lib/hash/rte_hash.h | 25 +++++++++++ lib/hash/version.map | 7 +++ 4 files changed, 143 insertions(+) diff --git a/app/test/test_hash.c b/app/test/test_hash.c index d586878a22..e763d0503f 100644 --- a/app/test/test_hash.c +++ b/app/test/test_hash.c @@ -2183,6 +2183,93 @@ test_hash_rcu_qsbr_sync_mode(uint8_t ext_bkt) } +/* + * rte_hash_rcu_qsbr_dq_reclaim unit test. + */ +static int test_hash_rcu_qsbr_dq_reclaim(void) +{ + size_t sz; + int32_t status; + unsigned int total_entries = 8; + unsigned int freed, pending, available; + uint32_t reclaim_keys[8] = {10, 11, 12, 13, 14, 15, 16, 17}; + struct rte_hash_rcu_config rcu_cfg = {0}; + struct rte_hash_parameters hash_params = { + .name = "test_hash_rcu_qsbr_dq_reclaim", + .entries = total_entries, + .key_len = sizeof(uint32_t), + .hash_func = NULL, + .hash_func_init_val = 0, + .socket_id = 0, + }; + + hash_params.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF; + + g_qsv = NULL; + g_handle = NULL; + + printf("\n# Running RCU QSBR DQ mode, reclaim defer queue functional test\n"); + + g_handle = rte_hash_create(&hash_params); + RETURN_IF_ERROR_RCU_QSBR(g_handle == NULL, "Hash creation failed"); + + /* Create RCU QSBR variable */ + sz = rte_rcu_qsbr_get_memsize(RTE_MAX_LCORE); + g_qsv = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz, RTE_CACHE_LINE_SIZE, + SOCKET_ID_ANY); + RETURN_IF_ERROR_RCU_QSBR(g_qsv == NULL, "RCU QSBR variable creation failed"); + + status = rte_rcu_qsbr_init(g_qsv, RTE_MAX_LCORE); + RETURN_IF_ERROR_RCU_QSBR(status != 0, "RCU QSBR variable initialization failed"); + + rcu_cfg.v = g_qsv; + rcu_cfg.dq_size = total_entries; + rcu_cfg.mode = RTE_HASH_QSBR_MODE_DQ; + + /* Attach RCU QSBR to hash table */ + status = rte_hash_rcu_qsbr_add(g_handle, &rcu_cfg); + RETURN_IF_ERROR_RCU_QSBR(status != 0, "Attach RCU QSBR to hash table failed"); + + /* Register pseudo reader */ + status = rte_rcu_qsbr_thread_register(g_qsv, 0); + RETURN_IF_ERROR_RCU_QSBR(status != 0, "RCU QSBR thread registration failed"); + rte_rcu_qsbr_thread_online(g_qsv, 0); + + /* Fill half of the hash table */ + for (size_t i = 0; i < total_entries / 2; i++) + status = rte_hash_add_key(g_handle, &reclaim_keys[i]); + + /* Lookup inserted elements*/ + for (size_t i = 0; i < total_entries / 2; i++) + rte_hash_lookup(g_handle, &reclaim_keys[i]); + + /* Try to put these elements into the defer queue*/ + for (size_t i = 0; i < total_entries / 2; i++) + rte_hash_del_key(g_handle, &reclaim_keys[i]); + + /* Reader quiescent */ + rte_rcu_qsbr_quiescent(g_qsv, 0); + + status = rte_hash_add_key(g_handle, &reclaim_keys[0]); + RETURN_IF_ERROR_RCU_QSBR(status < 0, "failed to add key (pos[%u]=%d)", 0, status); + + /* This should be (total_entries / 2) + 1 (last add) */ + unsigned int hash_size = rte_hash_count(g_handle); + + /* Freed size should be (total_entries / 2) */ + rte_hash_rcu_qsbr_dq_reclaim(g_handle, &freed, &pending, &available); + + rte_hash_free(g_handle); + rte_free(g_qsv); + + if (hash_size != (total_entries / 2 + 1) || freed != (total_entries / 2)) { + printf("Failed to reclaim defer queue\n"); + return -1; + } + + return 0; +} + /* * Do all unit and performance tests. */ @@ -2261,6 +2348,9 @@ test_hash(void) if (test_hash_rcu_qsbr_sync_mode(1) < 0) return -1; + if (test_hash_rcu_qsbr_dq_reclaim() < 0) + return -1; + return 0; } diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c index 9cf94645f6..52ccada12a 100644 --- a/lib/hash/rte_cuckoo_hash.c +++ b/lib/hash/rte_cuckoo_hash.c @@ -1588,6 +1588,27 @@ rte_hash_rcu_qsbr_add(struct rte_hash *h, struct rte_hash_rcu_config *cfg) return 0; } +int rte_hash_rcu_qsbr_dq_reclaim(struct rte_hash *h, unsigned int *freed, unsigned int *pending, + unsigned int *available) +{ + int ret; + + if (h == NULL || h->hash_rcu_cfg == NULL) { + HASH_LOG(ERR, "Invalid input parameter"); + rte_errno = EINVAL; + return 1; + } + + ret = rte_rcu_qsbr_dq_reclaim(h->dq, h->hash_rcu_cfg->max_reclaim_size, freed, pending, + available); + if (ret != 0) { + HASH_LOG(ERR, "%s: could not reclaim the defer queue in hash table", __func__); + return 1; + } + + return 0; +} + static inline void remove_entry(const struct rte_hash *h, struct rte_hash_bucket *bkt, unsigned int i) diff --git a/lib/hash/rte_hash.h b/lib/hash/rte_hash.h index 7ecc021111..e1e0375fd5 100644 --- a/lib/hash/rte_hash.h +++ b/lib/hash/rte_hash.h @@ -674,6 +674,31 @@ rte_hash_iterate(const struct rte_hash *h, const void **key, void **data, uint32 */ int rte_hash_rcu_qsbr_add(struct rte_hash *h, struct rte_hash_rcu_config *cfg); +/** + * Reclaim resources from the defer queue. + * This API reclaim the resources from the defer queue if rcu is enabled. + * + * @param h + * The hash object to reclaim resources. + * @param freed + * Number of resources that were freed. + * @param pending + * Number of resources pending on the defer queue. + * This number might not be accurate if multi-thread safety is configured. + * @param available + * Number of resources that can be added to the defer queue. + * This number might not be accurate if multi-thread safety is configured. + * @return + * On success - 0 + * On error - 1 with error code set in rte_errno. + * Possible rte_errno codes are: + * - EINVAL - invalid pointer + */ +__rte_experimental +int rte_hash_rcu_qsbr_dq_reclaim(struct rte_hash *h, unsigned int *freed, + unsigned int *pending, + unsigned int *available); + #ifdef __cplusplus } #endif diff --git a/lib/hash/version.map b/lib/hash/version.map index 6f4bcdb71b..d348dd9196 100644 --- a/lib/hash/version.map +++ b/lib/hash/version.map @@ -53,3 +53,10 @@ INTERNAL { rte_thash_gfni_stub; rte_thash_gfni_bulk_stub; }; + +EXPERIMENTAL { + global: + + # added in 24.07 + rte_hash_rcu_qsbr_dq_reclaim; +};