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 3DEE3A0524 for ; Fri, 5 Feb 2021 12:23:08 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 36D3B4067B; Fri, 5 Feb 2021 12:23:08 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 583D41606D7 for ; Fri, 5 Feb 2021 12:23:06 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id a16so7678183wmm.0 for ; Fri, 05 Feb 2021 03:23:06 -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=2zU8Y9HQ5CQUKR43kEuD9LP4/O2q8RbW4bZpx+wZRjw=; b=PtfbAZbJEJC0oF/QPqPpjttjXPJD48ouOVKLxTLlLoWUPA46ahTuEIQYsibaI0p7I3 mzq6QTBl/BRDx6ums1Z6O5sEyBgS0n98M2MzKfqqitMmD6Z65f3hxcCblOpFFyW6tDNC jJxGvk/BuKGqCh+NzPjuhz735m7I0L/bznJ26OgGv83lPLCRenQcOPdFpOgd0wf1cG8V sBPqJrA3ZAfoFN/9UWnyGFoc0RrO2UVYTEVZKX0m0Tc5Vezew5IVGdvwLdN8FN9S2XeH rA/xFSzeUYJLgWosJYwd/9ccMR9NH7AjUvWWCxE7DRJqsTgEZz9MCHwtO5Xm4HCRBf2G sA6Q== 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=2zU8Y9HQ5CQUKR43kEuD9LP4/O2q8RbW4bZpx+wZRjw=; b=eJFzSXiu4+juRRrjswO3O6UVNxekIuhxHRAWyvsUsLR6NDkuXp3FhiEk+XEoXnmao8 C4ivsxxyXvYwdBed8zZwl7gjUTG/23eVO+j0DRHOd4BBXCseNg85UWt62lrEf6j299Vz s2AMjf8mEh1B40HXcLer4VowlzxChRbP3mOh1mbit6sL2DyXJBHkJtHmD3Hh7SettpqV +5iDzsOzMB6qUHfrRAM6DcAMKLRcawp4iYe7yl8Y05EFTyLPodXLlk6BRNKdYGjR3rkR 96bIGfJug2DY+nQbJpuU8I6b0FklepeEhcMbcSVgTRtwLX3ddp9o20FpIP6MLHcIBt0N haFA== X-Gm-Message-State: AOAM533/pq5XbfTDORiD8sdMc9HKJOFWCf/5I2G+8n/HHibQyC0EZydO hRCG1wPv6g/a0JeRb8cb1Y8vyzI8HEqIay6H X-Google-Smtp-Source: ABdhPJwZXAcDYKsQUtR2qluRVcxIrhqHG5N0UgbxeAjRVztj7HYoREUh4SDpp/6n4cxXiks4YzA0Wg== X-Received: by 2002:a1c:6688:: with SMTP id a130mr3167793wmc.1.1612524186129; Fri, 05 Feb 2021 03:23:06 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z8sm11574519wrh.83.2021.02.05.03.23.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:23:05 -0800 (PST) From: luca.boccassi@gmail.com To: Junfeng Guo Cc: Hailin Xu , Qi Zhang , dpdk stable Date: Fri, 5 Feb 2021 11:15:53 +0000 Message-Id: <20210205111920.1272063-67-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix GTPU UL and DL support for flow director' has been queued to stable release 20.11.1 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 20.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/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/6876722e0fcad6aa11574f32712ffd6e6506c59d Thanks. Luca Boccassi --- >From 6876722e0fcad6aa11574f32712ffd6e6506c59d Mon Sep 17 00:00:00 2001 From: Junfeng Guo Date: Thu, 31 Dec 2020 13:13:07 +0800 Subject: [PATCH] net/iavf: fix GTPU UL and DL support for flow director [ upstream commit 78e8a87f6324349e06238f869edaecd53405d7aa ] For AVF FDIR, GTPU uplink and downlink are not supported in previous code. This patch distinguishes GTPU with IP/EH/DL/UL for AVF FDIR. Fixes: 4c7a41ae6b23 ("net/iavf: support flow director GTPU outer IPv4/IPv6") Signed-off-by: Junfeng Guo Tested-by: Hailin Xu Acked-by: Qi Zhang --- drivers/net/iavf/iavf_fdir.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c index 7054bde0b9..253213f8b5 100644 --- a/drivers/net/iavf/iavf_fdir.c +++ b/drivers/net/iavf/iavf_fdir.c @@ -25,6 +25,9 @@ #define IAVF_FDIR_IPV6_TC_OFFSET 20 #define IAVF_IPV6_TC_MASK (0xFF << IAVF_FDIR_IPV6_TC_OFFSET) +#define IAVF_GTPU_EH_DWLINK 0 +#define IAVF_GTPU_EH_UPLINK 1 + #define IAVF_FDIR_INSET_ETH (\ IAVF_INSET_ETHERTYPE) @@ -807,7 +810,14 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, hdr = &filter->add_fltr.rule_cfg.proto_hdrs.proto_hdr[layer]; - VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GTPU_EH); + if (!gtp_psc_spec) + VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GTPU_EH); + else if ((gtp_psc_mask->qfi) && !(gtp_psc_mask->pdu_type)) + VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GTPU_EH); + else if (gtp_psc_spec->pdu_type == IAVF_GTPU_EH_UPLINK) + VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GTPU_EH_PDU_UP); + else if (gtp_psc_spec->pdu_type == IAVF_GTPU_EH_DWLINK) + VIRTCHNL_SET_PROTO_HDR_TYPE(hdr, GTPU_EH_PDU_DWN); if (gtp_psc_spec && gtp_psc_mask) { if (gtp_psc_mask->qfi == UINT8_MAX) { -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:32.271575130 +0000 +++ 0067-net-iavf-fix-GTPU-UL-and-DL-support-for-flow-directo.patch 2021-02-05 11:18:28.826691493 +0000 @@ -1 +1 @@ -From 78e8a87f6324349e06238f869edaecd53405d7aa Mon Sep 17 00:00:00 2001 +From 6876722e0fcad6aa11574f32712ffd6e6506c59d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 78e8a87f6324349e06238f869edaecd53405d7aa ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 64bdb2193e..cce54f994e 100644 +index 7054bde0b9..253213f8b5 100644 @@ -33 +34 @@ -@@ -814,7 +817,14 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, +@@ -807,7 +810,14 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,