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 EA6094569C for ; Wed, 24 Jul 2024 13:35:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E4E0E433D0; Wed, 24 Jul 2024 13:35:08 +0200 (CEST) Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by mails.dpdk.org (Postfix) with ESMTP id F02A042D28 for ; Wed, 24 Jul 2024 13:35:06 +0200 (CEST) Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2ef2c109eabso37517361fa.0 for ; Wed, 24 Jul 2024 04:35:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721820906; x=1722425706; 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=Hc3YuVjMjIKwkuFAjHszEaXAg/GxpNQM4eUjJoSnCX4=; b=OJZQPk+8zWdRuGoLD7WKzU/emjpC/+ZtJ0FuArS4jL3hwT53vQ1Xz83C5e0uNqODw+ EFczs2CsRrqBB9s1HwqVD8LJr+ACj2yi4Y9gVukjbAqN1sHwyoLMvFaX32ruvkcfp4QN NgBnL05wSGFgupGJ4IPSSX8U4rto2pnSy4FC0ApLq7t52kxwrNk9I4qDHee87DaUWb/S 4TdQEGgkGnTQnq/MaPkKqTsc/e5Dg9diM2cCHxfDGwjpcqECftvSpnRWLdjIwEiIr5w5 k0N5hUTb9fJNn9SFymCI+PuYXzi5osMQq4ki47J+NTNvQoMqIHQ/CQ/HkGlUnz5fJ0sl 4M+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721820906; x=1722425706; 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=Hc3YuVjMjIKwkuFAjHszEaXAg/GxpNQM4eUjJoSnCX4=; b=gh99wrVDz3Cf5IuVMLxFic3opNJTLnlm/frgXfi3MgxGb3oNI2pkyHnPIn9AUG7J+W f0VmTTG+4jIHhQ21e16Fi94jkD/hFIHUs/+bCQU37rWktkjjWcK1EKbqDRVBNy0Rx9t/ bLrqrDHTvlQvnYRSfaHWGKlsFA6DozzQOq0WE9XthUZIyunc+Tpv06nYQldvvi5VzXsP 4npc5km4tDQ8bw/MkMUdvGMHERL3Ndeb7SYJRiYaqh/PAQlNlsBhOO7zRNygQCDJyCWJ oWv338p6GQzuouVFSVzU1SzB0R/R7MFJpyaa3mBfS0QsXaNy8y4atfw5zDTs5/PprrTR XIog== X-Forwarded-Encrypted: i=1; AJvYcCX7sXsLmmxLsmXU+HZpKs6nf0AhhkEplA9rX1iJCBOpsDvAH+d+WpnIDI7EWuNJfkWzfhtIN5U44ZutRCSJYgU= X-Gm-Message-State: AOJu0YxYpGjSSjDK+pjpp+OuaUv/UNc5ot38MbscYrJ3uLr3CxHYIY2j n0Uxt3r4BBUrVvkYiQFznoASvMB+Cu+Kp2dm1gFbViGMu2mEUGX8 X-Google-Smtp-Source: AGHT+IGzCiAkrj9Z0W4/5ZCjvce2PtVmbFMdiKc1MN++/h/42kNauvSa2aJOkpv4K9uaxLy0t0LU8A== X-Received: by 2002:a2e:9216:0:b0:2ef:232c:6938 with SMTP id 38308e7fff4ca-2ef232c6b4emr79173261fa.6.1721820905295; Wed, 24 Jul 2024 04:35:05 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427f939aafdsm24727165e9.28.2024.07.24.04.35.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jul 2024 04:35:04 -0700 (PDT) From: luca.boccassi@gmail.com To: Kaiwen Deng Cc: Hongbo Li , Konstantin Ananyev , dpdk stable Subject: patch 'examples/l3fwd: fix crash on multiple sockets' has been queued to stable release 22.11.6 Date: Wed, 24 Jul 2024 12:33:12 +0100 Message-Id: <20240724113318.616754-34-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/b9b793c805de39df6ff9afd5963ffd37ba6f2a07 Thanks. Luca Boccassi --- >From b9b793c805de39df6ff9afd5963ffd37ba6f2a07 Mon Sep 17 00:00:00 2001 From: Kaiwen Deng Date: Wed, 3 Jul 2024 15:50:37 +0800 Subject: [PATCH] examples/l3fwd: fix crash on multiple sockets [ upstream commit 0cf06d7d846523abd48307613d429830bfb45ac9 ] Setting acl will clear the acl config of other sockets, which will result in core dump. This commit will no longer clear the acl config when setting acl. Fixes: 6de0ea50e9b9 ("examples/l3fwd: merge l3fwd-acl example") Signed-off-by: Kaiwen Deng Tested-by: Hongbo Li Acked-by: Konstantin Ananyev --- examples/l3fwd/l3fwd_acl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/l3fwd/l3fwd_acl.c b/examples/l3fwd/l3fwd_acl.c index d9e4ae543f..a1d87f4a40 100644 --- a/examples/l3fwd/l3fwd_acl.c +++ b/examples/l3fwd/l3fwd_acl.c @@ -962,8 +962,6 @@ setup_acl(const int socket_id) acl_log("IPv6 ACL entries %u:\n", acl_num_ipv6); dump_ipv6_rules((struct acl6_rule *)acl_base_ipv6, acl_num_ipv6, 1); - memset(&acl_config, 0, sizeof(acl_config)); - /* Check sockets a context should be created on */ if (socket_id >= NB_SOCKETS) { acl_log("Socket %d is out " @@ -973,6 +971,9 @@ setup_acl(const int socket_id) return; } + rte_acl_free(acl_config.acx_ipv4[socket_id]); + rte_acl_free(acl_config.acx_ipv6[socket_id]); + acl_config.acx_ipv4[socket_id] = app_acl_init(route_base_ipv4, acl_base_ipv4, route_num_ipv4, acl_num_ipv4, 0, socket_id); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-24 12:29:23.133220449 +0100 +++ 0034-examples-l3fwd-fix-crash-on-multiple-sockets.patch 2024-07-24 12:29:20.807026855 +0100 @@ -1 +1 @@ -From 0cf06d7d846523abd48307613d429830bfb45ac9 Mon Sep 17 00:00:00 2001 +From b9b793c805de39df6ff9afd5963ffd37ba6f2a07 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0cf06d7d846523abd48307613d429830bfb45ac9 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index ab8222c9db..2109ab0a8c 100644 +index d9e4ae543f..a1d87f4a40 100644 @@ -25 +26 @@ -@@ -950,8 +950,6 @@ setup_acl(const int socket_id) +@@ -962,8 +962,6 @@ setup_acl(const int socket_id) @@ -34 +35 @@ -@@ -961,6 +959,9 @@ setup_acl(const int socket_id) +@@ -973,6 +971,9 @@ setup_acl(const int socket_id)