From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4A650A0518 for ; Fri, 24 Jul 2020 14:10:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3DF1E1C039; Fri, 24 Jul 2020 14:10:12 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id EAACD1C039 for ; Fri, 24 Jul 2020 14:10:10 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id f18so8117847wrs.0 for ; Fri, 24 Jul 2020 05:10:10 -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=wpps8fYG5C585BA5Hym8/3MuYTAGkJePW8SsDL23nxg=; b=H+wOuurQHHtG5fkWqR84fgwwwBVmo8tNQeH9sedSXdVPw1f51At3P0lDQlra3tTk50 0kEc4iHuM47PSrPOUy2+WPJGMb92lEPX2lfY/rF1VvIo4m3pkR89gc1vVIq3lttlbXu/ eCqPmTFqcs+ZOprVprbF1FpnWmal0//uGrVGTK5n6WtaTvcKsYHCY/ZjU+aM+yIKlMTk U8jCYocSdemajv8zw025IFe7nP311Ym2gt4Y+YisDz9SY/ISRIADHTBQ93Hfmou7pFVy Jvs4h3VcCpRoWGlmYS2GMZOxAVTrjHe7mPlSCi0b11pXVIIkooIgZf3OJmqqBsMV8qpO wA+Q== 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=wpps8fYG5C585BA5Hym8/3MuYTAGkJePW8SsDL23nxg=; b=IF6s0JT0V3zxLpXyWMewwtwRh1EySRCZmai/MmrxNExS3vzIYt+UAZfjE+SK8N4wWq BqBFctlmNLPXLBpubtYeAF2Q0goME9lOGCIpq8Td3S7KMpNiPyOr4HuKwhMTQvyBrHUp 10SB+RpSUPdTAgnKwpf3v5ulvrlWVOuA/LzUfvvLQm9CqEtnkG5rlYJyr55sH1Ums00r CWcFd4L86pWFT86sqnS3AgG+WeNFy1EWS/9xT4BHaUtF395BTn8T1ssxhDvEcbo9mC4u KlXoKIoGty0zvEOus/IR8V25tI9SUeZHp2OCpRSw5rMdER7VnrfIkvadNcVj7vpV/P8G U+kA== X-Gm-Message-State: AOAM533LwIamoZ6ErnrxcQuGgCPDB/NddCG+pZJXCSnkSzlPlD3ZlJcM 5yqT3xluy0cY4k0yc5KrR31MvzumF1R2gg== X-Google-Smtp-Source: ABdhPJyA9DG+PauB2ZVJ8i8ujsDthS86xBcAzI7U1EDhVLjC4EwaMnCvKpL9iBRsM2mqBH0OmH6mtg== X-Received: by 2002:adf:ed8c:: with SMTP id c12mr8467870wro.359.1595592610695; Fri, 24 Jul 2020 05:10:10 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id k14sm1073789wrn.76.2020.07.24.05.10.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:10:09 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , dpdk stable Date: Fri, 24 Jul 2020 12:59:44 +0100 Message-Id: <20200724120030.1863487-146-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix flow error on filter creation' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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.4 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/26/20. 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. Thanks. Luca Boccassi --- >From 9e4213197fc9ad881ee5da16245464e3a0b84850 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 9 Jul 2020 15:08:31 +0530 Subject: [PATCH] net/bnxt: fix flow error on filter creation [ upstream commit 87aefef133e3d670be365efdaa620f36d97ee4bd ] If set_em_filter/set_ntuple_filter cmds fails for some reason, driver is not filling the "rte_flow_error" string buffer. Same is the case when flow create fails due to an already existing mark id for the new flow id created. This leads to a crash in testpmd while trying to print the error message. Fixes: 5c1171c97216 ("net/bnxt: refactor filter/flow") Fixes: 9db66782bd06 ("net/bnxt: fix supporting zero mark ID with RSS action") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_flow.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c index d901479ee..52d521d6e 100644 --- a/drivers/net/bnxt/bnxt_flow.c +++ b/drivers/net/bnxt/bnxt_flow.c @@ -1715,12 +1715,24 @@ bnxt_flow_create(struct rte_eth_dev *dev, filter->enables |= HWRM_CFA_EM_FLOW_ALLOC_INPUT_ENABLES_L2_FILTER_ID; ret = bnxt_hwrm_set_em_filter(bp, filter->dst_id, filter); + if (ret != 0) { + rte_flow_error_set(error, -ret, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "Failed to create EM filter"); + goto free_filter; + } } if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER) { filter->enables |= HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_L2_FILTER_ID; ret = bnxt_hwrm_set_ntuple_filter(bp, filter->dst_id, filter); + if (ret != 0) { + rte_flow_error_set(error, -ret, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "Failed to create ntuple filter"); + goto free_filter; + } } vnic = find_matching_vnic(bp, filter); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:54.196815269 +0100 +++ 0146-net-bnxt-fix-flow-error-on-filter-creation.patch 2020-07-24 12:53:48.495010335 +0100 @@ -1,8 +1,10 @@ -From 87aefef133e3d670be365efdaa620f36d97ee4bd Mon Sep 17 00:00:00 2001 +From 9e4213197fc9ad881ee5da16245464e3a0b84850 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 9 Jul 2020 15:08:31 +0530 Subject: [PATCH] net/bnxt: fix flow error on filter creation +[ upstream commit 87aefef133e3d670be365efdaa620f36d97ee4bd ] + If set_em_filter/set_ntuple_filter cmds fails for some reason, driver is not filling the "rte_flow_error" string buffer. Same is the case when flow create fails due to an already @@ -12,19 +14,18 @@ Fixes: 5c1171c97216 ("net/bnxt: refactor filter/flow") Fixes: 9db66782bd06 ("net/bnxt: fix supporting zero mark ID with RSS action") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde --- - drivers/net/bnxt/bnxt_flow.c | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) + drivers/net/bnxt/bnxt_flow.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c -index 19bc66a5a..499dcdf6b 100644 +index d901479ee..52d521d6e 100644 --- a/drivers/net/bnxt/bnxt_flow.c +++ b/drivers/net/bnxt/bnxt_flow.c -@@ -1786,12 +1786,24 @@ bnxt_flow_create(struct rte_eth_dev *dev, +@@ -1715,12 +1715,24 @@ bnxt_flow_create(struct rte_eth_dev *dev, filter->enables |= HWRM_CFA_EM_FLOW_ALLOC_INPUT_ENABLES_L2_FILTER_ID; ret = bnxt_hwrm_set_em_filter(bp, filter->dst_id, filter); @@ -49,21 +50,6 @@ } vnic = find_matching_vnic(bp, filter); -@@ -1817,10 +1829,10 @@ done: - */ - flow_id = filter->flow_id & BNXT_FLOW_ID_MASK; - if (bp->mark_table[flow_id].valid) { -- PMD_DRV_LOG(ERR, -- "Entry for Mark id 0x%x occupied" -- " flow id 0x%x\n", -- filter->mark, filter->flow_id); -+ rte_flow_error_set(error, EEXIST, -+ RTE_FLOW_ERROR_TYPE_HANDLE, -+ NULL, -+ "Flow with mark id exists"); - goto free_filter; - } - bp->mark_table[flow_id].valid = true; -- 2.20.1