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 D7383A0C4C for ; Mon, 12 Jul 2021 15:09:48 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB2514069D; Mon, 12 Jul 2021 15:09:48 +0200 (CEST) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id 279004069D for ; Mon, 12 Jul 2021 15:09:48 +0200 (CEST) Received: by mail-wr1-f44.google.com with SMTP id d2so25600011wrn.0 for ; Mon, 12 Jul 2021 06:09:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L4NgCqqXwFffv3aVEvECzE0WSiD+Hlqn1OsUF4iwb/4=; b=XVbxhZMGLNhrLE9bs/s8qdAq9hTr2A/JFdPJEsAriicgSVacyKXbZblpDeywU+dEga yEErULHcwDuTwtSf5JYQBc7GzsH6kkEBH6/pK3SkfHLxIceabk8SKgV/E2cKAFlxOwLc AlqhKFheZ2mdwel2iJsepCQ7jyOcMHAxyAZhupCaakhAZmavGwIyHngJRV629LGqZd5i EAjGkjDgxzTV7dJ5gXjVE707QIl4Qeo8Cm9CmuS71ud6oTjxr2GtAoWDGLZjkoclzRh/ 4QUFAwgQ01T3Rhn5q7tmz3SXRIFfwht4afTX06G3Fi5Ur7Q11Fbz9aw6AJaFdAgaop3i 8Hvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L4NgCqqXwFffv3aVEvECzE0WSiD+Hlqn1OsUF4iwb/4=; b=DDNr1ZtpUTW2OUkTVuwv1mKl+P1HZ6SyGvL8unz7R4NHLCRlfgOMWs2qnvmOl3vdj4 Ov4A4RItkh3oXSkbRibguXjsCq0IGhYnpw2v1nSWOO3/hxpeGtY8fmjslvGE1vTey8gf HUqckyqrn50I4KlKnanT3oYxRky9v/ntlWhBJyh73QYrtC08pT41EzPNBiZgV9ATIrz/ CSuE/xuILQ+mAK5YUcEfPH5q3srBG/hRLtWHGqdjNcZ0G1dmEsndeoDFUtIbY2fB+rl5 XS+XgJb1WCV2L45NjwJMD6eO9ruZMjaTGEEK/qgdpz6TsqrBCKEPOKti08CZjd231RbN MhEA== X-Gm-Message-State: AOAM5326uXTR6AKsYshq9j68pIzbfaQ8gjewQr8vjRwW0ovfPaetssU2 1u8OTOs6NyIAGgX/7E9DpLQ= X-Google-Smtp-Source: ABdhPJyRXLWIubBaosW2lAgxVriLQHH6VNwHzOf4ji3RcFRbnNH45VUNMLV6GLUU9F0aRU/jIM2MgA== X-Received: by 2002:adf:d235:: with SMTP id k21mr26398703wrh.222.1626095387905; Mon, 12 Jul 2021 06:09:47 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id z13sm14794587wro.79.2021.07.12.06.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:09:43 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Mon, 12 Jul 2021 14:04:07 +0100 Message-Id: <20210712130551.2462159-12-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: set flow error after tunnel redirection free' has been queued to stable release 20.11.3 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.3 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/14/21. 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/cb99c42fe0ab3bc13c332d4fe16971289916b899 Thanks. Luca Boccassi --- >From cb99c42fe0ab3bc13c332d4fe16971289916b899 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Mon, 31 May 2021 12:56:40 +0530 Subject: [PATCH] net/bnxt: set flow error after tunnel redirection free [ upstream commit 25ee03f532b35e261bced83d1d0635d7271d6c9b ] During flow destroy, when bnxt_hwrm_tunnel_redirect_free() fails, driver is not setting flow error using "rte_flow_error_set". Fixes: 11e5e19695c7 ("net/bnxt: support redirecting tunnel packets to VF") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_flow.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c index 1ef6009bc7..f5b43d45ab 100644 --- a/drivers/net/bnxt/bnxt_flow.c +++ b/drivers/net/bnxt/bnxt_flow.c @@ -1959,12 +1959,20 @@ static int bnxt_handle_tunnel_redirect_destroy(struct bnxt *bp, /* Tunnel doesn't belong to this VF, so don't send HWRM * cmd, just delete the flow from driver */ - if (bp->fw_fid != (tun_dst_fid + bp->first_vf_id)) + if (bp->fw_fid != (tun_dst_fid + bp->first_vf_id)) { PMD_DRV_LOG(ERR, "Tunnel does not belong to this VF, skip hwrm_tunnel_redirect_free\n"); - else + } else { ret = bnxt_hwrm_tunnel_redirect_free(bp, filter->tunnel_type); + if (ret) { + rte_flow_error_set(error, -ret, + RTE_FLOW_ERROR_TYPE_HANDLE, + NULL, + "Unable to free tunnel redirection"); + return ret; + } + } } return ret; } -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:37.491036149 +0100 +++ 0012-net-bnxt-set-flow-error-after-tunnel-redirection-fre.patch 2021-07-12 13:41:36.194116444 +0100 @@ -1 +1 @@ -From 25ee03f532b35e261bced83d1d0635d7271d6c9b Mon Sep 17 00:00:00 2001 +From cb99c42fe0ab3bc13c332d4fe16971289916b899 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 25ee03f532b35e261bced83d1d0635d7271d6c9b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 03c71732e7..ed201a3552 100644 +index 1ef6009bc7..f5b43d45ab 100644 @@ -23 +24 @@ -@@ -1969,12 +1969,20 @@ static int bnxt_handle_tunnel_redirect_destroy(struct bnxt *bp, +@@ -1959,12 +1959,20 @@ static int bnxt_handle_tunnel_redirect_destroy(struct bnxt *bp,