Skip to contentSkip to conversation

s390x/tcg: Fix VERIM with 32/64 bit elements

PATCH Applied David Hildenbrand 2 participants 4 messages Aug 14, 2019 – Aug 15, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390x/tcg: Fix VERIM with 32/64 bit elements

Wrong order of operands. The constant always comes last. Makes QEMU crash reliably on specific git fetch invocations.

---

I guess it is too late for 4.1 :(

---
 target/s390x/translate_vx.inc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target/s390x/translate_vx.inc.c +1 -1
index 41d5cf869f..0caddb3958 100644
@@ -213,7 +213,7 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8_t reg, TCGv_i64 enr,
                        vec_full_reg_offset(v3), ptr, 16, 16, data, fn)
 #define gen_gvec_3i(v1, v2, v3, c, gen) \
     tcg_gen_gvec_3i(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \
-                    vec_full_reg_offset(v3), c, 16, 16, gen)
+                    vec_full_reg_offset(v3), 16, 16, c, gen)
 #define gen_gvec_4(v1, v2, v3, v4, gen) \
     tcg_gen_gvec_4(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \
                    vec_full_reg_offset(v3), vec_full_reg_offset(v4), \
Signature · 1 line
2.21.0
#1 lore raw
Quoted 8 lines · On Wed, 14 Aug 2019 17:12:42 +0200 David Hildenbrand <[email protected]> wrote:

Wrong order of operands. The constant always comes last. Makes QEMU crash reliably on specific git fetch invocations.

---

I guess it is too late for 4.1 :(

Yup :(

But cc:stable worthy, I guess.

Quoted 18 lines
---
 target/s390x/translate_vx.inc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target/s390x/translate_vx.inc.c +1 -1
index 41d5cf869f..0caddb3958 100644
@@ -213,7 +213,7 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8_t reg, TCGv_i64 enr,
                        vec_full_reg_offset(v3), ptr, 16, 16, data, fn)
 #define gen_gvec_3i(v1, v2, v3, c, gen) \
     tcg_gen_gvec_3i(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \
-                    vec_full_reg_offset(v3), c, 16, 16, gen)
+                    vec_full_reg_offset(v3), 16, 16, c, gen)
 #define gen_gvec_4(v1, v2, v3, v4, gen) \
     tcg_gen_gvec_4(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \
                    vec_full_reg_offset(v3), vec_full_reg_offset(v4), \
#2 lore raw
Quoted 10 lines · Cornelia Huck
Quoted 7 lines · On Wed, 14 Aug 2019 17:12:42 +0200 David Hildenbrand <[email protected]> wrote:

Wrong order of operands. The constant always comes last. Makes QEMU crash reliably on specific git fetch invocations.

---

Quoted 6 lines
Quoted 1 line

I guess it is too late for 4.1 :(

Yup :(

But cc:stable worthy, I guess.

Yes. Added this bug to

https://wiki.qemu.org/Planning/4.1#Not_yet_fixed_in_any_rc

Quoted 19 lines
Quoted 18 lines
---
 target/s390x/translate_vx.inc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target/s390x/translate_vx.inc.c +1 -1
index 41d5cf869f..0caddb3958 100644
@@ -213,7 +213,7 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8_t reg, TCGv_i64 enr,
                        vec_full_reg_offset(v3), ptr, 16, 16, data, fn)
 #define gen_gvec_3i(v1, v2, v3, c, gen) \
     tcg_gen_gvec_3i(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \
-                    vec_full_reg_offset(v3), c, 16, 16, gen)
+                    vec_full_reg_offset(v3), 16, 16, c, gen)
 #define gen_gvec_4(v1, v2, v3, v4, gen) \
     tcg_gen_gvec_4(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \
                    vec_full_reg_offset(v3), vec_full_reg_offset(v4), \
Signature · 3 lines
Thanks,

David / dhildenb
Reviewed-by on v1 1/1 Applied
#3 lore raw
In reply to David Hildenbrand
Quoted 18 lines · On Wed, 14 Aug 2019 17:12:42 +0200 David Hildenbrand <[email protected]> wrote:

Wrong order of operands. The constant always comes last. Makes QEMU crash reliably on specific git fetch invocations.

---

I guess it is too late for 4.1 :(

---
 target/s390x/translate_vx.inc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target/s390x/translate_vx.inc.c +0 -0
index 41d5cf869f..0caddb3958 100644

target/s390x/translate_vx.inc.c static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8_t reg, TCGv_i64 enr, · line 219

Quoted 8 lines
target/s390x/translate_vx.inc.c +1 -1
@@ -213,7 +213,7 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8_t reg, TCGv_i64 enr,
                        vec_full_reg_offset(v3), ptr, 16, 16, data, fn)
 #define gen_gvec_3i(v1, v2, v3, c, gen) \
     tcg_gen_gvec_3i(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \
-                    vec_full_reg_offset(v3), c, 16, 16, gen)
+                    vec_full_reg_offset(v3), 16, 16, c, gen)
 #define gen_gvec_4(v1, v2, v3, v4, gen) \
     tcg_gen_gvec_4(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \
                    vec_full_reg_offset(v3), vec_full_reg_offset(v4), \
Fixes 5c4b0ab460ef ("s390x/tcg: Implement VECTOR ELEMENT ROTATE AND INSERT UNDER MASK")

Thanks, applied.