Commit ce74efaf authored by Wei Fang's avatar Wei Fang Committed by Wentao Guan
Browse files

net: enetc: keep track of correct Tx BD count in enetc_map_tx_tso_buffs() 

stable inclusion
from stable-v6.6.81
commit 5642c3aa1690340a16afe2db401b45bb302c2cf9
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBYZED

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5642c3aa1690340a16afe2db401b45bb302c2cf9



--------------------------------

commit da291996b16ebd10626d4b20288327b743aff110 upstream.

When creating a TSO header, if the skb is VLAN tagged, the extended BD
will be used and the 'count' should be increased by 2 instead of 1.
Otherwise, when an error occurs, less tx_swbd will be freed than the
actual number.

Fixes: fb8629e2 ("net: enetc: add support for software TSO")
Cc: stable@vger.kernel.org
Suggested-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarWei Fang <wei.fang@nxp.com>
Reviewed-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarClaudiu Manoil <claudiu.manoil@nxp.com>
Link: https://patch.msgid.link/20250224111251.1061098-3-wei.fang@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 5642c3aa1690340a16afe2db401b45bb302c2cf9)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent d2848c77

drivers/net/ethernet/freescale/enetc/enetc.c

+10 −6
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb) 
	return 0;

}



static void enetc_map_tx_tso_hdr(struct enetc_bdr *tx_ring, struct sk_buff *skb,

static int enetc_map_tx_tso_hdr(struct enetc_bdr *tx_ring, struct sk_buff *skb,

				struct enetc_tx_swbd *tx_swbd,

				union enetc_tx_bd *txbd, int *i, int hdr_len,

				int data_len)
@@ -359,6 +359,7 @@ static void enetc_map_tx_tso_hdr(struct enetc_bdr *tx_ring, struct sk_buff *skb, 
	union enetc_tx_bd txbd_tmp;

	u8 flags = 0, e_flags = 0;

	dma_addr_t addr;

	int count = 1;



	enetc_clear_tx_bd(&txbd_tmp);

	addr = tx_ring->tso_headers_dma + *i * TSO_HEADER_SIZE;
@@ -401,7 +402,10 @@ static void enetc_map_tx_tso_hdr(struct enetc_bdr *tx_ring, struct sk_buff *skb, 
		/* Write the BD */

		txbd_tmp.ext.e_flags = e_flags;

		*txbd = txbd_tmp;

		count++;

	}



	return count;

}



static int enetc_map_tx_tso_data(struct enetc_bdr *tx_ring, struct sk_buff *skb,
@@ -533,9 +537,9 @@ static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb 


		/* compute the csum over the L4 header */

		csum = enetc_tso_hdr_csum(&tso, skb, hdr, hdr_len, &pos);

		enetc_map_tx_tso_hdr(tx_ring, skb, tx_swbd, txbd, &i, hdr_len, data_len);

		count += enetc_map_tx_tso_hdr(tx_ring, skb, tx_swbd, txbd,

					      &i, hdr_len, data_len);

		bd_data_num = 0;

		count++;



		while (data_len > 0) {

			int size;