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 77E5345AE3; Tue, 8 Oct 2024 19:55:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4DAE540A4B; Tue, 8 Oct 2024 19:55:31 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id 682C8402BB for ; Tue, 8 Oct 2024 19:55:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728410129; x=1759946129; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3rzEzVVgj/dXRCZbkRdtj4lpt8NA67rm8aLvUMbN6Bg=; b=h2s3BH1SqsRruCxmCipYDML9RnmjoOkz6U897ymA77OimqtxZQ05wx/8 VTSlhAmAkEg3rA0Fu8hibr5KLaqEMZelL1ZIqZUP3b89gBUH874UQAKWc H3R1je+dQbUHFe6wRJUCfMvsM25PELMTTxROnNwn/Fw0rltnRpEd+kWAY wlvuq/w0Btvw2kNfY3qZh+R6f5GIso10katIyvgDNmbI7WkpPKf+zjqOt JLj+BiHdpIREOqg46Sh9sL0h2EO6RJqLI38F9iGMkiNI6o6Nkxgh98OeE PvQTGE6aCtXlVPY86IBWuMpP5rwr+H8uHKuYTVJ4SdSOwMRn7UnKqnHUX w==; X-CSE-ConnectionGUID: 6F2aDo3iTnKN1ZsLIvYUQg== X-CSE-MsgGUID: 7+FsIiAeQ3ycdpzdFgOVkQ== X-IronPort-AV: E=McAfee;i="6700,10204,11219"; a="50171221" X-IronPort-AV: E=Sophos;i="6.11,187,1725346800"; d="scan'208";a="50171221" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2024 10:55:28 -0700 X-CSE-ConnectionGUID: 5OGubM4GTuWt8B6LyLIh0g== X-CSE-MsgGUID: useHjsIzTESRSxbjmCqFHA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,187,1725346800"; d="scan'208";a="80719317" Received: from unknown (HELO silpixa00401176.ir.intel.com) ([10.243.22.170]) by orviesa005.jf.intel.com with ESMTP; 08 Oct 2024 10:55:27 -0700 From: Vladimir Medvedkin To: dev@dpdk.org Cc: rjarry@redhat.com, ruifeng.wang@arm.com, honnappa.nagarahalli@arm.com, david.marchand@redhat.com Subject: [PATCH v2 2/2] test/fib: add RCU functional tests Date: Tue, 8 Oct 2024 17:55:24 +0000 Message-Id: <20241008175524.450829-2-vladimir.medvedkin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241008175524.450829-1-vladimir.medvedkin@intel.com> References: <20240906170907.1325808-1-vladimir.medvedkin@intel.com> <20241008175524.450829-1-vladimir.medvedkin@intel.com> 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 Add positive and negative tests for API rte_fib_rcu_qsbr_add. Also test FIB library behavior when RCU QSBR is enabled. Signed-off-by: Vladimir Medvedkin --- app/test/test_fib.c | 209 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 209 insertions(+) diff --git a/app/test/test_fib.c b/app/test/test_fib.c index 45dccca1f6..ed5cfc1fdf 100644 --- a/app/test/test_fib.c +++ b/app/test/test_fib.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "test.h" @@ -21,6 +22,8 @@ static int32_t test_free_null(void); static int32_t test_add_del_invalid(void); static int32_t test_get_invalid(void); static int32_t test_lookup(void); +static int32_t test_invalid_rcu(void); +static int32_t test_fib_rcu_sync_rw(void); #define MAX_ROUTES (1 << 16) #define MAX_TBL8 (1 << 15) @@ -376,6 +379,210 @@ test_lookup(void) return TEST_SUCCESS; } +/* + * rte_fib_rcu_qsbr_add positive and negative tests. + * - Add RCU QSBR variable to FIB + * - Add another RCU QSBR variable to FIB + * - Check returns + */ +int32_t +test_invalid_rcu(void) +{ + struct rte_fib *fib = NULL; + struct rte_fib_conf config; + size_t sz; + struct rte_rcu_qsbr *qsv; + struct rte_rcu_qsbr *qsv2; + int32_t status; + struct rte_fib_rcu_config rcu_cfg = {0}; + uint64_t def_nh = 100; + + config.max_routes = MAX_ROUTES; + config.rib_ext_sz = 0; + config.default_nh = def_nh; + config.type = RTE_FIB_DUMMY; + + fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config); + RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n"); + + /* Create RCU QSBR variable */ + sz = rte_rcu_qsbr_get_memsize(RTE_MAX_LCORE); + qsv = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz, + RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY); + RTE_TEST_ASSERT(qsv != NULL, "Can not allocate memory for RCU\n"); + + status = rte_rcu_qsbr_init(qsv, RTE_MAX_LCORE); + RTE_TEST_ASSERT(status == 0, "Can not initialize RCU\n"); + + rcu_cfg.v = qsv; + + /* adding rcu to RTE_FIB_DUMMY FIB type */ + rcu_cfg.mode = RTE_FIB_QSBR_MODE_SYNC; + status = rte_fib_rcu_qsbr_add(fib, &rcu_cfg); + RTE_TEST_ASSERT(status == -ENOTSUP, "rte_fib_rcu_qsbr_add returned wrong error status\n"); + rte_fib_free(fib); + + /* Invalid QSBR mode */ + config.type = RTE_FIB_DIR24_8; + config.dir24_8.nh_sz = RTE_FIB_DIR24_8_4B; + config.dir24_8.num_tbl8 = MAX_TBL8; + fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config); + RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n"); + rcu_cfg.mode = 2; + status = rte_fib_rcu_qsbr_add(fib, &rcu_cfg); + RTE_TEST_ASSERT(status != 0, "Failed to add RCU\n"); + + rcu_cfg.mode = RTE_FIB_QSBR_MODE_DQ; + /* Attach RCU QSBR to FIB */ + status = rte_fib_rcu_qsbr_add(fib, &rcu_cfg); + RTE_TEST_ASSERT(status == 0, "Can not attach RCU to FIB\n"); + + /* Create and attach another RCU QSBR to FIB table */ + qsv2 = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz, + RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY); + RTE_TEST_ASSERT(qsv2 != NULL, "Can not allocate memory for RCU\n"); + + rcu_cfg.v = qsv2; + rcu_cfg.mode = RTE_FIB_QSBR_MODE_SYNC; + status = rte_fib_rcu_qsbr_add(fib, &rcu_cfg); + RTE_TEST_ASSERT(status != 0, "Secondary RCU was mistakenly attached\n"); + + rte_fib_free(fib); + rte_free(qsv); + rte_free(qsv2); + + return TEST_SUCCESS; +} + +static struct rte_fib *g_fib; +static struct rte_rcu_qsbr *g_v; +static uint32_t g_ip = RTE_IPV4(192, 0, 2, 100); +static volatile uint8_t writer_done; +/* Report quiescent state interval every 1024 lookups. Larger critical + * sections in reader will result in writer polling multiple times. + */ +#define QSBR_REPORTING_INTERVAL 1024 +#define WRITER_ITERATIONS 512 + +/* + * Reader thread using rte_fib data structure with RCU. + */ +static int +test_fib_rcu_qsbr_reader(void *arg) +{ + int i; + uint64_t next_hop_return = 0; + + RTE_SET_USED(arg); + /* Register this thread to report quiescent state */ + rte_rcu_qsbr_thread_register(g_v, 0); + rte_rcu_qsbr_thread_online(g_v, 0); + + do { + for (i = 0; i < QSBR_REPORTING_INTERVAL; i++) + rte_fib_lookup_bulk(g_fib, &g_ip, &next_hop_return, 1); + + /* Update quiescent state */ + rte_rcu_qsbr_quiescent(g_v, 0); + } while (!writer_done); + + rte_rcu_qsbr_thread_offline(g_v, 0); + rte_rcu_qsbr_thread_unregister(g_v, 0); + + return 0; +} + +/* + * rte_fib_rcu_qsbr_add sync mode functional test. + * 1 Reader and 1 writer. They cannot be in the same thread in this test. + * - Create FIB which supports 1 tbl8 group at max + * - Add RCU QSBR variable with sync mode to FIB + * - Register a reader thread. Reader keeps looking up a specific rule. + * - Writer keeps adding and deleting a specific rule with depth=28 (> 24) + */ +int32_t +test_fib_rcu_sync_rw(void) +{ + struct rte_fib_conf config; + size_t sz; + int32_t status; + uint32_t i, next_hop; + uint8_t depth; + struct rte_fib_rcu_config rcu_cfg = {0}; + uint64_t def_nh = 100; + + if (rte_lcore_count() < 2) { + printf("Not enough cores for %s, expecting at least 2\n", + __func__); + return TEST_SKIPPED; + } + + config.max_routes = MAX_ROUTES; + config.rib_ext_sz = 0; + config.default_nh = def_nh; + config.type = RTE_FIB_DIR24_8; + config.dir24_8.nh_sz = RTE_FIB_DIR24_8_4B; + config.dir24_8.num_tbl8 = 1; + + g_fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config); + RTE_TEST_ASSERT(g_fib != NULL, "Failed to create FIB\n"); + + /* Create RCU QSBR variable */ + sz = rte_rcu_qsbr_get_memsize(1); + g_v = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz, + RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY); + RTE_TEST_ASSERT(g_v != NULL, "Can not allocate memory for RCU\n"); + + status = rte_rcu_qsbr_init(g_v, 1); + RTE_TEST_ASSERT(status == 0, "Can not initialize RCU\n"); + + rcu_cfg.v = g_v; + rcu_cfg.mode = RTE_FIB_QSBR_MODE_SYNC; + /* Attach RCU QSBR to FIB table */ + status = rte_fib_rcu_qsbr_add(g_fib, &rcu_cfg); + RTE_TEST_ASSERT(status == 0, "Can not attach RCU to FIB\n"); + + writer_done = 0; + /* Launch reader thread */ + rte_eal_remote_launch(test_fib_rcu_qsbr_reader, NULL, + rte_get_next_lcore(-1, 1, 0)); + + depth = 28; + next_hop = 1; + status = rte_fib_add(g_fib, g_ip, depth, next_hop); + if (status != 0) { + printf("%s: Failed to add rule\n", __func__); + goto error; + } + + /* Writer update */ + for (i = 0; i < WRITER_ITERATIONS; i++) { + status = rte_fib_delete(g_fib, g_ip, depth); + if (status != 0) { + printf("%s: Failed to delete rule at iteration %d\n", + __func__, i); + goto error; + } + + status = rte_fib_add(g_fib, g_ip, depth, next_hop); + if (status != 0) { + printf("%s: Failed to add rule at iteration %d\n", + __func__, i); + goto error; + } + } + +error: + writer_done = 1; + /* Wait until reader exited. */ + rte_eal_mp_wait_lcore(); + + rte_fib_free(g_fib); + rte_free(g_v); + + return (status == 0) ? TEST_SUCCESS : TEST_FAILED; +} + static struct unit_test_suite fib_fast_tests = { .suite_name = "fib autotest", .setup = NULL, @@ -386,6 +593,8 @@ static struct unit_test_suite fib_fast_tests = { TEST_CASE(test_add_del_invalid), TEST_CASE(test_get_invalid), TEST_CASE(test_lookup), + TEST_CASE(test_invalid_rcu), + TEST_CASE(test_fib_rcu_sync_rw), TEST_CASES_END() } }; -- 2.34.1