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 350E2A0C47 for ; Tue, 10 Aug 2021 17:40:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 25B3D411C7; Tue, 10 Aug 2021 17:40:39 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 671A740686 for ; Tue, 10 Aug 2021 17:40:38 +0200 (CEST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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-0.canonical.com (Postfix) with ESMTPS id 4E6913F0A1 for ; Tue, 10 Aug 2021 15:40:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610038; bh=WnqFRGR9TqMuAOvrdhNTFcmJDuxwzO+8IXk1+QVjejc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=T4yRI5e0HtkyPjlBNzFpY/TX6y/U7WdtpHVd8uw3OGCc+CPAekTKdRdIR/NZ5mkNQ 5wRPBFXzRt5ONCdf97y286kREiB751b/0VK6NCOzj/0LJLVTuTp0Wk+E/VtIdMXg5c 7Z3jS68DfHRFqAyGTaAez9B5139Y7N/tjeJRRmRkOZ9oK7HyZJTHVa8TirHFxb9Xkb pkaHKfNVQSFkglvAr9JeYbVhGZDC7OR48/MziA9+EYSwpYrKD4N5/AfV1t7PjISbTA bPOJJEO95GAGsWPpIdu8+OF8/l1bF1ng7YQMIwlg8HnsuVMDHcc+7Aua5WeZKLXJEn X2M9CBP8U/gpA== Received: by mail-ed1-f72.google.com with SMTP id p2-20020a50c9420000b02903a12bbba1ebso10896436edh.6 for ; Tue, 10 Aug 2021 08:40:38 -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=WnqFRGR9TqMuAOvrdhNTFcmJDuxwzO+8IXk1+QVjejc=; b=GuZZ+vIGdSyG5cwQToMgXEAppbbzB9uvGt4UEH+PRaC4hfikEZLilVUJnYscVj5E/W GOYNM5qJ7ffvX70L1icNPym9NGUcHsEJgkQ9jysTFYY05Aj+SHEjpvPf6ffjHFG4igce SrTNDefnnthOGKMC+oS6S2tEUNhIOhuh9sDo2pEOlw+VGCdNjFw8wjbyodo8mdgmFNFA 1KgK8WXfMQsmIgPXTMRz7DSrZmlL3WCkkNhzzZInZQgkI9y6NxU8LkEol1i4sYiXhLei SU3KXRMGXqH4stL3s17l6/xShkpkejiy+XUu2qefD+tKKq5uTGly3I6C+/4K64VINmMG IhUw== X-Gm-Message-State: AOAM532jVS1qofNPGbf6dLt+dif/kKmqIYRWdon8J75r7vH05pr28yif Vyy4W9epDQLLyvp6veqlgOUPXap44xRvDcbeD5kmPdbibuUC3wYiT8Fzms9F15bSjkHryWqS14B 474rCOmAvyH49MmMA5tNtcQMa X-Received: by 2002:a17:906:8751:: with SMTP id hj17mr27703564ejb.511.1628610038020; Tue, 10 Aug 2021 08:40:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWY89n1aP/ZcYPN4xKb17wEtZcKkJk5+rV7rHoLSvyuvEdc7b8FrdI0aRpzanjwsu2slhXqA== X-Received: by 2002:a17:906:8751:: with SMTP id hj17mr27703540ejb.511.1628610037808; Tue, 10 Aug 2021 08:40:37 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id b25sm9837155edv.9.2021.08.10.08.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:40:36 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Kalesh AP Cc: Ajit Khaparde , dpdk stable Date: Tue, 10 Aug 2021 17:38:44 +0200 Message-Id: <20210810154022.749358-4-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 when free filter not available' 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/efb741b14dcda254455bd82fe0a4b897725f5ad6 Thanks. Christian Ehrhardt --- >From efb741b14dcda254455bd82fe0a4b897725f5ad6 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 41be6b5d81..ec36c6787e 100644 --- a/drivers/net/bnxt/bnxt_flow.c +++ b/drivers/net/bnxt/bnxt_flow.c @@ -1514,9 +1514,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.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:13.248000594 +0200 +++ 0004-net-bnxt-set-flow-error-when-free-filter-not-availab.patch 2021-08-10 15:11:12.894637205 +0200 @@ -1 +1 @@ -From 94df7953ac6599c2887b859de19c541e5b5830d9 Mon Sep 17 00:00:00 2001 +From efb741b14dcda254455bd82fe0a4b897725f5ad6 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 41be6b5d81..ec36c6787e 100644 @@ -26 +27 @@ -@@ -1550,9 +1550,11 @@ bnxt_flow_validate(struct rte_eth_dev *dev, +@@ -1514,9 +1514,11 @@ bnxt_flow_validate(struct rte_eth_dev *dev,