patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH v4] net/tap: fix missing _SC_IOV_MAX
@ 2019-03-08 19:06 olegpoly123
  2019-03-08 19:13 ` Wiles, Keith
  2019-03-08 21:51 ` [dpdk-stable] [dpdk-dev] " Stephen Hemminger
  0 siblings, 2 replies; 3+ messages in thread
From: olegpoly123 @ 2019-03-08 19:06 UTC (permalink / raw)
  To: keith.wiles, thomas; +Cc: dev, olegpoly123, stable

If the value _SC_IOV_MAX is missing, sysconf returns -1.
In this case, iov_max is set to a default value of 1024.

Cc: stable@dpdk.org

Signed-off-by: Oleg Polyakov <olegp123@walla.co.il>
---
 drivers/net/tap/rte_eth_tap.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 6f5109fca..2a7e6aa00 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -68,6 +68,8 @@
 /* IPC key for queue fds sync */
 #define TAP_MP_KEY "tap_mp_sync_queues"
 
+#define TAP_IOV_DEFAULT_MAX 1024
+
 static int tap_devices_count;
 static struct rte_vdev_driver pmd_tap_drv;
 static struct rte_vdev_driver pmd_tun_drv;
@@ -1326,6 +1328,12 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,
 	struct rx_queue *rxq = &internals->rxq[rx_queue_id];
 	struct rte_mbuf **tmp = &rxq->pool;
 	long iov_max = sysconf(_SC_IOV_MAX);
+
+	if (iov_max <= 0) {
+		TAP_LOG(WARNING,
+			"_SC_IOV_MAX is not defined. Using %d as default\n", TAP_IOV_DEFAULT_MAX);
+		iov_max = TAP_IOV_DEFAULT_MAX;
+	}
 	uint16_t nb_desc = RTE_MIN(nb_rx_desc, iov_max - 1);
 	struct iovec (*iovecs)[nb_desc + 1];
 	int data_off = RTE_PKTMBUF_HEADROOM;
-- 
2.14.1

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [PATCH v4] net/tap: fix missing _SC_IOV_MAX
  2019-03-08 19:06 [dpdk-stable] [PATCH v4] net/tap: fix missing _SC_IOV_MAX olegpoly123
@ 2019-03-08 19:13 ` Wiles, Keith
  2019-03-08 21:51 ` [dpdk-stable] [dpdk-dev] " Stephen Hemminger
  1 sibling, 0 replies; 3+ messages in thread
From: Wiles, Keith @ 2019-03-08 19:13 UTC (permalink / raw)
  To: olegpoly123; +Cc: Thomas Monjalon, dev, stable



> On Mar 8, 2019, at 1:06 PM, olegpoly123 <olegp123@walla.co.il> wrote:
> 
> If the value _SC_IOV_MAX is missing, sysconf returns -1.
> In this case, iov_max is set to a default value of 1024.
> 
> Cc: stable@dpdk.org
> 
> Signed-off-by: Oleg Polyakov <olegp123@walla.co.il>
> ---
> drivers/net/tap/rte_eth_tap.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
> index 6f5109fca..2a7e6aa00 100644
> --- a/drivers/net/tap/rte_eth_tap.c
> +++ b/drivers/net/tap/rte_eth_tap.c
> @@ -68,6 +68,8 @@
> /* IPC key for queue fds sync */
> #define TAP_MP_KEY "tap_mp_sync_queues"
> 
> +#define TAP_IOV_DEFAULT_MAX 1024
> +
> static int tap_devices_count;
> static struct rte_vdev_driver pmd_tap_drv;
> static struct rte_vdev_driver pmd_tun_drv;
> @@ -1326,6 +1328,12 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,
> 	struct rx_queue *rxq = &internals->rxq[rx_queue_id];
> 	struct rte_mbuf **tmp = &rxq->pool;
> 	long iov_max = sysconf(_SC_IOV_MAX);
> +
> +	if (iov_max <= 0) {
> +		TAP_LOG(WARNING,
> +			"_SC_IOV_MAX is not defined. Using %d as default\n", TAP_IOV_DEFAULT_MAX);
> +		iov_max = TAP_IOV_DEFAULT_MAX;
> +	}
> 	uint16_t nb_desc = RTE_MIN(nb_rx_desc, iov_max - 1);
> 	struct iovec (*iovecs)[nb_desc + 1];
> 	int data_off = RTE_PKTMBUF_HEADROOM;
> -- 
> 2.14.1
> 

Acked-by Keith Wiles <keith.wiles@intel.com>

Regards,
Keith

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH v4] net/tap: fix missing _SC_IOV_MAX
  2019-03-08 19:06 [dpdk-stable] [PATCH v4] net/tap: fix missing _SC_IOV_MAX olegpoly123
  2019-03-08 19:13 ` Wiles, Keith
@ 2019-03-08 21:51 ` Stephen Hemminger
  1 sibling, 0 replies; 3+ messages in thread
From: Stephen Hemminger @ 2019-03-08 21:51 UTC (permalink / raw)
  To: olegpoly123; +Cc: keith.wiles, thomas, dev, stable

On Fri,  8 Mar 2019 14:06:58 -0500
olegpoly123 <olegp123@walla.co.il> wrote:

>  	struct rx_queue *rxq = &internals->rxq[rx_queue_id];
>  	struct rte_mbuf **tmp = &rxq->pool;
>  	long iov_max = sysconf(_SC_IOV_MAX);
> +
> +	if (iov_max <= 0) {
> +		TAP_LOG(WARNING,
> +			"_SC_IOV_MAX is not defined. Using %d as default\n", TAP_IOV_DEFAULT_MAX);
> +		iov_max = TAP_IOV_DEFAULT_MAX;
> +	}
>  	uint16_t nb_desc = RTE_MIN(nb_rx_desc, iov_max - 1);
>  	struct iovec (*iovecs)[nb_desc + 1];

Don't mix code and declarations.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-03-09  0:50 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-08 19:06 [dpdk-stable] [PATCH v4] net/tap: fix missing _SC_IOV_MAX olegpoly123
2019-03-08 19:13 ` Wiles, Keith
2019-03-08 21:51 ` [dpdk-stable] [dpdk-dev] " Stephen Hemminger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).