[PULL 0/1] LoongArch fix for 9.1

[PULL 0/1] LoongArch fix for 9.1

[Song Gao]

The following changes since commit 6410f877f5ed535acd01bbfaa4baec379e44d0ef:

  Merge tag 'hw-misc-20240723' of https://github.com/philmd/qemu into staging (2024-07-24 15:39:43 +1000)

are available in the Git repository at:

  https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240724

for you to fetch changes up to a18ffbcf8b9fabfc6c850ebb1d3e40a21b885c67:

  target/loongarch: Fix helper_lddir() a CID INTEGER_OVERFLOW issue (2024-07-24 16:52:18 +0800)

----------------------------------------------------------------
Fix for 9.1

----------------------------------------------------------------
Song Gao (1):
      target/loongarch: Fix helper_lddir() a CID INTEGER_OVERFLOW issue

 target/loongarch/tcg/tlb_helper.c | 1 +
 1 file changed, 1 insertion(+)

[PULL 1/1] target/loongarch: Fix helper_lddir() a CID INTEGER_OVERFLOW issue

[Song Gao]

When the lddir level is 4 and the base is a HugePage, we may try to put value 4
into a field in the TLBENTRY that is only 2 bits wide.

Fixes: Coverity CID 1547717
Fixes: 9c70db9a43388 ("target/loongarch: Fix tlb huge page loading issue")
Signed-off-by: Song Gao <gaosong@loongson.cn>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240724015853.1317396-1-gaosong@loongson.cn>
---
 target/loongarch/tcg/tlb_helper.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/loongarch/tcg/tlb_helper.c b/target/loongarch/tcg/tlb_helper.c
index d6331f9b0b..97f38fc391 100644
--- a/target/loongarch/tcg/tlb_helper.c
+++ b/target/loongarch/tcg/tlb_helper.c
@@ -525,6 +525,7 @@ target_ulong helper_lddir(CPULoongArchState *env, target_ulong base,
         if (unlikely(level == 4)) {
             qemu_log_mask(LOG_GUEST_ERROR,
                           "Attempted use of level 4 huge page\n");
+            return base;
         }
 
         if (FIELD_EX64(base, TLBENTRY, LEVEL)) {
-- 
2.34.1

Re: [PULL 0/1] LoongArch fix for 9.1

[Richard Henderson]

On 7/24/24 18:39, Song Gao wrote:
> The following changes since commit 6410f877f5ed535acd01bbfaa4baec379e44d0ef:
> 
>    Merge tag 'hw-misc-20240723' ofhttps://github.com/philmd/qemu into staging (2024-07-24 15:39:43 +1000)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240724
> 
> for you to fetch changes up to a18ffbcf8b9fabfc6c850ebb1d3e40a21b885c67:
> 
>    target/loongarch: Fix helper_lddir() a CID INTEGER_OVERFLOW issue (2024-07-24 16:52:18 +0800)
> 
> ----------------------------------------------------------------
> Fix for 9.1

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/9.1 as appropriate.

r~

[PULL 0/1] LoongArch: Fix for 9.1

[Song Gao]

The following changes since commit 4220ebde107c44412755d593fb46e168eeaed936:

  Merge tag 'migration-20240820-pull-request' of https://gitlab.com/farosas/qemu into staging (2024-08-21 08:46:45 +1000)

are available in the Git repository at:

  https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240821

for you to fetch changes up to d4f5e5af86d2e28edb578e556b307e3ad01ebf08:

  hw/loongarch: Fix length for lowram in ACPI SRAT (2024-08-21 11:01:09 +0800)

----------------------------------------------------------------
Fix for 9.1

----------------------------------------------------------------
Jiaxun Yang (1):
      hw/loongarch: Fix length for lowram in ACPI SRAT

 hw/loongarch/acpi-build.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Re: [PULL 0/1] LoongArch: Fix for 9.1

[Richard Henderson]

On 8/21/24 12:47, Song Gao wrote:
> The following changes since commit 4220ebde107c44412755d593fb46e168eeaed936:
> 
>    Merge tag 'migration-20240820-pull-request' ofhttps://gitlab.com/farosas/qemu into staging (2024-08-21 08:46:45 +1000)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240821
> 
> for you to fetch changes up to d4f5e5af86d2e28edb578e556b307e3ad01ebf08:
> 
>    hw/loongarch: Fix length for lowram in ACPI SRAT (2024-08-21 11:01:09 +0800)


Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/9.1 as appropriate.

r~