linux-kernel - [PATCH] iommu/vt-d: add NUMA awareness to intel_alloc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1517438756.3715.108.camel@gmail.com>
Date:   Wed, 31 Jan 2018 14:45:56 -0800
From:   Eric Dumazet <eric.dumazet@...il.com>
To:     linux-kernel <linux-kernel@...r.kernel.org>
Cc:     Benjamin Serebrin <serebrin@...gle.com>,
        David Woodhouse <dwmw2@...radead.org>,
        Joerg Roedel <joro@...tes.org>,
        iommu@...ts.linux-foundation.org, netdev <netdev@...r.kernel.org>,
        Eric Dumazet <edumazet@...gle.com>
Subject: [PATCH] iommu/vt-d: add NUMA awareness to intel_alloc_coherent()

From: Eric Dumazet <edumazet@...gle.com>

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 <edumazet@...gle.com>
Cc: Benjamin Serebrin <serebrin@...gle.com>
Cc: David Woodhouse <dwmw2@...radead.org>
Cc: Joerg Roedel <joro@...tes.org>
---
 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);