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 0938C43829 for ; Tue, 5 Mar 2024 16:36:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02A7C42E32; Tue, 5 Mar 2024 16:36:08 +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 64762410D3 for ; Tue, 5 Mar 2024 16:36:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652966; 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=uvMfhwuAWMa+17GIkFRgPw7uVTjaBllSvRYudf90eVg=; b=RWYq4y7IvpBFLhMujZzZ3wNaftvvpPcOJE8j5NXO1Uto7wJuSLCJ1A7OkrhMLD7IpFl5Fa JPZxzCPz/NAg/3wlkfzjCGkRgbvdYLCxF3mVkCjWZN/nLksyKZxEHBMaO6yBDiYyXxwnpo xmblDWKruqUzlEQ6rHs+SpJ2H1mKy1g= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-219-r0E8EVfdM-mT0cZzH-No-g-1; Tue, 05 Mar 2024 10:36:03 -0500 X-MC-Unique: r0E8EVfdM-mT0cZzH-No-g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 528B529AA393; Tue, 5 Mar 2024 15:36:03 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D6B1200AE7F; Tue, 5 Mar 2024 15:36:02 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: Chengwen Feng , Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix crash in multi-process forwarding' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:24 +0000 Message-ID: <20240305153449.263666-51-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/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/04fb58b84f1c130cf5968e713821d4181281fe08 Thanks. Kevin --- >From 04fb58b84f1c130cf5968e713821d4181281fe08 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Tue, 30 Jan 2024 09:32:49 +0800 Subject: [PATCH] app/testpmd: fix crash in multi-process forwarding [ upstream commit b3a33138f317d1c651cd86f423cc703176eb7b07 ] On multi-process scenario, each process creates flows based on the number of queues. When nbcore is greater than 1, multiple cores may use the same queue to forward packet, like: dpdk-testpmd -a BDF --proc-type=auto -- -i --rxq=4 --txq=4 --nb-cores=2 --num-procs=2 --proc-id=0 testpmd> start mac packet forwarding - ports=1 - cores=2 - streams=4 - NUMA support enabled, MP allocation mode: native Logical Core 2 (socket 0) forwards packets on 2 streams: RX P=0/Q=0 (socket 0) -> TX P=0/Q=0 (socket 0) peer=02:00:00:00:00:00 RX P=0/Q=1 (socket 0) -> TX P=0/Q=1 (socket 0) peer=02:00:00:00:00:00 Logical Core 3 (socket 0) forwards packets on 2 streams: RX P=0/Q=0 (socket 0) -> TX P=0/Q=0 (socket 0) peer=02:00:00:00:00:00 RX P=0/Q=1 (socket 0) -> TX P=0/Q=1 (socket 0) peer=02:00:00:00:00:00 After this commit, the result will be: dpdk-testpmd -a BDF --proc-type=auto -- -i --rxq=4 --txq=4 --nb-cores=2 --num-procs=2 --proc-id=0 testpmd> start io packet forwarding - ports=1 - cores=2 - streams=2 - NUMA support enabled, MP allocation mode: native Logical Core 2 (socket 0) forwards packets on 1 streams: RX P=0/Q=0 (socket 2) -> TX P=0/Q=0 (socket 2) peer=02:00:00:00:00:00 Logical Core 3 (socket 0) forwards packets on 1 streams: RX P=0/Q=1 (socket 2) -> TX P=0/Q=1 (socket 2) peer=02:00:00:00:00:00 Fixes: a550baf24af9 ("app/testpmd: support multi-process") Signed-off-by: Dengdui Huang Acked-by: Chengwen Feng Acked-by: Ferruh Yigit --- app/test-pmd/config.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index fef7fa71e4..cb576732d2 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -3328,5 +3328,4 @@ rss_fwd_config_setup(void) streamid_t sm_id; int start; - int end; nb_q = nb_rxq; @@ -3336,5 +3335,5 @@ rss_fwd_config_setup(void) cur_fwd_config.nb_fwd_ports = nb_fwd_ports; cur_fwd_config.nb_fwd_streams = - (streamid_t) (nb_q * cur_fwd_config.nb_fwd_ports); + (streamid_t) (nb_q / num_procs * cur_fwd_config.nb_fwd_ports); if (cur_fwd_config.nb_fwd_streams < cur_fwd_config.nb_fwd_lcores) @@ -3358,5 +3357,4 @@ rss_fwd_config_setup(void) */ start = proc_id * nb_q / num_procs; - end = start + nb_q / num_procs; rxp = 0; rxq = start; @@ -3377,6 +3375,4 @@ rss_fwd_config_setup(void) rxp = 0; rxq++; - if (rxq >= end) - rxq = start; } } -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.864965010 +0000 +++ 0051-app-testpmd-fix-crash-in-multi-process-forwarding.patch 2024-03-05 14:08:54.688520866 +0000 @@ -1 +1 @@ -From b3a33138f317d1c651cd86f423cc703176eb7b07 Mon Sep 17 00:00:00 2001 +From 04fb58b84f1c130cf5968e713821d4181281fe08 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b3a33138f317d1c651cd86f423cc703176eb7b07 ] + @@ -33 +34,0 @@ -Cc: stable@dpdk.org @@ -43 +44 @@ -index cad7537bc6..2c4dedd603 100644 +index fef7fa71e4..cb576732d2 100644 @@ -46 +47 @@ -@@ -4795,5 +4795,4 @@ rss_fwd_config_setup(void) +@@ -3328,5 +3328,4 @@ rss_fwd_config_setup(void) @@ -52 +53 @@ -@@ -4803,5 +4802,5 @@ rss_fwd_config_setup(void) +@@ -3336,5 +3335,5 @@ rss_fwd_config_setup(void) @@ -59 +60 @@ -@@ -4825,5 +4824,4 @@ rss_fwd_config_setup(void) +@@ -3358,5 +3357,4 @@ rss_fwd_config_setup(void) @@ -65 +66 @@ -@@ -4844,6 +4842,4 @@ rss_fwd_config_setup(void) +@@ -3377,6 +3375,4 @@ rss_fwd_config_setup(void)