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 A7838A0560; Fri, 3 Jun 2022 14:49:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5DE3D42BA7; Fri, 3 Jun 2022 14:48:59 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2084.outbound.protection.outlook.com [40.107.102.84]) by mails.dpdk.org (Postfix) with ESMTP id A399042BA0 for ; Fri, 3 Jun 2022 14:48:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DIHWCXOGmi0I2Xca+HZLAoljLB3Nd0TYZQl7puEK89iwl9qVnOY8tnqPczc6qp2mohNNYLgNe+HzO/OGKUEKtSuX6AB7uM4vetpa6ZGO82ODnfAU4q4RoncwCE9kLwHeDnZ1nuJynC0QNzpXqdLwIjVmjImkOVJA0qnOJmYYTluMvVrt03qbK81n+1ezVMy1YYXcWi54iv+78p9p/svsF+IslGzFPYHkNr5V6ei/DHjKinKidQZWT6hG+MUWmL7vMGHLBypzP/t82ScZGU+b/S2AoNFI4wmvDBFCeGHNF4b4z5eZa357h/Ng5kH3/OVLb2c7FAWH+38vP7vw8iss5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3xORe7VoL6wX54+EdI5EtqZxLihz7MqzAOgMI8wFuxk=; b=nrtKjgey4H1MZYn07KQ8kTe0WkjbUmX/arexkczVUCNMVtkUhOzNhLhKKlLi5oijdDt9JgAP1xY+9RM4GsFL/9aKZUYzyUzbAGixA+KdQ1bvbRmi7/kjtpWSwMUBzKulREbECHWXaDOC21eyAeaC0xBxEVJbW49XZngdkOE6nyDlAxXPR+y7wjoP+D+ImV/cGITr3xKcZzFRkFfCbaw3If3cv7sig9klRIjGQDbrb1RdxBfcjRpowlxNQ3pp7TdU3sq5aGHa/qBG461NKrT8eyisU28KDBuTYIrMTEEFKK69gs2QwltCdLazDZ3g/3M/IYI7PBqsSEcwECkzjEXlEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) smtp.rcpttodomain=oktetlabs.ru smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3xORe7VoL6wX54+EdI5EtqZxLihz7MqzAOgMI8wFuxk=; b=X/WfKdAYewMNqIjt5r3MyhzGcxnuEDLIOT+n6oHO5/421Fn5VTQr1RlVtuPKjRB+xcdLNLuWp4AmCirN4ZKW99LMxPs31vajUKxgLSb4Inkkx5w8Cv+r0bbnTkKrqwTPYkpW99K4FFMh4J8bLw79/GkaN6ig5Srl1G5hm362r7mO++VK7D3qijXQrddQukj0zZq8A2vt+Z2kEvk8qr/M3RhInoa5SH17iGoxsl+Vr9iTwRlFJXH7VN6koIMDTCK1IHg+13Ro4d7qqH5pvLVtE0l5fndasjqkYS6df0w+ir0HoecnWcWBgU/OlV4D7KbjUpr8/u//jE9TXwXw4g8hEQ== Received: from BN6PR18CA0002.namprd18.prod.outlook.com (2603:10b6:404:121::12) by BL1PR12MB5320.namprd12.prod.outlook.com (2603:10b6:208:314::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Fri, 3 Jun 2022 12:48:54 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:404:121:cafe::4) by BN6PR18CA0002.outlook.office365.com (2603:10b6:404:121::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.19 via Frontend Transport; Fri, 3 Jun 2022 12:48:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5314.12 via Frontend Transport; Fri, 3 Jun 2022 12:48:52 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Fri, 3 Jun 2022 12:48:52 +0000 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Fri, 3 Jun 2022 05:48:47 -0700 From: Spike Du To: , , , , Wenzhuo Lu , Beilei Xing , Bernard Iremonger , "Ray Kinsella" , Neil Horman CC: , , , , Subject: [PATCH v4 3/7] ethdev: introduce Rx queue based fill threshold Date: Fri, 3 Jun 2022 15:48:17 +0300 Message-ID: <20220603124821.1148119-4-spiked@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220603124821.1148119-1-spiked@nvidia.com> References: <20220524152041.737154-1-spiked@nvidia.com> <20220603124821.1148119-1-spiked@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1124558d-3d2a-4fe9-ae33-08da455f69fc X-MS-TrafficTypeDiagnostic: BL1PR12MB5320:EE_ X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2zo/f8IdelnGJGrARk7OSNq9zf/BlI16VsDtn/115jCMLjP7HP8ZmUbBV9NlHNsH7u2j/hrwNdKDOtHuOSH1Uwz+EKg9wp13skKHKRcfnXb1FKKsM4+v8mrNuAaXxdnv/gN44xu1a1WaZFx2EAkyanSgxWRe9Z488r2Lyc83/9wfMtuofgk51ao7VNWyIeoG93f1uKde0wb4NHuobXJp+qZuxGDU5JMGklPctX60XBP3+EKDNyIZr4p4Qku2FieSxYzs1fOboIJlUvpImiOKWWALNT6kg9ghcLVLAFqk6/Uvrx3wAo71IaouAnFi8jiNli+YIZCNX6VyGKQq3Z7iHSFkIwOSTeXGSkfJVHuCcXrbQyFObPGZm9nsxRjoHK74/BUeq+p2Gzg3iWofIO3e2jFyNmlqv27INsfwkEcl7Nhz3y/FZMn78lSy/nLUowLx/d7TtddcyQjkiaJv+Ne40VF6XKnz06Ekp+zjseFqvFiyCa3xFO4gdlAP/xAA9ou1bm0rysPd+ElZfOHyWIxj/PoBidEpyc4UG2rLbtwXhQ7bW6xeDB/8tfS8FQ2RxDPlzMeYAelB164KR9bGznre5RJujoeOleGU/hb2opIT3oei97NeGAsFpsrlvEyCXXAawLkws6gfMMTh/1l0B0/8r6MxzN4eY/ztdR1sZM3V9LdBFiorFeASoRSHDYJkur3jZQ50Cb0l40HC3+dDNykV9w== X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(8676002)(55016003)(7416002)(2906002)(83380400001)(40460700003)(26005)(6286002)(36860700001)(30864003)(86362001)(356005)(6666004)(7696005)(4326008)(2616005)(8936002)(316002)(508600001)(36756003)(186003)(110136005)(16526019)(82310400005)(426003)(54906003)(47076005)(336012)(1076003)(107886003)(70586007)(5660300002)(81166007)(70206006)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2022 12:48:52.6379 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1124558d-3d2a-4fe9-ae33-08da455f69fc X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5320 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 Fill threshold describes the fullness of a Rx queue. If the Rx queue fullness is above the threshold, the device will trigger the event RTE_ETH_EVENT_RX_FILL_THRESH. Fill threshold is defined as a percentage of Rx queue size with valid value of [0,99]. Setting fill threshold to 0 means disable it, which is the default. Add fill threshold configuration and query driver callbacks in eth_dev_ops. Add command line options to support fill_thresh per-rxq configure. - Command syntax: set port rxq fill_thresh - Example commands: To configure fill_thresh as 30% of rxq size on port 1 rxq 0: testpmd> set port 1 rxq 0 fill_thresh 30 To disable fill_thresh on port 1 rxq 0: testpmd> set port 1 rxq 0 fill_thresh 0 Signed-off-by: Spike Du --- app/test-pmd/cmdline.c | 68 +++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/config.c | 21 ++++++++++++++ app/test-pmd/testpmd.c | 18 ++++++++++++ app/test-pmd/testpmd.h | 2 ++ lib/ethdev/ethdev_driver.h | 22 ++++++++++++++ lib/ethdev/rte_ethdev.c | 52 +++++++++++++++++++++++++++++++++ lib/ethdev/rte_ethdev.h | 72 ++++++++++++++++++++++++++++++++++++++++++++++ lib/ethdev/version.map | 2 ++ 8 files changed, 257 insertions(+) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 0410bad..918581e 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -17823,6 +17823,73 @@ struct cmd_show_port_flow_transfer_proxy_result { } }; +/* *** SET FILL THRESHOLD FOR A RXQ OF A PORT *** */ +struct cmd_rxq_fill_thresh_result { + cmdline_fixed_string_t set; + cmdline_fixed_string_t port; + uint16_t port_num; + cmdline_fixed_string_t rxq; + uint16_t rxq_num; + cmdline_fixed_string_t fill_thresh; + uint16_t fill_thresh_num; +}; + +static void cmd_rxq_fill_thresh_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_rxq_fill_thresh_result *res = parsed_result; + int ret = 0; + + if ((strcmp(res->set, "set") == 0) && (strcmp(res->port, "port") == 0) + && (strcmp(res->rxq, "rxq") == 0) + && (strcmp(res->fill_thresh, "fill_thresh") == 0)) + ret = set_rxq_fill_thresh(res->port_num, res->rxq_num, + res->fill_thresh_num); + if (ret < 0) + printf("rxq_fill_thresh_cmd error: (%s)\n", strerror(-ret)); + +} + +cmdline_parse_token_string_t cmd_rxq_fill_thresh_set = + TOKEN_STRING_INITIALIZER(struct cmd_rxq_fill_thresh_result, + set, "set"); +cmdline_parse_token_string_t cmd_rxq_fill_thresh_port = + TOKEN_STRING_INITIALIZER(struct cmd_rxq_fill_thresh_result, + port, "port"); +cmdline_parse_token_num_t cmd_rxq_fill_thresh_portnum = + TOKEN_NUM_INITIALIZER(struct cmd_rxq_fill_thresh_result, + port_num, RTE_UINT16); +cmdline_parse_token_string_t cmd_rxq_fill_thresh_rxq = + TOKEN_STRING_INITIALIZER(struct cmd_rxq_fill_thresh_result, + rxq, "rxq"); +cmdline_parse_token_num_t cmd_rxq_fill_thresh_rxqnum = + TOKEN_NUM_INITIALIZER(struct cmd_rxq_fill_thresh_result, + rxq_num, RTE_UINT8); +cmdline_parse_token_string_t cmd_rxq_fill_thresh_fill_thresh = + TOKEN_STRING_INITIALIZER(struct cmd_rxq_fill_thresh_result, + fill_thresh, "fill_thresh"); +cmdline_parse_token_num_t cmd_rxq_fill_thresh_fill_threshnum = + TOKEN_NUM_INITIALIZER(struct cmd_rxq_fill_thresh_result, + fill_thresh_num, RTE_UINT16); + +cmdline_parse_inst_t cmd_rxq_fill_thresh = { + .f = cmd_rxq_fill_thresh_parsed, + .data = (void *)0, + .help_str = "set port rxq fill_thresh " + "Set fill_thresh for rxq on port_id", + .tokens = { + (void *)&cmd_rxq_fill_thresh_set, + (void *)&cmd_rxq_fill_thresh_port, + (void *)&cmd_rxq_fill_thresh_portnum, + (void *)&cmd_rxq_fill_thresh_rxq, + (void *)&cmd_rxq_fill_thresh_rxqnum, + (void *)&cmd_rxq_fill_thresh_fill_thresh, + (void *)&cmd_rxq_fill_thresh_fill_threshnum, + NULL, + }, +}; + /* ******************************************************************************** */ /* list of instructions */ @@ -18110,6 +18177,7 @@ struct cmd_show_port_flow_transfer_proxy_result { (cmdline_parse_inst_t *)&cmd_show_capability, (cmdline_parse_inst_t *)&cmd_set_flex_is_pattern, (cmdline_parse_inst_t *)&cmd_set_flex_spec_pattern, + (cmdline_parse_inst_t *)&cmd_rxq_fill_thresh, NULL, }; diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 1b1e738..d0c519b 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -6342,3 +6342,24 @@ struct igb_ring_desc_16_bytes { printf(" %s\n", buf); } } + +int +set_rxq_fill_thresh(portid_t port_id, uint16_t queue_idx, uint16_t fill_thresh) +{ + struct rte_eth_link link; + int ret; + + if (port_id_is_invalid(port_id, ENABLED_WARN)) + return -EINVAL; + ret = eth_link_get_nowait_print_err(port_id, &link); + if (ret < 0) + return -EINVAL; + if (fill_thresh > 99) + return -EINVAL; + ret = rte_eth_rx_fill_thresh_set(port_id, queue_idx, fill_thresh); + + if (ret) + return ret; + return 0; +} + diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 767765d..1209230 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -420,6 +420,7 @@ struct fwd_engine * fwd_engines[] = { [RTE_ETH_EVENT_NEW] = "device probed", [RTE_ETH_EVENT_DESTROY] = "device released", [RTE_ETH_EVENT_FLOW_AGED] = "flow aged", + [RTE_ETH_EVENT_RX_FILL_THRESH] = "rxq fill threshold reached", [RTE_ETH_EVENT_MAX] = NULL, }; @@ -3616,6 +3617,10 @@ struct pmd_test_command { eth_event_callback(portid_t port_id, enum rte_eth_event_type type, void *param, void *ret_param) { + struct rte_eth_dev_info dev_info; + uint16_t rxq_id; + uint8_t fill_thresh; + int ret; RTE_SET_USED(param); RTE_SET_USED(ret_param); @@ -3647,6 +3652,19 @@ struct pmd_test_command { ports[port_id].port_status = RTE_PORT_CLOSED; printf("Port %u is closed\n", port_id); break; + case RTE_ETH_EVENT_RX_FILL_THRESH: + ret = rte_eth_dev_info_get(port_id, &dev_info); + if (ret != 0) + break; + /* fill_thresh query API rewinds rxq_id, no need to check max rxq num. */ + for (rxq_id = 0; ; rxq_id++) { + ret = rte_eth_rx_fill_thresh_query(port_id, &rxq_id, &fill_thresh); + if (ret <= 0) + break; + printf("Received fill_thresh event, port:%d rxq_id:%d\n", + port_id, rxq_id); + } + break; default: break; } diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 78a5f4e..c7a144e 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -1173,6 +1173,8 @@ uint16_t tx_pkt_set_dynf(uint16_t port_id, __rte_unused uint16_t queue, void flex_item_create(portid_t port_id, uint16_t flex_id, const char *filename); void flex_item_destroy(portid_t port_id, uint16_t flex_id); void port_flex_item_flush(portid_t port_id); +int set_rxq_fill_thresh(portid_t port_id, uint16_t queue_idx, + uint16_t fill_thresh); extern int flow_parse(const char *src, void *result, unsigned int size, struct rte_flow_attr **attr, diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h index 69d9dc2..7ef7dba 100644 --- a/lib/ethdev/ethdev_driver.h +++ b/lib/ethdev/ethdev_driver.h @@ -470,6 +470,23 @@ typedef int (*eth_rx_queue_setup_t)(struct rte_eth_dev *dev, const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mb_pool); +/** + * @internal Set Rx queue fill threshold. + * @see rte_eth_rx_fill_thresh_set() + */ +typedef int (*eth_rx_queue_fill_thresh_set_t)(struct rte_eth_dev *dev, + uint16_t rx_queue_id, + uint8_t fill_thresh); + +/** + * @internal Query queue fill threshold event. + * @see rte_eth_rx_fill_thresh_query() + */ + +typedef int (*eth_rx_queue_fill_thresh_query_t)(struct rte_eth_dev *dev, + uint16_t *rx_queue_id, + uint8_t *fill_thresh); + /** @internal Setup a transmit queue of an Ethernet device. */ typedef int (*eth_tx_queue_setup_t)(struct rte_eth_dev *dev, uint16_t tx_queue_id, @@ -1168,6 +1185,11 @@ struct eth_dev_ops { /** Priority flow control queue configure */ priority_flow_ctrl_queue_config_t priority_flow_ctrl_queue_config; + /** Set Rx queue fill threshold. */ + eth_rx_queue_fill_thresh_set_t rx_queue_fill_thresh_set; + /** Query Rx queue fill threshold event. */ + eth_rx_queue_fill_thresh_query_t rx_queue_fill_thresh_query; + /** Set Unicast Table Array */ eth_uc_hash_table_set_t uc_hash_table_set; /** Set Unicast hash bitmap */ diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index a175867..69a1f75 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -4424,6 +4424,58 @@ int rte_eth_set_queue_rate_limit(uint16_t port_id, uint16_t queue_idx, queue_idx, tx_rate)); } +int rte_eth_rx_fill_thresh_set(uint16_t port_id, uint16_t queue_id, + uint8_t fill_thresh) +{ + struct rte_eth_dev *dev; + struct rte_eth_dev_info dev_info; + int ret; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + ret = rte_eth_dev_info_get(port_id, &dev_info); + if (ret != 0) + return ret; + + if (queue_id > dev_info.max_rx_queues) { + RTE_ETHDEV_LOG(ERR, + "Set queue fill thresh: port %u: invalid queue ID=%u.\n", + port_id, queue_id); + return -EINVAL; + } + + if (fill_thresh > 99) + return -EINVAL; + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_fill_thresh_set, -ENOTSUP); + return eth_err(port_id, (*dev->dev_ops->rx_queue_fill_thresh_set)(dev, + queue_id, fill_thresh)); +} + +int rte_eth_rx_fill_thresh_query(uint16_t port_id, uint16_t *queue_id, + uint8_t *fill_thresh) +{ + struct rte_eth_dev_info dev_info; + struct rte_eth_dev *dev; + int ret; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + ret = rte_eth_dev_info_get(port_id, &dev_info); + if (ret != 0) + return ret; + + if (queue_id == NULL) + return -EINVAL; + if (*queue_id >= dev_info.max_rx_queues) + *queue_id = 0; + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_fill_thresh_query, -ENOTSUP); + return eth_err(port_id, (*dev->dev_ops->rx_queue_fill_thresh_query)(dev, + queue_id, fill_thresh)); +} + RTE_INIT(eth_dev_init_fp_ops) { uint32_t i; diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 04225bb..d44e5da 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -1931,6 +1931,14 @@ struct rte_eth_rxq_info { uint8_t queue_state; /**< one of RTE_ETH_QUEUE_STATE_*. */ uint16_t nb_desc; /**< configured number of RXDs. */ uint16_t rx_buf_size; /**< hardware receive buffer size. */ + /** + * Per-queue Rx fill threshold defined as percentage of Rx queue + * size. If Rx queue receives traffic higher than this percentage, + * the event RTE_ETH_EVENT_RX_FILL_THESH is triggered. + * Value 0 means threshold monitoring is disabled, no event is + * triggered. + */ + uint8_t fill_thresh; } __rte_cache_min_aligned; /** @@ -3672,6 +3680,65 @@ int rte_eth_dev_set_vlan_ether_type(uint16_t port_id, */ int rte_eth_dev_set_vlan_pvid(uint16_t port_id, uint16_t pvid, int on); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Set Rx queue based fill threshold. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param queue_id + * The index of the receive queue. + * @param fill_thresh + * The fill threshold percentage of Rx queue size which describes + * the fullness of Rx queue. If the Rx queue fullness is above it, + * the device will trigger the event RTE_ETH_EVENT_RX_FILL_THRESH. + * [1-99] to set a new fill thresold. + * 0 to disable thresold monitoring. + * + * @return + * - 0 if successful. + * - negative if failed. + */ +__rte_experimental +int rte_eth_rx_fill_thresh_set(uint16_t port_id, uint16_t queue_id, + uint8_t fill_thresh); + +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Query Rx queue based fill threshold event. + * The function queries all queues in the port circularly until one + * pending fill_thresh event is found or no pending fill_thresh event is found. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param queue_id + * The API caller sets the starting Rx queue id in the pointer. + * If the queue_id is bigger than maximum queue id of the port, + * it's rewinded to 0 so that application can keep calling + * this function to handle all pending fill_thresh events in the queues + * with a simple increment between calls. + * If a Rx queue has pending fill_thresh event, the pointer is updated + * with this Rx queue id; otherwise this pointer's content is + * unchanged. + * @param fill_thresh + * The pointer to the fill threshold percentage of Rx queue. + * If Rx queue with pending fill_thresh event is found, the queue's fill_thresh + * percentage is stored in this pointer, otherwise the pointer's + * content is unchanged. + * + * @return + * - 1 if a Rx queue with pending fill_thresh event is found. + * - 0 if no Rx queue with pending fill_thresh event is found. + * - -EINVAL if queue_id is NULL. + */ +__rte_experimental +int rte_eth_rx_fill_thresh_query(uint16_t port_id, uint16_t *queue_id, + uint8_t *fill_thresh); + typedef void (*buffer_tx_error_fn)(struct rte_mbuf **unsent, uint16_t count, void *userdata); @@ -3877,6 +3944,11 @@ enum rte_eth_event_type { RTE_ETH_EVENT_DESTROY, /**< port is released */ RTE_ETH_EVENT_IPSEC, /**< IPsec offload related event */ RTE_ETH_EVENT_FLOW_AGED,/**< New aged-out flows is detected */ + /** + * Fill threshold value is exceeded in a queue. + * @see rte_eth_rx_fill_thresh_set() + */ + RTE_ETH_EVENT_RX_FILL_THRESH, RTE_ETH_EVENT_MAX /**< max value of this enum */ }; diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index daca785..29b1fe8 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -285,6 +285,8 @@ EXPERIMENTAL { rte_mtr_color_in_protocol_priority_get; rte_mtr_color_in_protocol_set; rte_mtr_meter_vlan_table_update; + rte_eth_rx_fill_thresh_set; + rte_eth_rx_fill_thresh_query; }; INTERNAL { -- 1.8.3.1