[v3] arm: xen: mm: use __GPF_DMA32 for arm64

[Xen-devel] [PATCH V3] arm: xen: mm: use __GPF_DMA32 for arm64

Posted by Peng Fan 4 years, 7 months ago

From: Peng Fan <peng.fan@nxp.com>

arm64 shares some code under arch/arm/xen, including mm.c.
However ZONE_DMA is removed by commit
ad67f5a6545("arm64: replace ZONE_DMA with ZONE_DMA32").

So add a check if CONFIG_ZONE_DMA32 is enabled use __GFP_DMA32.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---

V3:
 Use IS_ENABLED(CONFIG_ZONE_DMA32) and drop xen_set_gfp_dma.

V2:
 Follow suggestion from Stefano,
 introduce static inline void xen_set_gfp_dma(gfp_t *flags) for arm32/arm64, and
 for arm64 using __GFP_DMA for the former and __GFP_DMA32 for the latter.


 arch/arm/xen/mm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c
index 2b2c208408bb..38fa917c8585 100644
--- a/arch/arm/xen/mm.c
+++ b/arch/arm/xen/mm.c
@@ -28,7 +28,10 @@ unsigned long xen_get_swiotlb_free_pages(unsigned int order)
 
 	for_each_memblock(memory, reg) {
 		if (reg->base < (phys_addr_t)0xffffffff) {
-			flags |= __GFP_DMA;
+			if (IS_ENABLED(CONFIG_ZONE_DMA32))
+				flags |= __GFP_DMA32;
+			else
+				flags |= __GFP_DMA;
 			break;
 		}
 	}
-- 
2.16.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH V3] arm: xen: mm: use __GPF_DMA32 for arm64

Posted by Stefano Stabellini 4 years, 6 months ago

On Mon, 16 Sep 2019, Peng Fan wrote:
> From: Peng Fan <peng.fan@nxp.com>
> 
> arm64 shares some code under arch/arm/xen, including mm.c.
> However ZONE_DMA is removed by commit
> ad67f5a6545("arm64: replace ZONE_DMA with ZONE_DMA32").
> 
> So add a check if CONFIG_ZONE_DMA32 is enabled use __GFP_DMA32.
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>

Acked-by: Stefano Stabellini <sstabellini@kernel.org>


> ---
> 
> V3:
>  Use IS_ENABLED(CONFIG_ZONE_DMA32) and drop xen_set_gfp_dma.
> 
> V2:
>  Follow suggestion from Stefano,
>  introduce static inline void xen_set_gfp_dma(gfp_t *flags) for arm32/arm64, and
>  for arm64 using __GFP_DMA for the former and __GFP_DMA32 for the latter.
> 
> 
>  arch/arm/xen/mm.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c
> index 2b2c208408bb..38fa917c8585 100644
> --- a/arch/arm/xen/mm.c
> +++ b/arch/arm/xen/mm.c
> @@ -28,7 +28,10 @@ unsigned long xen_get_swiotlb_free_pages(unsigned int order)
>  
>  	for_each_memblock(memory, reg) {
>  		if (reg->base < (phys_addr_t)0xffffffff) {
> -			flags |= __GFP_DMA;
> +			if (IS_ENABLED(CONFIG_ZONE_DMA32))
> +				flags |= __GFP_DMA32;
> +			else
> +				flags |= __GFP_DMA;
>  			break;
>  		}
>  	}
> -- 
> 2.16.4
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel