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 41FB7A0553 for ; Mon, 17 Feb 2020 18:46:27 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 38DE11DA12; Mon, 17 Feb 2020 18:46:27 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by dpdk.org (Postfix) with ESMTP id EC74F1DA12 for ; Mon, 17 Feb 2020 18:46:25 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id a9so183083wmj.3 for ; Mon, 17 Feb 2020 09:46:25 -0800 (PST) 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=BAFql5AFjp61tZ5HUBuGWX3fro9juB9kKrIlm7fk/js=; b=b8MOsEMAYb5ECBwiE1Est/CjbH+rtsnKFn2mvZC7Uk9/WargcXG4elYb8nmoGGICWB bvUb7dEW7fAk0VBK9hPTEj5sv8Mb8MnpPX1ky/75wvBMmgS4U9JxZItuZaOWynOV4rvS Enx7hoys5sEF0lXe/ky58Zws9LX8tTvwawqgdD/13wxj53bOn9x1Hrdk0iVZCCl5v/kB 7FneHGt/pLsguYtoCGLcAoIqYPs/8co6WHh+P/x3fZkUhN03EK6DI5QIz3kQGWP2N+wM 1yAiUyOOP8l4J6gqFpW7GfkcSLQh0WHvQ5swcYfG9rwI4CbfeFfabDmRtN649v8zRYnc A6RA== 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=BAFql5AFjp61tZ5HUBuGWX3fro9juB9kKrIlm7fk/js=; b=YKePT3F4dstXN67dKNWAEA8zaKRz2ZtZN/iTl0jRmyRq3Sj40NpansP1/4eddnuZnY G608pxJBwQsO7ZQyuhjXmuZH41EKnZD8LwuYQLkzNma+zUgw4GX6DzL4uA8yajZT8Eta 3P06fvrR6zt9QDpIXbaIiPMKEKMG0MiYn7NF1JM4w+4Q+R5cn2ILrPYglEyZ+n6admfT cG4XuaJ6qlnhwqby384+gHyYJkcBrXjUgfr/lwhaM+pmOBApQYOZA2v9Kk3pMMS+H8L5 9qX6BvKD6llh9OXpvXQ/l/QDsuEbPNpM6n0Za4F/cSTMoi33KTOspQ7EG50pdwA96bpr iBkw== X-Gm-Message-State: APjAAAXBzX9kKdeGkFFJryOiRlJlOI9dOtANZWatyxliHfl6KMWdaPvQ lFwU+QumN+7+kU6e4XgRRo392UdCIUpyoA== X-Google-Smtp-Source: APXvYqyjGFwL9syz0eKC4pQF421js0GTZDHJQm3Mwls1sjgZ2a3tcVvEWFSqYHkFH6CfpaLdT5q/pw== X-Received: by 2002:a05:600c:2c01:: with SMTP id q1mr119202wmg.179.1581961585682; Mon, 17 Feb 2020 09:46:25 -0800 (PST) Received: from localhost (userh634.uk.uudial.com. [194.69.103.7]) by smtp.gmail.com with ESMTPSA id a13sm1885534wrp.93.2020.02.17.09.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 09:46:25 -0800 (PST) From: luca.boccassi@gmail.com To: Yahui Cao Cc: Qi Zhang , dpdk stable Date: Mon, 17 Feb 2020 17:45:14 +0000 Message-Id: <20200217174546.25334-22-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200217174546.25334-1-luca.boccassi@gmail.com> References: <20200211112216.3929-190-luca.boccassi@gmail.com> <20200217174546.25334-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix flow director passthru' has been queued to stable release 19.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/19/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 6a3de06023c9301132cb3fce90ed3725f3c0b4aa Mon Sep 17 00:00:00 2001 From: Yahui Cao Date: Tue, 21 Jan 2020 10:25:59 +0800 Subject: [PATCH] net/ice: fix flow director passthru [ upstream commit 0d14c49b282196f48d63da0e34d1a20cdfc6e3a8 ] The original PASSTHRU implementation is forwarding to queue 0. The corrected implementation is forwarding to the next stage filter. Fixes: f5cafa961fae ("net/ice: add flow director create and destroy") Signed-off-by: Yahui Cao Acked-by: Qi Zhang --- drivers/net/ice/base/ice_fdir.c | 9 ++++++++- drivers/net/ice/ice_fdir_filter.c | 3 +-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c index 551c7a6bc6..8e5aef8a38 100644 --- a/drivers/net/ice/base/ice_fdir.c +++ b/drivers/net/ice/base/ice_fdir.c @@ -430,6 +430,10 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input, if (input->dest_ctl == ICE_FLTR_PRGM_DESC_DEST_DROP_PKT) { fdir_fltr_ctx.drop = ICE_FXD_FLTR_QW0_DROP_YES; fdir_fltr_ctx.qindex = 0; + } else if (input->dest_ctl == + ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_OTHER) { + fdir_fltr_ctx.drop = ICE_FXD_FLTR_QW0_DROP_NO; + fdir_fltr_ctx.qindex = 0; } else { if (input->dest_ctl == ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_QGROUP) @@ -441,7 +445,10 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input, fdir_fltr_ctx.cnt_index = input->cnt_index; fdir_fltr_ctx.fd_vsi = ice_get_hw_vsi_num(hw, input->dest_vsi); fdir_fltr_ctx.evict_ena = ICE_FXD_FLTR_QW0_EVICT_ENA_FALSE; - fdir_fltr_ctx.toq_prio = 3; + if (input->dest_ctl == ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_OTHER) + fdir_fltr_ctx.toq_prio = 0; + else + fdir_fltr_ctx.toq_prio = 3; fdir_fltr_ctx.pcmd = (add) ? ICE_FXD_FLTR_QW1_PCMD_ADD : ICE_FXD_FLTR_QW1_PCMD_REMOVE; fdir_fltr_ctx.swap = ICE_FXD_FLTR_QW1_SWAP_NOT_SET; diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 442295e59d..5a791610f8 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -1499,8 +1499,7 @@ ice_fdir_parse_action(struct ice_adapter *ad, dest_num++; filter->input.dest_ctl = - ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_QINDEX; - filter->input.q_index = 0; + ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_OTHER; break; case RTE_FLOW_ACTION_TYPE_RSS: dest_num++; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-17 17:00:15.938317194 +0000 +++ 0022-net-ice-fix-flow-director-passthru.patch 2020-02-17 17:00:15.311950512 +0000 @@ -1,13 +1,14 @@ -From 0d14c49b282196f48d63da0e34d1a20cdfc6e3a8 Mon Sep 17 00:00:00 2001 +From 6a3de06023c9301132cb3fce90ed3725f3c0b4aa Mon Sep 17 00:00:00 2001 From: Yahui Cao Date: Tue, 21 Jan 2020 10:25:59 +0800 Subject: [PATCH] net/ice: fix flow director passthru +[ upstream commit 0d14c49b282196f48d63da0e34d1a20cdfc6e3a8 ] + The original PASSTHRU implementation is forwarding to queue 0. The corrected implementation is forwarding to the next stage filter. Fixes: f5cafa961fae ("net/ice: add flow director create and destroy") -Cc: stable@dpdk.org Signed-off-by: Yahui Cao Acked-by: Qi Zhang @@ -17,10 +18,10 @@ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c -index 56c1c1c845..ba002586b6 100644 +index 551c7a6bc6..8e5aef8a38 100644 --- a/drivers/net/ice/base/ice_fdir.c +++ b/drivers/net/ice/base/ice_fdir.c -@@ -401,6 +401,10 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input, +@@ -430,6 +430,10 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input, if (input->dest_ctl == ICE_FLTR_PRGM_DESC_DEST_DROP_PKT) { fdir_fltr_ctx.drop = ICE_FXD_FLTR_QW0_DROP_YES; fdir_fltr_ctx.qindex = 0; @@ -31,7 +32,7 @@ } else { if (input->dest_ctl == ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_QGROUP) -@@ -412,7 +416,10 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input, +@@ -441,7 +445,10 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input, fdir_fltr_ctx.cnt_index = input->cnt_index; fdir_fltr_ctx.fd_vsi = ice_get_hw_vsi_num(hw, input->dest_vsi); fdir_fltr_ctx.evict_ena = ICE_FXD_FLTR_QW0_EVICT_ENA_FALSE;