From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Chan Subject: [PATCH 2/3] cnic: Don't take cnic_dev_lock in cnic_alloc_uio_rings() Date: Fri, 30 May 2014 16:18:42 -0700 Message-ID: <1401491923-5480-3-git-send-email-mchan@broadcom.com> References: <1401491923-5480-1-git-send-email-mchan@broadcom.com> <1401491923-5480-2-git-send-email-mchan@broadcom.com> Mime-Version: 1.0 Content-Type: text/plain Cc: , , Michael Chan To: Return-path: Received: from mail-gw2-out.broadcom.com ([216.31.210.63]:56181 "EHLO mail-gw2-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934712AbaE3V7R (ORCPT ); Fri, 30 May 2014 17:59:17 -0400 In-Reply-To: <1401491923-5480-2-git-send-email-mchan@broadcom.com> Sender: netdev-owner@vger.kernel.org List-ID: We are allocating memory with GFP_KERNEL under spinlock. Since this is the only call manipulating the cnic_udev_list and it is always under rtnl_lock, cnic_dev_lock can be safely removed. Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/cnic.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c index 7f40a2c..4ebab75 100644 --- a/drivers/net/ethernet/broadcom/cnic.c +++ b/drivers/net/ethernet/broadcom/cnic.c @@ -1039,21 +1039,17 @@ static int cnic_alloc_uio_rings(struct cnic_dev *dev, int pages) struct cnic_local *cp = dev->cnic_priv; struct cnic_uio_dev *udev; - read_lock(&cnic_dev_lock); list_for_each_entry(udev, &cnic_udev_list, list) { if (udev->pdev == dev->pcidev) { udev->dev = dev; if (__cnic_alloc_uio_rings(udev, pages)) { udev->dev = NULL; - read_unlock(&cnic_dev_lock); return -ENOMEM; } cp->udev = udev; - read_unlock(&cnic_dev_lock); return 0; } } - read_unlock(&cnic_dev_lock); udev = kzalloc(sizeof(struct cnic_uio_dev), GFP_ATOMIC); if (!udev) @@ -1067,9 +1063,7 @@ static int cnic_alloc_uio_rings(struct cnic_dev *dev, int pages) if (__cnic_alloc_uio_rings(udev, pages)) goto err_udev; - write_lock(&cnic_dev_lock); list_add(&udev->list, &cnic_udev_list); - write_unlock(&cnic_dev_lock); pci_dev_get(udev->pdev); -- 1.7.1