[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <53E290A4.1020900@cogentembedded.com>
Date: Thu, 07 Aug 2014 00:31:32 +0400
From: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To: Zoltan Kiss <zoltan.kiss@...rix.com>,
Wei Liu <wei.liu2@...rix.com>,
Ian Campbell <Ian.Campbell@...rix.com>
CC: David Vrabel <david.vrabel@...rix.com>, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, xen-devel@...ts.xenproject.org
Subject: Re: [PATCH net-next] xen-netback: Fix vif->disable handling
Hello.
On 08/06/2014 11:33 PM, Zoltan Kiss wrote:
> In the patch called "xen-netback: Turn off the carrier if the guest is not able
> to receive" new branches were introduced to this if statement, risking that a
> queue with non-zero id can reenable the disabled interface.
> Signed-off-by: Zoltan Kiss <zoltan.kiss@...rix.com>
> Signed-off-by: David Vrabel <david.vrabel@...rix.com>
> Cc: netdev@...r.kernel.org
> Cc: linux-kernel@...r.kernel.org
> Cc: xen-devel@...ts.xenproject.org
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
> index aa20933..f84516f 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -2027,7 +2027,13 @@ int xenvif_kthread_guest_rx(void *data)
> */
> if (unlikely(queue->vif->disabled && queue->id == 0))
> xenvif_carrier_off(queue->vif);
> - else if (unlikely(test_and_clear_bit(QUEUE_STATUS_RX_PURGE_EVENT,
> + else if (unlikely(queue->vif->disabled)) {
Perhaps it's time to fix the coding style and add {} around the first arm
of the *if* statement?
> + /* kthread_stop() would be called upon this thread soon,
> + * be a bit proactive
> + */
> + skb_queue_purge(&queue->rx_queue);
> + queue->rx_last_skb_slots = 0;
> + } else if (unlikely(test_and_clear_bit(QUEUE_STATUS_RX_PURGE_EVENT,
> &queue->status))) {
> xenvif_rx_purge_event(queue);
> } else if (!netif_carrier_ok(queue->vif->dev)) {
WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists