diff mbox series

[16/27] net/ice/base: fix incorrect tunnel destroy

Message ID	20201215060519.302145-17-qi.z.zhang@intel.com (mailing list archive)
State	Accepted, archived
Delegated to:	Qi Zhang
Headers	IronPort-SDR: 1iNdYhwtsds5MME9rApG0O9Vota1BPoT4RuYT1tkzkQN7fYj3USviuszb0qLX+aDAW5CYJ8257 lYCYhzr++ixQ== IronPort-SDR: HqxTYMm5D7DIdlHiYSdJPcDW5Aw0PkyPiPxKiKaZJoYF0+J+jeMerCyFC1B/0IimmctTjesNpU CH4/aZEWhG/Q== From: Qi Zhang <qi.z.zhang@intel.com> To: qiming.yang@intel.com Cc: dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>, stable@dpdkr.org, Xiao Zhang <xiao.zhang@intel.com> Date: Tue, 15 Dec 2020 14:05:08 +0800 Message-Id: <20201215060519.302145-17-qi.z.zhang@intel.com> In-Reply-To: <20201215060519.302145-1-qi.z.zhang@intel.com> References: <20201215060519.302145-1-qi.z.zhang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 16/27] net/ice/base: fix incorrect tunnel destroy Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	ice base code update \| [00/27] ice base code update [01/27] net/ice/base: modify ptype map for UDP [02/27] net/ice/base: increased control queue timeout [03/27] net/ice/base: read more security revision options [04/27] net/ice/base: refactor interface for flash read [05/27] net/ice/base: allow reading inactive flash security revision [06/27] net/ice/base: allow reading arbitrary size data with flash read [07/27] net/ice/base: read Option ROM combo version from CIVD section [08/27] net/ice/base: implement inactive NVM version get [09/27] net/ice/base: support GTP filtering via advanced switch filter [10/27] net/ice/base: cleanup some macros [11/27] net/ice/base: add definitions for FW health status codes [12/27] net/ice/base: add function for NVM checksum verification [13/27] net/ice/base: add condition to copy module info into memory [14/27] net/ice/base: add interface to support configuring VLAN mode [15/27] net/ice/base: support VXLAN VNI field in FDIR [16/27] net/ice/base: fix incorrect tunnel destroy [17/27] net/ice/base: add functionality to check if DVM is supported [18/27] net/ice/base: resend some AQ commands when EBUSY [19/27] net/ice/base: change get PHY capability error level [20/27] net/ice/base: modify recursive way of adding nodes [21/27] net/ice/base: fix for dereference of null pointer [22/27] net/ice/base: use Mode 4 to get PHY Abilites [23/27] net/ice/base: align macro names to the specification [24/27] net/ice/base: add eCPRI over MAC type 0 flow support [25/27] net/ice/base: add eCPRI over UDP type 0 flow support [26/27] net/ice/base: remove unused struct member [27/27] net/ice/base: change a structure

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Qi Zhang Dec. 15, 2020, 6:05 a.m. UTC

  The tcam information in AQ command buffer is not correct when destroy
tunnel entries. The tcam count was always ONE even destroy multiple
entries, 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")
Cc: stable@dpdkr.org

Signed-off-by: Xiao Zhang <xiao.zhang@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/base/ice_flex_pipe.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c
index 0812135cf5..6c7f83899d 100644
--- a/drivers/net/ice/base/ice_flex_pipe.c
+++ b/drivers/net/ice/base/ice_flex_pipe.c
@@ -2163,7 +2163,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);
 
@@ -2203,30 +2203,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);