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 7F132A0093 for ; Tue, 19 May 2020 15:15:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6F9F71D94A; Tue, 19 May 2020 15:15:48 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 32B071D94A for ; Tue, 19 May 2020 15:15:47 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id z72so3531614wmc.2 for ; Tue, 19 May 2020 06:15:47 -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=6sSxRyWPQ67z7KjIAZnwwXZJ75/1ozl1WUyawJTsx3Q=; b=lv9E1SR7O6xhevaqJ0B1I0eBPUyDcrbB5/4UnIEXUyWjERQOzC0YmNl5f9YjS2pT3j UD3Z82h30cfa8W2vBmuBuS+By8FXYJIfbAL8XiQ+/VKrkb7sFHrhvQKhk3wihsfLgjSm RsErhUUQhaa3QohdI/HR7piaaLb6bW86P2q0CUHxF8nEcie/BTjPGLKb6CsdzTWeL9Xj yWPSbusk0UD0/PI8Dd+EzNp6SLUOjyYBwLTPHiVndKLSIxERYx19Cp8t8jU5n5f9x56d pyYMz09jMTTSWnCd1qwxqSpLNUVEKyb/mfSiRtaM/S2IGdDkMCZeaLStfibCZuEiFS6p DCnA== 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=6sSxRyWPQ67z7KjIAZnwwXZJ75/1ozl1WUyawJTsx3Q=; b=nJzjW5dn2eVy5GEE11MMiaU/ITEwsn0301Srvz+jETH3qxp/slVeK9Yckv2wnZmgDT l1ARN2AM7I/3WYOgxyyHLB8spgGCd6M7Ajo9yrVA1iBVe7pSIb+5ECCL6dQ1dAZfppop dEdGTERVEi+1tKdRl3mrbKKSzNp9+mZot5ffcPDJVhfLaSlnAP6FPxmQVc3JwcCNDGm/ rhHRxJUMg/zdyUKBj4ysWJRXLcOJBiACUL/GOExdc99KOTTGAsxwW45CnLaY0qU1MLqJ 6JcF7ezGHz5CgvOjMQ94Pr3Xk6qbtSz1NBN47l7ZJJYiwprD9rDrj+P9Njl7GmDfxmxL ffoQ== X-Gm-Message-State: AOAM531mkxBvSiDlIBR/9w/qMIv9yuv2MWl6D2bAkE9qw5nLJx+WWZ2x IBQu8V4SOQ/7QOFEbYJEaUs= X-Google-Smtp-Source: ABdhPJzeRRKytKjrhhcsTqF60ex+c21rdNIpg7YrRjCj1aOXXJ6kR6e3sA/ZWfjR95CBCRM3RbWfBQ== X-Received: by 2002:a1c:29c4:: with SMTP id p187mr5440639wmp.73.1589894146031; Tue, 19 May 2020 06:15:46 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p10sm20646483wrn.10.2020.05.19.06.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:15:45 -0700 (PDT) From: luca.boccassi@gmail.com To: Simei Su Cc: Qi Zhang , dpdk stable Date: Tue, 19 May 2020 14:05:25 +0100 Message-Id: <20200519130549.112823-190-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: support mark only action for flow director' has been queued to stable release 19.11.3 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.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 05/21/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 2e1e12f6a83b7e94ab50ccfa0df05629482a331e Mon Sep 17 00:00:00 2001 From: Simei Su Date: Tue, 14 Apr 2020 23:11:13 +0800 Subject: [PATCH] net/ice: support mark only action for flow director [ upstream commit 0f664f7d57268f9ab9bdef95f0d48b3ce5004a61 ] This patch fixes issue that doesn't support mark only case. Mark only action is equal to mark + passthru action. Fixes: f5cafa961fae ("net/ice: add flow director create and destroy") Signed-off-by: Simei Su Acked-by: Qi Zhang --- drivers/net/ice/ice_fdir_filter.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 6342b560c9..91fef712c1 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -1533,7 +1533,7 @@ ice_fdir_parse_action(struct ice_adapter *ad, } } - if (dest_num == 0 || dest_num >= 2) { + if (dest_num >= 2) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, actions, "Unsupported action combination"); @@ -1554,6 +1554,18 @@ ice_fdir_parse_action(struct ice_adapter *ad, return -rte_errno; } + if (dest_num + mark_num + counter_num == 0) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, actions, + "Empty action"); + return -rte_errno; + } + + /* set default action to PASSTHRU mode, in "mark/count only" case. */ + if (dest_num == 0) + filter->input.dest_ctl = + ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_OTHER; + return 0; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:52.315888095 +0100 +++ 0190-net-ice-support-mark-only-action-for-flow-director.patch 2020-05-19 14:04:44.544654318 +0100 @@ -1,13 +1,14 @@ -From 0f664f7d57268f9ab9bdef95f0d48b3ce5004a61 Mon Sep 17 00:00:00 2001 +From 2e1e12f6a83b7e94ab50ccfa0df05629482a331e Mon Sep 17 00:00:00 2001 From: Simei Su Date: Tue, 14 Apr 2020 23:11:13 +0800 Subject: [PATCH] net/ice: support mark only action for flow director +[ upstream commit 0f664f7d57268f9ab9bdef95f0d48b3ce5004a61 ] + This patch fixes issue that doesn't support mark only case. Mark only action is equal to mark + passthru action. Fixes: f5cafa961fae ("net/ice: add flow director create and destroy") -Cc: stable@dpdk.org Signed-off-by: Simei Su Acked-by: Qi Zhang @@ -16,10 +17,10 @@ 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c -index 1a85d6cc16..69c714c59c 100644 +index 6342b560c9..91fef712c1 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c -@@ -1539,7 +1539,7 @@ ice_fdir_parse_action(struct ice_adapter *ad, +@@ -1533,7 +1533,7 @@ ice_fdir_parse_action(struct ice_adapter *ad, } } @@ -28,7 +29,7 @@ rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, actions, "Unsupported action combination"); -@@ -1560,6 +1560,18 @@ ice_fdir_parse_action(struct ice_adapter *ad, +@@ -1554,6 +1554,18 @@ ice_fdir_parse_action(struct ice_adapter *ad, return -rte_errno; }