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 C7E16468E4 for ; Thu, 12 Jun 2025 23:10:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C03CE42E54; Thu, 12 Jun 2025 23:10:32 +0200 (CEST) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id AE36C42E54 for ; Thu, 12 Jun 2025 23:10:31 +0200 (CEST) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3a5257748e1so1167029f8f.2 for ; Thu, 12 Jun 2025 14:10:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762631; x=1750367431; 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=szw3UfWVJqKWAivqzIf7tEFzxN594A+TT58E9p+XsGQ=; b=P7xzMNAPjejs7nmdiplfmt99hoWB5sT8TurKckyDRnhhAkJRfNFLGaJvi/K+ORWnxa qPSbornZgvBd3Vrz50nTqyvvoGsSgwc/RJxuAPTpOiunuqvmwh5gD4uL8KNAgK4RrAJE vpmnVcCQbI7vVthcQi6kgLjI8XCJIDXe30sX46eh6EKxdwlQMPiMmcgP5dimXLrQu30n 4ePaoNRIm9b3wHYCCiEdKpb3aLJtkfg4G9WnyvE+H6za6WA6RSulLyjiJqrw1Kn9ZMmT D2I46k0QSwEn6CqaZl2QcjkFExtoeO4p6ETFuz3nqo99lVN2vZkT6H2CoOxlnnRIJynI BlSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762631; x=1750367431; 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=szw3UfWVJqKWAivqzIf7tEFzxN594A+TT58E9p+XsGQ=; b=dFSQLZLi9q1Ra9BhF7iavQ0kw7QrI/AxSWntLexn2Ib4hvU07WIe9W4xBnJt+faj8H hUsMQN9h976ZKm8hQNizQBjJT5rw1cYW9K3Kry2vJ2eu3ekxzKY8ymRLE0seFfjyq7Hg JptiNN6VGjjUPb3ueTqrqWT/Wu54hTFAFhy61i/YLDvuf6ViZpbKckEGfyo53ynSDPLo sXpOgfh5c2QNgCkZ1ttjNxItVzG1JWjqOBZJdlx6n2H4S9XpfMXsoal9bZo/OsCvHBJA TzryXM1X+izQmhlX8BZQuujYdliRgVvbX3DUipxzwAjFqHKfTPA5am9Q2DPY2Gx8z95m 1Ezg== X-Gm-Message-State: AOJu0Yx5tLEooDL/Xzkgvfwt5ObySEDdAbi7ZcztKxTNUBwXOkkevlMl bVR4Psrc3tQGx2ftTJUo3SziskjvKkNv3sauZuq+AW1nl6+uSr9d0FyRGc0gBrXK X-Gm-Gg: ASbGncu8QvclK/23MgKeVDxqBVSu1En3zu3/IXoyLzsLNX5bIKj/9RGvge9a9ps16En na8qnqhZ5nMO1p/m0H+78ez5NcpWlHXp1eHd5o568UVxwccqPuCBzoPKFZLYYK0yw1ixhIP/BUt fygua8K3KJH+8Qh4HASAaaEd4YFJupbDl/PA2Iq6Lwn9OtSmyhso9+9N1XSQwGEuTuI8ne2/zE1 J1uDEfMfmYi8TRuvHR4rLDqaD4PDtnu34wWtIenlK1tUpIH9UPL8uMHO7DFbqlDft9RAw3VYUBQ bcAPdWlgdbmZJiu60YbNSP+KQdkKk8kLgYyMLFLxcq+apTl4ixU5I4zXAooRYch7YS2b X-Google-Smtp-Source: AGHT+IH2ex+o6v+t5IsPCCo98lJlSgVbTHsRgpHPjGWPdSO6obCaC/+nGmnAQurXaF4Yt0AmVuRCQA== X-Received: by 2002:a05:6000:4211:b0:3a5:39e9:928d with SMTP id ffacd0b85a97d-3a568613e6emr635912f8f.0.1749762631182; Thu, 12 Jun 2025 14:10:31 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568b2b113sm366289f8f.75.2025.06.12.14.10.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:10:30 -0700 (PDT) From: luca.boccassi@gmail.com To: Maayan Kashani Cc: dpdk stable Subject: patch 'ethdev: fix error struct in flow configure' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:07:09 +0100 Message-ID: <20250612210733.2506558-52-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-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.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 06/14/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/b1c902f71ae72b489603351887544562e50ffed8 Thanks. Luca Boccassi --- >From b1c902f71ae72b489603351887544562e50ffed8 Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Thu, 29 May 2025 08:56:10 +0300 Subject: [PATCH] ethdev: fix error struct in flow configure [ upstream commit af7ac22d8da82398065d5f3c799c17a7cec3a6af ] rte_flow_configure() returned error value w/o filling the error struct which caused a crash on complain function. Filling the error struct fixed the issue. Fixes: 4ff58b734bc9 ("ethdev: introduce flow engine configuration") Signed-off-by: Maayan Kashani --- lib/ethdev/rte_flow.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index aa43b8034d..93dfa29df8 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -1489,21 +1489,21 @@ rte_flow_configure(uint16_t port_id, RTE_FLOW_LOG(INFO, "Device with port_id=%"PRIu16" is not configured.\n", port_id); - return -EINVAL; + goto error; } if (dev->data->dev_started != 0) { RTE_FLOW_LOG(INFO, "Device with port_id=%"PRIu16" already started.\n", port_id); - return -EINVAL; + goto error; } if (port_attr == NULL) { RTE_FLOW_LOG(ERR, "Port %"PRIu16" info is NULL.\n", port_id); - return -EINVAL; + goto error; } if (queue_attr == NULL) { RTE_FLOW_LOG(ERR, "Port %"PRIu16" queue info is NULL.\n", port_id); - return -EINVAL; + goto error; } if (likely(!!ops->configure)) { ret = ops->configure(dev, port_attr, nb_queue, queue_attr, error); @@ -1514,6 +1514,10 @@ rte_flow_configure(uint16_t port_id, return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, rte_strerror(ENOTSUP)); +error: + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, rte_strerror(EINVAL)); } struct rte_flow_pattern_template * -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:25.777059948 +0100 +++ 0052-ethdev-fix-error-struct-in-flow-configure.patch 2025-06-12 22:06:23.882044892 +0100 @@ -1 +1 @@ -From af7ac22d8da82398065d5f3c799c17a7cec3a6af Mon Sep 17 00:00:00 2001 +From b1c902f71ae72b489603351887544562e50ffed8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit af7ac22d8da82398065d5f3c799c17a7cec3a6af ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 9f8d8f3dc2..fe8f43caff 100644 +index aa43b8034d..93dfa29df8 100644 @@ -23,3 +24,3 @@ -@@ -1725,21 +1725,21 @@ rte_flow_configure(uint16_t port_id, - FLOW_LOG(INFO, - "Device with port_id=%"PRIu16" is not configured.", +@@ -1489,21 +1489,21 @@ rte_flow_configure(uint16_t port_id, + RTE_FLOW_LOG(INFO, + "Device with port_id=%"PRIu16" is not configured.\n", @@ -31,2 +32,2 @@ - FLOW_LOG(INFO, - "Device with port_id=%"PRIu16" already started.", + RTE_FLOW_LOG(INFO, + "Device with port_id=%"PRIu16" already started.\n", @@ -38 +39 @@ - FLOW_LOG(ERR, "Port %"PRIu16" info is NULL.", port_id); + RTE_FLOW_LOG(ERR, "Port %"PRIu16" info is NULL.\n", port_id); @@ -43 +44 @@ - FLOW_LOG(ERR, "Port %"PRIu16" queue info is NULL.", port_id); + RTE_FLOW_LOG(ERR, "Port %"PRIu16" queue info is NULL.\n", port_id); @@ -47,3 +48,3 @@ - if ((port_attr->flags & RTE_FLOW_PORT_FLAG_SHARE_INDIRECT) && - !rte_eth_dev_is_valid_port(port_attr->host_port_id)) { -@@ -1760,6 +1760,10 @@ rte_flow_configure(uint16_t port_id, + if (likely(!!ops->configure)) { + ret = ops->configure(dev, port_attr, nb_queue, queue_attr, error); +@@ -1514,6 +1514,10 @@ rte_flow_configure(uint16_t port_id, @@ -59 +60 @@ - RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_flow_pattern_template_create, 22.03) + struct rte_flow_pattern_template *