Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ffaeee7 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Greg Kroah-Hartman
Browse files

PCI: endpoint: Fix for concurrent memory allocation in OB address region 



commit 04e046ca57ebed3943422dee10eec9e73aec081e upstream.

pci-epc-mem uses a bitmap to manage the Endpoint outbound (OB) address
region. This address region will be shared by multiple endpoint
functions (in the case of multi function endpoint) and it has to be
protected from concurrent access to avoid updating an inconsistent state.

Use a mutex to protect bitmap updates to prevent the memory
allocation API from returning incorrect addresses.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: stable@vger.kernel.org # v4.14+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d2345d12

drivers/pci/endpoint/pci-epc-mem.c

+8 −2
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ int __pci_epc_mem_init(struct pci_epc *epc, phys_addr_t phys_base, size_t size, 
	mem->page_size = page_size;

	mem->pages = pages;

	mem->size = size;

	mutex_init(&mem->lock);



	epc->mem = mem;
@@ -122,7 +123,7 @@ void __iomem *pci_epc_mem_alloc_addr(struct pci_epc *epc, 
				     phys_addr_t *phys_addr, size_t size)

{

	int pageno;

	void __iomem *virt_addr;

	void __iomem *virt_addr = NULL;

	struct pci_epc_mem *mem = epc->mem;

	unsigned int page_shift = ilog2(mem->page_size);

	int order;
@@ -130,15 +131,18 @@ void __iomem *pci_epc_mem_alloc_addr(struct pci_epc *epc, 
	size = ALIGN(size, mem->page_size);

	order = pci_epc_mem_get_order(mem, size);



	mutex_lock(&mem->lock);

	pageno = bitmap_find_free_region(mem->bitmap, mem->pages, order);

	if (pageno < 0)

		return NULL;

		goto ret;



	*phys_addr = mem->phys_base + (pageno << page_shift);

	virt_addr = ioremap(*phys_addr, size);

	if (!virt_addr)

		bitmap_release_region(mem->bitmap, pageno, order);



ret:

	mutex_unlock(&mem->lock);

	return virt_addr;

}

EXPORT_SYMBOL_GPL(pci_epc_mem_alloc_addr);
@@ -164,7 +168,9 @@ void pci_epc_mem_free_addr(struct pci_epc *epc, phys_addr_t phys_addr, 
	pageno = (phys_addr - mem->phys_base) >> page_shift;

	size = ALIGN(size, mem->page_size);

	order = pci_epc_mem_get_order(mem, size);

	mutex_lock(&mem->lock);

	bitmap_release_region(mem->bitmap, pageno, order);

	mutex_unlock(&mem->lock);

}

EXPORT_SYMBOL_GPL(pci_epc_mem_free_addr);

include/linux/pci-epc.h

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ struct pci_epc_ops { 
 * @bitmap: bitmap to manage the PCI address space

 * @pages: number of bits representing the address region

 * @page_size: size of each page

 * @lock: mutex to protect bitmap

 */

struct pci_epc_mem {

	phys_addr_t	phys_base;
@@ -76,6 +77,8 @@ struct pci_epc_mem { 
	unsigned long	*bitmap;

	size_t		page_size;

	int		pages;

	/* mutex to protect against concurrent access for memory allocation*/

	struct mutex	lock;

};



/**