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 BA484A0524 for ; Fri, 5 Feb 2021 12:22:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B4E991606D2; Fri, 5 Feb 2021 12:22:53 +0100 (CET) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id 75DA64067B for ; Fri, 5 Feb 2021 12:22:52 +0100 (CET) Received: by mail-wr1-f52.google.com with SMTP id c12so7259341wrc.7 for ; Fri, 05 Feb 2021 03:22:52 -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=c+wYhrUIR6hWmAyx2MAjNOmdeXl9zS0cQIHKEoXVpgM=; b=lpbqnj3rgwQL82XWuwBM67P2mjgILFUDKoNAcEsBvcGCL2J438B1wBvv05FfINRvae TWj2zvkbA3ASnMbRlEJSZCvDu7L7UEIOpkmwibj3VhFavKNMztZ8rQV3XzjKIlA5aZEU etQZnvT7kd41VmxT5Q/ledMAsqUn48AMafSm7QcxcZM/bX2g+ZMAq1dberfwYcdFC5ye HQ9mCe2Q5LVfkQthY0MOewk7zvnomEFFJGJ0EdVpQ5dPgBPSpoz4s9COWBF8SxMK9xFf xnXGb8IkZ+rhy+Oge/tysFmVJ3OE0BJdIe1et2LdUKLql8oCyBaoLZZI6+rYRbiGbObK Yn7A== 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=c+wYhrUIR6hWmAyx2MAjNOmdeXl9zS0cQIHKEoXVpgM=; b=M8C/ITNzL9JEjMUlIVuLbZKAzy9szNhRnSs5VQfK8U8hiVKdlYo7rjtB/rt5IgURy3 Vus3DyBESGCqq0g15ewRaF5ncCdx6B/fFosVDtun1gW/VAQbUBvY5q/XA+zzjeXqxF+L AKpwuqDCUnpexLCTRhcaBmBZSCu2+cTRdxLSBQFCNyIPxCJWOngJf22klwNrjp3K+5Hn FGcLMVjp+oRzaRMcq+TZB8U1N20MaVI/rw2BeuChExq8yv7pQtK4coPmDJB+YAFomo3E aG8zFxAU2widA/jyl3PgrNqKKy6Rg+AIgmV/vsLaly8t0o+qxTcqbxpBM7OAm+3+FZ74 xR5g== X-Gm-Message-State: AOAM531xS8cBAQ2Nuv+FE4QLNCQUy85hYCMXQPRgDql1zzljGVDnubcZ qs8WtTr4IYOzUBecG4Spn0T719jToRacNbrU X-Google-Smtp-Source: ABdhPJyLViOpsEscSU5TH5stWmkQvT3O76hWD6mxyjTtjAZpErQ0f1Uj5kS3aRBEoZ3w7rLUAKMvkA== X-Received: by 2002:adf:fc86:: with SMTP id g6mr4488134wrr.20.1612524172229; Fri, 05 Feb 2021 03:22:52 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l5sm11797428wrv.44.2021.02.05.03.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:22:51 -0800 (PST) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Xiao Zhang , Qiming Yang , dpdk stable Date: Fri, 5 Feb 2021 11:15:50 +0000 Message-Id: <20210205111920.1272063-64-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/ice/base: fix tunnel destroy' 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/66a184240864ee8fe35fbdf1f4f0eec4707ecdbe Thanks. Luca Boccassi --- >From 66a184240864ee8fe35fbdf1f4f0eec4707ecdbe Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 15 Dec 2020 12:13:57 +0800 Subject: [PATCH] net/ice/base: fix tunnel destroy [ upstream commit c7ff2213a5fe884d56adcd4a7b50ecd5810bebf2 ] The TCAM information in AQ command buffer is not correct when destroying the tunnel entries. The TCAM count was always ONE even multiple entries are destroyed, and the offset of TCAM memory was also incorrect. This patch is to fix this issue. Fixes: 884efe3ca1f3 ("net/ice/base: add VXLAN/generic tunnel management") Signed-off-by: Xiao Zhang Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_flex_pipe.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c index 7594df1696..d74fecbf5b 100644 --- a/drivers/net/ice/base/ice_flex_pipe.c +++ b/drivers/net/ice/base/ice_flex_pipe.c @@ -2156,7 +2156,7 @@ enum ice_status ice_destroy_tunnel(struct ice_hw *hw, u16 port, bool all) u16 count = 0; u16 index; u16 size; - u16 i; + u16 i, j; ice_acquire_lock(&hw->tnl_lock); @@ -2196,30 +2196,31 @@ enum ice_status ice_destroy_tunnel(struct ice_hw *hw, u16 port, bool all) size); if (!sect_rx) goto ice_destroy_tunnel_err; - sect_rx->count = CPU_TO_LE16(1); + sect_rx->count = CPU_TO_LE16(count); sect_tx = (struct ice_boost_tcam_section *) ice_pkg_buf_alloc_section(bld, ICE_SID_TXPARSER_BOOST_TCAM, size); if (!sect_tx) goto ice_destroy_tunnel_err; - sect_tx->count = CPU_TO_LE16(1); + sect_tx->count = CPU_TO_LE16(count); /* copy original boost entry to update package buffer, one copy to Rx * section, another copy to the Tx section */ - for (i = 0; i < hw->tnl.count && i < ICE_TUNNEL_MAX_ENTRIES; i++) + for (i = 0, j = 0; i < hw->tnl.count && i < ICE_TUNNEL_MAX_ENTRIES; i++) if (hw->tnl.tbl[i].valid && hw->tnl.tbl[i].in_use && (all || hw->tnl.tbl[i].port == port)) { - ice_memcpy(sect_rx->tcam + i, + ice_memcpy(sect_rx->tcam + j, hw->tnl.tbl[i].boost_entry, sizeof(*sect_rx->tcam), ICE_NONDMA_TO_NONDMA); - ice_memcpy(sect_tx->tcam + i, + ice_memcpy(sect_tx->tcam + j, hw->tnl.tbl[i].boost_entry, sizeof(*sect_tx->tcam), ICE_NONDMA_TO_NONDMA); hw->tnl.tbl[i].marked = true; + j++; } status = ice_update_pkg(hw, ice_pkg_buf(bld), 1); -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:32.143369973 +0000 +++ 0064-net-ice-base-fix-tunnel-destroy.patch 2021-02-05 11:18:28.818691340 +0000 @@ -1 +1 @@ -From c7ff2213a5fe884d56adcd4a7b50ecd5810bebf2 Mon Sep 17 00:00:00 2001 +From 66a184240864ee8fe35fbdf1f4f0eec4707ecdbe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c7ff2213a5fe884d56adcd4a7b50ecd5810bebf2 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 0812135cf5..6c7f83899d 100644 +index 7594df1696..d74fecbf5b 100644 @@ -25 +26 @@ -@@ -2163,7 +2163,7 @@ enum ice_status ice_destroy_tunnel(struct ice_hw *hw, u16 port, bool all) +@@ -2156,7 +2156,7 @@ enum ice_status ice_destroy_tunnel(struct ice_hw *hw, u16 port, bool all) @@ -34 +35 @@ -@@ -2203,30 +2203,31 @@ enum ice_status ice_destroy_tunnel(struct ice_hw *hw, u16 port, bool all) +@@ -2196,30 +2196,31 @@ enum ice_status ice_destroy_tunnel(struct ice_hw *hw, u16 port, bool all)