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 455A3A0555 for ; Wed, 25 May 2022 18:29:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 364524281C; Wed, 25 May 2022 18:29:55 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 1CD9742B8B for ; Wed, 25 May 2022 18:29:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496191; 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=BjRt91kQ27coQQc1m9JMyqYu+biuiYug9Zh1cj+qANo=; b=KhPdXNBppMmctexEpuCerhj3eYIZ+HE3IL+oHe45rZEv42U5I11Hd637N4GriFSvSoF73P /ATVCYjvtgBbwtu6axrTx+G1BKo/ODK0cg4O6Oo8Amzc4ygrFcxt/a+mSfPIsqZK+Yp9qT dA08O9plfl+dM4skY9MRlU9vmMo5ttk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-56-UfLH0sujPjyQQwkAYKjATQ-1; Wed, 25 May 2022 12:29:46 -0400 X-MC-Unique: UfLH0sujPjyQQwkAYKjATQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ACA6283397E; Wed, 25 May 2022 16:29:39 +0000 (UTC) Received: from rh.Home (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6361E2026D64; Wed, 25 May 2022 16:29:38 +0000 (UTC) From: Kevin Traynor To: Satheesh Paul Cc: Kiran Kumar K , dpdk stable Subject: patch 'net/cnxk: add message on flow parsing failure' has been queued to stable release 21.11.2 Date: Wed, 25 May 2022 17:28:22 +0100 Message-Id: <20220525162847.711753-30-ktraynor@redhat.com> In-Reply-To: <20220525162847.711753-1-ktraynor@redhat.com> References: <20220525162847.711753-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/30/22. 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/b117088323fca6ab18ea32be499b612626e0c259 Thanks. Kevin --- >From b117088323fca6ab18ea32be499b612626e0c259 Mon Sep 17 00:00:00 2001 From: Satheesh Paul Date: Tue, 19 Apr 2022 12:04:38 +0530 Subject: [PATCH] net/cnxk: add message on flow parsing failure [ upstream commit c8647cd7f3260eec8d55ee392240dcc10f7c0a4b ] Set the error message with rte_flow_error_set() API when flow parsing fails. Fixes: 8c009b4505e ("net/cnxk: support flow API") Signed-off-by: Satheesh Paul Reviewed-by: Kiran Kumar K --- drivers/net/cnxk/cnxk_rte_flow.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/cnxk/cnxk_rte_flow.c b/drivers/net/cnxk/cnxk_rte_flow.c index b08d7c34fa..32166ae764 100644 --- a/drivers/net/cnxk/cnxk_rte_flow.c +++ b/drivers/net/cnxk/cnxk_rte_flow.c @@ -298,5 +298,12 @@ cnxk_flow_validate(struct rte_eth_dev *eth_dev, } - return roc_npc_flow_parse(npc, &in_attr, in_pattern, in_actions, &flow); + rc = roc_npc_flow_parse(npc, &in_attr, in_pattern, in_actions, &flow); + + if (rc) { + rte_flow_error_set(error, 0, rc, NULL, + "Flow validation failed"); + return rc; + } + return 0; } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-25 17:26:59.313959185 +0100 +++ 0030-net-cnxk-add-message-on-flow-parsing-failure.patch 2022-05-25 17:26:58.607828390 +0100 @@ -1 +1 @@ -From c8647cd7f3260eec8d55ee392240dcc10f7c0a4b Mon Sep 17 00:00:00 2001 +From b117088323fca6ab18ea32be499b612626e0c259 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c8647cd7f3260eec8d55ee392240dcc10f7c0a4b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - drivers/net/cnxk/cnxk_flow.c | 9 ++++++++- + drivers/net/cnxk/cnxk_rte_flow.c | 9 ++++++++- @@ -18,5 +19,5 @@ -diff --git a/drivers/net/cnxk/cnxk_flow.c b/drivers/net/cnxk/cnxk_flow.c -index ff962c141d..1034a2c5a4 100644 ---- a/drivers/net/cnxk/cnxk_flow.c -+++ b/drivers/net/cnxk/cnxk_flow.c -@@ -300,5 +300,12 @@ cnxk_flow_validate(struct rte_eth_dev *eth_dev, +diff --git a/drivers/net/cnxk/cnxk_rte_flow.c b/drivers/net/cnxk/cnxk_rte_flow.c +index b08d7c34fa..32166ae764 100644 +--- a/drivers/net/cnxk/cnxk_rte_flow.c ++++ b/drivers/net/cnxk/cnxk_rte_flow.c +@@ -298,5 +298,12 @@ cnxk_flow_validate(struct rte_eth_dev *eth_dev,