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 5F18BA04FD; Wed, 8 Jun 2022 14:14:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2AA1D42BDE; Wed, 8 Jun 2022 14:14:16 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 3EE3042BB9 for ; Wed, 8 Jun 2022 14:14:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654690451; x=1686226451; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=waIqpRqXG1pk8ZoXSWL6qzavBjMyokk0+jiPk7YoO9M=; b=m2HC5PvNYu/fShb71zXxH7/Zuy1usfqDYwDZteqc8phXB7uDbBI8BhKi 2gVUGNK9FkIPA3uaOlCX+oJq7rk8WDFG1a/8BFmD2zmLwWos50IMeLw+Y nVquvJJrrOjA9TkAOghyRqYSKXmsmFneMwtdtuLX6ewANH/eSKjs/pTZk mbyyClfgHzZskgdZ8KWUD9Sa+IqewTAoqa36A5GP1iO8cMZ1s5baeEgb/ aG2RPMLU/Toq4pFgcKiNfYt9H3KP+n/C87+x6hIOGqWnoLztZTPcB2oqs smRph5ZUKXCY5k71o3CbCBHWJ7TIrK7fxBGFGV9TVbBSL2BUFJoLm8jvq w==; X-IronPort-AV: E=McAfee;i="6400,9594,10371"; a="276901998" X-IronPort-AV: E=Sophos;i="5.91,286,1647327600"; d="scan'208";a="276901998" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2022 05:14:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,286,1647327600"; d="scan'208";a="670523284" Received: from txandevlnx322.an.intel.com ([10.123.117.44]) by FMSMGA003.fm.intel.com with ESMTP; 08 Jun 2022 05:14:09 -0700 From: Ganapati Kundapura To: jerinjacobk@gmail.com, dev@dpdk.org, jay.jayatheerthan@intel.com Cc: s.v.naga.harish.k@intel.com Subject: [PATCH v6 4/7] eventdev/eth_tx: add instance get API Date: Wed, 8 Jun 2022 07:13:57 -0500 Message-Id: <20220608121400.3954603-4-ganapati.kundapura@intel.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20220608121400.3954603-1-ganapati.kundapura@intel.com> References: <20220608111644.3939628-1-ganapati.kundapura@intel.com> <20220608121400.3954603-1-ganapati.kundapura@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 Added rte_event_eth_tx_adapter_instance_get() to get the adapter instance id for specified ethernet device id and tx queue index. Signed-off-by: Ganapati Kundapura diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c index 1b304f0..d9de6e5 100644 --- a/lib/eventdev/rte_event_eth_tx_adapter.c +++ b/lib/eventdev/rte_event_eth_tx_adapter.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2018 Intel Corporation. */ +#include + #include #include #include @@ -17,6 +19,11 @@ #define TXA_MAX_NB_TX 128 #define TXA_INVALID_DEV_ID INT32_C(-1) #define TXA_INVALID_SERVICE_ID INT64_C(-1) +#define INVALID_INSTANCE_ID UINT8_MAX + +#define TXA_ADAPTER_ARRAY "txa_adapter_array" +#define TXA_SERVICE_DATA_ARRAY "txa_service_data_array" +#define TXA_ADAPTER_INSTANCE_ARRAY "txa_adapter_instance_array" #define txa_evdev(id) (&rte_eventdevs[txa_dev_id_array[(id)]]) @@ -140,6 +147,10 @@ struct txa_service_ethdev { void *queues; }; +struct event_eth_txa_inst_info { + uint8_t txa_inst_id; +}; + /* Array of adapter instances, initialized with event device id * when adapter is created */ @@ -148,6 +159,9 @@ static int *txa_dev_id_array; /* Array of pointers to service implementation data */ static struct txa_service_data **txa_service_data_array; +/* array of adapter instances to store tx queue specific instance */ +static struct event_eth_txa_inst_info **event_eth_txa_inst_info; + static int32_t txa_service_func(void *args); static int txa_service_adapter_create_ext(uint8_t id, struct rte_eventdev *dev, @@ -194,12 +208,42 @@ txa_memzone_array_get(const char *name, unsigned int elt_size, int nb_elems) } static int +txa_memzone_lookup(void) +{ + const struct rte_memzone *mz; + + if (txa_dev_id_array == NULL) { + mz = rte_memzone_lookup(TXA_ADAPTER_ARRAY); + if (mz == NULL) + return -ENOMEM; + txa_dev_id_array = mz->addr; + } + + if (txa_service_data_array == NULL) { + mz = rte_memzone_lookup(TXA_SERVICE_DATA_ARRAY); + if (mz == NULL) + return -ENOMEM; + txa_service_data_array = mz->addr; + } + + if (event_eth_txa_inst_info == NULL) { + mz = rte_memzone_lookup(TXA_ADAPTER_INSTANCE_ARRAY); + if (mz == NULL) + return -ENOMEM; + event_eth_txa_inst_info = mz->addr; + } + + return 0; +} + + +static int txa_dev_id_array_init(void) { if (txa_dev_id_array == NULL) { int i; - txa_dev_id_array = txa_memzone_array_get("txa_adapter_array", + txa_dev_id_array = txa_memzone_array_get(TXA_ADAPTER_ARRAY, sizeof(int), RTE_EVENT_ETH_TX_ADAPTER_MAX_INSTANCE); if (txa_dev_id_array == NULL) @@ -221,15 +265,30 @@ txa_init(void) static int txa_service_data_init(void) { + uint8_t i; + if (txa_service_data_array == NULL) { txa_service_data_array = - txa_memzone_array_get("txa_service_data_array", + txa_memzone_array_get(TXA_SERVICE_DATA_ARRAY, sizeof(int), RTE_EVENT_ETH_TX_ADAPTER_MAX_INSTANCE); if (txa_service_data_array == NULL) return -ENOMEM; } + if (event_eth_txa_inst_info == NULL) { + event_eth_txa_inst_info = + txa_memzone_array_get(TXA_ADAPTER_INSTANCE_ARRAY, + sizeof(*event_eth_txa_inst_info), + RTE_MAX_ETHPORTS); + if (event_eth_txa_inst_info == NULL) + return -ENOMEM; + } + + /* Reset the txa instance pointers */ + for (i = 0; i < RTE_MAX_ETHPORTS; i++) + event_eth_txa_inst_info[i] = NULL; + return 0; } @@ -763,6 +822,7 @@ txa_service_queue_add(uint8_t id, struct rte_eth_dev_tx_buffer *tb; struct txa_retry *txa_retry; int ret = 0; + uint16_t eth_dev_id = eth_dev->data->port_id; txa = txa_service_id_to_data(id); @@ -831,6 +891,31 @@ txa_service_queue_add(uint8_t id, rte_eth_tx_buffer_set_err_callback(tb, txa_service_buffer_retry, txa_retry); + /* Allocate storage to store txa_inst_id for txq */ + if (event_eth_txa_inst_info[eth_dev_id] == NULL) { + uint16_t n, i; + struct event_eth_txa_inst_info *i_info; + + n = eth_dev->data->nb_tx_queues; + + i_info = rte_zmalloc_socket("event_eth_txa_inst_info", + n * sizeof(event_eth_txa_inst_info), + 0, + txa->socket_id); + if (i_info == NULL) { + RTE_EDEV_LOG_ERR("Failed to allocate storage for " + "event_eth_txa_inst_info"); + goto err_unlock; + } + + for (i = 0; i < n; i++) + i_info[i].txa_inst_id = INVALID_INSTANCE_ID; + + event_eth_txa_inst_info[eth_dev_id] = i_info; + } + + event_eth_txa_inst_info[eth_dev_id][tx_queue_id].txa_inst_id = id; + tqi->tx_buf = tb; tqi->added = 1; tdi->nb_queues++; @@ -902,6 +987,12 @@ txa_service_queue_del(uint8_t id, txa->nb_queues--; txa->txa_ethdev[port_id].nb_queues--; + /* unset txa_inst_id for tx_queue_id */ + if (event_eth_txa_inst_info[port_id]) + event_eth_txa_inst_info[port_id][tx_queue_id].txa_inst_id = + INVALID_INSTANCE_ID; + + txa_service_queue_array_free(txa, port_id); return 0; } @@ -1056,6 +1147,10 @@ int rte_event_eth_tx_adapter_free(uint8_t id) { int ret; + uint16_t eth_dev_id; + + if (txa_memzone_lookup()) + return -ENOMEM; TXA_CHECK_OR_ERR_RET(id); @@ -1067,6 +1162,13 @@ rte_event_eth_tx_adapter_free(uint8_t id) ret = txa_service_adapter_free(id); txa_dev_id_array[id] = TXA_INVALID_DEV_ID; + for (eth_dev_id = 0; eth_dev_id < RTE_MAX_ETHPORTS; eth_dev_id++) { + if (event_eth_txa_inst_info[eth_dev_id]) { + rte_free(event_eth_txa_inst_info[eth_dev_id]); + event_eth_txa_inst_info[eth_dev_id] = NULL; + } + } + rte_eventdev_trace_eth_tx_adapter_free(id, ret); return ret; } @@ -1080,6 +1182,9 @@ rte_event_eth_tx_adapter_queue_add(uint8_t id, int ret; uint32_t caps; + if (txa_memzone_lookup()) + return -ENOMEM; + RTE_ETH_VALID_PORTID_OR_ERR_RET(eth_dev_id, -EINVAL); TXA_CHECK_OR_ERR_RET(id); @@ -1113,6 +1218,9 @@ rte_event_eth_tx_adapter_queue_del(uint8_t id, int ret; uint32_t caps; + if (txa_memzone_lookup()) + return -ENOMEM; + RTE_ETH_VALID_PORTID_OR_ERR_RET(eth_dev_id, -EINVAL); TXA_CHECK_OR_ERR_RET(id); @@ -1218,3 +1326,46 @@ rte_event_eth_tx_adapter_stop(uint8_t id) rte_eventdev_trace_eth_tx_adapter_stop(id, ret); return ret; } + +int +rte_event_eth_tx_adapter_instance_get(uint16_t eth_dev_id, + uint16_t tx_queue_id, + uint8_t *txa_inst_id) +{ + uint8_t inst_id; + + if (txa_memzone_lookup()) + return -ENOMEM; + + if (eth_dev_id >= rte_eth_dev_count_avail()) { + RTE_EDEV_LOG_ERR("Invalid ethernet port id %u", eth_dev_id); + return -EINVAL; + } + + if (tx_queue_id >= rte_eth_devices[eth_dev_id].data->nb_tx_queues) { + RTE_EDEV_LOG_ERR("Invalid tx queue id %u", tx_queue_id); + return -EINVAL; + } + + if (txa_inst_id == NULL) { + RTE_EDEV_LOG_ERR("txa_instance_id cannot be NULL"); + return -EINVAL; + } + + if (event_eth_txa_inst_info[eth_dev_id] == NULL) { + RTE_EDEV_LOG_ERR("No valid txa instance for eth_dev_id %d", + eth_dev_id); + return -EINVAL; + } + + inst_id = event_eth_txa_inst_info[eth_dev_id][tx_queue_id].txa_inst_id; + if (inst_id == INVALID_INSTANCE_ID) { + RTE_EDEV_LOG_ERR("Invalid txa instance for eth_dev_id %u, " + "tx_queue_id %u", eth_dev_id, tx_queue_id); + return -EINVAL; + } + + *txa_inst_id = inst_id; + + return 0; +} diff --git a/lib/eventdev/rte_event_eth_tx_adapter.h b/lib/eventdev/rte_event_eth_tx_adapter.h index 3908c2d..20d28a7 100644 --- a/lib/eventdev/rte_event_eth_tx_adapter.h +++ b/lib/eventdev/rte_event_eth_tx_adapter.h @@ -34,6 +34,7 @@ * - rte_event_eth_tx_adapter_enqueue() * - rte_event_eth_tx_adapter_event_port_get() * - rte_event_eth_tx_adapter_service_id_get() + * - rte_event_eth_tx_adapter_instance_get() * * The application creates the adapter using * rte_event_eth_tx_adapter_create() or rte_event_eth_tx_adapter_create_ext(). @@ -423,6 +424,24 @@ rte_event_eth_tx_adapter_stats_reset(uint8_t id); int rte_event_eth_tx_adapter_service_id_get(uint8_t id, uint32_t *service_id); +/** + * Get TX adapter instance id for TX queue + * + * @param eth_dev_id + * Port identifier of Ethernet device. + * + * @param tx_queue_id + * Etherdev device TX queue index. + * + * @param[out] txa_inst_id + * Pointer to store TX adapter instance identifier. + */ +__rte_experimental +int +rte_event_eth_tx_adapter_instance_get(uint16_t eth_dev_id, + uint16_t tx_queue_id, + uint8_t *txa_inst_id); + #ifdef __cplusplus } #endif diff --git a/lib/eventdev/version.map b/lib/eventdev/version.map index f1818a2..1c99d52 100644 --- a/lib/eventdev/version.map +++ b/lib/eventdev/version.map @@ -106,6 +106,7 @@ EXPERIMENTAL { rte_event_eth_rx_adapter_queue_conf_get; rte_event_eth_rx_adapter_queue_stats_get; rte_event_eth_rx_adapter_queue_stats_reset; + rte_event_eth_tx_adapter_instance_get; # added in 22.03 rte_event_eth_rx_adapter_event_port_get; -- 2.6.4