[PATCH] target/mips: Fix address space range declaration on n32

[PATCH] target/mips: Fix address space range declaration on n32

[WANG Xuerui]

This bug is probably lurking there for so long, I cannot even git-blame
my way to the commit first introducing it.

Anyway, because n32 is also TARGET_MIPS64, the address space range
cannot be determined by looking at TARGET_MIPS64 alone. Fix this by only
declaring 48-bit address spaces for n64, or the n32 user emulation will
happily hand out memory ranges beyond the 31-bit limit and crash.

Confirmed to make the minimal reproducing example in the linked issue
behave.

Closes: https://gitlab.com/qemu-project/qemu/-/issues/939
Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
Cc: Andreas K. Hüttel <dilfridge@gentoo.org>
---
 target/mips/cpu-param.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/mips/cpu-param.h b/target/mips/cpu-param.h
index 9c4a6ea45e2..1aebd01df9c 100644
--- a/target/mips/cpu-param.h
+++ b/target/mips/cpu-param.h
@@ -12,7 +12,7 @@
 #else
 # define TARGET_LONG_BITS 32
 #endif
-#ifdef TARGET_MIPS64
+#ifdef TARGET_ABI_MIPSN64
 #define TARGET_PHYS_ADDR_SPACE_BITS 48
 #define TARGET_VIRT_ADDR_SPACE_BITS 48
 #else
-- 
2.35.1

Re: [PATCH] target/mips: Fix address space range declaration on n32

[Andreas K. Huettel]

[-- Attachment #1: Type: text/plain, Size: 1605 bytes --]

Am Sonntag, 27. März 2022, 07:34:55 CEST schrieb WANG Xuerui:
> This bug is probably lurking there for so long, I cannot even git-blame
> my way to the commit first introducing it.
> 
> Anyway, because n32 is also TARGET_MIPS64, the address space range
> cannot be determined by looking at TARGET_MIPS64 alone. Fix this by only
> declaring 48-bit address spaces for n64, or the n32 user emulation will
> happily hand out memory ranges beyond the 31-bit limit and crash.
> 
> Confirmed to make the minimal reproducing example in the linked issue
> behave.
> 
> Closes: https://gitlab.com/qemu-project/qemu/-/issues/939
> Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
> Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
> Cc: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
> Cc: Andreas K. Hüttel <dilfridge@gentoo.org>
> ---

Tested-by: Andreas K. Huettel <dilfridge@gentoo.org>

>  target/mips/cpu-param.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/target/mips/cpu-param.h b/target/mips/cpu-param.h
> index 9c4a6ea45e2..1aebd01df9c 100644
> --- a/target/mips/cpu-param.h
> +++ b/target/mips/cpu-param.h
> @@ -12,7 +12,7 @@
>  #else
>  # define TARGET_LONG_BITS 32
>  #endif
> -#ifdef TARGET_MIPS64
> +#ifdef TARGET_ABI_MIPSN64
>  #define TARGET_PHYS_ADDR_SPACE_BITS 48
>  #define TARGET_VIRT_ADDR_SPACE_BITS 48
>  #else
> 


-- 
Andreas K. Hüttel
dilfridge@gentoo.org
Gentoo Linux developer
(council, toolchain, base-system, perl, libreoffice)

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 981 bytes --]

Re: [PATCH] target/mips: Fix address space range declaration on n32

[Richard Henderson]

On 3/26/22 23:34, WANG Xuerui wrote:
> This bug is probably lurking there for so long, I cannot even git-blame
> my way to the commit first introducing it.
> 
> Anyway, because n32 is also TARGET_MIPS64, the address space range
> cannot be determined by looking at TARGET_MIPS64 alone. Fix this by only
> declaring 48-bit address spaces for n64, or the n32 user emulation will
> happily hand out memory ranges beyond the 31-bit limit and crash.
> 
> Confirmed to make the minimal reproducing example in the linked issue
> behave.
> 
> Closes:https://gitlab.com/qemu-project/qemu/-/issues/939
> Signed-off-by: WANG Xuerui<xen0n@gentoo.org>
> Cc: Philippe Mathieu-Daudé<f4bug@amsat.org>
> Cc: Aurelien Jarno<aurelien@aurel32.net>
> Cc: Jiaxun Yang<jiaxun.yang@flygoat.com>
> Cc: Aleksandar Rikalo<aleksandar.rikalo@syrmia.com>
> Cc: Andreas K. Hüttel<dilfridge@gentoo.org>
> ---
>   target/mips/cpu-param.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

This is what I was expecting, when I read the issue report.
Thanks,

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~