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 39D4B45DB9 for ; Wed, 27 Nov 2024 18:21:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EA8394066C; Wed, 27 Nov 2024 18:21:34 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 31C024066C for ; Wed, 27 Nov 2024 18:21:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wiHFyUAq/OpFZwje7fPXV4qqTAvMawckLYV+sLTFE+4=; b=JxeM15gany/EH5KuwN2PKM3MWSYSEOZqibZIBqqzdCB0lZKrZVIHX3WukY61/B0gdPpq/d 8DaMTULyjsP3dQL/3eF31tnVCVr/gdWCkX8Ai97FQtQjrILPf1A6niZxtmmQS0JrhO92tY fTYlphziniyLtTbeMP4GiLjHlHSWlhg= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-441-TKKGNAUuNGuGhR60PSYMSA-1; Wed, 27 Nov 2024 12:21:29 -0500 X-MC-Unique: TKKGNAUuNGuGhR60PSYMSA-1 X-Mimecast-MFC-AGG-ID: TKKGNAUuNGuGhR60PSYMSA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A42EC19560B0; Wed, 27 Nov 2024 17:21:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 34B10300019E; Wed, 27 Nov 2024 17:21:26 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/tap: restrict maximum number of MP FDs' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:02 +0000 Message-ID: <20241127171916.690404-55-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: FpnJa-4U8qydBozL4VWczq6tK9PAQUqMOiupYU-PSm8_1732728088 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/24. 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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/624a4d290aed0d1a794b52bce488cab2705dc901 Thanks. Kevin --- >From 624a4d290aed0d1a794b52bce488cab2705dc901 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 11 Oct 2024 10:29:23 -0700 Subject: [PATCH] net/tap: restrict maximum number of MP FDs [ upstream commit 288649a11a8a332727f2a988c676ff7dfd1bc4c5 ] Now that max MP fds has increased to 253 it is possible that the number of queues the TAP device can handle is less than that. Therefore the code to handle MP message should only allow the number of queues it can handle. Coverity issue: 445386 Signed-off-by: Stephen Hemminger Acked-by: Ferruh Yigit --- drivers/net/tap/rte_eth_tap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 3a11f36e6f..1389cad9a8 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -2429,5 +2429,5 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer) reply_param->rxq_count = 0; if (dev->data->nb_rx_queues + dev->data->nb_tx_queues > - RTE_MP_MAX_FD_NUM){ + RTE_PMD_TAP_MAX_QUEUES){ TAP_LOG(ERR, "Number of rx/tx queues exceeds max number of fds"); return -1; -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:39.996086138 +0000 +++ 0055-net-tap-restrict-maximum-number-of-MP-FDs.patch 2024-11-27 17:17:38.229269394 +0000 @@ -1 +1 @@ -From 288649a11a8a332727f2a988c676ff7dfd1bc4c5 Mon Sep 17 00:00:00 2001 +From 624a4d290aed0d1a794b52bce488cab2705dc901 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 288649a11a8a332727f2a988c676ff7dfd1bc4c5 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - drivers/net/tap/rte_eth_tap.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) + drivers/net/tap/rte_eth_tap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) @@ -21 +22 @@ -index 5ad3bbadd1..c486c6f073 100644 +index 3a11f36e6f..1389cad9a8 100644 @@ -24,9 +25,6 @@ -@@ -2392,7 +2392,8 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer) - - RTE_ASSERT(dev->data->nb_rx_queues == dev->data->nb_tx_queues); -- if (dev->data->nb_rx_queues > RTE_MP_MAX_FD_NUM) { -+ -+ if (dev->data->nb_rx_queues > RTE_PMD_TAP_MAX_QUEUES) { - TAP_LOG(ERR, "Number of rx/tx queues %u exceeds max number of fds %u", -- dev->data->nb_rx_queues, RTE_MP_MAX_FD_NUM); -+ dev->data->nb_rx_queues, RTE_PMD_TAP_MAX_QUEUES); +@@ -2429,5 +2429,5 @@ tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer) + reply_param->rxq_count = 0; + if (dev->data->nb_rx_queues + dev->data->nb_tx_queues > +- RTE_MP_MAX_FD_NUM){ ++ RTE_PMD_TAP_MAX_QUEUES){ + TAP_LOG(ERR, "Number of rx/tx queues exceeds max number of fds"); @@ -34 +31,0 @@ - }