From patchwork Thu May 15 11:24:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 349168 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1B4E11400DA for ; Thu, 15 May 2014 21:24:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752658AbaEOLYS (ORCPT ); Thu, 15 May 2014 07:24:18 -0400 Received: from smtp.citrix.com ([66.165.176.89]:33657 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751376AbaEOLYS (ORCPT ); Thu, 15 May 2014 07:24:18 -0400 X-IronPort-AV: E=Sophos;i="4.97,1058,1389744000"; d="scan'208";a="131432940" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 15 May 2014 11:24:17 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Thu, 15 May 2014 07:24:17 -0400 Received: from dt47.uk.xensource.com ([10.80.229.47] helo=dt47.uk.xensource.com.) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1Wktlo-0006l1-KZ; Thu, 15 May 2014 12:24:16 +0100 From: Wei Liu To: , CC: , Wei Liu , Ian Campbell , Paul Durrant Subject: [PATCH net] xen-netback: don't move event pointer in TX credit timeout callback Date: Thu, 15 May 2014 12:24:16 +0100 Message-ID: <1400153056-12793-1-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-DLP: MIA2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ... otherwise the frontend will try to send TX event all the time, even if no progress can be made. The pointer should only be advanced by the routine that actually processes the ring. Reported-by: Jacek Konieczny Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Paul Durrant Acked-by: Ian Campbell --- drivers/net/xen-netback/netback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 7666540..8e2cbeb 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -658,7 +658,7 @@ void xenvif_check_rx_xenvif(struct xenvif *vif) { int more_to_do; - RING_FINAL_CHECK_FOR_REQUESTS(&vif->tx, more_to_do); + more_to_do = RING_HAS_UNCONSUMED_REQUESTS(&vif->tx); if (more_to_do) napi_schedule(&vif->napi);