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 85CB3A051C for ; Tue, 11 Feb 2020 12:40:33 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7DC081BFA7; Tue, 11 Feb 2020 12:40:33 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by dpdk.org (Postfix) with ESMTP id E9CDF1BFB5 for ; Tue, 11 Feb 2020 12:40:31 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id t23so3108704wmi.1 for ; Tue, 11 Feb 2020 03:40:31 -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=Mr+GJygI0UI1bMhWO7QcyIyu/6GOjNyq2IGXeLyZYG4=; b=nN+sGRoI0WRscylG5RJ9X7gq6fc5DuANcDWWk0ypSV92cfeqcfcvy37nKD3zHseE3H 4JNMV6Q0mBFzxUqaHiAN/S+J9e1p4gq0izUFqmzGusBf58OIG+IFR2OlrXJ2jzvpYSis MPsS6XI6+OBdcE6h4Poh3XPrLGAsZHtxygZZhFvGUKdiQ6FDgpIQXaRKVYlWxsR/xXx7 UsX6O2JllQLFZ3wfzSMeBYr3S+NizysNcsQDLKqRayOrXMj3tO4LneA8Ll3npETYNvqV HzSgb7PEF3ZThF7jg6sRJEzWmqnIspmPxw2eesHLCXEu60rwjpDGNdjsYSX4LU+DS3lJ kCGA== 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=Mr+GJygI0UI1bMhWO7QcyIyu/6GOjNyq2IGXeLyZYG4=; b=LIdxW3LHLLxPpZLmeWn3oCO21QOm0LsmvA+4PJROo+vZrTcB4V7bFk39QuJDix5Yef vwhSyH9RmNjWR/JwWG1NQqHtZi5MxD/8W+Ho1VWElu7ae1b9ODJmt1ShX2dyS5YrIfY9 /RWPmZat2egJuGIIAxXGsYsxb7/xelmdN+4Y/OqrjHJ9s8SGEuO37UhbFIRY+TYZHP2o eFJ5EWE8wTQMGcPAOVQKGUUs1w92IupAKtriDZ1Df7xzzEn1fj8/3Y/kRvg+IS641Pzs 6IyGgq1LWqq3sM5oUVeHxIt7wNRaFjOfgXeq5a6ifg/n8I83AcpHpAbO6tS2V8hMq43A BmBQ== X-Gm-Message-State: APjAAAVNu3XqtOA0/3NQkUqOQliDDZrXL+tSXM+c3TshgrFUkn0lPZ7A hn0IFafQGgl9+C89BcwjzC+gdKzCLu0= X-Google-Smtp-Source: APXvYqzCvZagRwHb6QBtUd2OrDZLC5IDAa1qtYosMsgNv2OTwHq0VEeChjXkGJIE1AQsgbGSV3y10Q== X-Received: by 2002:a05:600c:20f:: with SMTP id 15mr5136147wmi.128.1581421231658; Tue, 11 Feb 2020 03:40:31 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x21sm3306303wmi.30.2020.02.11.03.40.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:40:31 -0800 (PST) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Xiaolong Ye , dpdk stable Date: Tue, 11 Feb 2020 11:21:28 +0000 Message-Id: <20200211112216.3929-142-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 GTP-U pattern' 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 0b525bf3dc1a88d0ca1dcb83d3e56842aa484cb4 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 21 Jan 2020 09:30:48 +0800 Subject: [PATCH] net/ice: fix flow director GTP-U pattern [ upstream commit ab76e2b03d6aba12542e36488723b402e25a02f6 ] Based on current FDIR implementation for GTP-U, inner specification is not supported, issue a rule for eth/ipv4/gtpu/ipv4 will also match eth/ipv4/gtpu/ipv6, the patch adds new pattern list to align with existed implementation. Fixes: efc16c621415 ("net/ice: support flow director GTPU tunnel") Signed-off-by: Qi Zhang Acked-by: Xiaolong Ye --- drivers/net/ice/ice_fdir_filter.c | 9 ++++----- drivers/net/ice/ice_generic_flow.c | 15 +++++++++++++++ drivers/net/ice/ice_generic_flow.h | 2 ++ 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 68af2f2e25..2d8cdadf59 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -67,10 +67,10 @@ ICE_FDIR_INSET_VXLAN_IPV4 | \ ICE_INSET_TUN_SCTP_SRC_PORT | ICE_INSET_TUN_SCTP_DST_PORT) -#define ICE_FDIR_INSET_GTPU_IPV4 (\ +#define ICE_FDIR_INSET_GTPU (\ ICE_INSET_GTPU_TEID) -#define ICE_FDIR_INSET_GTPU_EH_IPV4 (\ +#define ICE_FDIR_INSET_GTPU_EH (\ ICE_INSET_GTPU_TEID | ICE_INSET_GTPU_QFI) static struct ice_pattern_match_item ice_fdir_pattern_os[] = { @@ -125,9 +125,8 @@ static struct ice_pattern_match_item ice_fdir_pattern_comms[] = { ICE_FDIR_INSET_VXLAN_IPV4_TCP, ICE_INSET_NONE}, {pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp, ICE_FDIR_INSET_VXLAN_IPV4_SCTP, ICE_INSET_NONE}, - {pattern_eth_ipv4_gtpu_ipv4, ICE_FDIR_INSET_GTPU_IPV4, ICE_INSET_NONE}, - {pattern_eth_ipv4_gtpu_eh_ipv4, - ICE_FDIR_INSET_GTPU_EH_IPV4, ICE_INSET_NONE}, + {pattern_eth_ipv4_gtpu, ICE_FDIR_INSET_GTPU, ICE_INSET_NONE}, + {pattern_eth_ipv4_gtpu_eh, ICE_FDIR_INSET_GTPU_EH, ICE_INSET_NONE}, }; static struct ice_flow_parser ice_fdir_parser_os; diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index c9efa8356f..38ac799d85 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -1034,6 +1034,13 @@ enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[] = { }; /* GTPU */ +enum rte_flow_item_type pattern_eth_ipv4_gtpu[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_END, +}; enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = { RTE_FLOW_ITEM_TYPE_ETH, RTE_FLOW_ITEM_TYPE_IPV4, @@ -1042,6 +1049,14 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = { RTE_FLOW_ITEM_TYPE_IPV4, RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_END, +}; enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[] = { RTE_FLOW_ITEM_TYPE_ETH, RTE_FLOW_ITEM_TYPE_IPV4, diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h index ac085b47fa..adc30ee2aa 100644 --- a/drivers/net/ice/ice_generic_flow.h +++ b/drivers/net/ice/ice_generic_flow.h @@ -336,7 +336,9 @@ extern enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_sctp[]; extern enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[]; /* GTPU */ +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu[]; extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh[]; extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[]; extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[]; extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[]; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.587303681 +0000 +++ 0142-net-ice-fix-flow-director-GTP-U-pattern.patch 2020-02-11 11:17:38.656006134 +0000 @@ -1,15 +1,16 @@ -From ab76e2b03d6aba12542e36488723b402e25a02f6 Mon Sep 17 00:00:00 2001 +From 0b525bf3dc1a88d0ca1dcb83d3e56842aa484cb4 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 21 Jan 2020 09:30:48 +0800 Subject: [PATCH] net/ice: fix flow director GTP-U pattern +[ upstream commit ab76e2b03d6aba12542e36488723b402e25a02f6 ] + Based on current FDIR implementation for GTP-U, inner specification is not supported, issue a rule for eth/ipv4/gtpu/ipv4 will also match eth/ipv4/gtpu/ipv6, the patch adds new pattern list to align with existed implementation. Fixes: efc16c621415 ("net/ice: support flow director GTPU tunnel") -Cc: stable@dpdk.org Signed-off-by: Qi Zhang Acked-by: Xiaolong Ye