From patchwork Fri Feb 10 13:46:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Naga Harish K, S V" X-Patchwork-Id: 123681 X-Patchwork-Delegate: jerinj@marvell.com 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 156C641C61; Fri, 10 Feb 2023 14:46:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE8F040EE6; Fri, 10 Feb 2023 14:46:51 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id B56E740687 for ; Fri, 10 Feb 2023 14:46:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676036810; x=1707572810; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OjWwFxMa0b4Gf8/dvRAm2mcpqF4Sk3Hz9yhU/BybyHY=; b=EkCImVh+3qlALAK5o7YMGHs7uFhZt9WJZ64wYjvJusQItg/L8BvFurQz DKzK6yS9geCx+63kFN3RyBZmuo0uzCprx+BDJZNHAuwt/u3Dt6cH7AFh/ Wc+NPewbNxOb5wRH80Q6i3IlrmbOiSmvFv00+WSdLoEE3Xq/N/NRl/6lV pXpm1fy6Sot00/WL5dNFRl3Lkr8K0qFQli/qePegsWMlJWmPCqINGQp+H 1F/dPNCbik177/48d04CSaWTSImgBmVHcX0XGiQfd36bu087b3V4VK9v+ OftAfrAuElspNXWwZIegF2/0tCRWfxSffj5+QqgEA3JfLF9YT5WWFpE+1 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10617"; a="416649283" X-IronPort-AV: E=Sophos;i="5.97,287,1669104000"; d="scan'208";a="416649283" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2023 05:46:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10617"; a="913534592" X-IronPort-AV: E=Sophos;i="5.97,287,1669104000"; d="scan'208";a="913534592" Received: from txandevlnx322.an.intel.com ([10.123.117.44]) by fmsmga006.fm.intel.com with ESMTP; 10 Feb 2023 05:46:49 -0800 From: Naga Harish K S V To: jerinj@marvell.com, erik.g.carrillo@intel.com, abhinandan.gujjar@intel.com Cc: dev@dpdk.org, jay.jayatheerthan@intel.com Subject: [PATCH v5 1/3] eventdev/eth_rx: add params set/get APIs Date: Fri, 10 Feb 2023 07:46:44 -0600 Message-Id: <20230210134646.3407253-1-s.v.naga.harish.k@intel.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20230210045816.3039312-1-s.v.naga.harish.k@intel.com> References: <20230210045816.3039312-1-s.v.naga.harish.k@intel.com> 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 The adapter configuration parameters defined in the struct rte_event_eth_rx_adapter_runtime_params can be configured and retrieved using rte_event_eth_rx_adapter_runtime_params_set and rte_event_eth_tx_adapter_runtime_params_get respectively. Signed-off-by: Naga Harish K S V --- app/test/test_event_eth_rx_adapter.c | 113 ++++++++++++++++++ .../prog_guide/event_ethernet_rx_adapter.rst | 8 ++ lib/eventdev/rte_event_eth_rx_adapter.c | 101 +++++++++++++++- lib/eventdev/rte_event_eth_rx_adapter.h | 93 +++++++++++++- lib/eventdev/version.map | 3 + 5 files changed, 316 insertions(+), 2 deletions(-) diff --git a/app/test/test_event_eth_rx_adapter.c b/app/test/test_event_eth_rx_adapter.c index 1da7782560..cfe6052d7e 100644 --- a/app/test/test_event_eth_rx_adapter.c +++ b/app/test/test_event_eth_rx_adapter.c @@ -1198,6 +1198,117 @@ adapter_intrq_instance_get(void) return TEST_SUCCESS; } +static int +adapter_get_set_params(void) +{ + int err; + struct rte_event_eth_rx_adapter_runtime_params in_params; + struct rte_event_eth_rx_adapter_runtime_params out_params; + struct rte_event_eth_rx_adapter_queue_conf queue_config = {0}; + struct rte_event ev; + + ev.queue_id = 0; + ev.sched_type = RTE_SCHED_TYPE_ATOMIC; + ev.priority = 0; + ev.flow_id = 1; + + queue_config.rx_queue_flags = + RTE_EVENT_ETH_RX_ADAPTER_QUEUE_FLOW_ID_VALID; + queue_config.ev = ev; + queue_config.servicing_weight = 1; + + err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, + TEST_ETHDEV_ID, 0, + &queue_config); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_rx_adapter_runtime_params_init(&in_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + err = rte_event_eth_rx_adapter_runtime_params_init(&out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + /* Case 1: Get the default value of mbufs processed by Rx adapter */ + err = rte_event_eth_rx_adapter_runtime_params_get(TEST_INST_ID, + &out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + /* Case 2: Set max_nb_rx = 32 (=BATCH_SEIZE) */ + in_params.max_nb_rx = 32; + + err = rte_event_eth_rx_adapter_runtime_params_set(TEST_INST_ID, + &in_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_rx_adapter_runtime_params_get(TEST_INST_ID, + &out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + TEST_ASSERT(in_params.max_nb_rx == out_params.max_nb_rx, + "Expected %u got %u", + in_params.max_nb_rx, out_params.max_nb_rx); + + /* Case 3: Set max_nb_rx = 192 */ + in_params.max_nb_rx = 192; + + err = rte_event_eth_rx_adapter_runtime_params_set(TEST_INST_ID, + &in_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_rx_adapter_runtime_params_get(TEST_INST_ID, + &out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + TEST_ASSERT(in_params.max_nb_rx == out_params.max_nb_rx, + "Expected %u got %u", + in_params.max_nb_rx, out_params.max_nb_rx); + + /* Case 4: Set max_nb_rx = 256 */ + in_params.max_nb_rx = 256; + + err = rte_event_eth_rx_adapter_runtime_params_set(TEST_INST_ID, + &in_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_rx_adapter_runtime_params_get(TEST_INST_ID, + &out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + TEST_ASSERT(in_params.max_nb_rx == out_params.max_nb_rx, + "Expected %u got %u", + in_params.max_nb_rx, out_params.max_nb_rx); + + /* Case 5: Set max_nb_rx = 30(event_port_id = port_id; - conf->max_nb_rx = 128; + conf->max_nb_rx = RXA_NB_RX_WORK_DEFAULT; if (started) ret = rte_event_dev_start(dev_id); rx_adapter->default_cb_arg = 1; @@ -3461,6 +3463,103 @@ rte_event_eth_rx_adapter_instance_get(uint16_t eth_dev_id, return -EINVAL; } +static int +rxa_caps_check(struct event_eth_rx_adapter *rxa) +{ + uint16_t eth_dev_id; + uint32_t caps = 0; + int ret; + + if (!rxa->nb_queues) + return -EINVAL; + + /* The eth_dev used is always of same type. + * Hence eth_dev_id is taken from first entry of poll array. + */ + eth_dev_id = rxa->eth_rx_poll[0].eth_dev_id; + ret = rte_event_eth_rx_adapter_caps_get(rxa->eventdev_id, + eth_dev_id, + &caps); + if (ret) { + RTE_EDEV_LOG_ERR("Failed to get adapter caps edev %" PRIu8 + "eth port %" PRIu16, rxa->eventdev_id, eth_dev_id); + return ret; + } + + if (caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT) + return -ENOTSUP; + + return 0; +} + +int +rte_event_eth_rx_adapter_runtime_params_init( + struct rte_event_eth_rx_adapter_runtime_params *params) +{ + if (params == NULL) + return -EINVAL; + + memset(params, 0, sizeof(struct rte_event_eth_rx_adapter_runtime_params)); + params->max_nb_rx = RXA_NB_RX_WORK_DEFAULT; + + return 0; +} + +int +rte_event_eth_rx_adapter_runtime_params_set(uint8_t id, + struct rte_event_eth_rx_adapter_runtime_params *params) +{ + struct event_eth_rx_adapter *rxa; + int ret; + + if (params == NULL) + return -EINVAL; + + if (rxa_memzone_lookup()) + return -ENOMEM; + + rxa = rxa_id_to_adapter(id); + if (rxa == NULL) + return -EINVAL; + + ret = rxa_caps_check(rxa); + if (ret) + return ret; + + rte_spinlock_lock(&rxa->rx_lock); + rxa->max_nb_rx = params->max_nb_rx; + rte_spinlock_unlock(&rxa->rx_lock); + + return 0; +} + +int +rte_event_eth_rx_adapter_runtime_params_get(uint8_t id, + struct rte_event_eth_rx_adapter_runtime_params *params) +{ + struct event_eth_rx_adapter *rxa; + int ret; + + if (params == NULL) + return -EINVAL; + + if (rxa_memzone_lookup()) + return -ENOMEM; + + rxa = rxa_id_to_adapter(id); + if (rxa == NULL) + return -EINVAL; + + ret = rxa_caps_check(rxa); + if (ret) + return ret; + + params->max_nb_rx = rxa->max_nb_rx; + + return 0; +} + +/* RX-adapter telemetry callbacks */ #define RXA_ADD_DICT(stats, s) rte_tel_data_add_dict_uint(d, #s, stats.s) static int diff --git a/lib/eventdev/rte_event_eth_rx_adapter.h b/lib/eventdev/rte_event_eth_rx_adapter.h index f4652f40e8..ff08df25e8 100644 --- a/lib/eventdev/rte_event_eth_rx_adapter.h +++ b/lib/eventdev/rte_event_eth_rx_adapter.h @@ -39,10 +39,14 @@ * - rte_event_eth_rx_adapter_queue_stats_reset() * - rte_event_eth_rx_adapter_event_port_get() * - rte_event_eth_rx_adapter_instance_get() + * - rte_event_eth_rx_adapter_runtime_params_get() + * - rte_event_eth_rx_adapter_runtime_params_init() + * - rte_event_eth_rx_adapter_runtime_params_set() * * The application creates an ethernet to event adapter using * rte_event_eth_rx_adapter_create_ext() or rte_event_eth_rx_adapter_create() * or rte_event_eth_rx_adapter_create_with_params() functions. + * * The adapter needs to know which ethernet rx queues to poll for mbufs as well * as event device parameters such as the event queue identifier, event * priority and scheduling type that the adapter should use when constructing @@ -299,6 +303,30 @@ struct rte_event_eth_rx_adapter_params { /**< flag to indicate that event buffer is separate for each queue */ }; +/** + * Adapter runtime configuration parameters + */ +struct rte_event_eth_rx_adapter_runtime_params { + uint32_t max_nb_rx; + /**< The adapter can return early if it has processed at least + * max_nb_rx mbufs. This isn't treated as a requirement; batching may + * cause the adapter to process more than max_nb_rx mbufs. + * + * rte_event_eth_rx_adapter_create() or + * rte_event_eth_adapter_create_with_params() configures the + * adapter with default value of maximum packets processed per + * iteration to 128. + * rte_event_eth_rx_adapter_runtime_params_set() allows to re-configure + * maximum packets processed per iteration. This is alternative to using + * rte_event_eth_rx_adapter_create_ext() with parameter + * rte_event_eth_rx_adapter_conf::max_nb_rx + * + * This is valid for service based SW adapter only + */ + uint32_t rsvd[15]; + /**< Reserved fields for future use */ +}; + /** * * Callback function invoked by the SW adapter before it continues @@ -377,7 +405,7 @@ int rte_event_eth_rx_adapter_create_ext(uint8_t id, uint8_t dev_id, * Create a new ethernet Rx event adapter with the specified identifier. * This function uses an internal configuration function that creates an event * port. This default function reconfigures the event device with an - * additional event port and setups up the event port using the port_config + * additional event port and setup the event port using the port_config * parameter passed into this function. In case the application needs more * control in configuration of the service, it should use the * rte_event_eth_rx_adapter_create_ext() version. @@ -743,6 +771,69 @@ rte_event_eth_rx_adapter_instance_get(uint16_t eth_dev_id, uint16_t rx_queue_id, uint8_t *rxa_inst_id); +/** + * Initialize the adapter runtime configuration parameters with default values + * + * @param params + * A pointer to structure of type struct rte_event_eth_rx_adapter_runtime_params + * + * @return + * - 0: Success + * - <0: Error code on failure + */ +__rte_experimental +int +rte_event_eth_rx_adapter_runtime_params_init( + struct rte_event_eth_rx_adapter_runtime_params *params); + +/** + * Set the adapter runtime configuration parameters + * + * This API is to be used after adding at least one queue to the adapter + * and is supported only for service based adapter. + * + * @param id + * Adapter identifier + * + * @param params + * A pointer to structure of type struct rte_event_eth_rx_adapter_runtime_params + * with configuration parameter values. The reserved fields of the structure + * must be initialized to zero and the valid fields need to be set appropriately. + * This structure can be initialized using + * rte_event_eth_rx_adapter_runtime_params_init() to default values or + * application may reset this structure and update the required fields. + * + * @return + * - 0: Success + * - <0: Error code on failure + */ +__rte_experimental +int +rte_event_eth_rx_adapter_runtime_params_set(uint8_t id, + struct rte_event_eth_rx_adapter_runtime_params *params); + +/** + * Get the adapter runtime configuration parameters + * + * This API is to be used after adding at least one queue to the adapter + * and is supported only for service based adapter. + * + * @param id + * Adapter identifier + * + * @param[out] params + * A pointer to structure of type struct rte_event_eth_rx_adapter_runtime_params + * containing valid adapter parameters when return value is 0. + * + * @return + * - 0: Success + * - <0: Error code on failure + */ +__rte_experimental +int +rte_event_eth_rx_adapter_runtime_params_get(uint8_t id, + struct rte_event_eth_rx_adapter_runtime_params *params); + #ifdef __cplusplus } #endif diff --git a/lib/eventdev/version.map b/lib/eventdev/version.map index 3add5e3088..ef9c3b86b2 100644 --- a/lib/eventdev/version.map +++ b/lib/eventdev/version.map @@ -121,6 +121,9 @@ EXPERIMENTAL { rte_event_eth_tx_adapter_queue_stop; # added in 23.03 + rte_event_eth_rx_adapter_runtime_params_get; + rte_event_eth_rx_adapter_runtime_params_init; + rte_event_eth_rx_adapter_runtime_params_set; rte_event_timer_remaining_ticks_get; }; From patchwork Fri Feb 10 13:46:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Naga Harish K, S V" X-Patchwork-Id: 123682 X-Patchwork-Delegate: jerinj@marvell.com 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 3FD8C41C61; Fri, 10 Feb 2023 14:46:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 89B0142B8C; Fri, 10 Feb 2023 14:46:55 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 09B8A410EA for ; Fri, 10 Feb 2023 14:46:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676036813; x=1707572813; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lFRjI1hK1y22nEl8PTkcfYUQ1HH9P3dXusxk6BgdKDo=; b=XYcYSyjtPKJihV5dZRnWhElYEW+lc4BsW8GfWSbQOuOnBmnLOXRresKK eiytB0ZviEcbCX1inbv2aKsi/JxkttRrGlM6q+Y8GazZ4X6TOSYCAitk3 FfMSs+oDdqJtV670llda1xZOYU4c8MZ+9S5TaSwCcii2jPd9R996OX8ua hlOCcpk72v5meozRjkA2ISu61dwjCzcdgjd7jQ4lqZ1eEiqbcD+jc66+1 xjz8CaUR2hMY+fcOJOcchbFtn3Xto9C3NhN/Ix1aBaDzPIEjbPxdU4Rkq sXMlBxF47CjkpRgJPv2SSbSN5FgrdokB0LbBG3E6yxosHz+Ta8rGHbTxq Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10617"; a="416649304" X-IronPort-AV: E=Sophos;i="5.97,287,1669104000"; d="scan'208";a="416649304" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2023 05:46:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10617"; a="913534614" X-IronPort-AV: E=Sophos;i="5.97,287,1669104000"; d="scan'208";a="913534614" Received: from txandevlnx322.an.intel.com ([10.123.117.44]) by fmsmga006.fm.intel.com with ESMTP; 10 Feb 2023 05:46:51 -0800 From: Naga Harish K S V To: jerinj@marvell.com, erik.g.carrillo@intel.com, abhinandan.gujjar@intel.com Cc: dev@dpdk.org, jay.jayatheerthan@intel.com Subject: [PATCH v5 2/3] eventdev/eth_tx: add params set/get APIs Date: Fri, 10 Feb 2023 07:46:45 -0600 Message-Id: <20230210134646.3407253-2-s.v.naga.harish.k@intel.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20230210134646.3407253-1-s.v.naga.harish.k@intel.com> References: <20230210045816.3039312-1-s.v.naga.harish.k@intel.com> <20230210134646.3407253-1-s.v.naga.harish.k@intel.com> 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 The adapter runtime configuration parameters defined in the struct rte_event_eth_tx_adapter_runtime_params can be configured and retrieved using rte_event_eth_tx_adapter_runtime_params_set and rte_event_eth_tx_adapter_runtime_params_get respectively. Signed-off-by: Naga Harish K S V --- app/test/test_event_eth_tx_adapter.c | 132 ++++++++++++++++++ .../prog_guide/event_ethernet_tx_adapter.rst | 9 ++ lib/eventdev/rte_event_eth_tx_adapter.c | 115 ++++++++++++++- lib/eventdev/rte_event_eth_tx_adapter.h | 88 ++++++++++++ lib/eventdev/version.map | 3 + 5 files changed, 346 insertions(+), 1 deletion(-) diff --git a/app/test/test_event_eth_tx_adapter.c b/app/test/test_event_eth_tx_adapter.c index c19a87a86a..4e1d821bf9 100644 --- a/app/test/test_event_eth_tx_adapter.c +++ b/app/test/test_event_eth_tx_adapter.c @@ -40,6 +40,8 @@ test_event_eth_tx_adapter_common(void) #define PORT(p) default_params.port[(p)] #define TEST_ETHDEV_ID PORT(0) #define TEST_ETHDEV_PAIR_ID PORT(PAIR_PORT_INDEX(0)) +#define DEFAULT_FLUSH_THRESHOLD 1024 +#define TXA_NB_TX_WORK_DEFAULT 128 #define EDEV_RETRY 0xffff @@ -795,6 +797,134 @@ tx_adapter_queue_start_stop(void) return TEST_SUCCESS; } +static int +tx_adapter_set_get_params(void) +{ + int err; + struct rte_event_eth_tx_adapter_runtime_params in_params; + struct rte_event_eth_tx_adapter_runtime_params out_params; + + err = rte_event_eth_tx_adapter_queue_add(TEST_INST_ID, + TEST_ETHDEV_ID, + 0); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_tx_adapter_runtime_params_init(&in_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + err = rte_event_eth_tx_adapter_runtime_params_init(&out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + /* Case 1: Get the default values of adapter */ + err = rte_event_eth_tx_adapter_runtime_params_get(TEST_INST_ID, + &out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + TEST_ASSERT(out_params.flush_threshold == DEFAULT_FLUSH_THRESHOLD, + "Expected %u got %u", + DEFAULT_FLUSH_THRESHOLD, out_params.flush_threshold); + TEST_ASSERT(out_params.max_nb_tx == TXA_NB_TX_WORK_DEFAULT, + "Expected %u got %u", + TXA_NB_TX_WORK_DEFAULT, out_params.max_nb_tx); + + /* Case 2: Set max_nb_tx = 32 (=TXA_BATCH_SEIZE) */ + in_params.max_nb_tx = 32; + in_params.flush_threshold = DEFAULT_FLUSH_THRESHOLD; + + err = rte_event_eth_tx_adapter_runtime_params_set(TEST_INST_ID, + &in_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_tx_adapter_runtime_params_get(TEST_INST_ID, + &out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + TEST_ASSERT(in_params.max_nb_tx == out_params.max_nb_tx, + "Expected %u got %u", + in_params.max_nb_tx, out_params.max_nb_tx); + TEST_ASSERT(in_params.flush_threshold == out_params.flush_threshold, + "Expected %u got %u", + in_params.flush_threshold, out_params.flush_threshold); + + /* Case 3: Set max_nb_tx = 192 */ + in_params.max_nb_tx = 192; + + err = rte_event_eth_tx_adapter_runtime_params_set(TEST_INST_ID, + &in_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_tx_adapter_runtime_params_get(TEST_INST_ID, + &out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + TEST_ASSERT(in_params.max_nb_tx == out_params.max_nb_tx, + "Expected %u got %u", + in_params.max_nb_tx, out_params.max_nb_tx); + + /* Case 4: Set max_nb_tx = 256 */ + in_params.max_nb_tx = 256; + + err = rte_event_eth_tx_adapter_runtime_params_set(TEST_INST_ID, + &in_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_tx_adapter_runtime_params_get(TEST_INST_ID, + &out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + TEST_ASSERT(in_params.max_nb_tx == out_params.max_nb_tx, + "Expected %u got %u", + in_params.max_nb_tx, out_params.max_nb_tx); + + /* Case 5: Set max_nb_tx = 30(loop_cnt++ & (TXA_FLUSH_THRESHOLD - 1)) == 0) { + if (txa->loop_cnt++ == txa->flush_threshold) { struct txa_service_ethdev *tdi; struct txa_service_queue_info *tqi; struct rte_eth_dev *dev; uint16_t i; + txa->loop_cnt = 0; tdi = txa->txa_ethdev; nb_tx = 0; @@ -769,6 +772,7 @@ txa_service_adapter_create_ext(uint8_t id, struct rte_eventdev *dev, txa->service_id = TXA_INVALID_SERVICE_ID; rte_spinlock_init(&txa->tx_lock); txa_service_data_array[id] = txa; + txa->flush_threshold = TXA_FLUSH_THRESHOLD; return 0; } @@ -1291,6 +1295,115 @@ rte_event_eth_tx_adapter_stats_reset(uint8_t id) return ret; } +int +rte_event_eth_tx_adapter_runtime_params_init( + struct rte_event_eth_tx_adapter_runtime_params *txa_params) +{ + if (txa_params == NULL) + return -EINVAL; + + memset(txa_params, 0, sizeof(*txa_params)); + txa_params->max_nb_tx = TXA_MAX_NB_TX; + txa_params->flush_threshold = TXA_FLUSH_THRESHOLD; + + return 0; +} + +static int +txa_caps_check(uint8_t id, struct txa_service_data *txa) +{ + uint32_t caps = 0; + struct rte_eth_dev *eth_dev = NULL; + struct txa_service_ethdev *tdi; + int i; + + if (!txa->dev_count) + return -EINVAL; + + /* The eth_dev used is always the same type. + * Hence first valid eth_dev is taken. + */ + for (i = 0; i < txa->dev_count; i++) { + tdi = &txa->txa_ethdev[i]; + if (tdi->nb_queues) { + eth_dev = tdi->dev; + break; + } + } + if (eth_dev == NULL) + return -EINVAL; + + if (txa_dev_caps_get(id)) + txa_dev_caps_get(id)(txa_evdev(id), eth_dev, &caps); + + if (caps & RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT) + return -ENOTSUP; + + return 0; +} + +int +rte_event_eth_tx_adapter_runtime_params_set(uint8_t id, + struct rte_event_eth_tx_adapter_runtime_params *txa_params) +{ + struct txa_service_data *txa; + int ret; + + if (txa_lookup()) + return -ENOMEM; + + TXA_CHECK_OR_ERR_RET(id); + + if (txa_params == NULL) + return -EINVAL; + + txa = txa_service_id_to_data(id); + if (txa == NULL) + return -EINVAL; + + ret = txa_caps_check(id, txa); + if (ret) + return ret; + + rte_spinlock_lock(&txa->tx_lock); + txa->flush_threshold = txa_params->flush_threshold; + txa->max_nb_tx = txa_params->max_nb_tx; + rte_spinlock_unlock(&txa->tx_lock); + + return 0; +} + +int +rte_event_eth_tx_adapter_runtime_params_get(uint8_t id, + struct rte_event_eth_tx_adapter_runtime_params *txa_params) +{ + struct txa_service_data *txa; + int ret; + + if (txa_lookup()) + return -ENOMEM; + + TXA_CHECK_OR_ERR_RET(id); + + if (txa_params == NULL) + return -EINVAL; + + txa = txa_service_id_to_data(id); + if (txa == NULL) + return -EINVAL; + + ret = txa_caps_check(id, txa); + if (ret) + return ret; + + rte_spinlock_lock(&txa->tx_lock); + txa_params->flush_threshold = txa->flush_threshold; + txa_params->max_nb_tx = txa->max_nb_tx; + rte_spinlock_unlock(&txa->tx_lock); + + return 0; +} + int rte_event_eth_tx_adapter_stop(uint8_t id) { diff --git a/lib/eventdev/rte_event_eth_tx_adapter.h b/lib/eventdev/rte_event_eth_tx_adapter.h index cd539af7ef..9b1ac2055e 100644 --- a/lib/eventdev/rte_event_eth_tx_adapter.h +++ b/lib/eventdev/rte_event_eth_tx_adapter.h @@ -37,6 +37,9 @@ * - rte_event_eth_tx_adapter_instance_get() * - rte_event_eth_tx_adapter_queue_start() * - rte_event_eth_tx_adapter_queue_stop() + * - rte_event_eth_tx_adapter_runtime_params_get() + * - rte_event_eth_tx_adapter_runtime_params_init() + * - rte_event_eth_tx_adapter_runtime_params_set() * * The application creates the adapter using * rte_event_eth_tx_adapter_create() or rte_event_eth_tx_adapter_create_ext(). @@ -103,6 +106,25 @@ struct rte_event_eth_tx_adapter_conf { */ }; +/** + * Adapter runtime configuration parameters + */ +struct rte_event_eth_tx_adapter_runtime_params { + uint32_t max_nb_tx; + /**< The adapter can return early if it has processed at least + * max_nb_tx mbufs. This isn't treated as a requirement; batching may + * cause the adapter to process more than max_nb_tx mbufs. + * This is valid for service based SW adapter only. + */ + uint16_t flush_threshold; + /**< the number of service function iteration count to + * flush buffered packets. + * This is valid for service based SW adapter only. + */ + uint16_t rsvd[29]; + /**< Reserved fields for future expansion */ +}; + /** * Function type used for adapter configuration callback. The callback is * used to fill in members of the struct rte_event_eth_tx_adapter_conf, this @@ -516,6 +538,72 @@ __rte_experimental int rte_event_eth_tx_adapter_queue_stop(uint16_t eth_dev_id, uint16_t tx_queue_id); +/** + * Initialize the adapter runtime configuration parameters with default values + * + * @param txa_params + * A pointer to structure of type struct rte_event_eth_tx_adapter_runtime_params + * + * @return + * - 0: Success + * - <0: Error code on failure + */ +__rte_experimental +int +rte_event_eth_tx_adapter_runtime_params_init( + struct rte_event_eth_tx_adapter_runtime_params *txa_params); + +/** + * Set the runtime configuration parameters for adapter. + * + * In case not all fields are to be updated, the suggested way to use this + * api is read the current values using rte_event_eth_tx_adapter_get_params(), + * modify the required parameters and then call + * rte_event_eth_tx_adapter_runtime_params_set(). + * + * This API is to be used after adding at least one queue to the adapter + * and is supported only for service based adapter. + * + * @param id + * Adapter identifier + * @param params + * A pointer to structure of type struct rte_event_eth_tx_adapter_runtime_params + * with configuration parameter values. The reserved fields of this structure + * must be initialized to zero and the valid fields need to be set appropriately. + * This structure can be initialized using + * rte_event_eth_tx_adapter_runtime_params_init() API to default values or + * application may reset this structure and update required fields. + * + * @return + * - 0: Success + * - <0: Error code on failure + */ +__rte_experimental +int +rte_event_eth_tx_adapter_runtime_params_set(uint8_t id, + struct rte_event_eth_tx_adapter_runtime_params *params); + +/** + * Get the runtime configuration parameters of adapter. + * + * This API is to be used after adding at least one queue to the adapter + * and is supported only for service based adapter. + * + * @param id + * Adapter identifier + * @param[out] params + * A pointer to structure of type struct rte_event_eth_tx_adapter_runtime_params + * containing valid Tx adapter parameters when return value is 0. + * + * @return + * - 0: Success + * - <0: Error code on failure + */ +__rte_experimental +int +rte_event_eth_tx_adapter_runtime_params_get(uint8_t id, + struct rte_event_eth_tx_adapter_runtime_params *params); + #ifdef __cplusplus } #endif diff --git a/lib/eventdev/version.map b/lib/eventdev/version.map index ef9c3b86b2..7b93736dff 100644 --- a/lib/eventdev/version.map +++ b/lib/eventdev/version.map @@ -124,6 +124,9 @@ EXPERIMENTAL { rte_event_eth_rx_adapter_runtime_params_get; rte_event_eth_rx_adapter_runtime_params_init; rte_event_eth_rx_adapter_runtime_params_set; + rte_event_eth_tx_adapter_runtime_params_get; + rte_event_eth_tx_adapter_runtime_params_init; + rte_event_eth_tx_adapter_runtime_params_set; rte_event_timer_remaining_ticks_get; }; From patchwork Fri Feb 10 13:46:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Naga Harish K, S V" X-Patchwork-Id: 123683 X-Patchwork-Delegate: jerinj@marvell.com 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 8186D41C61; Fri, 10 Feb 2023 14:47:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AD90B42D0C; Fri, 10 Feb 2023 14:46:57 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 3AFAF410EA for ; Fri, 10 Feb 2023 14:46:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676036815; x=1707572815; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0Tho4b2H8OF1IjGUrfi0cYGOxPQaS4BoHwHYcZ/bnos=; b=Dn0iRRIrrTaKu+8LeNc3MGomNeaox80tsICGglEJ0n1NvCJWtV4J9FhD /fNZVDODf7X2y7gDfcBwMXExIztOm9RnVKridwyXhfcuZLh45eUnmQ37m bgRVHT1drS/tKHKLvMWbkfibAZSAhCHzmyD9f9YG5PM+MF+CMmH3faiNp wQhU7NmGp6DzAxt2n1LV9ELhqkGyMz/hvSD2fgjqvMFrDTJ48rObKkzOh CIfEnnNSNSCi4DrYvDA4JyNde2U8VfcHhUX11gj8OKxUDzUtosew29tUi C6u7wMbJX4Z1TgBv4YjoBHDGCbFYL1UgeANrmhAVzmJoEWb2IKp86bYJ4 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10617"; a="416649322" X-IronPort-AV: E=Sophos;i="5.97,287,1669104000"; d="scan'208";a="416649322" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2023 05:46:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10617"; a="913534661" X-IronPort-AV: E=Sophos;i="5.97,287,1669104000"; d="scan'208";a="913534661" Received: from txandevlnx322.an.intel.com ([10.123.117.44]) by fmsmga006.fm.intel.com with ESMTP; 10 Feb 2023 05:46:54 -0800 From: Naga Harish K S V To: jerinj@marvell.com, erik.g.carrillo@intel.com, abhinandan.gujjar@intel.com Cc: dev@dpdk.org, jay.jayatheerthan@intel.com Subject: [PATCH v5 3/3] eventdev/crypto: add params set/get APIs Date: Fri, 10 Feb 2023 07:46:46 -0600 Message-Id: <20230210134646.3407253-3-s.v.naga.harish.k@intel.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20230210134646.3407253-1-s.v.naga.harish.k@intel.com> References: <20230210045816.3039312-1-s.v.naga.harish.k@intel.com> <20230210134646.3407253-1-s.v.naga.harish.k@intel.com> 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 The adapter runtime configuration parameters defined in the struct rte_event_crypto_adapter_runtime_params can be configured and retrieved using rte_event_crypto_adapter_runtime_params_set and rte_event_eth_rx_adapter_runtime_params_get respectively. Signed-off-by: Naga Harish K S V --- app/test/test_event_crypto_adapter.c | 109 ++++++++++++++++++ .../prog_guide/event_crypto_adapter.rst | 8 ++ lib/eventdev/rte_event_crypto_adapter.c | 101 ++++++++++++++++ lib/eventdev/rte_event_crypto_adapter.h | 80 +++++++++++++ lib/eventdev/version.map | 3 + 5 files changed, 301 insertions(+) diff --git a/app/test/test_event_crypto_adapter.c b/app/test/test_event_crypto_adapter.c index a38e389abd..264d6f731e 100644 --- a/app/test/test_event_crypto_adapter.c +++ b/app/test/test_event_crypto_adapter.c @@ -272,6 +272,111 @@ test_crypto_adapter_stats(void) return TEST_SUCCESS; } +static int +test_crypto_adapter_params(void) +{ + int err; + struct rte_event_crypto_adapter_runtime_params in_params; + struct rte_event_crypto_adapter_runtime_params out_params; + uint32_t cap; + struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; + + err = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap); + TEST_ASSERT_SUCCESS(err, "Failed to get adapter capabilities\n"); + + if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) { + err = rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID, + TEST_CDEV_ID, TEST_CDEV_QP_ID, &queue_conf); + } else + err = rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID, + TEST_CDEV_ID, TEST_CDEV_QP_ID, NULL); + + TEST_ASSERT_SUCCESS(err, "Failed to add queue pair\n"); + + err = rte_event_crypto_adapter_runtime_params_init(&in_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + err = rte_event_crypto_adapter_runtime_params_init(&out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + /* Case 1: Get the default value of mbufs processed by adapter */ + err = rte_event_crypto_adapter_runtime_params_get(TEST_ADAPTER_ID, + &out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + /* Case 2: Set max_nb = 32 (=BATCH_SEIZE) */ + in_params.max_nb = 32; + + err = rte_event_crypto_adapter_runtime_params_set(TEST_ADAPTER_ID, + &in_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_crypto_adapter_runtime_params_get(TEST_ADAPTER_ID, + &out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + TEST_ASSERT(in_params.max_nb == out_params.max_nb, "Expected %u got %u", + in_params.max_nb, out_params.max_nb); + + /* Case 3: Set max_nb = 192 */ + in_params.max_nb = 192; + + err = rte_event_crypto_adapter_runtime_params_set(TEST_ADAPTER_ID, + &in_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_crypto_adapter_runtime_params_get(TEST_ADAPTER_ID, + &out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + TEST_ASSERT(in_params.max_nb == out_params.max_nb, "Expected %u got %u", + in_params.max_nb, out_params.max_nb); + + /* Case 4: Set max_nb = 256 */ + in_params.max_nb = 256; + + err = rte_event_crypto_adapter_runtime_params_set(TEST_ADAPTER_ID, + &in_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_crypto_adapter_runtime_params_get(TEST_ADAPTER_ID, + &out_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + TEST_ASSERT(in_params.max_nb == out_params.max_nb, "Expected %u got %u", + in_params.max_nb, out_params.max_nb); + + /* Case 5: Set max_nb = 30(max_nb = DEFAULT_MAX_NB; + + return 0; +} + +static int +crypto_adapter_cap_check(struct event_crypto_adapter *adapter) +{ + int ret; + uint32_t caps; + + if (!adapter->nb_qps) + return -EINVAL; + ret = rte_event_crypto_adapter_caps_get(adapter->eventdev_id, + adapter->next_cdev_id, + &caps); + if (ret) { + RTE_EDEV_LOG_ERR("Failed to get adapter caps dev %" PRIu8 + " cdev %" PRIu8, adapter->eventdev_id, + adapter->next_cdev_id); + return ret; + } + + if ((caps & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) || + (caps & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW)) + return -ENOTSUP; + + return 0; +} + +int +rte_event_crypto_adapter_runtime_params_set(uint8_t id, + struct rte_event_crypto_adapter_runtime_params *params) +{ + struct event_crypto_adapter *adapter; + int ret; + + if (eca_memzone_lookup()) + return -ENOMEM; + + EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, -EINVAL); + + if (params == NULL) { + RTE_EDEV_LOG_ERR("params pointer is NULL\n"); + return -EINVAL; + } + + adapter = eca_id_to_adapter(id); + if (adapter == NULL) + return -EINVAL; + + ret = crypto_adapter_cap_check(adapter); + if (ret) + return ret; + + rte_spinlock_lock(&adapter->lock); + adapter->max_nb = params->max_nb; + rte_spinlock_unlock(&adapter->lock); + + return 0; +} + +int +rte_event_crypto_adapter_runtime_params_get(uint8_t id, + struct rte_event_crypto_adapter_runtime_params *params) +{ + struct event_crypto_adapter *adapter; + int ret; + + if (eca_memzone_lookup()) + return -ENOMEM; + + + EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, -EINVAL); + + if (params == NULL) { + RTE_EDEV_LOG_ERR("params pointer is NULL\n"); + return -EINVAL; + } + + adapter = eca_id_to_adapter(id); + if (adapter == NULL) + return -EINVAL; + + ret = crypto_adapter_cap_check(adapter); + if (ret) + return ret; + + params->max_nb = adapter->max_nb; + + return 0; +} + int rte_event_crypto_adapter_service_id_get(uint8_t id, uint32_t *service_id) { diff --git a/lib/eventdev/rte_event_crypto_adapter.h b/lib/eventdev/rte_event_crypto_adapter.h index fad4543506..c1c4c62ef7 100644 --- a/lib/eventdev/rte_event_crypto_adapter.h +++ b/lib/eventdev/rte_event_crypto_adapter.h @@ -138,6 +138,9 @@ * - rte_event_crypto_adapter_stop() * - rte_event_crypto_adapter_stats_get() * - rte_event_crypto_adapter_stats_reset() + * - rte_event_crypto_adapter_runtime_params_get() + * - rte_event_crypto_adapter_runtime_params_init() + * - rte_event_crypto_adapter_runtime_params_set() * The application creates an instance using rte_event_crypto_adapter_create() * or rte_event_crypto_adapter_create_ext(). @@ -253,6 +256,20 @@ struct rte_event_crypto_adapter_conf { */ }; +/** + * Adapter runtime configuration parameters + */ +struct rte_event_crypto_adapter_runtime_params { + uint32_t max_nb; + /**< The adapter can return early if it has processed at least + * max_nb crypto ops. This isn't treated as a requirement; batching + * may cause the adapter to process more than max_nb crypto ops. + * This is valid for service based SW adapter only. + */ + uint32_t rsvd[15]; + /**< Reserved fields for future expansion */ +}; + #define RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR 0x1 /**< This flag indicates that crypto operations processed on the crypto * adapter need to be vectorized @@ -608,6 +625,69 @@ rte_event_crypto_adapter_service_id_get(uint8_t id, uint32_t *service_id); int rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id); +/** + * Initialize the adapter runtime configuration parameters + * + * @param params + * A pointer to structure of type struct rte_event_crypto_adapter_runtime_params + * + * @return + * - 0: Success + * - <0: Error code on failure + */ +__rte_experimental +int +rte_event_crypto_adapter_runtime_params_init( + struct rte_event_crypto_adapter_runtime_params *params); + +/** + * Set the adapter runtime configuration parameters + * + * This API needs to be called after adding at least one qp to the adapter + * and is supported only for the service-based adapter. + * + * @param id + * Adapter identifier + * + * @param params + * A pointer to structure of type struct rte_event_crypto_adapter_runtime_params + * with configuration parameter values. The reserved fields of this structure + * must be initialized to zero and the valid fields need to be set appropriately. + * This struct can be initialized using + * rte_event_crypto_adapter_runtime_params_init() API to default values or + * application may reset this struct and update required fields. + * + * @return + * - 0: Success + * - <0: Error code on failure + */ +__rte_experimental +int +rte_event_crypto_adapter_runtime_params_set(uint8_t id, + struct rte_event_crypto_adapter_runtime_params *params); + +/** + * Get the adapter runtime configuration parameters + * + * This API needs to be called after adding at least one qp to the adapter + * and is supported only for the service-based adapter. + * + * @param id + * Adapter identifier + * + * @param[out] params + * A pointer to structure of type struct rte_event_crypto_adapter_runtime_params + * containing valid adapter parameters when return value is 0. + * + * @return + * - 0: Success + * - <0: Error code on failure + */ +__rte_experimental +int +rte_event_crypto_adapter_runtime_params_get(uint8_t id, + struct rte_event_crypto_adapter_runtime_params *params); + /** * @warning * @b EXPERIMENTAL: this API may change without prior notice diff --git a/lib/eventdev/version.map b/lib/eventdev/version.map index 7b93736dff..3b17c84eae 100644 --- a/lib/eventdev/version.map +++ b/lib/eventdev/version.map @@ -121,6 +121,9 @@ EXPERIMENTAL { rte_event_eth_tx_adapter_queue_stop; # added in 23.03 + rte_event_crypto_adapter_runtime_params_get; + rte_event_crypto_adapter_runtime_params_init; + rte_event_crypto_adapter_runtime_params_set; rte_event_eth_rx_adapter_runtime_params_get; rte_event_eth_rx_adapter_runtime_params_init; rte_event_eth_rx_adapter_runtime_params_set;