From patchwork Wed Oct 2 10:57:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 279688 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 E584D2C00AB for ; Wed, 2 Oct 2013 20:58:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753887Ab3JBK6e (ORCPT ); Wed, 2 Oct 2013 06:58:34 -0400 Received: from mail-bk0-f53.google.com ([209.85.214.53]:54224 "EHLO mail-bk0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753629Ab3JBK5v (ORCPT ); Wed, 2 Oct 2013 06:57:51 -0400 Received: by mail-bk0-f53.google.com with SMTP id d7so244837bkh.40 for ; Wed, 02 Oct 2013 03:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zPoyHu+uKMDlQig0X9GD4kWyG07ur0Own49NEFLrmvc=; b=bD9W4vDZXAmMLh0sDKI4hf5dnokCDoHnJMvzjk/UJwHsjw4SzCSFeX7XewO6gCs7S0 7Cq40qN/jAgDuXp2YsjLCRZATkSdG0W7QDniTe6eLWzH3N4Qp0jfPz+bTUf1aEzX+46R cxjertfCIyPrDS7n7bCONZ8xPxsL04ub6Et7CEUZMtPzwirjyPgwHxiXSrJAy98Cldut Ud75EB8mN57NIxTEqPo9lu7OUgDhw9pRHjeHWQzjxvpUPBZGePmqvIjWcrYv++nxnUL6 0dLft7tWHb8gAQ2RToZMU/6Y4yxqD0KaXnOo7pF9O1noyDg150ph6jQQRHRKZQSykc7v Mang== X-Received: by 10.205.87.12 with SMTP id au12mr1285996bkc.34.1380711468660; Wed, 02 Oct 2013 03:57:48 -0700 (PDT) Received: from topkick.lan (dslc-082-083-247-252.pools.arcor-ip.net. [82.83.247.252]) by mx.google.com with ESMTPSA id w9sm811190bkn.12.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Oct 2013 03:57:47 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Cc: David Miller , Lennert Buytenhek , Jason Cooper , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] net: mv643xx_eth: update statistics timer from timer context only Date: Wed, 2 Oct 2013 12:57:20 +0200 Message-Id: <1380711442-24735-2-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1380711442-24735-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1380711442-24735-1-git-send-email-sebastian.hesselbarth@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Each port driver installs a periodic timer to update port statistics by calling mib_counters_update. As mib_counters_update is also called from non-timer context, we should not reschedule the timer there but rather move it to timer-only context. Signed-off-by: Sebastian Hesselbarth Acked-by: Jason Cooper --- Cc: David Miller Cc: Lennert Buytenhek Cc: Jason Cooper Cc: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 7fb5677..44a87e4 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -1131,15 +1131,13 @@ static void mib_counters_update(struct mv643xx_eth_private *mp) p->rx_discard += rdlp(mp, RX_DISCARD_FRAME_CNT); p->rx_overrun += rdlp(mp, RX_OVERRUN_FRAME_CNT); spin_unlock_bh(&mp->mib_counters_lock); - - mod_timer(&mp->mib_counters_timer, jiffies + 30 * HZ); } static void mib_counters_timer_wrapper(unsigned long _mp) { struct mv643xx_eth_private *mp = (void *)_mp; - mib_counters_update(mp); + mod_timer(&mp->mib_counters_timer, jiffies + 30 * HZ); }