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 85740A0C47 for ; Tue, 10 Aug 2021 17:40:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7FF1C4014F; Tue, 10 Aug 2021 17:40:53 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 0DCB94114F for ; Tue, 10 Aug 2021 17:40:52 +0200 (CEST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id E83583F107 for ; Tue, 10 Aug 2021 15:40:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610051; bh=J+tq7we0IwNHfdmokB7v0/5i62KsbjwI9zoUHUs302g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HvaigEjRR/0BoWHEQiq60f2IKHgUyDf9R9Q99loF8u95OAz5L0+7qdPWsaPJ13WdX gXlfhWEcCF2kVWcbEfiO/iM+3wfT0aKe5AlCF9mjER0q7Rs8pgBGX3ReUKJRaOfx79 exGMFdU3VLKFVwOTXwI6hU/8i8wk8FLYrTytW+xWfiqKa856La+0HrMFte8FI1nyPv vxIkOQHt4FdezrYP9BS4LzUQl3m796nl+E9a0yqrm4vHkaXjeCCQ4FfpASgThO6OED IvvO4qpdSnCO+y0Pn52BxIBH5kcTzx6+CgE0aqpntZe5bbGxrNau3LflZDdOSsbifE AjMX37PhhhGHw== Received: by mail-ed1-f70.google.com with SMTP id l18-20020a0564021252b02903be7bdd65ccso312881edw.12 for ; Tue, 10 Aug 2021 08:40:51 -0700 (PDT) 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=J+tq7we0IwNHfdmokB7v0/5i62KsbjwI9zoUHUs302g=; b=biujegvZDuWXyPC/u6bOvUBS+M1pMtpu/OWRdeVZVlqp/hd5E6k0DOJ3R3ouSr1O2Y AA78xH2mm26KUdckWAO7SQe9Wx6I9+nyfBt+bCacyY8+LJls78UKtcFpOvCXXLWk0OzP eSHLFDochJa0AS0VUylwxIAWFbALtb40JZuhVLCI8xtPaGnxiAgR9crHOCcsnydRklEc OIA4Vljk45Zss79uZItUSDavBpwbryMTOljobdtrnNYKw4C+nAxWF0F5jb/1uC/dX2xW 1/JqjZap6n1RyH4lwktIoyzqVkVCA3H/ioWRYY/SHWyQFUc5anw3p+Y52Ilww3/1mHIY mikA== X-Gm-Message-State: AOAM531flcUmOhTjnRMpm7e7+YEUHK3z3va20IN3JO4EGeLJd59Zk1TL mrVw228iVwVKTpKssQIxeJIysAYq1T+FnDNKObK+9QR233xDuofUvm/8QJMMzp5Wcdv+sf6h7c2 2bRXDSnIUQh8npAiv/zckHlZi X-Received: by 2002:a17:906:e0ce:: with SMTP id gl14mr28604814ejb.168.1628610051121; Tue, 10 Aug 2021 08:40:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4UZf6xSFaFOhDl07ArgAZ/4ws13kyVOm7t23NjXDoq5qf9zWPDQ8YAN7YJNHb6Woei5kP7A== X-Received: by 2002:a17:906:e0ce:: with SMTP id gl14mr28604800ejb.168.1628610050956; Tue, 10 Aug 2021 08:40:50 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id i16sm9725499edr.38.2021.08.10.08.40.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:40:50 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Tue, 10 Aug 2021 17:38:47 +0200 Message-Id: <20210810154022.749358-7-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.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 19.11.10 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 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/f6e2a4d566083c7f264c985e063e480ee5e6661e Thanks. Christian Ehrhardt --- >From f6e2a4d566083c7f264c985e063e480ee5e6661e 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 82203c2411..faaf0d0479 100644 --- a/drivers/net/bnxt/bnxt_flow.c +++ b/drivers/net/bnxt/bnxt_flow.c @@ -1860,12 +1860,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.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:13.357524755 +0200 +++ 0007-net-bnxt-set-flow-error-after-tunnel-redirection-fre.patch 2021-08-10 15:11:12.898637234 +0200 @@ -1 +1 @@ -From 25ee03f532b35e261bced83d1d0635d7271d6c9b Mon Sep 17 00:00:00 2001 +From f6e2a4d566083c7f264c985e063e480ee5e6661e 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 82203c2411..faaf0d0479 100644 @@ -23 +24 @@ -@@ -1969,12 +1969,20 @@ static int bnxt_handle_tunnel_redirect_destroy(struct bnxt *bp, +@@ -1860,12 +1860,20 @@ static int bnxt_handle_tunnel_redirect_destroy(struct bnxt *bp,