From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <arybchenko@solarflare.com>
Received: from nbfkord-smmo02.seg.att.com (nbfkord-smmo02.seg.att.com
[209.65.160.78]) by dpdk.org (Postfix) with ESMTP id E6236F923
for <dev@dpdk.org>; Thu, 2 Mar 2017 14:06:11 +0100 (CET)
Received: from unknown [12.187.104.26] (EHLO nbfkord-smmo02.seg.att.com)
by nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) with ESMTP id
3c818b85.2ae05608f940.1009374.00-2461.2789354.nbfkord-smmo02.seg.att.com
(envelope-from <arybchenko@solarflare.com>);
Thu, 02 Mar 2017 13:06:11 +0000 (UTC)
X-MXL-Hash: 58b818c34c835380-0d4f903d2b3a192cd4156c923c7e9519b9fc13ba
Received: from unknown [12.187.104.26]
by nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7)
with SMTP id fb818b85.0.1009368.00-2331.2789340.nbfkord-smmo02.seg.att.com
(envelope-from <arybchenko@solarflare.com>);
Thu, 02 Mar 2017 13:06:10 +0000 (UTC)
X-MXL-Hash: 58b818c26bfce036-8911c1ffba045f131a4e3d69cc3bc4fcba982c39
Received: from ocex03.SolarFlarecom.com (10.20.40.36) by
ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id
15.0.1044.25; Thu, 2 Mar 2017 05:06:04 -0800
Received: from opal.uk.solarflarecom.com (10.17.10.1) by
ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id
15.0.1044.25 via Frontend Transport; Thu, 2 Mar 2017 05:06:04 -0800
Received: from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com
[10.17.10.10])
by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v22D63AP016842;
Thu, 2 Mar 2017 13:06:03 GMT
Received: from uklogin.uk.solarflarecom.com (localhost.localdomain [127.0.0.1])
by uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v22D62sB013382;
Thu, 2 Mar 2017 13:06:03 GMT
From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
CC: Thomas Monjalon <thomas.monjalon@6wind.com>, Roman Zhukov
<Roman.Zhukov@oktetlabs.ru>
Date: Thu, 2 Mar 2017 13:05:34 +0000
Message-ID: <1488459935-13273-2-git-send-email-arybchenko@solarflare.com>
X-Mailer: git-send-email 1.8.2.3
In-Reply-To: <1488459935-13273-1-git-send-email-arybchenko@solarflare.com>
References: <1488459935-13273-1-git-send-email-arybchenko@solarflare.com>
MIME-Version: 1.0
Content-Type: text/plain
X-AnalysisOut: [v=2.1 cv=T6yKOq+Q c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==]
X-AnalysisOut: [:17 a=6Iz7jQTuP9IA:10 a=pK7X0mNQAAAA:8 a=zRKbQ67AAAAA:8 a=]
X-AnalysisOut: [SaE3VjkI3IpKS6i-HBIA:9 a=ik6T_nIFCyaj4_a7:21 a=STGl28cEnZA]
X-AnalysisOut: [Ac8aj:21 a=5HA-qpC1VU4iIGLgRoNS:22 a=PA03WX8tBzeizutn5_OT:]
X-AnalysisOut: [22]
X-Spam: [F=0.4556935261; CM=0.500; S=0.455(2015072901)]
X-MAIL-FROM: <arybchenko@solarflare.com>
X-SOURCE-IP: [12.187.104.26]
Subject: [dpdk-dev] [RFC PATCH 1/2] ethdev: add function to adjust number of
descriptors
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Mar 2017 13:06:12 -0000
From: Roman Zhukov <Roman.Zhukov@oktetlabs.ru>
Check that numbers of Rx and Tx descriptors satisfy descriptors limits
from the Ethernet device information, otherwise adjust them to boundaries.
Signed-off-by: Roman Zhukov <Roman.Zhukov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
lib/librte_ether/rte_ethdev.c | 37 ++++++++++++++++++++++++++++++++++
lib/librte_ether/rte_ethdev.h | 20 ++++++++++++++++++
lib/librte_ether/rte_ether_version.map | 7 +++++++
3 files changed, 64 insertions(+)
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index eb0a94a..67ae2d7 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -3273,3 +3273,40 @@ rte_eth_dev_l2_tunnel_offload_set(uint8_t port_id,
-ENOTSUP);
return (*dev->dev_ops->l2_tunnel_offload_set)(dev, l2_tunnel, mask, en);
}
+
+static void
+rte_eth_dev_adjust_nb_desc(uint16_t *nb_desc,
+ const struct rte_eth_desc_lim *desc_lim)
+{
+ if (desc_lim->nb_align != 0)
+ *nb_desc = RTE_ALIGN_CEIL(*nb_desc, desc_lim->nb_align);
+
+ if (desc_lim->nb_max != 0)
+ *nb_desc = RTE_MIN(*nb_desc, desc_lim->nb_max);
+
+ *nb_desc = RTE_MAX(*nb_desc, desc_lim->nb_min);
+}
+
+int
+rte_eth_dev_adjust_nb_rx_tx_desc(uint8_t port_id,
+ uint16_t *nb_rx_desc,
+ uint16_t *nb_tx_desc)
+{
+ struct rte_eth_dev *dev;
+ struct rte_eth_dev_info dev_info;
+
+ RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+ dev = &rte_eth_devices[port_id];
+ RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP);
+
+ rte_eth_dev_info_get(port_id, &dev_info);
+
+ if (nb_rx_desc != NULL)
+ rte_eth_dev_adjust_nb_desc(nb_rx_desc, &dev_info.rx_desc_lim);
+
+ if (nb_tx_desc != NULL)
+ rte_eth_dev_adjust_nb_desc(nb_tx_desc, &dev_info.tx_desc_lim);
+
+ return 0;
+}
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 97f3e2d..b8b985c 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -4421,6 +4421,26 @@ int rte_eth_dev_pci_probe(struct rte_pci_driver *pci_drv,
*/
int rte_eth_dev_pci_remove(struct rte_pci_device *pci_dev);
+/**
+ * Check that numbers of Rx and Tx descriptors satisfy descriptors limits from
+ * the ethernet device information, otherwise adjust them to boundaries.
+ *
+ * @param port_id
+ * The port identifier of the Ethernet device.
+ * @param nb_rx_desc
+ * A pointer to a uint16_t where the number of receive
+ * descriptors stored.
+ * @param nb_tx_desc
+ * A pointer to a uint16_t where the number of transmit
+ * descriptors stored.
+ * @return
+ * - (0) if successful.
+ * - (-ENOTSUP, -ENODEV or -EINVAL) on failure.
+ */
+int rte_eth_dev_adjust_nb_rx_tx_desc(uint8_t port_id,
+ uint16_t *nb_rx_desc,
+ uint16_t *nb_tx_desc);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/librte_ether/rte_ether_version.map b/lib/librte_ether/rte_ether_version.map
index c6c9d0d..8a6696a 100644
--- a/lib/librte_ether/rte_ether_version.map
+++ b/lib/librte_ether/rte_ether_version.map
@@ -154,3 +154,10 @@ DPDK_17.02 {
rte_flow_validate;
} DPDK_16.11;
+
+DPDK_17.05 {
+ global:
+
+ rte_eth_dev_adjust_nb_rx_tx_desc;
+
+} DPDK_17.02;
--
2.9.3