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 226A5A0C4E; Sat, 4 Dec 2021 18:29:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6CA1240DDD; Sat, 4 Dec 2021 18:29:28 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 386174013F for ; Sat, 4 Dec 2021 18:29:26 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1B4E0Ibs014333; Sat, 4 Dec 2021 09:29:03 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=JfXLgNL7AdNnkdOZrrZ7xJL4/1/FUrEQcVcvn9GqNI0=; b=ZxfV1/qYw6hX14IOmr+p5axDT4HBzg08quIYxSShCbPXj8QgZNitawFuZIW3tD1RukZf UDa0avXldjy5I+hLC7uRPHUVKUabqao/uVdFmXhk2xYRANYu5CPsW3kerBOk3mWAc02s 6wLoH1xHYW2Tx4gSGTr/cE8BBAFt3FprpYrjLYA1fGJnUiLclSPwqGi26bmzq/3Lu+uJ YEbNGLYz5B406FrA4fvljP/UkDJWC3LBAlnm6VeIP350nkkukjr91cJsWouC/bLjZhph bD1s3lj8e6WiTH8zLAAPUFtqQOqlATYzSuyJNJhecclga9TKSx7SmLJQ+YcTLUcFelrh gQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3cr6jrgw0w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Sat, 04 Dec 2021 09:29:03 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sat, 4 Dec 2021 09:29:01 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Sat, 4 Dec 2021 09:29:01 -0800 Received: from jerin-lab.marvell.com (jerin-lab.marvell.com [10.28.34.14]) by maili.marvell.com (Postfix) with ESMTP id B17B43F7088; Sat, 4 Dec 2021 09:28:43 -0800 (PST) From: To: , Ray Kinsella , Thomas Monjalon , Ferruh Yigit , "Andrew Rybchenko" CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Jerin Jacob Subject: [dpdk-dev] [PATCH] ethdev: support queue-based priority flow control Date: Sat, 4 Dec 2021 22:54:58 +0530 Message-ID: <20211204172458.1904300-1-jerinj@marvell.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: awfiGvI4ICld-TSrh5R97pUKjdSopvOd X-Proofpoint-ORIG-GUID: awfiGvI4ICld-TSrh5R97pUKjdSopvOd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2021-12-04_06,2021-12-02_01,2021-12-02_01 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 From: Jerin Jacob Based on device support and use-case need, there are two different ways to enable PFC. The first case is the port level PFC configuration, in this case, rte_eth_dev_priority_flow_ctrl_set() API shall be used to configure the PFC, and PFC frames will be generated using based on VLAN TC value. The second case is the queue level PFC configuration, in this case, Any packet field content can be used to steer the packet to the specific queue using rte_flow or RSS and then use rte_eth_dev_priority_flow_ctrl_queue_set() to set the TC mapping on each queue. Based on congestion selected on the specific queue, configured TC shall be used to generate PFC frames. Operation of these modes are mutually exclusive, when driver sets non zero value for rte_eth_dev_info::pfc_queue_tc_max, application must use queue level PFC configuration via rte_eth_dev_priority_flow_ctrl_queue_set() API instead of port level PFC configuration via rte_eth_dev_priority_flow_ctrl_set() API to realize PFC configuration. This patch enables the configuration for second case a.k.a queue based PFC also updates rte_eth_dev_priority_flow_ctrl_set() implmentaion to adheher to rte_eth_dev_info::pfc_queue_tc_max handling. Also updated libabigail.abignore to ignore the update to reserved fields in rte_eth_dev_info. Signed-off-by: Jerin Jacob --- devtools/libabigail.abignore | 6 ++ doc/guides/nics/features.rst | 5 +- doc/guides/rel_notes/release_22_03.rst | 4 ++ lib/ethdev/ethdev_driver.h | 6 +- lib/ethdev/rte_ethdev.c | 73 ++++++++++++++++++++++++ lib/ethdev/rte_ethdev.h | 77 +++++++++++++++++++++++++- lib/ethdev/version.map | 3 + 7 files changed, 168 insertions(+), 6 deletions(-) diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore index 4b676f317d..e5686115f7 100644 --- a/devtools/libabigail.abignore +++ b/devtools/libabigail.abignore @@ -11,3 +11,9 @@ ; Ignore generated PMD information strings [suppress_variable] name_regexp = _pmd_info$ + +; Ignore fields inserted in place of reserved fields of rte_eth_dev_info +[suppress_type] + name = rte_eth_dev_info + has_data_member_inserted_between = {offset_after(switch_info), end} + diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index 27be2d2576..6bb7337c58 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -379,9 +379,10 @@ Flow control Supports configuring link flow control. * **[implements] eth_dev_ops**: ``flow_ctrl_get``, ``flow_ctrl_set``, - ``priority_flow_ctrl_set``. + ``priority_flow_ctrl_set``, ``priority_flow_ctrl_queue_set_t``. * **[related] API**: ``rte_eth_dev_flow_ctrl_get()``, ``rte_eth_dev_flow_ctrl_set()``, - ``rte_eth_dev_priority_flow_ctrl_set()``. + ``rte_eth_dev_priority_flow_ctrl_set()``, ``rte_eth_dev_priority_flow_ctrl_queue_set()``. +* **[provides] rte_eth_dev_info**: ``pfc_queue_tc_max``. .. _nic_features_rate_limitation: diff --git a/doc/guides/rel_notes/release_22_03.rst b/doc/guides/rel_notes/release_22_03.rst index 6d99d1eaa9..f336ee2996 100644 --- a/doc/guides/rel_notes/release_22_03.rst +++ b/doc/guides/rel_notes/release_22_03.rst @@ -55,6 +55,10 @@ New Features Also, make sure to start the actual text at the margin. ======================================================= +* **Added an API to enable queue based priority flow ctrl(PFC).** + + A new API, ``rte_eth_dev_priority_flow_ctrl_queue_set()``, was added. + Removed Items ------------- diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h index d95605a355..0cbd434152 100644 --- a/lib/ethdev/ethdev_driver.h +++ b/lib/ethdev/ethdev_driver.h @@ -532,6 +532,9 @@ typedef int (*flow_ctrl_set_t)(struct rte_eth_dev *dev, /** @internal Setup priority flow control parameter on an Ethernet device. */ typedef int (*priority_flow_ctrl_set_t)(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *pfc_conf); +/** @internal Queue setup for priority flow control parameter on an Ethernet device. */ +typedef int (*priority_flow_ctrl_queue_set_t)(struct rte_eth_dev *dev, + uint16_t queue_id, struct rte_eth_pfc_queue_conf *pfc_queue_conf); /** @internal Update RSS redirection table on an Ethernet device. */ typedef int (*reta_update_t)(struct rte_eth_dev *dev, @@ -1080,7 +1083,8 @@ struct eth_dev_ops { flow_ctrl_set_t flow_ctrl_set; /**< Setup flow control */ /** Setup priority flow control */ priority_flow_ctrl_set_t priority_flow_ctrl_set; - + /** Priority flow control queue setup */ + priority_flow_ctrl_queue_set_t priority_flow_ctrl_queue_set; /** 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 a1d475a292..86e0adac24 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -3998,7 +3998,9 @@ int rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, struct rte_eth_pfc_conf *pfc_conf) { + 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]; @@ -4010,6 +4012,17 @@ rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, return -EINVAL; } + ret = rte_eth_dev_info_get(port_id, &dev_info); + if (ret != 0) + return ret; + + if (dev_info.pfc_queue_tc_max != 0) { + RTE_ETHDEV_LOG(ERR, + "Ethdev port %u driver does not support port level PFC config\n", + port_id); + return -ENOTSUP; + } + if (pfc_conf->priority > (RTE_ETH_DCB_NUM_USER_PRIORITIES - 1)) { RTE_ETHDEV_LOG(ERR, "Invalid priority, only 0-7 allowed\n"); return -EINVAL; @@ -4022,6 +4035,66 @@ rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, return -ENOTSUP; } +int +rte_eth_dev_priority_flow_ctrl_queue_set( + uint16_t port_id, uint16_t queue_id, + struct rte_eth_pfc_queue_conf *pfc_queue_conf) +{ + 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]; + + if (pfc_queue_conf == NULL) { + RTE_ETHDEV_LOG(ERR, + "Cannot set ethdev port %u queue %d PFC from NULL config\n", + port_id, queue_id); + return -EINVAL; + } + + ret = rte_eth_dev_info_get(port_id, &dev_info); + if (ret != 0) + return ret; + + if (dev_info.pfc_queue_tc_max == 0) { + RTE_ETHDEV_LOG(ERR, + "Ethdev port %u driver does not support PFC TC values\n", + port_id); + return -ENOTSUP; + } + + if (pfc_queue_conf->mode != RTE_ETH_FC_TX_PAUSE && + queue_id >= dev_info.nb_rx_queues) { + RTE_ETHDEV_LOG(ERR, + "PFC Rx queue not in range(requested: %d configured: %d)\n", + queue_id, dev_info.nb_rx_queues); + return -EINVAL; + } + + if (pfc_queue_conf->mode != RTE_ETH_FC_RX_PAUSE && + queue_id >= dev_info.nb_tx_queues) { + RTE_ETHDEV_LOG(ERR, + "PFC Tx queue not in range(requested: %d configured: %d)\n", + queue_id, dev_info.nb_tx_queues); + return -EINVAL; + } + + if (pfc_queue_conf->tc >= dev_info.pfc_queue_tc_max) { + RTE_ETHDEV_LOG(ERR, + "PFC TC not in range(requested: %d max: %d)\n", + pfc_queue_conf->tc, dev_info.pfc_queue_tc_max); + return -EINVAL; + } + + if (*dev->dev_ops->priority_flow_ctrl_queue_set) + return eth_err(port_id, + (*dev->dev_ops->priority_flow_ctrl_queue_set)( + dev, queue_id, pfc_queue_conf)); + return -ENOTSUP; +} + static int eth_check_reta_mask(struct rte_eth_rss_reta_entry64 *reta_conf, uint16_t reta_size) diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index fa299c8ad7..b40e54576f 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -1395,6 +1395,19 @@ struct rte_eth_pfc_conf { uint8_t priority; /**< VLAN User Priority. */ }; +/** + * @warning + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice + * + * A structure used to configure Ethernet priority flow control parameter for + * ethdev queues. + */ +struct rte_eth_pfc_queue_conf { + uint8_t tc; /**< Traffic class as per PFC (802.1Qbb) specification */ + uint16_t pause_time; /**< Pause quota in the Pause frame */ + enum rte_eth_fc_mode mode; /**< Link flow control mode */ +}; + /** * Tunnel type for device-specific classifier configuration. * @see rte_eth_udp_tunnel @@ -1841,8 +1854,30 @@ struct rte_eth_dev_info { * embedded managed interconnect/switch. */ struct rte_eth_switch_info switch_info; - - uint64_t reserved_64s[2]; /**< Reserved for future fields */ + /** + * Maximum supported traffic class as per PFC (802.1Qbb) specification. + * + * Based on device support and use-case need, there are two different + * ways to enable PFC. The first case is the port level PFC + * configuration, in this case, rte_eth_dev_priority_flow_ctrl_set() + * API shall be used to configure the PFC, and PFC frames will be + * generated using based on VLAN TC value. + * The second case is the queue level PFC configuration, in this case, + * Any packet field content can be used to steer the packet to the + * specific queue using rte_flow or RSS and then use + * rte_eth_dev_priority_flow_ctrl_queue_set() to set the TC mapping + * on each queue. Based on congestion selected on the specific queue, + * configured TC shall be used to generate PFC frames. + * + * When set to non zero value, application must use queue level + * PFC configuration via rte_eth_dev_priority_flow_ctrl_queue_set() API + * instead of port level PFC configuration via + * rte_eth_dev_priority_flow_ctrl_set() API to realize + * PFC configuration. + */ + uint8_t pfc_queue_tc_max; + uint8_t reserved_8s[7]; + uint64_t reserved_64s[1]; /**< Reserved for future fields */ void *reserved_ptrs[2]; /**< Reserved for future fields */ }; @@ -4109,6 +4144,9 @@ int rte_eth_dev_flow_ctrl_set(uint16_t port_id, * Configure the Ethernet priority flow control under DCB environment * for Ethernet device. * + * @see struct rte_eth_dev_info::pfc_queue_tc_max priority + * flow control usage models. + * * @param port_id * The port identifier of the Ethernet device. * @param pfc_conf @@ -4119,10 +4157,43 @@ int rte_eth_dev_flow_ctrl_set(uint16_t port_id, * - (-ENODEV) if *port_id* invalid. * - (-EINVAL) if bad parameter * - (-EIO) if flow control setup failure or device is removed. + * */ int rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, - struct rte_eth_pfc_conf *pfc_conf); + struct rte_eth_pfc_conf *pfc_conf); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Configure the Ethernet priority flow control for a given queue + * for Ethernet device. + * + * @see struct rte_eth_dev_info::pfc_queue_tc_max priority flow control + * usage models. + * + * @note When an ethdev port switches to PFC mode, the unconfigured + * queues shall be configured by the driver with default values such as + * lower priority value for TC etc. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param queue_id + * The Rx/Tx queue to apply the PFC configuration. + * @note pfc_queue_conf::mode depicts the queue direction(Rx and/or Tx) + * @param pfc_queue_conf + * The pointer to the structure of the priority flow control parameters + * for the queue. + * @return + * - (0) if successful. + * - (-ENOTSUP) if hardware doesn't support priority flow control mode. + * - (-ENODEV) if *port_id* invalid. + * - (-EINVAL) if bad parameter + * - (-EIO) if flow control setup queue failure + */ +__rte_experimental +int rte_eth_dev_priority_flow_ctrl_queue_set(uint16_t port_id, uint16_t queue_id, + struct rte_eth_pfc_queue_conf *pfc_queue_conf); /** * Add a MAC address to the set used for filtering incoming packets. * diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index c2fb0669a4..8f361ec15a 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -256,6 +256,9 @@ EXPERIMENTAL { rte_flow_flex_item_create; rte_flow_flex_item_release; rte_flow_pick_transfer_proxy; + + # added in 22.03 + rte_eth_dev_priority_flow_ctrl_queue_set; }; INTERNAL { -- 2.34.1