From: Michal Swiatkowski <michal.swiatkowski@linux•intel.com>
To: Wei Fang <wei.fang@nxp•com>
Cc: claudiu.manoil@nxp•com, vladimir.oltean@nxp•com,
xiaoning.wang@nxp•com, andrew+netdev@lunn•ch,
davem@davemloft•net, edumazet@google•com, kuba@kernel•org,
pabeni@redhat•com, ioana.ciornei@nxp•com, yangbo.lu@nxp•com,
michal.swiatkowski@linux•intel.com, netdev@vger•kernel.org,
linux-kernel@vger•kernel.org, imx@lists•linux.dev,
stable@vger•kernel.org
Subject: Re: [PATCH v2 net 9/9] net: enetc: fix the off-by-one issue in enetc_map_tx_tso_buffs()
Date: Wed, 19 Feb 2025 12:04:14 +0100 [thread overview]
Message-ID: <Z7W6rtLwpHGlox3T@mev-dev.igk.intel.com> (raw)
In-Reply-To: <20250219054247.733243-10-wei.fang@nxp.com>
On Wed, Feb 19, 2025 at 01:42:47PM +0800, Wei Fang wrote:
> There is an off-by-one issue for the err_chained_bd path, it will free
> one more tx_swbd than expected. But there is no such issue for the
> err_map_data path. To fix this off-by-one issue and make the two error
> handling consistent, the loop condition of error handling is modified
> and the 'count++' operation is moved before enetc_map_tx_tso_data().
>
> Fixes: fb8629e2cbfc ("net: enetc: add support for software TSO")
> Cc: stable@vger•kernel.org
> Signed-off-by: Wei Fang <wei.fang@nxp•com>
> ---
> drivers/net/ethernet/freescale/enetc/enetc.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
> index 9a24d1176479..fe3967268a19 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc.c
> @@ -832,6 +832,7 @@ static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb
> txbd = ENETC_TXBD(*tx_ring, i);
> tx_swbd = &tx_ring->tx_swbd[i];
> prefetchw(txbd);
> + count++;
>
> /* Compute the checksum over this segment of data and
> * add it to the csum already computed (over the L4
> @@ -848,7 +849,6 @@ static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb
> goto err_map_data;
>
> data_len -= size;
> - count++;
> bd_data_num++;
> tso_build_data(skb, &tso, size);
>
> @@ -874,13 +874,13 @@ static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb
> dev_err(tx_ring->dev, "DMA map error");
>
> err_chained_bd:
> - do {
> + while (count--) {
> tx_swbd = &tx_ring->tx_swbd[i];
> enetc_free_tx_frame(tx_ring, tx_swbd);
> if (i == 0)
> i = tx_ring->bd_count;
> i--;
> - } while (count--);
> + }
>
> return 0;
> }
Thanks for fixing it.
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux•intel.com>
> --
> 2.34.1
>
next prev parent reply other threads:[~2025-02-19 11:07 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-19 5:42 [PATCH v2 net 0/9] net: enetc: fix some known issues Wei Fang
2025-02-19 5:42 ` [PATCH v2 net 1/9] net: enetc: fix the off-by-one issue in enetc_map_tx_buffs() Wei Fang
2025-02-19 10:48 ` Claudiu Manoil
2025-02-20 13:01 ` Vladimir Oltean
2025-02-21 1:26 ` Wei Fang
2025-02-19 5:42 ` [PATCH v2 net 2/9] net: enetc: correct the tx_swbd statistics Wei Fang
2025-02-20 8:31 ` Ioana Ciornei
2025-02-20 16:01 ` Vladimir Oltean
2025-02-21 1:42 ` Wei Fang
2025-02-21 8:03 ` Claudiu Manoil
2025-02-21 8:34 ` Wei Fang
2025-02-21 9:22 ` Claudiu Manoil
2025-02-21 9:18 ` Vladimir Oltean
2025-02-24 3:27 ` Wei Fang
2025-02-19 5:42 ` [PATCH v2 net 3/9] net: enetc: correct the xdp_tx statistics Wei Fang
2025-02-20 8:37 ` Ioana Ciornei
2025-02-20 16:58 ` Vladimir Oltean
2025-02-19 5:42 ` [PATCH v2 net 4/9] net: enetc: VFs do not support HWTSTAMP_TX_ONESTEP_SYNC Wei Fang
2025-02-20 16:52 ` Vladimir Oltean
2025-02-19 5:42 ` [PATCH v2 net 5/9] net: enetc: update UDP checksum when updating originTimestamp field Wei Fang
2025-02-20 15:50 ` Vladimir Oltean
2025-02-19 5:42 ` [PATCH v2 net 6/9] net: enetc: add missing enetc4_link_deinit() Wei Fang
2025-02-20 16:50 ` Vladimir Oltean
2025-02-19 5:42 ` [PATCH v2 net 7/9] net: enetc: remove the mm_lock from the ENETC v4 driver Wei Fang
2025-02-20 16:03 ` Vladimir Oltean
2025-02-19 5:42 ` [PATCH v2 net 8/9] net: enetc: correct the EMDIO base offset for ENETC v4 Wei Fang
2025-02-19 20:42 ` Andrew Lunn
2025-02-20 8:05 ` Wei Fang
2025-02-20 15:58 ` Vladimir Oltean
2025-02-19 5:42 ` [PATCH v2 net 9/9] net: enetc: fix the off-by-one issue in enetc_map_tx_tso_buffs() Wei Fang
2025-02-19 11:04 ` Michal Swiatkowski [this message]
2025-02-19 17:46 ` Claudiu Manoil
2025-02-20 5:06 ` Wei Fang
2025-02-20 8:39 ` Claudiu Manoil
2025-02-20 16:32 ` Vladimir Oltean
2025-02-20 16:46 ` Vladimir Oltean
2025-02-21 2:56 ` Wei Fang
2025-02-21 9:30 ` Vladimir Oltean
2025-02-24 4:42 ` Wei Fang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z7W6rtLwpHGlox3T@mev-dev.igk.intel.com \
--to=michal.swiatkowski@linux$(echo .)intel.com \
--cc=andrew+netdev@lunn$(echo .)ch \
--cc=claudiu.manoil@nxp$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=imx@lists$(echo .)linux.dev \
--cc=ioana.ciornei@nxp$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=stable@vger$(echo .)kernel.org \
--cc=vladimir.oltean@nxp$(echo .)com \
--cc=wei.fang@nxp$(echo .)com \
--cc=xiaoning.wang@nxp$(echo .)com \
--cc=yangbo.lu@nxp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox