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 C599CA0518 for ; Fri, 24 Jul 2020 14:10:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BD9AF1C21A; Fri, 24 Jul 2020 14:10:31 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 171571C20A for ; Fri, 24 Jul 2020 14:10:30 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id f18so8068357wml.3 for ; Fri, 24 Jul 2020 05:10:30 -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=03qesasdNCz86NlAR0JIsOVLQMwMbRjhC5yhHTLijeM=; b=oucAJkrQaT0hgJ/Mz9yNacxnoz0hzitVCcSHHly7fcR+0W7KqRinvfKL/kNIyzE39V gOZBFGe7Eog6ap20Y160juA+yOrrwcOMSwWRiT2KStFT3jdvNtIZrZ5qs5MGXJg7vb+n agGkBUUcae/clLWmSt9Oq73m39KFGorolX06wko/tZixUz1EX3nh5eS7fVm8AQgDy8sT kxaunfcdtl1krHQTW5rdMg7fZKomI33ptSIlg8zYchKszcx3rJjOJ0Xe9S7E5lkBO/ue 3qSKLzJtkKpJsMyXZyW2xGpUIA2SawJtg3bs8e3ZUPjRUc0/ulSEkDUTA3BlU/+MRlnZ Nf9w== 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=03qesasdNCz86NlAR0JIsOVLQMwMbRjhC5yhHTLijeM=; b=WELt8KjZA//8K6bAhm5e3yCn/gQQQI0Ldb89T95eMTlWLWj4vU20X5eJ50EwmmsQPX waMAdyzSSxSBKFJ6cTPTQXepmeFx+gkWt36GDkj02o5vD3S1Boou3YTRuBKhuDYIdW9l iYKEIe5GTbXhtCQkHvYZbdxS+6t/wdhZykTW4SAUt0hP5eLFEk+xZhVrdSTL/4wkQOC/ 6VNSH7a/vkWe/GTp8mgF1xIbpsz9HLVaVJ899QoxhoaSmJGezlhaww4bD5ZiKAs5z2eQ llY+mmsDF5Ea1tRK99Iu6RCpNKpuO3QmE6MpGOFJs7rmUcuyGZpcM+jXPWquMZfPBZRc MUHQ== X-Gm-Message-State: AOAM531DLNjxqnm9DCRMIR0CAFYmnL+6tVN3X+T/HVjrjjvoW3NYBFHu jSWzWJuCwyGKGE8BunqtT6w= X-Google-Smtp-Source: ABdhPJyC2sACI2m5K1OmaXTBMJAQDY6fq57VW1ijzqNq/dqHkinEDRh28X/klRLs/2skS1f7a/4pVQ== X-Received: by 2002:a1c:68c2:: with SMTP id d185mr8244267wmc.24.1595592629806; Fri, 24 Jul 2020 05:10:29 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x9sm7340642wmk.45.2020.07.24.05.10.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:10:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Junfeng Guo Cc: Ferruh Yigit , dpdk stable Date: Fri, 24 Jul 2020 12:59:50 +0100 Message-Id: <20200724120030.1863487-152-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 RSS removal for GTP-U' 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 8f9e2f8855833c56c41d2155440c3362467fb8da Mon Sep 17 00:00:00 2001 From: Junfeng Guo Date: Mon, 13 Jul 2020 19:05:40 +0800 Subject: [PATCH] net/ice/base: fix RSS removal for GTP-U [ upstream commit 27dc00646f54c5fd885ecbd7498d3158ed2fc458 ] Previous logic in removing RSS for GTPU was added in incorrect lines. The adjustment in this patch will correct the code order so that RSS for GTPU can be removed successfully. We also delete the redundant print statement and cleanup the coding style in this patch. Fixes: bed9bb3139ef ("net/ice/base: fix GTP-U inner RSS IPv4 IPv6 co-exist") Signed-off-by: Junfeng Guo Reviewed-by: Ferruh Yigit --- drivers/net/ice/base/ice_flow.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c index 9d958b329..83432bd20 100644 --- a/drivers/net/ice/base/ice_flow.c +++ b/drivers/net/ice/base/ice_flow.c @@ -2126,10 +2126,8 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, /* 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"); + segs[segs_cnt - 1].hdrs & ICE_FLOW_SEG_HDR_GTPU) 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 @@ -2281,16 +2279,16 @@ 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); if (status) goto out; + if (segs_cnt == ICE_RSS_OUTER_HEADERS && + segs[segs_cnt - 1].hdrs & ICE_FLOW_SEG_HDR_GTPU) + return ICE_SUCCESS; + prof = ice_flow_find_prof_conds(hw, blk, ICE_FLOW_RX, segs, segs_cnt, vsi_handle, ICE_FLOW_FIND_PROF_CHK_FLDS); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:54.427909564 +0100 +++ 0152-net-ice-base-fix-RSS-removal-for-GTP-U.patch 2020-07-24 12:53:48.515010708 +0100 @@ -1,8 +1,10 @@ -From 27dc00646f54c5fd885ecbd7498d3158ed2fc458 Mon Sep 17 00:00:00 2001 +From 8f9e2f8855833c56c41d2155440c3362467fb8da Mon Sep 17 00:00:00 2001 From: Junfeng Guo Date: Mon, 13 Jul 2020 19:05:40 +0800 Subject: [PATCH] net/ice/base: fix RSS removal for GTP-U +[ upstream commit 27dc00646f54c5fd885ecbd7498d3158ed2fc458 ] + Previous logic in removing RSS for GTPU was added in incorrect lines. The adjustment in this patch will correct the code order so that RSS for GTPU can be removed successfully. @@ -11,7 +13,6 @@ style in this patch. Fixes: bed9bb3139ef ("net/ice/base: fix GTP-U inner RSS IPv4 IPv6 co-exist") -Cc: stable@dpdk.org Signed-off-by: Junfeng Guo Reviewed-by: Ferruh Yigit @@ -20,10 +21,10 @@ 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c -index d1b8a0534..9a17d956b 100644 +index 9d958b329..83432bd20 100644 --- a/drivers/net/ice/base/ice_flow.c +++ b/drivers/net/ice/base/ice_flow.c -@@ -3559,10 +3559,8 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, +@@ -2126,10 +2126,8 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, /* don't do RSS for GTPU outer */ if (segs_cnt == ICE_RSS_OUTER_HEADERS && @@ -35,7 +36,7 @@ /* Search for a flow profile that has matching headers, hash fields * and has the input VSI associated to it. If found, no further -@@ -3714,16 +3712,16 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, +@@ -2281,16 +2279,16 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds, if (!segs) return ICE_ERR_NO_MEMORY;