From: Jason Wang <jasowang@redhat.com>
To: Haiyang Zhang <haiyangz@microsoft.com>
Cc: davem@davemloft.net, netdev@vger.kernel.org,
haiyangz@microsoft.com, kys@microsoft.com, olaf@aepfle.de,
linux-kernel@vger.kernel.org,
driverdev-devel@linuxdriverproject.org
Subject: Re: [PATCH net] hyperv: Fix the error processing in netvsc_send()
Date: Fri, 30 Jan 2015 10:33:19 +0008 [thread overview]
Message-ID: <1422613519.8840.0@smtp.corp.redhat.com> (raw)
In-Reply-To: <1422563689-31036-1-git-send-email-haiyangz@microsoft.com>
On Fri, Jan 30, 2015 at 4:34 AM, Haiyang Zhang <haiyangz@microsoft.com>
wrote:
> The existing code frees the skb in EAGAIN case, in which the skb will
> be
> retried from upper layer and used again.
> Also, the existing code doesn't free send buffer slot in error case,
> because
> there is no completion message for unsent packets.
> This patch fixes these problems.
>
> (Please also include this patch for stable trees. Thanks!)
>
> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
> Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
> ---
> drivers/net/hyperv/netvsc.c | 11 ++++++++---
> 1 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
> index 9f49c01..7cd4eb3 100644
> --- a/drivers/net/hyperv/netvsc.c
> +++ b/drivers/net/hyperv/netvsc.c
> @@ -716,7 +716,7 @@ int netvsc_send(struct hv_device *device,
> u64 req_id;
> unsigned int section_index = NETVSC_INVALID_INDEX;
> u32 msg_size = 0;
> - struct sk_buff *skb;
> + struct sk_buff *skb = NULL;
> u16 q_idx = packet->q_idx;
>
>
> @@ -743,8 +743,6 @@ int netvsc_send(struct hv_device *device,
> packet);
> skb = (struct sk_buff *)
> (unsigned long)packet->send_completion_tid;
> - if (skb)
> - dev_kfree_skb_any(skb);
> packet->page_buf_cnt = 0;
> }
> }
> @@ -810,6 +808,13 @@ int netvsc_send(struct hv_device *device,
> packet, ret);
> }
>
> + if (ret != 0) {
> + if (section_index != NETVSC_INVALID_INDEX)
> + netvsc_free_send_slot(net_device, section_index);
What if ret is -EINVAL or -ENOSPC? Looks like we need free the skb in
this case also.
>
> + } else if (skb) {
> + dev_kfree_skb_any(skb);
The caller - netvsc_start_xmit() do this also, may be handle this in
caller is better since netvsc_start_xmit() is the only user that tries
to send a skb?
btw, I find during netvsc_start_xmit(), ret was change to -ENOSPC when
queue_sends[q_idx] < 1. But non of the caller check -ENOSPC in fact?
Thanks
>
> + }
> +
> return ret;
> }
>
> --
> 1.7.4.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2015-01-30 10:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-29 20:34 [PATCH net] hyperv: Fix the error processing in netvsc_send() Haiyang Zhang
2015-01-30 10:25 ` Jason Wang [this message]
2015-01-30 15:05 ` Haiyang Zhang
[not found] ` <BN1PR0301MB0770FCDA58F3BC9E25382D95CA310@BN1PR0301MB0770.namprd03.prod.out look.com>
2015-02-02 6:49 ` Jason Wang
2015-02-03 15:46 ` Haiyang Zhang
[not found] ` <BN1PR0301MB077018D4A512E3AA9B8583E0CA3D0@BN1PR0301MB0770.namprd03.prod.out look.com>
2015-02-04 7:29 ` Jason Wang
2015-02-04 22:26 ` Haiyang Zhang
2015-02-01 1:32 ` David Miller
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=1422613519.8840.0@smtp.corp.redhat.com \
--to=jasowang@redhat.com \
--cc=davem@davemloft.net \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=haiyangz@microsoft.com \
--cc=kys@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olaf@aepfle.de \
/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).