Commit c6ff0f8d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/p2pdma' 

- Add Logan Gunthorpe as P2PDMA maintainer (Bjorn Helgaas)

- Optimize by using percpu_ref_tryget_live_rcu() inside RCU critical
  section (Christophe JAILLET)

* pci/p2pdma:
  PCI/P2PDMA: Use percpu_ref_tryget_live_rcu() inside RCU critical section
  MAINTAINERS: Add Logan Gunthorpe as P2PDMA maintainer
parents 446cc1c5 69f457b1

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -14717,6 +14717,19 @@ L: linux-pci@vger.kernel.org 
S:	Supported

F:	Documentation/PCI/pci-error-recovery.rst









PCI PEER-TO-PEER DMA (P2PDMA)









M:	Bjorn Helgaas <bhelgaas@google.com>









M:	Logan Gunthorpe <logang@deltatee.com>









L:	linux-pci@vger.kernel.org









S:	Supported









Q:	https://patchwork.kernel.org/project/linux-pci/list/









B:	https://bugzilla.kernel.org









C:	irc://irc.oftc.net/linux-pci









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git









F:	Documentation/driver-api/pci/p2pdma.rst









F:	drivers/pci/p2pdma.c









F:	include/linux/pci-p2pdma.h

















PCI MSI DRIVER FOR ALTERA MSI IP









M:	Joyce Ooi <joyce.ooi@intel.com>









L:	linux-pci@vger.kernel.org
































drivers/pci/p2pdma.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -710,7 +710,7 @@ void *pci_alloc_p2pmem(struct pci_dev *pdev, size_t size)







	if (!ret)









		goto out;



















	if (unlikely(!percpu_ref_tryget_live(ref))) {









	if (unlikely(!percpu_ref_tryget_live_rcu(ref))) {









		gen_pool_free(p2pdma->pool, (unsigned long) ret, size);









		ret = NULL;









		goto out;