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 90B184624E for ; Mon, 17 Feb 2025 18:08:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B7BA402AB; Mon, 17 Feb 2025 18:08:59 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id AFADB400EF for ; Mon, 17 Feb 2025 18:08:56 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-38f2c4382d1so1826698f8f.0 for ; Mon, 17 Feb 2025 09:08:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812136; x=1740416936; 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=Sv4NSAAXczCpNlJuwkVQrUOPtmm/x1/uUzoP6UHHHAY=; b=YsxuUqpgzWpEgWbxjbSVm0A62QFMnCu3cYjxT7Ptb/rzEswwwlg772syZO+VS1d6xw /ij51n21wUnA/VF0gRIXoRDheuJ//UoeBK+5DNH4lo+ACros3HXk5O67GDGgidOOFMqC ZPKWKjM+0dSjUh1sI+6EPQrRSaI0VxpJKI/HTaY/9JuWqHsVi/YZ9wOKAenufZCgoye6 NBzsoHClRwkAW/pp2NkDtz3G+YC/ljgXX4Y5kkxl5sGzDNfcqaPrVFCWnejRdlM9E50T oIbv8a3uuekO3d0BFHlpencdbvTERMRjY+YQzM2ii941UBF+VhFw2eA6UT4bOPkaugsw YTgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812136; x=1740416936; 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=Sv4NSAAXczCpNlJuwkVQrUOPtmm/x1/uUzoP6UHHHAY=; b=vrQ4Qt2RYaJKThfBSEKLpDhqcfdtVOylOi9UIUQ35/U0tuTnAzpS7ueqrNfpSizTtg GT1KrldAwoIGc0dFtDW3I2XrorhldT4eaBo0cTd37u05oCJOoYeT7afGOqLbdHXYprQw w031n7nUabCCBBkg2qrRmcY3ngb9LHpo8F9IA2wlCcIZ472oam7VB7Rv1FtaXdh8+73l zqPt/Y/agJaOgLLs5h/ZKBJxsdajqXKsFjwsXP+opS8uuCFeW1zoudlRf9YqdylV78OT 7K06YJACMX2U+Wk+jRYMffV609jRPKPFc6BxmQ8uz20f1MvDBd+ekjRwvqHwsDMFye44 vCew== X-Gm-Message-State: AOJu0Yx31ojoAvP1VXZxdeEqtj2jmaJ/bV0cdQ9ss62MlQ9brbgcV7n6 qIhgGmZZVadAbcORyrmvB0I3mw00GO4/lYchwG3lJC0t4k14gkexn9tdGoZoMD7E7w== X-Gm-Gg: ASbGnctj4fRun6fF2qdzs5m6gipbdS4GfG//YNLIw3IthZFI1Zf1++L7TslxFfsHzNC SVYQRA2VqUJLk791ZUu+QXjeVQr97YQqUkCFLWlxcqjAAfZXYKDDKvcyyzCOIzTpI6JzDhwRtX8 oM91drHJjc3ywFIgXxbRNTIiZh1y9dHeL68rp4kYaBU7SKB7F2HRySqL4x8X1zHU6gMpjpyqbQL Wj1hZWlLVYRwbUJ3p4+mkZIHwkRVDKe8LNK/72hO0csTpeajlouKgdHL0QqIp6ubO/qJrei2csQ BEEe+2HLbBLKNj97nC4ilw== X-Google-Smtp-Source: AGHT+IE1X0pfC3hSZi2kM9lJGvygsxxvRt714UcVWYqpAriZ/eH6TcXRNtaAj1WF8jiojH7/RG+BRQ== X-Received: by 2002:a05:6000:18a9:b0:38c:5da8:5f88 with SMTP id ffacd0b85a97d-38f33c30f32mr9023849f8f.28.1739812136172; Mon, 17 Feb 2025 09:08:56 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f258cccdesm12761674f8f.26.2025.02.17.09.08.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:08:55 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: dpdk stable Subject: patch 'examples/l3fwd: fix socket ID check' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:48 +0000 Message-ID: <20250217170456.1068278-75-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/19/25. 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/883c3357a84ec219cedc9a6ca0e00847b13f20aa Thanks. Luca Boccassi --- >From 883c3357a84ec219cedc9a6ca0e00847b13f20aa Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:19 -0800 Subject: [PATCH] examples/l3fwd: fix socket ID check [ upstream commit a7216f081767c7259dd3fba5eda0ca7b0bcb4595 ] The expression: if ((socketid = rte_lcore_to_socket_id(lcore) != 0) && gets evaluated as socketid = (rte_lcore_to_socket_id(lcore) != 0) which is not what was intended. This is goes all the way back to first release. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: af75078fece3 ("first public release") Signed-off-by: Stephen Hemminger --- examples/l3fwd-power/main.c | 4 ++-- examples/l3fwd/main.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 1bcc61e777..501e4c47d6 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -1537,8 +1537,8 @@ check_lcore_params(void) "mask\n", lcore); return -1; } - if ((socketid = rte_lcore_to_socket_id(lcore) != 0) && - (numa_on == 0)) { + socketid = rte_lcore_to_socket_id(lcore); + if (socketid != 0 && numa_on == 0) { printf("warning: lcore %u is on socket %d with numa " "off\n", lcore, socketid); } diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 9201019711..d0067657e9 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -303,8 +303,9 @@ check_lcore_params(void) printf("error: lcore %u is not enabled in lcore mask\n", lcore); return -1; } - if ((socketid = rte_lcore_to_socket_id(lcore) != 0) && - (numa_on == 0)) { + + socketid = rte_lcore_to_socket_id(lcore); + if (socketid != 0 && numa_on == 0) { printf("warning: lcore %u is on socket %d with numa off\n", lcore, socketid); } -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:19.464653932 +0000 +++ 0075-examples-l3fwd-fix-socket-ID-check.patch 2025-02-17 16:13:16.870441592 +0000 @@ -1 +1 @@ -From a7216f081767c7259dd3fba5eda0ca7b0bcb4595 Mon Sep 17 00:00:00 2001 +From 883c3357a84ec219cedc9a6ca0e00847b13f20aa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a7216f081767c7259dd3fba5eda0ca7b0bcb4595 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index d279e664b3..e27b8531b5 100644 +index 1bcc61e777..501e4c47d6 100644 @@ -28 +29 @@ -@@ -1412,8 +1412,8 @@ check_lcore_params(void) +@@ -1537,8 +1537,8 @@ check_lcore_params(void) @@ -40 +41 @@ -index 994b7dd8e5..ae3b4f6439 100644 +index 9201019711..d0067657e9 100644 @@ -43 +44 @@ -@@ -311,8 +311,9 @@ check_lcore_params(void) +@@ -303,8 +303,9 @@ check_lcore_params(void)