xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: dma-direct: Make DMA32 disablement work for CONFIG_NUMA

Browse Source 
zone_dma32_is_empty() currently lacks the proper validation to ensure
that the NUMA node ID it receives as an argument is valid. This has no
effect on kernels with CONFIG_NUMA=n as NODE_DATA() will return the
same pglist_data on these devices, but on kernels with CONFIG_NUMA=y,
this is not the case, and the node passed to NODE_DATA must be
validated.

Rather than trying to find the node containing ZONE_DMA32, replace
calls of zone_dma32_is_empty() with zone_dma32_are_empty() (which
iterates over all nodes and returns false if one of the nodes holds
DMA32 and it is non-empty).

Bug: 199917449
Fixes: c3c2bb34ac ("ANDROID: arm64/mm: Add command line option to make ZONE_DMA32 empty")
Signed-off-by: Chris Goldsworthy <quic_cgoldswo@quicinc.com>
Change-Id: I850fb9213b71a1ef29106728bfda0cc6de46fdbb
This commit is contained in:
Chris Goldsworthy
2022-02-24 16:13:30 -08:00
committed by Suren Baghdasaryan
parent 8f66dc1a78
commit bf96382fb9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/dma-direct.h
View File

@@ -37,11 +37,16 @@ static inline bool zone_dma32_is_empty(int node)
static inline bool zone_dma32_are_empty(void) static inline bool zone_dma32_are_empty(void)
{ {
#ifdef CONFIG_NUMA
int node; int node;
for_each_node(node) for_each_node(node)
if (!zone_dma32_is_empty(node)) if (!zone_dma32_is_empty(node))
return false; return false;
#else
if (!zone_dma32_is_empty(numa_node_id()))
return false;
#endif
return true; return true;
} }

4
kernel/dma/direct.c
View File

@@ -62,7 +62,7 @@ static gfp_t dma_direct_optimal_gfp_mask(struct device *dev, u64 dma_mask,
if (*phys_limit <= DMA_BIT_MASK(zone_dma_bits)) if (*phys_limit <= DMA_BIT_MASK(zone_dma_bits))
return GFP_DMA; return GFP_DMA;
if (*phys_limit <= DMA_BIT_MASK(32) && if (*phys_limit <= DMA_BIT_MASK(32) &&
!zone_dma32_is_empty(dev_to_node(dev))) !zone_dma32_are_empty())
return GFP_DMA32; return GFP_DMA32;
return 0; return 0;
} }
@@ -103,7 +103,7 @@ again:
if (IS_ENABLED(CONFIG_ZONE_DMA32) && if (IS_ENABLED(CONFIG_ZONE_DMA32) &&
phys_limit < DMA_BIT_MASK(64) && phys_limit < DMA_BIT_MASK(64) &&
!(gfp & (GFP_DMA32 | GFP_DMA)) && !(gfp & (GFP_DMA32 | GFP_DMA)) &&
!zone_dma32_is_empty(node)) { !zone_dma32_are_empty()) {
gfp |= GFP_DMA32; gfp |= GFP_DMA32;
goto again; goto again;
} }