Unverified Commit cac877a4 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11884 PCI: Add missing bridge lock to pci_bus_lock() 

Merge Pull Request from: @ci-robot 
 
PR sync from: liwei <liwei728@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FN3UDDULNKSS3BNZJ4S2YL5MDAVWYDBW/ 
 
https://gitee.com/src-openeuler/kernel/issues/IARWL9 
 
Link:https://gitee.com/openeuler/kernel/pulls/11884

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents f822c175 cf0d8347

drivers/pci/pci.c

+21 −14
Original line number Diff line number Diff line
@@ -5737,10 +5737,12 @@ static void pci_bus_lock(struct pci_bus *bus) 
{

	struct pci_dev *dev;



	pci_dev_lock(bus->self);

	list_for_each_entry(dev, &bus->devices, bus_list) {

		pci_dev_lock(dev);

		if (dev->subordinate)

			pci_bus_lock(dev->subordinate);

		else

			pci_dev_lock(dev);

	}

}
@@ -5752,8 +5754,10 @@ static void pci_bus_unlock(struct pci_bus *bus) 
	list_for_each_entry(dev, &bus->devices, bus_list) {

		if (dev->subordinate)

			pci_bus_unlock(dev->subordinate);

		else

			pci_dev_unlock(dev);

	}

	pci_dev_unlock(bus->self);

}



/* Return 1 on successful lock, 0 on contention */
@@ -5761,15 +5765,15 @@ static int pci_bus_trylock(struct pci_bus *bus) 
{

	struct pci_dev *dev;



	if (!pci_dev_trylock(bus->self))

		return 0;



	list_for_each_entry(dev, &bus->devices, bus_list) {

		if (!pci_dev_trylock(dev))

			goto unlock;

		if (dev->subordinate) {

			if (!pci_bus_trylock(dev->subordinate)) {

				pci_dev_unlock(dev);

			if (!pci_bus_trylock(dev->subordinate))

				goto unlock;

		} else if (!pci_dev_trylock(dev))

			goto unlock;

			}

		}

	}

	return 1;
@@ -5777,8 +5781,10 @@ static int pci_bus_trylock(struct pci_bus *bus) 
	list_for_each_entry_continue_reverse(dev, &bus->devices, bus_list) {

		if (dev->subordinate)

			pci_bus_unlock(dev->subordinate);

		else

			pci_dev_unlock(dev);

	}

	pci_dev_unlock(bus->self);

	return 0;

}
@@ -5810,9 +5816,10 @@ static void pci_slot_lock(struct pci_slot *slot) 
	list_for_each_entry(dev, &slot->bus->devices, bus_list) {

		if (!dev->slot || dev->slot != slot)

			continue;

		pci_dev_lock(dev);

		if (dev->subordinate)

			pci_bus_lock(dev->subordinate);

		else

			pci_dev_lock(dev);

	}

}
@@ -5838,14 +5845,13 @@ static int pci_slot_trylock(struct pci_slot *slot) 
	list_for_each_entry(dev, &slot->bus->devices, bus_list) {

		if (!dev->slot || dev->slot != slot)

			continue;

		if (!pci_dev_trylock(dev))

			goto unlock;

		if (dev->subordinate) {

			if (!pci_bus_trylock(dev->subordinate)) {

				pci_dev_unlock(dev);

				goto unlock;

			}

		}

		} else if (!pci_dev_trylock(dev))

			goto unlock;

	}

	return 1;
@@ -5856,6 +5862,7 @@ static int pci_slot_trylock(struct pci_slot *slot) 
			continue;

		if (dev->subordinate)

			pci_bus_unlock(dev->subordinate);

		else

			pci_dev_unlock(dev);

	}

	return 0;