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 93EAAA051C for ; Tue, 11 Feb 2020 12:40:35 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8E1E31BFC7; Tue, 11 Feb 2020 12:40:35 +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 6358A1BFC7 for ; Tue, 11 Feb 2020 12:40:34 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id p17so3142521wma.1 for ; Tue, 11 Feb 2020 03:40:34 -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=hF+/haPPIbBimo3AZEMvdV+pNpnXD1anFHoxr2kqEAg=; b=EUOreNjtjpEPWV/Lhs1id+Y3hBLLUhLp8pL5aRZRJvLyrYY/tKHGhnD8biZGU/FMop A5w/lTRMNjBJSyu4CRULG1r2aklMuD1exA2T+Qv+l1Cl151qhbQyUsLVutTWnghP4SgN 8NA+xd+4Xi96gz7++zTZjQN3zZiLngPry/vIbT3n4Qf0jacbMs5f5jXkOITKp6hOcojW EkjVg0EzICUn+eTwawVoWnpnzJicDlyAom881dB5mlqJBq/Vxq2FoIZwdatyVMGIS0Qn /A2n33eSR6AeCXwb6+YU3x6xyqznYynPkqs2WlQQBkwhtQK+a+c8IikGnj8Wn0JGjRSb ZILQ== 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=hF+/haPPIbBimo3AZEMvdV+pNpnXD1anFHoxr2kqEAg=; b=SyXvRr4i7FWpOg6xxVTw/8pJDYvKfp4gODiItPiA/TSYKP4P5e9QReN1AuZaTANvQY aL6tPSkAigCOo2j+7E7SVofmDrBDCWa6W9SO64VlMErkKeaz2mtZT/YblXeef49Oigv4 dLY+RIxIuC8id36u1YE3N5qz+3C3j5ZZOhuM+cnD1yH7kqrPrsdd9hx0HiSqPHBHEevQ 3hDB23AhkMYpl2+6mPGmJzQmGwkjcuPJMCxk3/sPp1evxGRf8cATRO/PJ08BT+aMitQI NdUKf7hP6qsIMG07MlUWBh8f/wYAL1Z83p8EqlqIW7kIPRcUZKVE94KIVOmF2DWVK9vZ ZgyQ== X-Gm-Message-State: APjAAAXyjrdO/nBqA+WZjE7cfmBFAOdMkvgrdAPMdh9oMtJ9m3rq9+gF 7M5To+lwxmW5TdzLoRBNh2c= X-Google-Smtp-Source: APXvYqxrNaIaXyvX3ASG1K+Bg3NL9bWmpOr9jGLbc7tSxlVFpruv2gmh9QJiYuJTUr9f7TD7Xpi+MQ== X-Received: by 2002:a1c:7dd4:: with SMTP id y203mr5299227wmc.67.1581421234101; Tue, 11 Feb 2020 03:40:34 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y139sm3578644wmd.24.2020.02.11.03.40.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:40:33 -0800 (PST) From: luca.boccassi@gmail.com To: Chenmin Sun Cc: Qi Zhang , Xiaolong Ye , dpdk stable Date: Tue, 11 Feb 2020 11:21:29 +0000 Message-Id: <20200211112216.3929-143-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: add outer IPv4 matching for GTP-U flow' 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 385898db6780b6b236319d660fcccaaeac9a122b Mon Sep 17 00:00:00 2001 From: Chenmin Sun Date: Tue, 21 Jan 2020 19:56:53 +0800 Subject: [PATCH] net/ice: add outer IPv4 matching for GTP-U flow [ upstream commit 1bfc89ec1e47e0f91a62ed8f9465e020c3732bba ] This patch adds the capability of matching the outer IPv4 headers for GTPU flows. Fixes: efc16c621415 ("net/ice: support flow director GTPU tunnel") Signed-off-by: Chenmin Sun Acked-by: Qi Zhang Acked-by: Xiaolong Ye --- drivers/net/ice/base/ice_fdir.c | 4 ++++ drivers/net/ice/ice_fdir_filter.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c index 41136d1f0c..551c7a6bc6 100644 --- a/drivers/net/ice/base/ice_fdir.c +++ b/drivers/net/ice/base/ice_fdir.c @@ -786,6 +786,10 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input, case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP: case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP: case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER: + ice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET, + input->ip.v4.src_ip); + ice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET, + input->ip.v4.dst_ip); ice_pkt_insert_u32(loc, ICE_IPV4_GTPU_TEID_OFFSET, input->gtpu_data.teid); ice_pkt_insert_u6_qfi(loc, ICE_IPV4_GTPU_QFI_OFFSET, diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 2d8cdadf59..79e4d2edf8 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -68,9 +68,10 @@ ICE_INSET_TUN_SCTP_SRC_PORT | ICE_INSET_TUN_SCTP_DST_PORT) #define ICE_FDIR_INSET_GTPU (\ - ICE_INSET_GTPU_TEID) + ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_GTPU_TEID) #define ICE_FDIR_INSET_GTPU_EH (\ + ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_GTPU_TEID | ICE_INSET_GTPU_QFI) static struct ice_pattern_match_item ice_fdir_pattern_os[] = { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.617111104 +0000 +++ 0143-net-ice-add-outer-IPv4-matching-for-GTP-U-flow.patch 2020-02-11 11:17:38.656006134 +0000 @@ -1,13 +1,14 @@ -From 1bfc89ec1e47e0f91a62ed8f9465e020c3732bba Mon Sep 17 00:00:00 2001 +From 385898db6780b6b236319d660fcccaaeac9a122b Mon Sep 17 00:00:00 2001 From: Chenmin Sun Date: Tue, 21 Jan 2020 19:56:53 +0800 Subject: [PATCH] net/ice: add outer IPv4 matching for GTP-U flow +[ upstream commit 1bfc89ec1e47e0f91a62ed8f9465e020c3732bba ] + This patch adds the capability of matching the outer IPv4 headers for GTPU flows. Fixes: efc16c621415 ("net/ice: support flow director GTPU tunnel") -Cc: stable@dpdk.org Signed-off-by: Chenmin Sun Acked-by: Qi Zhang @@ -18,10 +19,10 @@ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c -index 20d64f8612..56c1c1c845 100644 +index 41136d1f0c..551c7a6bc6 100644 --- a/drivers/net/ice/base/ice_fdir.c +++ b/drivers/net/ice/base/ice_fdir.c -@@ -804,6 +804,10 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input, +@@ -786,6 +786,10 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input, case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP: case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP: case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER: