From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-it1-f197.google.com (mail-it1-f197.google.com [209.85.166.197]) by kanga.kvack.org (Postfix) with ESMTP id 2C6816B5AA3 for ; Fri, 30 Nov 2018 17:59:21 -0500 (EST) Received: by mail-it1-f197.google.com with SMTP id 135so714796itk.5 for ; Fri, 30 Nov 2018 14:59:21 -0800 (PST) Received: from ale.deltatee.com (ale.deltatee.com. [207.54.116.67]) by mx.google.com with ESMTPS id x65si334109itf.28.2018.11.30.14.59.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Nov 2018 14:59:17 -0800 (PST) From: Logan Gunthorpe Date: Fri, 30 Nov 2018 15:59:11 -0700 Message-Id: <20181130225911.2900-1-logang@deltatee.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [PATCH] PCI/P2PDMA: Match interface changes to devm_memremap_pages() Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: Linux MM , linux-pci@vger.kernel.org, Linux Kernel Mailing List , Logan Gunthorpe , Dan Williams , Bjorn Helgaas "mm-hmm-mark-hmm_devmem_add-add_resource-export_symbol_gpl.patch" in the mm tree breaks p2pdma. The patch was written and reviewed before p2pdma was merged so the necessary changes were not done to the call site in that code. Without this patch, all drivers will fail to register P2P resources because devm_memremap_pages() will return -EINVAL due to the 'kill' member of the pagemap structure not yet being set. Signed-off-by: Logan Gunthorpe Cc: Andrew Morton Cc: Dan Williams Cc: Bjorn Helgaas --- Ideally this patch should be squashed with the one mentioned above to avoid a bisect regression point. drivers/pci/p2pdma.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index ae3c5b25dcc7..a2eb25271c96 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -82,10 +82,8 @@ static void pci_p2pdma_percpu_release(struct percpu_ref *ref) complete_all(&p2p->devmap_ref_done); } -static void pci_p2pdma_percpu_kill(void *data) +static void pci_p2pdma_percpu_kill(struct percpu_ref *ref) { - struct percpu_ref *ref = data; - /* * pci_p2pdma_add_resource() may be called multiple times * by a driver and may register the percpu_kill devm action multiple @@ -198,6 +196,7 @@ int pci_p2pdma_add_resource(struct pci_dev *pdev, int bar, size_t size, pgmap->type = MEMORY_DEVICE_PCI_P2PDMA; pgmap->pci_p2pdma_bus_offset = pci_bus_address(pdev, bar) - pci_resource_start(pdev, bar); + pgmap->kill = pci_p2pdma_percpu_kill; addr = devm_memremap_pages(&pdev->dev, pgmap); if (IS_ERR(addr)) { @@ -211,11 +210,6 @@ int pci_p2pdma_add_resource(struct pci_dev *pdev, int bar, size_t size, if (error) goto pgmap_free; - error = devm_add_action_or_reset(&pdev->dev, pci_p2pdma_percpu_kill, - &pdev->p2pdma->devmap_ref); - if (error) - goto pgmap_free; - pci_info(pdev, "added peer-to-peer DMA memory %pR\n", &pgmap->res); -- 2.19.0