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 407ACA0C4C for ; Mon, 12 Jul 2021 15:09:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 373F14069D; Mon, 12 Jul 2021 15:09:00 +0200 (CEST) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id 837274069D for ; Mon, 12 Jul 2021 15:08:58 +0200 (CEST) Received: by mail-wr1-f42.google.com with SMTP id v5so25549758wrt.3 for ; Mon, 12 Jul 2021 06:08:58 -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=IbNT5QkM1o08B7qUUAmjhwMOjqtZB9eB2Rr++0w+NFE=; b=UfnIRyBTghasAZeHTZ0C9aX+vCZgqyrXn2XJTpdaKx2Uinlfb+dC0CSDLf5dF/5CpW jYyDbK1N9ktZVusxPTjGFc8ZrWEINzw+HLXBhlFae0mnz0ErkMHhpsOvQ4J4WDATdVpx sA8T9tUlffkZSlKx2IUDraWaArLUx+60zPZ/no26FAw+/9On+30ch/qdgBELSC6DiB/f 4px5K7SJCDLq4k4tndrtkZeHW/1qvFes4eCAnLudi6iewRkaYyDseuMLNA3eajeoGFhA n2yKW+Rsgmd6AdNbLfmkNH7ksrIJr2RkQbW2XuKIXGdiRJbiq5uuLtjpGzPypHJmvmmh bvTA== 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=IbNT5QkM1o08B7qUUAmjhwMOjqtZB9eB2Rr++0w+NFE=; b=swisKgFFtjxSFNbbAE9rtOPUdXJ0IYwJR2Q3eYOsn1Ri4NAUIMdWcXXr4Q8Hj2qWk7 FyCRSViRXJRpPlJex6O+bULw2HXlpbrj4Abg6vthyW+wufqWakYDDeQWsNjqC0HAtG9g uHB3LBHqDQ4Z7/EdvoUJX3zu/8RtXWqPxJ5T9OwIDtEZ924bV6LXv2kmG4cSb18FFso8 Ww4L2X8I9wrV9E64e9yTDN4mDRJo9eYM5wPK5R1kJK7wH35HZLXQQ6rbl91NL9oNnw7h 5PcGJvVn0g+TFPGqH0p4irs93pmCVZFLMIudnh6A50H4/AbNoQrM4qVP9bbgJDur+mSV TEhA== X-Gm-Message-State: AOAM533/JWlyiJ8z5IKkXPbvqNLCt10fJkN3jz2PrdUVAA6DpWkbhmV4 G6fHHC2AJYxRLNXHLeKZuDc= X-Google-Smtp-Source: ABdhPJzlWklZwbA7GAd7hGIQLR2WjXaIRrA94HbSc0h5Gal99swAT8IWClGS+v4c9cmAzeRgkcacHw== X-Received: by 2002:a5d:6652:: with SMTP id f18mr34130318wrw.235.1626095338336; Mon, 12 Jul 2021 06:08:58 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id c12sm16347086wrr.90.2021.07.12.06.08.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:08:53 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , dpdk stable Date: Mon, 12 Jul 2021 14:04:04 +0100 Message-Id: <20210712130551.2462159-9-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 when free filter not available' 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/da7d8b7da30754d7a69d76f0cf7da8f6a6ee8ce0 Thanks. Luca Boccassi --- >From da7d8b7da30754d7a69d76f0cf7da8f6a6ee8ce0 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Mon, 31 May 2021 12:56:37 +0530 Subject: [PATCH] net/bnxt: set flow error when free filter not available [ upstream commit 94df7953ac6599c2887b859de19c541e5b5830d9 ] In bnxt_flow_validate(), when bnxt_get_unused_filter() fails due to no filter resources available, driver is not setting flow error using "rte_flow_error_set". Also, fixed the error code. Fixes: 5ef3b79fdfe6 ("net/bnxt: support flow filter ops") Signed-off-by: Kalesh AP Reviewed-by: Kalesh AP Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_flow.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c index 1c46cdd1ab..14789b9472 100644 --- a/drivers/net/bnxt/bnxt_flow.c +++ b/drivers/net/bnxt/bnxt_flow.c @@ -1543,9 +1543,11 @@ bnxt_flow_validate(struct rte_eth_dev *dev, filter = bnxt_get_unused_filter(bp); if (filter == NULL) { - PMD_DRV_LOG(ERR, "Not enough resources for a new flow.\n"); + rte_flow_error_set(error, ENOSPC, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "Not enough resources for a new flow"); bnxt_release_flow_lock(bp); - return -ENOMEM; + return -ENOSPC; } ret = bnxt_validate_and_parse_flow(dev, pattern, actions, attr, -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:37.350730831 +0100 +++ 0009-net-bnxt-set-flow-error-when-free-filter-not-availab.patch 2021-07-12 13:41:36.186116278 +0100 @@ -1 +1 @@ -From 94df7953ac6599c2887b859de19c541e5b5830d9 Mon Sep 17 00:00:00 2001 +From da7d8b7da30754d7a69d76f0cf7da8f6a6ee8ce0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 94df7953ac6599c2887b859de19c541e5b5830d9 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 66012b8057..9b4780773a 100644 +index 1c46cdd1ab..14789b9472 100644 @@ -26 +27 @@ -@@ -1550,9 +1550,11 @@ bnxt_flow_validate(struct rte_eth_dev *dev, +@@ -1543,9 +1543,11 @@ bnxt_flow_validate(struct rte_eth_dev *dev,