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 0825AA051C for ; Tue, 11 Feb 2020 12:39:20 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F12825B3C; Tue, 11 Feb 2020 12:39:19 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by dpdk.org (Postfix) with ESMTP id 2C98A1BF9E for ; Tue, 11 Feb 2020 12:39:18 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id z3so11962701wru.3 for ; Tue, 11 Feb 2020 03:39:18 -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=ONlvpqhiMb4P98pV8K/6wda6rqz9KZodaEsd5gYW45M=; b=WnydwZ1PHMCetNVq7JxGX2XbUNjYbucaa/yP1oxdc4gqr8oD1TLFsnqfn7G1pX0Doa 0uCgZP2cHkW2Qy9/OmWtLIN+WDb5nstvAFnQ5l57e3mM5sBl0ZnBY9SY8id2Pr/1N6v8 qsvFTq/DrEGTijYkBoLijnatnRgAgWU0pnY+9IQlZIdcpJ3I+gtz0eWvlaqmH1FvNUAr j0g8JceNY7FZoHQOHZCobEinFLMuoHZGAipDgBMTHjSEdQx3vlv9YraKLS+RRuSYYfkM s8jLWCJCwcWpe5ynmv/d8Cd7ftMABlbAYjvelr8dH59ETBpKXkx7f3Gu5E0yimBYa8VT BqLw== 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=ONlvpqhiMb4P98pV8K/6wda6rqz9KZodaEsd5gYW45M=; b=f3HQx7c4AuwZaPlYB1xqKUCUgrIl5UXtdQ08d/9GFXMt/C5b67iuqON+UIzZe0FCSb to74U/6A+vugZxnNRE7PV5hH8tJC+uazKC/8CzVG9smTrUbz9j+0T9Mg/V8cvsVnj/Wh Q5wXGzsvG+jkAqifHzr6hv+ZddszpNoTAj9NUl5GDmo4QJD0MU2W8QsqJkYd045RgGjZ rRFiar9xEVbDuEIMm5dtkuk3ftyG8gGYN4nLX+aLxb3EZ89Hl6SCmnPzha2cpuu1sLnp zoZsxBbHU0wRWfgqJ7iFRLwONcuSkkSGj7azEyQ4S4rQQRuvkhQOYaw9JHvlMsFwmPNs epVw== X-Gm-Message-State: APjAAAX+9ROhX3f4pfBcoILZAC92yGXVWQM1wQrc5njN4k2mZ1iNtUa8 1xRMK/GPTUmcXH5CPUi8Gy8= X-Google-Smtp-Source: APXvYqxO29hTSMURlWNvPfWegtBU97fpIUU2XYNi7cwyDcP0SgrTlAHCAOQzN+skhSMKVhdIadZ/Dg== X-Received: by 2002:adf:fa08:: with SMTP id m8mr8104016wrr.366.1581421157910; Tue, 11 Feb 2020 03:39:17 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c141sm3432385wme.41.2020.02.11.03.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:39:17 -0800 (PST) From: luca.boccassi@gmail.com To: Beilei Xing Cc: Qi Zhang , dpdk stable Date: Tue, 11 Feb 2020 11:21:22 +0000 Message-Id: <20200211112216.3929-136-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix flow director flag' 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/13/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 aa021c9de9081352faa7a16988648afac92c1c35 Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Tue, 21 Jan 2020 19:42:11 +0800 Subject: [PATCH] net/ice: fix flow director flag [ upstream commit 1f0bc0592ae59d5d809ade9044d886c7c6f6186d ] If there's no mark action when creating a FDIR rule, there shouldn't be FDIR flags in mbuf. Fixes: f5cafa961fae ("net/ice: add flow director create and destroy") Fixes: bd984f155f49 ("net/ice/base: support FDIR") Signed-off-by: Beilei Xing Acked-by: Qi Zhang --- drivers/net/ice/base/ice_fdir.c | 2 +- drivers/net/ice/base/ice_fdir.h | 1 + drivers/net/ice/ice_fdir_filter.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c index 37b3881696..41136d1f0c 100644 --- a/drivers/net/ice/base/ice_fdir.c +++ b/drivers/net/ice/base/ice_fdir.c @@ -447,7 +447,7 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input, fdir_fltr_ctx.swap = ICE_FXD_FLTR_QW1_SWAP_NOT_SET; fdir_fltr_ctx.comp_q = ICE_FXD_FLTR_QW0_COMP_Q_ZERO; fdir_fltr_ctx.comp_report = ICE_FXD_FLTR_QW0_COMP_REPORT_SW; - fdir_fltr_ctx.fdid_prio = 3; + fdir_fltr_ctx.fdid_prio = input->fdid_prio; fdir_fltr_ctx.desc_prof = 1; fdir_fltr_ctx.desc_prof_prio = 3; ice_set_fd_desc_val(&fdir_fltr_ctx, fdesc); diff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h index db1f8351f9..c811f7606d 100644 --- a/drivers/net/ice/base/ice_fdir.h +++ b/drivers/net/ice/base/ice_fdir.h @@ -202,6 +202,7 @@ struct ice_fdir_fltr { u8 cnt_ena; u8 fltr_status; u16 cnt_index; + u8 fdid_prio; u32 fltr_id; }; diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index fa87074556..42b9628630 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -1504,6 +1504,7 @@ ice_fdir_parse_action(struct ice_adapter *ad, mark_spec = actions->conf; filter->input.fltr_id = mark_spec->id; + filter->input.fdid_prio = ICE_FXD_FLTR_QW1_FDID_PRI_ONE; break; case RTE_FLOW_ACTION_TYPE_COUNT: counter_num++; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.415105344 +0000 +++ 0136-net-ice-fix-flow-director-flag.patch 2020-02-11 11:17:38.648005984 +0000 @@ -1,14 +1,15 @@ -From 1f0bc0592ae59d5d809ade9044d886c7c6f6186d Mon Sep 17 00:00:00 2001 +From aa021c9de9081352faa7a16988648afac92c1c35 Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Tue, 21 Jan 2020 19:42:11 +0800 Subject: [PATCH] net/ice: fix flow director flag +[ upstream commit 1f0bc0592ae59d5d809ade9044d886c7c6f6186d ] + If there's no mark action when creating a FDIR rule, there shouldn't be FDIR flags in mbuf. Fixes: f5cafa961fae ("net/ice: add flow director create and destroy") Fixes: bd984f155f49 ("net/ice/base: support FDIR") -Cc: stable@dpdk.org Signed-off-by: Beilei Xing Acked-by: Qi Zhang @@ -19,10 +20,10 @@ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c -index 87fa0afbab..20d64f8612 100644 +index 37b3881696..41136d1f0c 100644 --- a/drivers/net/ice/base/ice_fdir.c +++ b/drivers/net/ice/base/ice_fdir.c -@@ -418,7 +418,7 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input, +@@ -447,7 +447,7 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input, fdir_fltr_ctx.swap = ICE_FXD_FLTR_QW1_SWAP_NOT_SET; fdir_fltr_ctx.comp_q = ICE_FXD_FLTR_QW0_COMP_Q_ZERO; fdir_fltr_ctx.comp_report = ICE_FXD_FLTR_QW0_COMP_REPORT_SW;