cnic: Don't take cnic_dev_lock in cnic_alloc_uio_rings() (437b8a26) · Commits · 戴 / test

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 <mchan@broadcom.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/broadcom/cnic.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -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);

Admin message