lkml.org 
[lkml]   [2015]   [Jan]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH net] hyperv: Fix the error processing in netvsc_send()


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


\
 
 \ /
  Last update: 2015-01-30 11:41    [W:0.101 / U:1.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site