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 C9E8AA0518 for ; Fri, 24 Jul 2020 14:08:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C1A401C039; Fri, 24 Jul 2020 14:08:32 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 21AEC1C1AD for ; Fri, 24 Jul 2020 14:08:32 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id f2so8081574wrp.7 for ; Fri, 24 Jul 2020 05:08:32 -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=7wVUV6C3l6m2ZL7LLhKT95UnETUbtUNds50kdHkebh8=; b=OgG+yYmB2kejPwZCJp9YwEv3Ago9xLYBlH1muVGfkn0eD5U1R4suvC9fDJoO9oIMPX Ns0e6CVoIKrbaTvezaOyk1q4p2wtISmiOtZiTk//qQw9NY10Nliz+meQTyjpgWRqcWz/ ERdqTJ9XdXakqauZcaRi7/BNH4/xyWd2oVluzfgElY/cmnuVJOfQRPVFZJU/LfLYL/vk HCcshzYeJaQZ8iYej4O+K+z4Ej490zfC4+Y2uKaF1zT/SxdVNwYZmiAWFgZmmakxGZRX /KzVukpJk1yUeeH3HeEjwHLJgesCa/REWubTYLIMqfyxcq74xn/pH1MX3YT5mHFHsETA T8gw== 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=7wVUV6C3l6m2ZL7LLhKT95UnETUbtUNds50kdHkebh8=; b=TtzUG8OkF256vw0WGaA3PG13UsooIlu7oGa/fSAx3JK/U0VkpPhHoOy485CSM6JLow cyeinIOuwkGCZSvDwQprcDZrf4fK8H/8ukLP8dzrp5u+C1IaDP2rM1b9SLlOvvL2tVbC CoRV4Taf/pHvjZfkKwh7VPVDMzvtfZN/mPGdnSh5Yp8jGE3MvrbAp2l+I/iOxEkIJJZd lozmd3PARXk1tMayfN0s3Bry/YIPCRrCAoEr+G6tu3GIVLxvd7pQTY8inCgRrpxhAG5K 9bM8+HgM+UPTIfeCKLdeUJth5fHlnWeRItdmgGOjkpJbxlSRhLyDWrpZMqRJtu4CQQxd +e6w== X-Gm-Message-State: AOAM532IKDV9LQ+No3mmxbdCMeu7oJI7wykqJBJ2uwNPZF5ngw0vmZgE kSkfYkmiS2xLJh+kefVnr7E= X-Google-Smtp-Source: ABdhPJxoXqEbjtap/3PxFmNRQCELs1aickx67nZOh1IhrYdyierbLZsTro5JvdG0T6cgzWrgeuKuqg== X-Received: by 2002:a5d:60d1:: with SMTP id x17mr8221778wrt.293.1595592511902; Fri, 24 Jul 2020 05:08:31 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p14sm1171865wrg.96.2020.07.24.05.08.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:08:30 -0700 (PDT) From: luca.boccassi@gmail.com To: Shougang Wang Cc: Qi Zhang , dpdk stable Date: Fri, 24 Jul 2020 12:59:16 +0100 Message-Id: <20200724120030.1863487-118-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/ice: fix error log in generic flow' 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 5d3bcbcebf981afc683e0138e78aaadefb11f38c Mon Sep 17 00:00:00 2001 From: Shougang Wang Date: Mon, 6 Jul 2020 09:37:05 +0000 Subject: [PATCH] net/ice: fix error log in generic flow [ upstream commit c04e7f5a7080e2fa91aa2cf9a01a40760edecbe7 ] When create a RSS rule with void action, the error log is "Invalid input set". This patch fix the issue by adding check for the type of first actions item. Fixes: 7615a6895009 ("net/ice: rework for generic flow enabling") Signed-off-by: Shougang Wang Acked-by: Qi Zhang --- drivers/net/ice/ice_generic_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index a1648eeb5..1d2d60fda 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -1786,7 +1786,7 @@ ice_flow_process_filter(struct rte_eth_dev *dev, return -rte_errno; } - if (!actions) { + if (!actions || actions->type == RTE_FLOW_ACTION_TYPE_END) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION_NUM, NULL, "NULL action."); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:53.082275100 +0100 +++ 0118-net-ice-fix-error-log-in-generic-flow.patch 2020-07-24 12:53:48.395008472 +0100 @@ -1,14 +1,15 @@ -From c04e7f5a7080e2fa91aa2cf9a01a40760edecbe7 Mon Sep 17 00:00:00 2001 +From 5d3bcbcebf981afc683e0138e78aaadefb11f38c Mon Sep 17 00:00:00 2001 From: Shougang Wang Date: Mon, 6 Jul 2020 09:37:05 +0000 Subject: [PATCH] net/ice: fix error log in generic flow +[ upstream commit c04e7f5a7080e2fa91aa2cf9a01a40760edecbe7 ] + When create a RSS rule with void action, the error log is "Invalid input set". This patch fix the issue by adding check for the type of first actions item. Fixes: 7615a6895009 ("net/ice: rework for generic flow enabling") -Cc: stable@dpdk.org Signed-off-by: Shougang Wang Acked-by: Qi Zhang @@ -17,10 +18,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c -index ad103d0e8..80ef0e323 100644 +index a1648eeb5..1d2d60fda 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c -@@ -1873,7 +1873,7 @@ ice_flow_process_filter(struct rte_eth_dev *dev, +@@ -1786,7 +1786,7 @@ ice_flow_process_filter(struct rte_eth_dev *dev, return -rte_errno; }