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 320FDA0518 for ; Fri, 24 Jul 2020 14:07:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 273651BFE7; Fri, 24 Jul 2020 14:07:57 +0200 (CEST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by dpdk.org (Postfix) with ESMTP id 7B7341C1B4 for ; Fri, 24 Jul 2020 14:07:55 +0200 (CEST) Received: by mail-wm1-f50.google.com with SMTP id o8so7750434wmh.4 for ; Fri, 24 Jul 2020 05:07:55 -0700 (PDT) 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=YFWebMSM5CPa1FeO2YT3nhaUhDbRURnYVsmqlCwtzOo=; b=E9e0u9lyUhGxE12Y/Gt1g0CWnk0PgPpIt15BAOC1yVSAikCssNJ+XGSP0oxbC4/JpI 3Pj2LZawQI9UWqmbjQ9hipMhTm1O+2Q8c8J8cmXAsx+IthvV6kqwE4yuUz2qf5SswtUJ W/dIcbYYRYlXk1QGSaBVxOnvSFpxIl0yW+lJdnJiqJUcvKefVXlshW65xJANp7NT509a 8WU4GTw+mTpqTe9xG9T0o/pyv00djnryBCFQIkoYCq+xM6sya5Y+kLZ1XqLLyczwQS0P qbphasDV02MkUN3Rb58PA3G5qEctjpdkLuRAV1ZcI9fQLESrzHTp6VS9s0PHxM1sRJhW hF/g== 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=YFWebMSM5CPa1FeO2YT3nhaUhDbRURnYVsmqlCwtzOo=; b=dVSztukCYb3NHC7SFtVVPpjINr/RsnGLXhNKWqkzOBGeMikCo+b+jUtZbb+dIvwdmM Y5LFAY7bz7dgdcbGfY2+YH907mHSTLm1oukDbiFl+CwuYitmSfewdP1DgdCexHMB9P0A jOtUweDNaLQr6XKF5DS01QWPSLjcIcOAAaczKmOQ/lI80n8gsZzUukXLUNSUu2OTm63F qX0Wz47fAZdexV17gnn3DYQUZT+Slft9dJ83+51w2vbc0QInR13bOnT5OgMfJS50rZcA /iY43U9ZegjNeHANn8t6do3ZSa8aopT1XF71L6PscdmwZUJu+RVO8J1/7ckSLaYco/C/ LuYQ== X-Gm-Message-State: AOAM530VjcvXgsIN9CdPNm1x3594PB+P/CJWQ5bX78+CL/y4qkgDVd4m igTMoRV2PJobIFuDnpcNmox6tGEdN2ddww== X-Google-Smtp-Source: ABdhPJxBUV6GlMAm8iGZscdJ+vQxZ5VVE07z/+IVOYYuTTWbJSTkAs+58HMdJExn8GMnfAtpWXbDjg== X-Received: by 2002:a1c:19c6:: with SMTP id 189mr782143wmz.98.1595592475226; Fri, 24 Jul 2020 05:07:55 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z11sm1012410wrw.93.2020.07.24.05.07.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:07:54 -0700 (PDT) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Junfeng Guo , Qiming Yang , dpdk stable Date: Fri, 24 Jul 2020 12:59:08 +0100 Message-Id: <20200724120030.1863487-110-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice/base: fix GTP-U inner RSS IPv4 IPv6 co-exist' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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 85098a10e2037b80670e9f67507feb59d96c4019 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Wed, 1 Jul 2020 13:49:44 +0800 Subject: [PATCH] net/ice/base: fix GTP-U inner RSS IPv4 IPv6 co-exist [ upstream commit bed9bb3139efd07817288dea85488435f79e0ab8 ] An IP header combined with GTP-U header should be regarded as inner layer for RSS, otherwise it mess the field vector between an IPv4 rule and IPv6 rule e.g: testpmd> flow create 0 ingress pattern eth / ipv4 / udp / gtpu / \ gtpu_psc / ipv4 / udp / end actions rss types ipv4-udp end key_len \ 0 queues end / end testpmd> flow create 0 ingress pattern eth / ipv4 / udp / gtpu / \ gtpu_psc / ipv6 / udp / end actions rss types ipv6-udp end key_len \ 0 queues end / end Fixes: b7d34ccc47b5 ("net/ice/base: packet encapsulation for RSS") Signed-off-by: Qi Zhang Signed-off-by: Junfeng Guo Acked-by: Qiming Yang --- drivers/net/ice/base/ice_flow.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c index 9d58d284f..9d958b329 100644 --- a/drivers/net/ice/base/ice_flow.c +++ b/drivers/net/ice/base/ice_flow.c @@ -2124,6 +2124,13 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, if (status) goto exit; + /* don't do RSS for GTPU outer */ + if (segs_cnt == ICE_RSS_OUTER_HEADERS && + (segs[segs_cnt - 1].hdrs & ICE_FLOW_SEG_HDR_GTPU)) { + printf("ignore gtpu\n"); + return ICE_SUCCESS; + } + /* Search for a flow profile that has matching headers, hash fields * and has the input VSI associated to it. If found, no further * operations required and exit. @@ -2240,6 +2247,7 @@ ice_add_rss_cfg(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, ice_acquire_lock(&hw->rss_locks); status = ice_add_rss_cfg_sync(hw, vsi_handle, hashed_flds, addl_hdrs, ICE_RSS_OUTER_HEADERS, symm); + if (!status) status = ice_add_rss_cfg_sync(hw, vsi_handle, hashed_flds, addl_hdrs, ICE_RSS_INNER_HEADERS, @@ -2273,6 +2281,10 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, if (!segs) return ICE_ERR_NO_MEMORY; + if (segs_cnt == ICE_RSS_OUTER_HEADERS && + segs[segs_cnt - 1].hdrs & ICE_FLOW_SEG_HDR_GTPU) + return ICE_SUCCESS; + /* Construct the packet segment info from the hashed fields */ status = ice_flow_set_rss_seg_info(&segs[segs_cnt - 1], hashed_flds, addl_hdrs); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:52.776424996 +0100 +++ 0110-net-ice-base-fix-GTP-U-inner-RSS-IPv4-IPv6-co-exist.patch 2020-07-24 12:53:48.363007876 +0100 @@ -1,8 +1,10 @@ -From bed9bb3139efd07817288dea85488435f79e0ab8 Mon Sep 17 00:00:00 2001 +From 85098a10e2037b80670e9f67507feb59d96c4019 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Wed, 1 Jul 2020 13:49:44 +0800 Subject: [PATCH] net/ice/base: fix GTP-U inner RSS IPv4 IPv6 co-exist +[ upstream commit bed9bb3139efd07817288dea85488435f79e0ab8 ] + An IP header combined with GTP-U header should be regarded as inner layer for RSS, otherwise it mess the field vector between an IPv4 rule and IPv6 rule e.g: @@ -15,7 +17,6 @@ 0 queues end / end Fixes: b7d34ccc47b5 ("net/ice/base: packet encapsulation for RSS") -Cc: stable@dpdk.org Signed-off-by: Qi Zhang Signed-off-by: Junfeng Guo @@ -25,10 +26,10 @@ 1 file changed, 12 insertions(+) diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c -index 6adcda844..180fe4466 100644 +index 9d58d284f..9d958b329 100644 --- a/drivers/net/ice/base/ice_flow.c +++ b/drivers/net/ice/base/ice_flow.c -@@ -3557,6 +3557,13 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, +@@ -2124,6 +2124,13 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, if (status) goto exit; @@ -42,7 +43,7 @@ /* Search for a flow profile that has matching headers, hash fields * and has the input VSI associated to it. If found, no further * operations required and exit. -@@ -3673,6 +3680,7 @@ ice_add_rss_cfg(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, +@@ -2240,6 +2247,7 @@ ice_add_rss_cfg(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, ice_acquire_lock(&hw->rss_locks); status = ice_add_rss_cfg_sync(hw, vsi_handle, hashed_flds, addl_hdrs, ICE_RSS_OUTER_HEADERS, symm); @@ -50,7 +51,7 @@ if (!status) status = ice_add_rss_cfg_sync(hw, vsi_handle, hashed_flds, addl_hdrs, ICE_RSS_INNER_HEADERS, -@@ -3706,6 +3714,10 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, +@@ -2273,6 +2281,10 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, if (!segs) return ICE_ERR_NO_MEMORY;