From patchwork Tue Oct 28 15:29:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Vrabel X-Patchwork-Id: 39673 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8FE7C24026 for ; Tue, 28 Oct 2014 15:30:27 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id d17sf838758eek.11 for ; Tue, 28 Oct 2014 08:30:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=E50WYc2LsO7Kmm4oxJDfp+G7Nh9fT89qMRMXNDrPu6E=; b=Ly+p7VBUD8VuVrQGUFjwYSOHRxQJhrKQ7kMKUhCCbWmg3ul4gaXEfUtoCEoAu2VU8k RAnnig0ifR0NeYLFz0Q1HHtShRSBUnLeEGGXrFHkhouLZe0dQwfGnsvK0ckYnTGm0RN5 zyAP3VERuJr/vWeF+7dcb5qyKjZEFfT0bdJR6XjH1zEdER95rENshT7MyA6SQCqahX3j /MiVbsOvSRyvrjAj/T1yW6bLK8X3yOsC3qdAHtbPiYtEXjg8PYqqBBqxn+Fu2mg94xlC Jwh4MJx9rnhoLWGqSHJJBG5DljX0hQnIk31xieFDXBPUlLf8U9QMqkaIRi3uxDFEYsmJ JHcw== X-Gm-Message-State: ALoCoQkqAvKwDwfV7abS4W7BpDfxDlrvGOJqIQmK0ySidDubshPbZXxF/YSo+BDwXiv3HUwSbjR4 X-Received: by 10.152.88.70 with SMTP id be6mr760682lab.1.1414510226460; Tue, 28 Oct 2014 08:30:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.169 with SMTP id c9ls70019laa.104.gmail; Tue, 28 Oct 2014 08:30:26 -0700 (PDT) X-Received: by 10.112.144.228 with SMTP id sp4mr4776261lbb.58.1414510226253; Tue, 28 Oct 2014 08:30:26 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id ay11si1786219lab.132.2014.10.28.08.30.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 28 Oct 2014 08:30:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id p9so814720lbv.21 for ; Tue, 28 Oct 2014 08:30:26 -0700 (PDT) X-Received: by 10.112.189.10 with SMTP id ge10mr4765889lbc.23.1414510226171; Tue, 28 Oct 2014 08:30:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp501430lbz; Tue, 28 Oct 2014 08:30:24 -0700 (PDT) X-Received: by 10.66.140.102 with SMTP id rf6mr4144232pab.1.1414510224064; Tue, 28 Oct 2014 08:30:24 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id de9si1602840pdb.129.2014.10.28.08.30.23 for ; Tue, 28 Oct 2014 08:30:24 -0700 (PDT) Received-SPF: none (google.com: netdev-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753095AbaJ1PaU (ORCPT + 3 others); Tue, 28 Oct 2014 11:30:20 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:29705 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750925AbaJ1PaS (ORCPT ); Tue, 28 Oct 2014 11:30:18 -0400 X-IronPort-AV: E=Sophos;i="5.04,802,1406592000"; d="scan'208";a="186921720" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Tue, 28 Oct 2014 11:29:40 -0400 Received: from qabil.uk.xensource.com ([10.80.2.76]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1Xj8iJ-00058U-SN; Tue, 28 Oct 2014 15:29:39 +0000 From: David Vrabel To: CC: David Vrabel , , Ian Campbell , Wei Liu , "Zoltan Kiss" Subject: [PATCH 1/2] xen-netback: Disable NAPI after disabling interrupts Date: Tue, 28 Oct 2014 15:29:30 +0000 Message-ID: <1414510171-12853-2-git-send-email-david.vrabel@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1414510171-12853-1-git-send-email-david.vrabel@citrix.com> References: <1414510171-12853-1-git-send-email-david.vrabel@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Sender: netdev-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: netdev@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: netdev-owner@vger.kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Zoltan Kiss Otherwise the interrupt handler still calls napi_complete. Although it won't schedule NAPI again as either NAPI_STATE_DISABLE or NAPI_STATE_SCHED is set, it is just unnecessary, and it makes more sense to do this way. Signed-off-by: Zoltan Kiss Signed-off-by: David Vrabel Acked-by: Wei Liu --- drivers/net/xen-netback/interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index 895fe84..a6a32d3 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -235,10 +235,10 @@ static void xenvif_down(struct xenvif *vif) for (queue_index = 0; queue_index < num_queues; ++queue_index) { queue = &vif->queues[queue_index]; - napi_disable(&queue->napi); disable_irq(queue->tx_irq); if (queue->tx_irq != queue->rx_irq) disable_irq(queue->rx_irq); + napi_disable(&queue->napi); del_timer_sync(&queue->credit_timeout); } }