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 2372DA034F for ; Tue, 1 Mar 2022 11:45:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1E877407FF; Tue, 1 Mar 2022 11:45:59 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 1337A426E2 for ; Tue, 1 Mar 2022 11:45:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131556; 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=S1lfGfxXnHS/3DgCuofWUlN8Zy4v+cdkrezcXmwt6jg=; b=LqXIh8tvGCZg95HY0y5gZ74daRxkZYFzfyw22exBj0YdkwXgaz37xKIAnZ52z7xj1NqQKz QfgzKfkvKDO0Na/gjfAuVfTNbBBvFLwuA8TQovb/CoV6tbNF4LuOupOWl0aPJp76cwXKA/ 2D3wFbOTR5hSUyBnNPTWq9VbwTVapqs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-639-s4tYe-RoNO60JRUOCeXJeQ-1; Tue, 01 Mar 2022 05:45:47 -0500 X-MC-Unique: s4tYe-RoNO60JRUOCeXJeQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 303FD100C609; Tue, 1 Mar 2022 10:45:46 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 036666FB02; Tue, 1 Mar 2022 10:45:44 +0000 (UTC) From: Kevin Traynor To: Suanming Mou Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: set flow error for hash list create' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:36 +0000 Message-Id: <20220301104300.334382-80-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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-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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/06/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/383f7b7f800a445f546e977667334b9f1700814e Thanks. Kevin --- >From 383f7b7f800a445f546e977667334b9f1700814e Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Tue, 15 Feb 2022 12:10:52 +0200 Subject: [PATCH] net/mlx5: set flow error for hash list create [ upstream commit 0c5d3e4cdf1bbc92d138bce1f98f0b260a10b8fc ] While mlx5_hlist_create() failed, the rte_flow_error was not filled with the corresponding error information. This commit adds the missing rte_flow_error_set() for the failure case. Fixes: f3020a331dca ("net/mlx5: optimize hash list table allocate on demand") Signed-off-by: Suanming Mou Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 10ef2af06a..c7f43c9ab4 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -313,5 +313,6 @@ flow_dv_hlist_prepare(struct mlx5_dev_ctx_shared *sh, struct mlx5_hlist **phl, mlx5_list_remove_cb cb_remove, mlx5_list_clone_cb cb_clone, - mlx5_list_clone_free_cb cb_clone_free) + mlx5_list_clone_free_cb cb_clone_free, + struct rte_flow_error *error) { struct mlx5_hlist *hl; @@ -328,5 +329,7 @@ flow_dv_hlist_prepare(struct mlx5_dev_ctx_shared *sh, struct mlx5_hlist **phl, if (!hl) { DRV_LOG(ERR, "%s hash creation failed", name); - rte_errno = ENOMEM; + rte_flow_error_set(error, ENOMEM, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "cannot allocate resource memory"); return NULL; } @@ -3732,5 +3735,6 @@ flow_dv_encap_decap_resource_register flow_dv_encap_decap_remove_cb, flow_dv_encap_decap_clone_cb, - flow_dv_encap_decap_clone_free_cb); + flow_dv_encap_decap_clone_free_cb, + error); if (unlikely(!encaps_decaps)) return -rte_errno; @@ -5828,5 +5832,6 @@ flow_dv_modify_hdr_resource_register flow_dv_modify_remove_cb, flow_dv_modify_clone_cb, - flow_dv_modify_clone_free_cb); + flow_dv_modify_clone_free_cb, + error); if (unlikely(!modify_cmds)) return -rte_errno; @@ -10765,5 +10770,6 @@ flow_dv_tag_resource_register flow_dv_tag_remove_cb, flow_dv_tag_clone_cb, - flow_dv_tag_clone_free_cb); + flow_dv_tag_clone_free_cb, + error); if (unlikely(!tag_table)) return -rte_errno; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.616418159 +0000 +++ 0080-net-mlx5-set-flow-error-for-hash-list-create.patch 2022-03-01 10:41:01.415244121 +0000 @@ -1 +1 @@ -From 0c5d3e4cdf1bbc92d138bce1f98f0b260a10b8fc Mon Sep 17 00:00:00 2001 +From 383f7b7f800a445f546e977667334b9f1700814e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0c5d3e4cdf1bbc92d138bce1f98f0b260a10b8fc ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index c30cb4c203..ce69b6ff3a 100644 +index 10ef2af06a..c7f43c9ab4 100644 @@ -41 +42 @@ -@@ -3728,5 +3731,6 @@ flow_dv_encap_decap_resource_register +@@ -3732,5 +3735,6 @@ flow_dv_encap_decap_resource_register @@ -49 +50 @@ -@@ -5826,5 +5830,6 @@ flow_dv_modify_hdr_resource_register +@@ -5828,5 +5832,6 @@ flow_dv_modify_hdr_resource_register @@ -57 +58 @@ -@@ -10758,5 +10763,6 @@ flow_dv_tag_resource_register +@@ -10765,5 +10770,6 @@ flow_dv_tag_resource_register