From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Dumazet Subject: [PATCH] iommu/vt-d: add NUMA awareness to intel_alloc_coherent() Date: Wed, 31 Jan 2018 14:45:56 -0800 Message-ID: <1517438756.3715.108.camel@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Cc: Benjamin Serebrin , David Woodhouse , Joerg Roedel , iommu@lists.linux-foundation.org, netdev , Eric Dumazet To: linux-kernel Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Eric Dumazet Some devices (like mlx4) try hard to allocate memory on selected NUMA node, but it turns out intel_alloc_coherent() is not NUMA aware yet. Note that dma_generic_alloc_coherent() in arch/x86/kernel/pci-dma.c gets this right. Signed-off-by: Eric Dumazet Cc: Benjamin Serebrin Cc: David Woodhouse Cc: Joerg Roedel ---  drivers/iommu/intel-iommu.c |    7 +++++--  1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index a1373cf343269455808f66ad18dc0a2fb7aa73f2..0efef077abc099eb29ebc5cefdd1b996f025dffd 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -3734,8 +3734,11 @@ static void *intel_alloc_coherent(struct device *dev, size_t size, } } - if (!page) - page = alloc_pages(flags, order); + if (!page) { + page = alloc_pages_node(dev_to_node(dev), flags, order); + if (!page) + page = alloc_pages(flags, order); + } if (!page) return NULL; memset(page_address(page), 0, size);