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 B0D5C4569C for ; Wed, 24 Jul 2024 13:35:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AC5C8433BE; Wed, 24 Jul 2024 13:35:07 +0200 (CEST) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 754C842D28 for ; Wed, 24 Jul 2024 13:35:04 +0200 (CEST) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-367940c57ddso3581964f8f.3 for ; Wed, 24 Jul 2024 04:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721820904; x=1722425704; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FrNRH8H5pp9YWmKQsO078G6+ETtXBE/NmNLwphsib9o=; b=m5XlA+IkyvPuuGYRBwegZLnuXT5ZEHKqhuxvAozHXYNL+pVKBi3UB9vuy/XRWTc3s5 IF96ydbaJK0ZNDH6A6ucMqpb6SZhi+BGIrNq0GxieSm4MJL574rB6id2LxvrIrsfvGdX YLPy1Ze6AVVtOjrmrRNvdKyZ5Pb6YmjOnPwfNZmYxo0pyj+aMiTPuN0voJ2yXmcZnf5G BhvxuqGZxK+rsKgpMy4P3mLaEoMhldL0f2THetzTuirQspKbyKtl9t32SVnKvWyV3FO5 5FxTCRpZHraFe3Y3xFlgKUqD20+pOMuR2bY5f5FpezQoBfYAGQlD5YezXXth+1GFkjSy X5Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721820904; x=1722425704; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FrNRH8H5pp9YWmKQsO078G6+ETtXBE/NmNLwphsib9o=; b=LLqD0iHoHVF9xppgJzDsAk29pJDWC0xh009XBJVU6lwM3MYrC1+iQSGIOiBgcCinm+ 8zEB73hLGp7dR+qQWdqkwBKv+QCR0W4yY7mfQTjtW1lnclvG4fUb8Vu4WlOq+prUBAUY F2BI1XtusBhMKcTzp3Z2Qi64bgwyI1li8w3b8Yk1JicijR7PT5WT7P70g/w07Z8FrA1s zdaVE6ljJv+eOzH++UdSGMoweE0mX7sSfnNI+KAERlEwk2kOZcAAR58P975aQtkvxraY k4VvpA0rr61/JEb5P+RS8lZbDU3N/beKY0pC8EAEBrjKKpevy8aJhcmqHUP4YWogcSeQ L5mg== X-Gm-Message-State: AOJu0YxHANeibHBTDqVLR21ZGSfM+e3aWXl19+zVVaFss5TvWg08ayex u9/EvxOHDe69KDIKnKbLNIqbT972ug9gQdUZE34DnJBz6TmTbLV1c4YpbhOX X-Google-Smtp-Source: AGHT+IHzlVBeZcI/KPtPEvWjE3q7nF+Cqg1Fuccc3kTVyATacmRNUU1zqyRLop/qnehzHdpGrvj6Ew== X-Received: by 2002:adf:e510:0:b0:369:f662:109b with SMTP id ffacd0b85a97d-369f6621237mr1044660f8f.27.1721820903919; Wed, 24 Jul 2024 04:35:03 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-368787cecb4sm14002927f8f.77.2024.07.24.04.35.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jul 2024 04:35:03 -0700 (PDT) From: luca.boccassi@gmail.com To: Konstantin Ananyev Cc: dpdk stable Subject: patch 'examples/l3fwd: fix crash in ACL mode for mixed traffic' has been queued to stable release 22.11.6 Date: Wed, 24 Jul 2024 12:33:11 +0100 Message-Id: <20240724113318.616754-33-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240724113318.616754-1-luca.boccassi@gmail.com> References: <20240715152704.2229503-86-luca.boccassi@gmail.com> <20240724113318.616754-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/68b33da50ff2ca8bb79ae9ffaa4aebfff48420f2 Thanks. Luca Boccassi --- >From 68b33da50ff2ca8bb79ae9ffaa4aebfff48420f2 Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Thu, 2 May 2024 16:28:15 +0100 Subject: [PATCH] examples/l3fwd: fix crash in ACL mode for mixed traffic [ upstream commit 659ded8eb733315878857f82bc22f0b03be5ce71 ] When running l3fwd in ACL mode, if we'll have mix of IPv4/IPv6 packets in the same burst, it will most likely cause a crash. The reason for that is that we split our burst of packets into 2 arrays - one for ipv4, another for ipv6 for classify(). But then we try to send all packets as one burst again, not taking into account that acl_search.res_ipv4[] will be set only for ipv4 packets. Same story for ipv6. The fix is straightforward: use two already split arrays for TX. Bugzilla ID: 1434 Fixes: 6de0ea50e9b9 ("examples/l3fwd: merge l3fwd-acl example") Signed-off-by: Konstantin Ananyev --- examples/l3fwd/l3fwd_acl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/l3fwd/l3fwd_acl.c b/examples/l3fwd/l3fwd_acl.c index 401692bcec..d9e4ae543f 100644 --- a/examples/l3fwd/l3fwd_acl.c +++ b/examples/l3fwd/l3fwd_acl.c @@ -1073,9 +1073,9 @@ acl_main_loop(__rte_unused void *dummy) l3fwd_acl_send_packets( qconf, - pkts_burst, + acl_search.m_ipv4, acl_search.res_ipv4, - nb_rx); + acl_search.num_ipv4); } if (acl_search.num_ipv6) { @@ -1088,9 +1088,9 @@ acl_main_loop(__rte_unused void *dummy) l3fwd_acl_send_packets( qconf, - pkts_burst, + acl_search.m_ipv6, acl_search.res_ipv6, - nb_rx); + acl_search.num_ipv6); } } } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-24 12:29:23.093106556 +0100 +++ 0033-examples-l3fwd-fix-crash-in-ACL-mode-for-mixed-traff.patch 2024-07-24 12:29:20.807026855 +0100 @@ -1 +1 @@ -From 659ded8eb733315878857f82bc22f0b03be5ce71 Mon Sep 17 00:00:00 2001 +From 68b33da50ff2ca8bb79ae9ffaa4aebfff48420f2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 659ded8eb733315878857f82bc22f0b03be5ce71 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org