From: Logan Gunthorpe <logang@deltatee.com>
To: Christoph Hellwig <hch@lst.de>, bhelgaas@google.com
Cc: linux-pci@vger.kernel.org, Matthew Wilcox <willy@infradead.org>
Subject: Re: [PATCH] PCI/P2PDMA: fix build without dma ops
Date: Mon, 10 Aug 2020 09:55:55 -0600 [thread overview]
Message-ID: <d1e55a10-382f-ba3e-62dd-fee675a80561@deltatee.com> (raw)
In-Reply-To: <20200810124843.1532738-1-hch@lst.de>
On 2020-08-10 6:48 a.m., Christoph Hellwig wrote:
> My commit to make dma ops support optional missed the reference in
> the p2pdma code. And while the build bot didn't manage to find a config
> where this can happen, Matthew did. Fix this by replacing two IS_ENABLED
> checks with ifdefs.
Makes sense to me.
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
> Fixes: 2f9237d4f6d ("dma-mapping: make support for dma ops optional")
> Reported-by: Matthew Wilcox <willy@infradead.org>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> drivers/pci/p2pdma.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
> index 64ebed129dbf5f..f357f9a32b3a57 100644
> --- a/drivers/pci/p2pdma.c
> +++ b/drivers/pci/p2pdma.c
> @@ -556,13 +556,14 @@ int pci_p2pdma_distance_many(struct pci_dev *provider, struct device **clients,
> return -1;
>
> for (i = 0; i < num_clients; i++) {
> - if (IS_ENABLED(CONFIG_DMA_VIRT_OPS) &&
> - clients[i]->dma_ops == &dma_virt_ops) {
> +#ifdef CONFIG_DMA_VIRT_OPS
> + if (clients[i]->dma_ops == &dma_virt_ops) {
> if (verbose)
> dev_warn(clients[i],
> "cannot be used for peer-to-peer DMA because the driver makes use of dma_virt_ops\n");
> return -1;
> }
> +#endif
>
> pci_client = find_parent_pci_dev(clients[i]);
> if (!pci_client) {
> @@ -842,9 +843,10 @@ static int __pci_p2pdma_map_sg(struct pci_p2pdma_pagemap *p2p_pgmap,
> * this should never happen because it will be prevented
> * by the check in pci_p2pdma_distance_many()
> */
> - if (WARN_ON_ONCE(IS_ENABLED(CONFIG_DMA_VIRT_OPS) &&
> - dev->dma_ops == &dma_virt_ops))
> +#ifdef CONFIG_DMA_VIRT_OPS
> + if (WARN_ON_ONCE(dev->dma_ops == &dma_virt_ops))
> return 0;
> +#endif
>
> for_each_sg(sg, s, nents, i) {
> paddr = sg_phys(s);
>
next prev parent reply other threads:[~2020-08-10 15:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-10 12:48 [PATCH] PCI/P2PDMA: fix build without dma ops Christoph Hellwig
2020-08-10 15:55 ` Logan Gunthorpe [this message]
2020-08-17 19:51 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d1e55a10-382f-ba3e-62dd-fee675a80561@deltatee.com \
--to=logang@deltatee.com \
--cc=bhelgaas@google.com \
--cc=hch@lst.de \
--cc=linux-pci@vger.kernel.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).