linux-kernel - Re: [PATCH] mips: fix r3k_cache

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-prev] [day] [month] [year] [list]

Message-ID: <e7a5aae4-f3f6-449f-8877-16bfcc880b57@linaro.org>
Date: Tue, 26 Dec 2023 09:24:40 +0100
From: Philippe Mathieu-Daudé <philmd@...aro.org>
To: Arnd Bergmann <arnd@...nel.org>
Cc: Arnd Bergmann <arnd@...db.de>, Andrew Morton <akpm@...ux-foundation.org>,
 "kernelci . org bot" <bot@...nelci.org>,
 Thomas Bogendoerfer <tsbogend@...ha.franken.de>, Zi Yan <ziy@...dia.com>,
 Jiaxun Yang <jiaxun.yang@...goat.com>, linux-mips@...r.kernel.org,
 linux-kernel@...r.kernel.org
Subject: Re: [PATCH] mips: fix r3k_cache_init build regression

Hi Arnd,

On 14/12/23 21:54, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@...db.de>
> 
> My earlier patch removed __weak function declarations that used to
> be turned into wild branches by the linker, instead causing
> a link failure when the called functions are unavailable:
> 
> mips-linux-ld: arch/mips/mm/cache.o: in function `cpu_cache_init':
> cache.c:(.text+0x670): undefined reference to `r3k_cache_init'
> 
> The __weak method seems suboptimal, so rather than putting that
> back, make the function calls conditional on the Kconfig symbol
> that controls the compilation.
> 
> Reported-by: kernelci.org bot <bot@...nelci.org>
> Fixes: 66445677f01e ("mips: move cache declarations into header")
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
> ---
> My broken patch is currently in linux-mm, so the fix should
> be applied on top.
> ---
>   arch/mips/mm/cache.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
> index e5d19f4a38ba..b7ce73fba998 100644
> --- a/arch/mips/mm/cache.c
> +++ b/arch/mips/mm/cache.c
> @@ -205,14 +205,14 @@ static inline void setup_protection_map(void)
>   
>   void cpu_cache_init(void)
>   {
> -	if (cpu_has_3k_cache) {
> +	if (IS_ENABLED(CONFIG_CPU_R3000) && cpu_has_3k_cache) {
>   		r3k_cache_init();
>   	}
> -	if (cpu_has_4k_cache) {
> +	if (IS_ENABLED(CONFIG_CPU_R4K_CACHE_TLB) && cpu_has_4k_cache) {

Shouldn't we also check for CONFIG_CPU_SB1 enabled?
(See commit 641e97f31887 "Replace SB1 cachecode with standard
R4000 class cache code.")

With that:
Reviewed-by: Philippe Mathieu-Daudé <philmd@...aro.org>

>   		r4k_cache_init();
>   	}
>   
> -	if (cpu_has_octeon_cache) {
> +	if (IS_ENABLED(CONFIG_CPU_CAVIUM_OCTEON) && cpu_has_octeon_cache) {
>   		octeon_cache_init();
>   	}
>