Message ID | 20230716165147.1897-2-jszhang@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp703291vqt; Sun, 16 Jul 2023 10:06:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlHpHt1PCFg6Xo1dE6ayxf5IF7FIiFV1zdu8KR8yuOsA7gwkj2X6wpAeVjjldaa2ld7gLX1l X-Received: by 2002:a17:906:ad5:b0:992:345e:8319 with SMTP id z21-20020a1709060ad500b00992345e8319mr7901703ejf.58.1689527209304; Sun, 16 Jul 2023 10:06:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689527209; cv=none; d=google.com; s=arc-20160816; b=t/Yy0grToAd+5npcl0bZH3E9v/GLfvZAl8rCq1UPHOZtKbi+JTJz2ed2tfdd19GzH2 F9WA1ZpKqI0FozlRVeW9n6rRhxJaNUStb/v8SLmVdGzT0CIXKf2ObEToXHp3G3SG7HjG e8Z2GPmeLcZEGmMuaAPoxL5uMg4UfrqnH+NGQlEawACqZridPfiYFUVVrJ9Q3uxfghf7 p48J2rjS4Q9/MzbeCAV+1FvZecQzk/uityTTmrouI+yQA1+tocPjMWMWqF/X1EvxpmY4 B7aKBIK7H8VKcuHe98bcdLNYkHIgwQGubFQILNqALoUi4zEAggBL7xg0U/1ctbLuM8bc aUSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4ycBnPlJWk3xW5aqsZ74vIsQJiYdagd26Jr3LC4FUuw=; fh=4dEsi7QIwecjtTyQysIed7zhM6Kqdn9yv5jIBHUtcd8=; b=wn1bBzX9QPsuDh/g1WfFT8dfKndMHPsT17xAoPlWAHGMb4N35ANUbiaDNQQMgsRMVW YZThf0vh03G16b5guH7z2Dc69JSIwMN8jOdySL0f6Sg4nymdA3XEvvnuFHL/x/h85wRg CXCVUuQfQL4G9F2/OJnFL4HwYwM1r76+anYqQFUcw2oXXXDYApMr/kv3TqX1ch6dD7wi CA71lF1idE0+Nrg7uex+CCmBQJefgHES/J1JEWhHA7G3vLLfGEJOA3XhpvhwDRSc63dy uYEeh3YvuvqZ4605BjY7XHK9+n5nJTrevIJ1O/L3NtOO1O4fkIrCYIzL/Ws7LnOT+kOw cM2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WUGEipBa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id rk13-20020a170907214d00b00992ac6d88acsi12290224ejb.274.2023.07.16.10.06.24; Sun, 16 Jul 2023 10:06:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WUGEipBa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230111AbjGPRDb (ORCPT <rfc822;assdfgzxcv4@gmail.com> + 99 others); Sun, 16 Jul 2023 13:03:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230118AbjGPRD1 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 16 Jul 2023 13:03:27 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EAA7EE73 for <linux-kernel@vger.kernel.org>; Sun, 16 Jul 2023 10:03:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 77F7260DD8 for <linux-kernel@vger.kernel.org>; Sun, 16 Jul 2023 17:03:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2D8CC433C7; Sun, 16 Jul 2023 17:03:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689527002; bh=R60+V/37UOZT1DTXQO/7MNYMa4wOfYncK+58obmAxSE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WUGEipBanle9RykyLDUpv89TBYjl9dD8EuRLFheAN90H2eFCNdnB+1lFFtiSAMgBq gE1IQNFslmIewyDH0wf5JNHioaV/ZtDHslPdKzF98jYnNxI0+Fc7rll2rUImziPxew 5gexT7/ZZODPt8EdF4CVrcWCE29G0qIk7l9kIwfqgMoK851S/Du2p1af3z/vD7pIsq ClDkFRfyLbFNW85ZLU1Rw3lVYIZ/THesHI1B9/tLf1yBLHxfmsFjll1yyHcVXksg6b ggo3OyWtGeVFYCI8OsEcWQ6bV4H2NiJ1Y2bfgCeIuQSKmG9+oiv4JwbsG2i8EnEAw2 mB8SUULb/TmNw== From: Jisheng Zhang <jszhang@kernel.org> To: Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu> Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] riscv: allow kmalloc() caches aligned to the smallest value Date: Mon, 17 Jul 2023 00:51:46 +0800 Message-Id: <20230716165147.1897-2-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230716165147.1897-1-jszhang@kernel.org> References: <20230716165147.1897-1-jszhang@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771597682812708946 X-GMAIL-MSGID: 1771597682812708946 |
Series |
riscv: Reduce ARCH_KMALLOC_MINALIGN to 8
|
|
Commit Message
Jisheng Zhang
July 16, 2023, 4:51 p.m. UTC
Currently, riscv defines ARCH_DMA_MINALIGN as L1_CACHE_BYTES, I.E
64Bytes, if CONFIG_RISCV_DMA_NONCOHERENT=y. To support unified kernel
Image, usually we have to enable CONFIG_RISCV_DMA_NONCOHERENT, thus
it brings some bad effects to coherent platforms:
Firstly, it wastes memory, kmalloc-96, kmalloc-32, kmalloc-16 and
kmalloc-8 slab caches don't exist any more, they are replaced with
either kmalloc-128 or kmalloc-64.
Secondly, larger than necessary kmalloc aligned allocations results
in unnecessary cache/TLB pressure.
This issue also exists on arm64 platforms. From last year, Catalin
tried to solve this issue by decoupling ARCH_KMALLOC_MINALIGN from
ARCH_DMA_MINALIGN, limiting kmalloc() minimum alignment to
dma_get_cache_alignment() and replacing ARCH_KMALLOC_MINALIGN usage
in various drivers with ARCH_DMA_MINALIGN etc.[1]
One fact we can make use of for riscv: if the CPU doesn't support
ZICBOM or T-HEAD CMO, we know the platform is coherent. Based on
Catalin's work and above fact, we can easily solve the kmalloc align
issue for riscv: we can override dma_get_cache_alignment(), then let
it return ARCH_DMA_MINALIGN at the beginning and return 1 once we know
the underlying HW neither supports ZICBOM nor supports T-HEAD CMO.
So what about if the CPU supports ZICBOM and T-HEAD CMO, but all the
devices are dma coherent? Well, we use ARCH_DMA_MINALIGN as the
kmalloc minimum alignment, nothing changed in this case. This case
can be improved in the future.
After this patch, a simple test of booting to a small buildroot rootfs
on qemu shows:
kmalloc-96 5041 5041 96 ...
kmalloc-64 9606 9606 64 ...
kmalloc-32 5128 5128 32 ...
kmalloc-16 7682 7682 16 ...
kmalloc-8 10246 10246 8 ...
So we save about 1268KB memory. The saving will be much larger in normal
OS env on real HW platforms.
[1] Link: https://lore.kernel.org/linux-arm-kernel/20230524171904.3967031-1-catalin.marinas@arm.com/
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Change-Id: Ica249d0f8058a02bd4bc6543b4ffc2946a4734a2
---
arch/riscv/include/asm/cache.h | 14 ++++++++++++++
arch/riscv/include/asm/cacheflush.h | 2 ++
arch/riscv/kernel/setup.c | 1 +
arch/riscv/mm/dma-noncoherent.c | 8 ++++++++
4 files changed, 25 insertions(+)
Comments
Hey Jisheng, On Mon, Jul 17, 2023 at 12:51:46AM +0800, Jisheng Zhang wrote: > Currently, riscv defines ARCH_DMA_MINALIGN as L1_CACHE_BYTES, I.E > 64Bytes, if CONFIG_RISCV_DMA_NONCOHERENT=y. To support unified kernel > Image, usually we have to enable CONFIG_RISCV_DMA_NONCOHERENT, thus > it brings some bad effects to coherent platforms: > > Firstly, it wastes memory, kmalloc-96, kmalloc-32, kmalloc-16 and > kmalloc-8 slab caches don't exist any more, they are replaced with > either kmalloc-128 or kmalloc-64. > > Secondly, larger than necessary kmalloc aligned allocations results > in unnecessary cache/TLB pressure. > > This issue also exists on arm64 platforms. From last year, Catalin > tried to solve this issue by decoupling ARCH_KMALLOC_MINALIGN from > ARCH_DMA_MINALIGN, limiting kmalloc() minimum alignment to > dma_get_cache_alignment() and replacing ARCH_KMALLOC_MINALIGN usage > in various drivers with ARCH_DMA_MINALIGN etc.[1] > > One fact we can make use of for riscv: if the CPU doesn't support > ZICBOM or T-HEAD CMO, we know the platform is coherent. Based on > Catalin's work and above fact, we can easily solve the kmalloc align > issue for riscv: we can override dma_get_cache_alignment(), then let > it return ARCH_DMA_MINALIGN at the beginning and return 1 once we know > the underlying HW neither supports ZICBOM nor supports T-HEAD CMO. > > So what about if the CPU supports ZICBOM and T-HEAD CMO, but all the > devices are dma coherent? Well, we use ARCH_DMA_MINALIGN as the > kmalloc minimum alignment, nothing changed in this case. This case > can be improved in the future. > > After this patch, a simple test of booting to a small buildroot rootfs > on qemu shows: > > kmalloc-96 5041 5041 96 ... > kmalloc-64 9606 9606 64 ... > kmalloc-32 5128 5128 32 ... > kmalloc-16 7682 7682 16 ... > kmalloc-8 10246 10246 8 ... > > So we save about 1268KB memory. The saving will be much larger in normal > OS env on real HW platforms. > > [1] Link: https://lore.kernel.org/linux-arm-kernel/20230524171904.3967031-1-catalin.marinas@arm.com/ In the future, Link: https://lore.kernel.org/linux-arm-kernel/20230524171904.3967031-1-catalin.marinas@arm.com/ [1] > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> > Change-Id: Ica249d0f8058a02bd4bc6543b4ffc2946a4734a2 How come this has ended up with a Change-ID? Checkpatch says this is something to do with Gerrit & needs to be removed. > --- > arch/riscv/include/asm/cache.h | 14 ++++++++++++++ > arch/riscv/include/asm/cacheflush.h | 2 ++ > arch/riscv/kernel/setup.c | 1 + > arch/riscv/mm/dma-noncoherent.c | 8 ++++++++ > 4 files changed, 25 insertions(+) > > diff --git a/arch/riscv/include/asm/cache.h b/arch/riscv/include/asm/cache.h > index d3036df23ccb..2174fe7bac9a 100644 > --- a/arch/riscv/include/asm/cache.h > +++ b/arch/riscv/include/asm/cache.h > @@ -13,6 +13,7 @@ > > #ifdef CONFIG_RISCV_DMA_NONCOHERENT > #define ARCH_DMA_MINALIGN L1_CACHE_BYTES > +#define ARCH_KMALLOC_MINALIGN (8) > #endif > > /* > @@ -23,4 +24,17 @@ > #define ARCH_SLAB_MINALIGN 16 > #endif > > +#ifndef __ASSEMBLY__ > + > +#ifdef CONFIG_RISCV_DMA_NONCOHERENT > +extern int dma_cache_alignment; > +#define dma_get_cache_alignment dma_get_cache_alignment > +static inline int dma_get_cache_alignment(void) > +{ > + return dma_cache_alignment; > +} > +#endif > + > +#endif /* __ASSEMBLY__ */ > + > #endif /* _ASM_RISCV_CACHE_H */ > diff --git a/arch/riscv/include/asm/cacheflush.h b/arch/riscv/include/asm/cacheflush.h > index 8091b8bf4883..c640ab6f843b 100644 > --- a/arch/riscv/include/asm/cacheflush.h > +++ b/arch/riscv/include/asm/cacheflush.h > @@ -55,8 +55,10 @@ void riscv_init_cbo_blocksizes(void); > > #ifdef CONFIG_RISCV_DMA_NONCOHERENT > void riscv_noncoherent_supported(void); > +void __init riscv_set_dma_cache_alignment(void); > #else > static inline void riscv_noncoherent_supported(void) {} > +static inline void riscv_set_dma_cache_alignment(void) {} > #endif > > /* > diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c > index 971fe776e2f8..027879b1557a 100644 > --- a/arch/riscv/kernel/setup.c > +++ b/arch/riscv/kernel/setup.c > @@ -311,6 +311,7 @@ void __init setup_arch(char **cmdline_p) > if (IS_ENABLED(CONFIG_RISCV_ISA_ZICBOM) && > riscv_isa_extension_available(NULL, ZICBOM)) > riscv_noncoherent_supported(); > + riscv_set_dma_cache_alignment(); > } > > static int __init topology_init(void) > diff --git a/arch/riscv/mm/dma-noncoherent.c b/arch/riscv/mm/dma-noncoherent.c > index d51a75864e53..811227e54bbd 100644 > --- a/arch/riscv/mm/dma-noncoherent.c > +++ b/arch/riscv/mm/dma-noncoherent.c > @@ -11,6 +11,8 @@ > #include <asm/cacheflush.h> > > static bool noncoherent_supported __ro_after_init; > +int dma_cache_alignment __ro_after_init = ARCH_DMA_MINALIGN; > +EXPORT_SYMBOL(dma_cache_alignment); Why is this not EXPORT_SYMBOL_GPL()? Otherwise, this is generally good to me, thanks. Conor. > > void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, > enum dma_data_direction dir) > @@ -78,3 +80,9 @@ void riscv_noncoherent_supported(void) > "Non-coherent DMA support enabled without a block size\n"); > noncoherent_supported = true; > } > + > +void __init riscv_set_dma_cache_alignment(void) > +{ > + if (!noncoherent_supported) > + dma_cache_alignment = 1; > +} > -- > 2.40.1 >
On Tue, Jul 18, 2023 at 11:23:50AM +0100, Conor Dooley wrote: > Hey Jisheng, > > On Mon, Jul 17, 2023 at 12:51:46AM +0800, Jisheng Zhang wrote: > > Currently, riscv defines ARCH_DMA_MINALIGN as L1_CACHE_BYTES, I.E > > 64Bytes, if CONFIG_RISCV_DMA_NONCOHERENT=y. To support unified kernel > > Image, usually we have to enable CONFIG_RISCV_DMA_NONCOHERENT, thus > > it brings some bad effects to coherent platforms: > > > > Firstly, it wastes memory, kmalloc-96, kmalloc-32, kmalloc-16 and > > kmalloc-8 slab caches don't exist any more, they are replaced with > > either kmalloc-128 or kmalloc-64. > > > > Secondly, larger than necessary kmalloc aligned allocations results > > in unnecessary cache/TLB pressure. > > > > This issue also exists on arm64 platforms. From last year, Catalin > > tried to solve this issue by decoupling ARCH_KMALLOC_MINALIGN from > > ARCH_DMA_MINALIGN, limiting kmalloc() minimum alignment to > > dma_get_cache_alignment() and replacing ARCH_KMALLOC_MINALIGN usage > > in various drivers with ARCH_DMA_MINALIGN etc.[1] > > > > One fact we can make use of for riscv: if the CPU doesn't support > > ZICBOM or T-HEAD CMO, we know the platform is coherent. Based on > > Catalin's work and above fact, we can easily solve the kmalloc align > > issue for riscv: we can override dma_get_cache_alignment(), then let > > it return ARCH_DMA_MINALIGN at the beginning and return 1 once we know > > the underlying HW neither supports ZICBOM nor supports T-HEAD CMO. > > > > So what about if the CPU supports ZICBOM and T-HEAD CMO, but all the > > devices are dma coherent? Well, we use ARCH_DMA_MINALIGN as the > > kmalloc minimum alignment, nothing changed in this case. This case > > can be improved in the future. > > > > After this patch, a simple test of booting to a small buildroot rootfs > > on qemu shows: > > > > kmalloc-96 5041 5041 96 ... > > kmalloc-64 9606 9606 64 ... > > kmalloc-32 5128 5128 32 ... > > kmalloc-16 7682 7682 16 ... > > kmalloc-8 10246 10246 8 ... > > > > So we save about 1268KB memory. The saving will be much larger in normal > > OS env on real HW platforms. > > > > [1] Link: https://lore.kernel.org/linux-arm-kernel/20230524171904.3967031-1-catalin.marinas@arm.com/ > > In the future, > > Link: https://lore.kernel.org/linux-arm-kernel/20230524171904.3967031-1-catalin.marinas@arm.com/ [1] > > > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> > > Change-Id: Ica249d0f8058a02bd4bc6543b4ffc2946a4734a2 > > How come this has ended up with a Change-ID? Checkpatch says this is > something to do with Gerrit & needs to be removed. Oops, when amending, I forgot to add "-n". And I thought only amending doesn't need to try checkpatch. Will fix it soon. Thank you. > > > --- > > arch/riscv/include/asm/cache.h | 14 ++++++++++++++ > > arch/riscv/include/asm/cacheflush.h | 2 ++ > > arch/riscv/kernel/setup.c | 1 + > > arch/riscv/mm/dma-noncoherent.c | 8 ++++++++ > > 4 files changed, 25 insertions(+) > > > > diff --git a/arch/riscv/include/asm/cache.h b/arch/riscv/include/asm/cache.h > > index d3036df23ccb..2174fe7bac9a 100644 > > --- a/arch/riscv/include/asm/cache.h > > +++ b/arch/riscv/include/asm/cache.h > > @@ -13,6 +13,7 @@ > > > > #ifdef CONFIG_RISCV_DMA_NONCOHERENT > > #define ARCH_DMA_MINALIGN L1_CACHE_BYTES > > +#define ARCH_KMALLOC_MINALIGN (8) > > #endif > > > > /* > > @@ -23,4 +24,17 @@ > > #define ARCH_SLAB_MINALIGN 16 > > #endif > > > > +#ifndef __ASSEMBLY__ > > + > > +#ifdef CONFIG_RISCV_DMA_NONCOHERENT > > +extern int dma_cache_alignment; > > +#define dma_get_cache_alignment dma_get_cache_alignment > > +static inline int dma_get_cache_alignment(void) > > +{ > > + return dma_cache_alignment; > > +} > > +#endif > > + > > +#endif /* __ASSEMBLY__ */ > > + > > #endif /* _ASM_RISCV_CACHE_H */ > > diff --git a/arch/riscv/include/asm/cacheflush.h b/arch/riscv/include/asm/cacheflush.h > > index 8091b8bf4883..c640ab6f843b 100644 > > --- a/arch/riscv/include/asm/cacheflush.h > > +++ b/arch/riscv/include/asm/cacheflush.h > > @@ -55,8 +55,10 @@ void riscv_init_cbo_blocksizes(void); > > > > #ifdef CONFIG_RISCV_DMA_NONCOHERENT > > void riscv_noncoherent_supported(void); > > +void __init riscv_set_dma_cache_alignment(void); > > #else > > static inline void riscv_noncoherent_supported(void) {} > > +static inline void riscv_set_dma_cache_alignment(void) {} > > #endif > > > > /* > > diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c > > index 971fe776e2f8..027879b1557a 100644 > > --- a/arch/riscv/kernel/setup.c > > +++ b/arch/riscv/kernel/setup.c > > @@ -311,6 +311,7 @@ void __init setup_arch(char **cmdline_p) > > if (IS_ENABLED(CONFIG_RISCV_ISA_ZICBOM) && > > riscv_isa_extension_available(NULL, ZICBOM)) > > riscv_noncoherent_supported(); > > + riscv_set_dma_cache_alignment(); > > } > > > > static int __init topology_init(void) > > diff --git a/arch/riscv/mm/dma-noncoherent.c b/arch/riscv/mm/dma-noncoherent.c > > index d51a75864e53..811227e54bbd 100644 > > --- a/arch/riscv/mm/dma-noncoherent.c > > +++ b/arch/riscv/mm/dma-noncoherent.c > > @@ -11,6 +11,8 @@ > > #include <asm/cacheflush.h> > > > > static bool noncoherent_supported __ro_after_init; > > +int dma_cache_alignment __ro_after_init = ARCH_DMA_MINALIGN; > > +EXPORT_SYMBOL(dma_cache_alignment); > > Why is this not EXPORT_SYMBOL_GPL()? > > Otherwise, this is generally good to me, thanks. > > Conor. > > > > > void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, > > enum dma_data_direction dir) > > @@ -78,3 +80,9 @@ void riscv_noncoherent_supported(void) > > "Non-coherent DMA support enabled without a block size\n"); > > noncoherent_supported = true; > > } > > + > > +void __init riscv_set_dma_cache_alignment(void) > > +{ > > + if (!noncoherent_supported) > > + dma_cache_alignment = 1; > > +} > > -- > > 2.40.1 > >
diff --git a/arch/riscv/include/asm/cache.h b/arch/riscv/include/asm/cache.h index d3036df23ccb..2174fe7bac9a 100644 --- a/arch/riscv/include/asm/cache.h +++ b/arch/riscv/include/asm/cache.h @@ -13,6 +13,7 @@ #ifdef CONFIG_RISCV_DMA_NONCOHERENT #define ARCH_DMA_MINALIGN L1_CACHE_BYTES +#define ARCH_KMALLOC_MINALIGN (8) #endif /* @@ -23,4 +24,17 @@ #define ARCH_SLAB_MINALIGN 16 #endif +#ifndef __ASSEMBLY__ + +#ifdef CONFIG_RISCV_DMA_NONCOHERENT +extern int dma_cache_alignment; +#define dma_get_cache_alignment dma_get_cache_alignment +static inline int dma_get_cache_alignment(void) +{ + return dma_cache_alignment; +} +#endif + +#endif /* __ASSEMBLY__ */ + #endif /* _ASM_RISCV_CACHE_H */ diff --git a/arch/riscv/include/asm/cacheflush.h b/arch/riscv/include/asm/cacheflush.h index 8091b8bf4883..c640ab6f843b 100644 --- a/arch/riscv/include/asm/cacheflush.h +++ b/arch/riscv/include/asm/cacheflush.h @@ -55,8 +55,10 @@ void riscv_init_cbo_blocksizes(void); #ifdef CONFIG_RISCV_DMA_NONCOHERENT void riscv_noncoherent_supported(void); +void __init riscv_set_dma_cache_alignment(void); #else static inline void riscv_noncoherent_supported(void) {} +static inline void riscv_set_dma_cache_alignment(void) {} #endif /* diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 971fe776e2f8..027879b1557a 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -311,6 +311,7 @@ void __init setup_arch(char **cmdline_p) if (IS_ENABLED(CONFIG_RISCV_ISA_ZICBOM) && riscv_isa_extension_available(NULL, ZICBOM)) riscv_noncoherent_supported(); + riscv_set_dma_cache_alignment(); } static int __init topology_init(void) diff --git a/arch/riscv/mm/dma-noncoherent.c b/arch/riscv/mm/dma-noncoherent.c index d51a75864e53..811227e54bbd 100644 --- a/arch/riscv/mm/dma-noncoherent.c +++ b/arch/riscv/mm/dma-noncoherent.c @@ -11,6 +11,8 @@ #include <asm/cacheflush.h> static bool noncoherent_supported __ro_after_init; +int dma_cache_alignment __ro_after_init = ARCH_DMA_MINALIGN; +EXPORT_SYMBOL(dma_cache_alignment); void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, enum dma_data_direction dir) @@ -78,3 +80,9 @@ void riscv_noncoherent_supported(void) "Non-coherent DMA support enabled without a block size\n"); noncoherent_supported = true; } + +void __init riscv_set_dma_cache_alignment(void) +{ + if (!noncoherent_supported) + dma_cache_alignment = 1; +}