From: Francois Romieu <romieu@fr.zoreil.com>
To: Zhang Changzhong <zhangchangzhong@huawei.com>
Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, mdf@kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH net v2 3/3] net: nixge: fix tx queue handling
Date: Wed, 16 Nov 2022 00:04:29 +0100 [thread overview]
Message-ID: <Y3Qa/fjjMhctsE5w@electric-eye.fr.zoreil.com> (raw)
In-Reply-To: <1668525024-38409-4-git-send-email-zhangchangzhong@huawei.com>
Zhang Changzhong <zhangchangzhong@huawei.com> :
> Currently the driver check for available space at the beginning of
> nixge_start_xmit(), and when there is not enough space for this packet,
> it returns NETDEV_TX_OK, which casues packet loss and memory leak.
>
> Instead the queue should be stopped after the packet is added to the BD
> when there may not be enough space for next packet. In addition, the
> queue should be wakeup only if there is enough space for a packet with
> max frags.
>
> Fixes: 492caffa8a1a ("net: ethernet: nixge: Add support for National Instruments XGE netdev")
> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
> ---
> drivers/net/ethernet/ni/nixge.c | 54 +++++++++++++++++++++++++++++------------
> 1 file changed, 38 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c
> index 91b7ebc..3776a03 100644
> --- a/drivers/net/ethernet/ni/nixge.c
> +++ b/drivers/net/ethernet/ni/nixge.c
[...]
> static netdev_tx_t nixge_start_xmit(struct sk_buff *skb,
> @@ -518,10 +523,15 @@ static netdev_tx_t nixge_start_xmit(struct sk_buff *skb,
> cur_p = &priv->tx_bd_v[priv->tx_bd_tail];
> tx_skb = &priv->tx_skb[priv->tx_bd_tail];
>
> - if (nixge_check_tx_bd_space(priv, num_frag + 1)) {
> - if (!netif_queue_stopped(ndev))
> - netif_stop_queue(ndev);
> - return NETDEV_TX_OK;
> + if (unlikely(nixge_check_tx_bd_space(priv, num_frag + 1))) {
> + /* Should not happen as last start_xmit call should have
> + * checked for sufficient space and queue should only be
> + * woken when sufficient space is available.
> + */
Almost. IRQ triggering after nixge_start_xmit::netif_stop_queue and
before nixge_start_xmit::smp_mb may wrongly wake queue.
Call me timorous but I would feel more confortable if this code could
be tested on real hardware before being fed into -net.
--
Ueimor
next prev parent reply other threads:[~2022-11-15 23:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-15 15:10 [PATCH net v2 0/3] three fixes for nixge driver Zhang Changzhong
2022-11-15 15:10 ` [PATCH net v2 1/3] net: nixge: fix potential memory leak in nixge_start_xmit() Zhang Changzhong
2022-11-15 22:57 ` Francois Romieu
2022-11-15 15:10 ` [PATCH net v2 2/3] net: nixge: avoid overwriting buffer descriptor Zhang Changzhong
2022-11-15 23:03 ` Francois Romieu
2022-11-15 15:10 ` [PATCH net v2 3/3] net: nixge: fix tx queue handling Zhang Changzhong
2022-11-15 23:04 ` Francois Romieu [this message]
2022-11-16 8:55 ` Zhang Changzhong
2022-11-16 10:27 ` Francois Romieu
2022-11-16 11:52 ` Zhang Changzhong
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=Y3Qa/fjjMhctsE5w@electric-eye.fr.zoreil.com \
--to=romieu@fr.zoreil.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mdf@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=zhangchangzhong@huawei.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
all inboxes | Powered by JetHome®