netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Denis Kirjanov <dkirjanov@suse.de>
To: Xiaomeng Tong <xiam0nd.tong@gmail.com>,
	christopher.lee@cspi.com, davem@davemloft.net, kuba@kernel.org,
	pabeni@redhat.com
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] myri10ge: fix an incorrect free for skb in myri10ge_sw_tso
Date: Wed, 6 Apr 2022 15:33:49 +0300	[thread overview]
Message-ID: <857f3f9c-abc3-779e-d03b-76c23f6e13af@suse.de> (raw)
In-Reply-To: <20220406035556.730-1-xiam0nd.tong@gmail.com>



4/6/22 06:55, Xiaomeng Tong пишет:
> All remaining skbs should be released when myri10ge_xmit fails to
> transmit a packet. Fix it within another skb_list_walk_safe.
> 
> Signed-off-by: Xiaomeng Tong <xiam0nd.tong@gmail.com>
> ---
> 
> changes since v2:
>   - free all remaining skbs. (Xiaomeng Tong)
> 
> changes since v1:
>   - remove the unneeded assignmnets. (Xiaomeng Tong)
> 
> v2:https://lore.kernel.org/lkml/20220405000553.21856-1-xiam0nd.tong@gmail.com/
> v1:https://lore.kernel.org/lkml/20220319052350.26535-1-xiam0nd.tong@gmail.com/
> 
> ---
>   drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
> index 50ac3ee2577a..21d2645885ce 100644
> --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
> +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
> @@ -2903,11 +2903,9 @@ static netdev_tx_t myri10ge_sw_tso(struct sk_buff *skb,
>   		status = myri10ge_xmit(curr, dev);
>   		if (status != 0) {
>   			dev_kfree_skb_any(curr);
> -			if (segs != NULL) {
> -				curr = segs;
> -				segs = next;
> +			skb_list_walk_safe(next, curr, next) {
>   				curr->next = NULL;
> -				dev_kfree_skb_any(segs);
> +				dev_kfree_skb_any(curr);

why can't we just do the following?
         skb_list_walk_safe(segs, skb, nskb) {
                 status = myri10ge_xmit(curr, dev);
                 if (err)
                         break;

         }

         /* Free all of the segments. */
         skb_list_walk_safe(segs, skb, nskb) {
                 if (err)
                         kfree_skb(skb);
                 else
                         consume_skb(skb);
         }
         return err;


>   			}
>   			goto drop;
>   		}

  parent reply	other threads:[~2022-04-06 15:02 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-06  3:55 [PATCH v3] myri10ge: fix an incorrect free for skb in myri10ge_sw_tso Xiaomeng Tong
2022-04-06 11:36 ` Denis Kirjanov
2022-04-06 12:33 ` Denis Kirjanov [this message]
2022-04-06 14:30 ` patchwork-bot+netdevbpf
2022-04-06 17:50 ` Jakub Kicinski

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=857f3f9c-abc3-779e-d03b-76c23f6e13af@suse.de \
    --to=dkirjanov@suse.de \
    --cc=christopher.lee@cspi.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=xiam0nd.tong@gmail.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;
as well as URLs for NNTP newsgroup(s).