From patchwork Thu Aug 6 17:00:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 504768 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 C2BAA1402AE for ; Fri, 7 Aug 2015 03:01:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754935AbbHFRAy (ORCPT ); Thu, 6 Aug 2015 13:00:54 -0400 Received: from mail-la0-f41.google.com ([209.85.215.41]:36283 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753220AbbHFRAw (ORCPT ); Thu, 6 Aug 2015 13:00:52 -0400 Received: by lagz9 with SMTP id z9so7265559lag.3 for ; Thu, 06 Aug 2015 10:00:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2FsPy/2eA/d0lVWA1WOeS4Y/uUAD8O8qkOKFzc5Bg3E=; b=NSQEZ74/8Z0Gnb0Fx5UVAl41DEFcTMVEXaiyvjQXJXrZB1P7688STJhLKOgzCUaTgT vqNvxquDNemHIK7APbH55aYqGMuJ2jg08t8cPq7Ja0fWGI8e9jurgOpZNYZEoAjdVb8h kMdKYiFu3WWlXQbu0oVOu+Bntz8vWn4DVMEk+VyFud3VtxKQJckwekKPJVv5uKHXLOFv pDB3pCUE++mqmczAoP0V/cD0PjOFw7NKfGT+3LVM8cN8UOaxC7iWj02Ykjb4CEhjfZcT RAh63v2ZN5PO7mInlJFXe9wz6WxzuzFa6kbgPvoiIPF6Z1sWG2T3lutb5PxsbgJ+JURQ YVOQ== X-Gm-Message-State: ALoCoQlN74kqFIV4y66fsHc+OXdbvMzjU/qd21PdxpbpfoRuktwsxA+tuor2t7aTxn/iPnqkXmGV X-Received: by 10.152.25.169 with SMTP id d9mr3394286lag.80.1438880450871; Thu, 06 Aug 2015 10:00:50 -0700 (PDT) Received: from mw-VirtualBox.semihalf.com ([80.82.22.190]) by smtp.gmail.com with ESMTPSA id v8sm1506147lbo.43.2015.08.06.10.00.48 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Aug 2015 10:00:49 -0700 (PDT) From: Marcin Wojtas To: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Cc: davem@davemloft.net, jason@lakedaemon.net, thomas.petazzoni@free-electrons.com, gregory.clement@free-electrons.com, ezequiel.garcia@free-electrons.com, alior@marvell.com, jaz@semihalf.com, Marcin Wojtas Subject: [PATCH 1/3] net: mvpp2: remove excessive spinlocks from driver initialization Date: Thu, 6 Aug 2015 19:00:28 +0200 Message-Id: <1438880430-5480-2-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1438880430-5480-1-git-send-email-mw@semihalf.com> References: <1438880430-5480-1-git-send-email-mw@semihalf.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Using spinlocks protection during one-time driver initialization is not necessary. Moreover it resulted in invalid GFP_KERNEL allocation under the lock. This commit removes redundant spinlocks from buffer manager part of mvpp2 initialization. Signed-off-by: Marcin Wojtas Reported-by: Alexandre Fournier --- drivers/net/ethernet/marvell/mvpp2.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 3e8b1bf..f94bd12 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -913,8 +913,6 @@ struct mvpp2_bm_pool { /* Occupied buffers indicator */ atomic_t in_use; int in_use_thresh; - - spinlock_t lock; }; struct mvpp2_buff_hdr { @@ -3376,7 +3374,6 @@ static int mvpp2_bm_pool_create(struct platform_device *pdev, bm_pool->pkt_size = 0; bm_pool->buf_num = 0; atomic_set(&bm_pool->in_use, 0); - spin_lock_init(&bm_pool->lock); return 0; } @@ -3647,7 +3644,6 @@ static struct mvpp2_bm_pool * mvpp2_bm_pool_use(struct mvpp2_port *port, int pool, enum mvpp2_bm_type type, int pkt_size) { - unsigned long flags = 0; struct mvpp2_bm_pool *new_pool = &port->priv->bm_pools[pool]; int num; @@ -3656,8 +3652,6 @@ mvpp2_bm_pool_use(struct mvpp2_port *port, int pool, enum mvpp2_bm_type type, return NULL; } - spin_lock_irqsave(&new_pool->lock, flags); - if (new_pool->type == MVPP2_BM_FREE) new_pool->type = type; @@ -3686,8 +3680,6 @@ mvpp2_bm_pool_use(struct mvpp2_port *port, int pool, enum mvpp2_bm_type type, if (num != pkts_num) { WARN(1, "pool %d: %d of %d allocated\n", new_pool->id, num, pkts_num); - /* We need to undo the bufs_add() allocations */ - spin_unlock_irqrestore(&new_pool->lock, flags); return NULL; } } @@ -3695,15 +3687,12 @@ mvpp2_bm_pool_use(struct mvpp2_port *port, int pool, enum mvpp2_bm_type type, mvpp2_bm_pool_bufsize_set(port->priv, new_pool, MVPP2_RX_BUF_SIZE(new_pool->pkt_size)); - spin_unlock_irqrestore(&new_pool->lock, flags); - return new_pool; } /* Initialize pools for swf */ static int mvpp2_swf_bm_pool_init(struct mvpp2_port *port) { - unsigned long flags = 0; int rxq; if (!port->pool_long) { @@ -3714,9 +3703,7 @@ static int mvpp2_swf_bm_pool_init(struct mvpp2_port *port) if (!port->pool_long) return -ENOMEM; - spin_lock_irqsave(&port->pool_long->lock, flags); port->pool_long->port_map |= (1 << port->id); - spin_unlock_irqrestore(&port->pool_long->lock, flags); for (rxq = 0; rxq < rxq_number; rxq++) mvpp2_rxq_long_pool_set(port, rxq, port->pool_long->id); @@ -3730,9 +3717,7 @@ static int mvpp2_swf_bm_pool_init(struct mvpp2_port *port) if (!port->pool_short) return -ENOMEM; - spin_lock_irqsave(&port->pool_short->lock, flags); port->pool_short->port_map |= (1 << port->id); - spin_unlock_irqrestore(&port->pool_short->lock, flags); for (rxq = 0; rxq < rxq_number; rxq++) mvpp2_rxq_short_pool_set(port, rxq,