From: Paolo Abeni <pabeni@redhat.com>
To: Wei Fang <wei.fang@nxp.com>,
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,
frank.li@nxp.com, horms@kernel.org, idosch@idosch.org
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
imx@lists.linux.dev
Subject: Re: [PATCH v8 net-next 3/4] net: enetc: add LSO support for i.MX95 ENETC PF
Date: Tue, 17 Dec 2024 10:20:10 +0100 [thread overview]
Message-ID: <118bbd72-b1fb-4da2-b1bd-5a66ecfe7322@redhat.com> (raw)
In-Reply-To: <20241213021731.1157535-4-wei.fang@nxp.com>
On 12/13/24 03:17, Wei Fang wrote:
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
> index 09ca4223ff9d..41a3798c7564 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc.c
> @@ -533,6 +533,224 @@ static void enetc_tso_complete_csum(struct enetc_bdr *tx_ring, struct tso_t *tso
> }
> }
>
> +static inline int enetc_lso_count_descs(const struct sk_buff *skb)
Please, don't use inline in c files
> +{
> + /* 4 BDs: 1 BD for LSO header + 1 BD for extended BD + 1 BD
> + * for linear area data but not include LSO header, namely
> + * skb_headlen(skb) - lso_hdr_len. And 1 BD for gap.
> + */
> + return skb_shinfo(skb)->nr_frags + 4;
> +}
> +static int enetc_lso_hw_offload(struct enetc_bdr *tx_ring, struct sk_buff *skb)
> +{
> + struct enetc_tx_swbd *tx_swbd;
> + struct enetc_lso_t lso = {0};
> + int err, i, count = 0;
> +
> + /* Initialize the LSO handler */
> + enetc_lso_start(skb, &lso);
> + i = tx_ring->next_to_use;
> +
> + enetc_lso_map_hdr(tx_ring, skb, &i, &lso);
> + /* First BD and an extend BD */
> + count += 2;
> +
> + err = enetc_lso_map_data(tx_ring, skb, &i, &lso, &count);
> + if (err)
> + goto dma_err;
> +
> + /* Go to the next BD */
> + enetc_bdr_idx_inc(tx_ring, &i);
> + tx_ring->next_to_use = i;
> + enetc_update_tx_ring_tail(tx_ring);
> +
> + return count;
> +
> +dma_err:
> + do {
> + 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;
> +}
I'm sorry for not catching the issue early, but apparently there is an
off-by-one in the above loop: if 'count' bds have been used, it will
attempt to free 'count + 1' of them.
The minimal fix should be using:
} while (--count);
/P
next prev parent reply other threads:[~2024-12-17 9:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-13 2:17 [PATCH v8 net-next 0/4] Add more feautues for ENETC v4 - round 1 Wei Fang
2024-12-13 2:17 ` [PATCH v8 net-next 1/4] net: enetc: add Tx checksum offload for i.MX95 ENETC Wei Fang
2024-12-17 15:13 ` Alexander Lobakin
2024-12-18 1:53 ` Wei Fang
2024-12-13 2:17 ` [PATCH v8 net-next 2/4] net: enetc: update max chained Tx BD number " Wei Fang
2024-12-13 2:17 ` [PATCH v8 net-next 3/4] net: enetc: add LSO support for i.MX95 ENETC PF Wei Fang
2024-12-17 9:20 ` Paolo Abeni [this message]
2024-12-17 12:52 ` Wei Fang
2024-12-17 15:32 ` Alexander Lobakin
2024-12-18 3:06 ` Wei Fang
2024-12-18 5:45 ` Wei Fang
2024-12-18 14:30 ` Alexander Lobakin
2024-12-19 1:32 ` Wei Fang
2024-12-19 15:16 ` Alexander Lobakin
2024-12-13 2:17 ` [PATCH v8 net-next 4/4] net: enetc: add UDP segmentation offload support 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=118bbd72-b1fb-4da2-b1bd-5a66ecfe7322@redhat.com \
--to=pabeni@redhat.com \
--cc=andrew+netdev@lunn.ch \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=frank.li@nxp.com \
--cc=horms@kernel.org \
--cc=idosch@idosch.org \
--cc=imx@lists.linux.dev \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vladimir.oltean@nxp.com \
--cc=wei.fang@nxp.com \
--cc=xiaoning.wang@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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