From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id B1708A00E6 for ; Tue, 16 Apr 2019 16:38:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A098A1B4EC; Tue, 16 Apr 2019 16:38:35 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D62C51B4EA for ; Tue, 16 Apr 2019 16:38:33 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 14E0781105; Tue, 16 Apr 2019 14:38:33 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-214.ams2.redhat.com [10.36.117.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id E82EB1001E93; Tue, 16 Apr 2019 14:38:31 +0000 (UTC) From: Kevin Traynor To: Oleg Polyakov Cc: Keith Wiles , dpdk stable Date: Tue, 16 Apr 2019 15:36:53 +0100 Message-Id: <20190416143719.21601-35-ktraynor@redhat.com> In-Reply-To: <20190416143719.21601-1-ktraynor@redhat.com> References: <20190416143719.21601-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 16 Apr 2019 14:38:33 +0000 (UTC) Subject: [dpdk-stable] patch 'net/tap: fix getting max iovec' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/24/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Kevin Traynor --- >From 454c44c9b9d1801e4210b7c4c0f40c42b324a96a Mon Sep 17 00:00:00 2001 From: Oleg Polyakov Date: Mon, 18 Mar 2019 14:20:47 -0400 Subject: [PATCH] net/tap: fix getting max iovec [ upstream commit efa28ae847546a1376b2112544490251dd0ea5cd ] If the value _SC_IOV_MAX is missing, sysconf returns -1. In this case, iov_max is set to a default value of 1024. This should never happen except for redhat bug: https://bugzilla.redhat.com/show_bug.cgi?id=1504165 Fixes: ec12df9504fe ("net/tap: fix support for large Rx queues") Signed-off-by: Oleg Polyakov Acked-by: Keith Wiles --- drivers/net/tap/rte_eth_tap.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 17273eb68..d16bc8c7f 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -68,4 +68,6 @@ #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; @@ -1327,4 +1329,11 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, 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", + 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]; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-16 15:34:26.750037671 +0100 +++ 0035-net-tap-fix-getting-max-iovec.patch 2019-04-16 15:34:25.186179817 +0100 @@ -1,15 +1,16 @@ -From efa28ae847546a1376b2112544490251dd0ea5cd Mon Sep 17 00:00:00 2001 +From 454c44c9b9d1801e4210b7c4c0f40c42b324a96a Mon Sep 17 00:00:00 2001 From: Oleg Polyakov Date: Mon, 18 Mar 2019 14:20:47 -0400 Subject: [PATCH] net/tap: fix getting max iovec +[ upstream commit efa28ae847546a1376b2112544490251dd0ea5cd ] + If the value _SC_IOV_MAX is missing, sysconf returns -1. In this case, iov_max is set to a default value of 1024. This should never happen except for redhat bug: https://bugzilla.redhat.com/show_bug.cgi?id=1504165 Fixes: ec12df9504fe ("net/tap: fix support for large Rx queues") -Cc: stable@dpdk.org Signed-off-by: Oleg Polyakov Acked-by: Keith Wiles @@ -18,10 +19,10 @@ 1 file changed, 9 insertions(+) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c -index 6f5109fca..9aae4c77f 100644 +index 17273eb68..d16bc8c7f 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c -@@ -69,4 +69,6 @@ +@@ -68,4 +68,6 @@ #define TAP_MP_KEY "tap_mp_sync_queues" +#define TAP_IOV_DEFAULT_MAX 1024