* [PATCH] iommu/io-pgtable-arm: Fix pgtable allocation in selftest
@ 2018-06-18 11:27 Jean-Philippe Brucker
2018-06-19 10:02 ` Will Deacon
0 siblings, 1 reply; 2+ messages in thread
From: Jean-Philippe Brucker @ 2018-06-18 11:27 UTC (permalink / raw)
To: linux-arm-kernel
Commit 4b123757eeaa ("iommu/io-pgtable-arm: Make allocations
NUMA-aware") added a NUMA hint to page table allocation, but the pgtable
selftest doesn't provide an SMMU device parameter. Since dev_to_node
doesn't accept a NULL argument, add a special case for selftest.
Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm•com>
---
drivers/iommu/io-pgtable-arm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index 010a254305dd..88641b4560bc 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -237,7 +237,8 @@ static void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp,
void *pages;
VM_BUG_ON((gfp & __GFP_HIGHMEM));
- p = alloc_pages_node(dev_to_node(dev), gfp | __GFP_ZERO, order);
+ p = alloc_pages_node(dev ? dev_to_node(dev) : NUMA_NO_NODE,
+ gfp | __GFP_ZERO, order);
if (!p)
return NULL;
--
2.17.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] iommu/io-pgtable-arm: Fix pgtable allocation in selftest
2018-06-18 11:27 [PATCH] iommu/io-pgtable-arm: Fix pgtable allocation in selftest Jean-Philippe Brucker
@ 2018-06-19 10:02 ` Will Deacon
0 siblings, 0 replies; 2+ messages in thread
From: Will Deacon @ 2018-06-19 10:02 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jun 18, 2018 at 12:27:54PM +0100, Jean-Philippe Brucker wrote:
> Commit 4b123757eeaa ("iommu/io-pgtable-arm: Make allocations
> NUMA-aware") added a NUMA hint to page table allocation, but the pgtable
> selftest doesn't provide an SMMU device parameter. Since dev_to_node
> doesn't accept a NULL argument, add a special case for selftest.
>
> Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm•com>
> ---
> drivers/iommu/io-pgtable-arm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Thanks, I'll pick this up.
Will
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-19 10:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-18 11:27 [PATCH] iommu/io-pgtable-arm: Fix pgtable allocation in selftest Jean-Philippe Brucker
2018-06-19 10:02 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox