Comment 10 for bug 1830872

Revision history for this message
Andrew Randrianasulu (andrew-randrianasulu) wrote : Re: [Bug 1830872] Re: AARCH64 to ARMv7 mistranslation in TCG

В сообщении от Monday 03 June 2019 18:51:40 Alex Bennée написал(а):
> I managed to tweak the memory test enough to detect the failure on
> aarch64-on-armv7 and I the attached patch fixes it. Could you please
> double check with your test case?
>

Hm, I manually applied path from LP(git diff disliked copypasted patch),
so for now git diff in qemu tree shows:

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index cdcc377102..b796ab1cbe 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -1303,7 +1303,7 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
         && unlikely((addr & ~TARGET_PAGE_MASK) + size - 1
                     >= TARGET_PAGE_SIZE)) {
         target_ulong addr1, addr2;
- tcg_target_ulong r1, r2;
+ uint64_t r1, r2;
         unsigned shift;
     do_unaligned_access:
         addr1 = addr & ~(size - 1);
lines 1-13/13 (END)

---------

but x86_64-softmmu/qemu-system-x86_64 -kernel /boot/bzImage-4.12.0-x64 -accel tcg
still hangs at 'booting the kernel" (it decompress OK)

I make distclean'ed source tree and reconfigured it:
 ./configure --target-list=x86_64-softmmu --disable-werror --enable-debug-tcg --cross-cc-x86_64="/opt/kgcc64/bin/x86_64-unknown-linux-gnu-gcc-6.5.0"

next, make -j 5 and test.

Hm.

I tried debug switches, it seems to hang a bit differently for two runs:

x86_64-softmmu/qemu-system-x86_64 -kernel /boot/bzImage-4.12.0-x64 -accel tcg -nographic -d in_asm,op,op_opt,op_ind,out_asm

=====================

IN:
0xffffffff810e8a63: 48 83 c3 64 addq $0x64, %rbx
0xffffffff810e8a67: eb c2 jmp 0xffffffff810e8a2b

OP:
 ld_i32 tmp18,env,$0xfffffff0
 movi_i32 tmp19,$0x0
 brcond_i32 tmp18,tmp19,lt,$L0

 ---- ffffffff810e8a63 0000000000000000
 movi_i32 tmp2,$0x64
 movi_i32 tmp3,$0x0
 mov_i32 tmp0,rbx_0
 mov_i32 tmp1,rbx_1
 add2_i32 tmp0,tmp1,tmp0,tmp1,tmp2,tmp3
 mov_i32 rbx_0,tmp0
 mov_i32 rbx_1,tmp1
 mov_i32 cc_src_0,tmp2
 mov_i32 cc_src_1,tmp3
 mov_i32 cc_dst_0,tmp0
 mov_i32 cc_dst_1,tmp1
 discard cc_src2_0
 discard cc_src2_1
 discard cc_op

 ---- ffffffff810e8a67 0000000000000009
 movi_i32 cc_op,$0x9
 goto_tb $0x0
 movi_i32 tmp6,$0x810e8a2b
 movi_i32 tmp7,$0xffffffff
 st_i32 tmp6,env,$0x80
 st_i32 tmp7,env,$0x84
 exit_tb $0xf2f1c080
 set_label $L0
 exit_tb $0xf2f1c083

OP after optimization and liveness analysis:
 ld_i32 tmp18,env,$0xfffffff0 dead: 1 pref=0xff
 movi_i32 tmp19,$0x0 pref=0xff
 brcond_i32 tmp18,tmp19,lt,$L0 dead: 0 1

 ---- ffffffff810e8a63 0000000000000000
 movi_i32 tmp2,$0x64 pref=0xff
 movi_i32 tmp3,$0x0 pref=0xff
 add2_i32 tmp0,tmp1,rbx_0,rbx_1,tmp2,tmp3 dead: 2 3 pref=0xff,0xff
 mov_i32 rbx_0,tmp0 sync: 0 dead: 1 pref=0xff
 mov_i32 rbx_1,tmp1 sync: 0 dead: 1 pref=0xff
 mov_i32 cc_src_0,tmp2 sync: 0 dead: 0 1 pref=0xff
 mov_i32 cc_src_1,tmp3 sync: 0 dead: 0 1 pref=0xff
 mov_i32 cc_dst_0,rbx_0 sync: 0 dead: 0 1 pref=0xff
 mov_i32 cc_dst_1,rbx_1 sync: 0 dead: 0 1 pref=0xff
 discard cc_src2_0 pref=0xff
 discard cc_src2_1 pref=0xff
 discard cc_op pref=0xff mov_i32 cc_dst_0,tmp0
 mov_i32 cc_dst_1,tmp1
 discard cc_src2_0
 discard cc_src2_1
 discard cc_op

 ---- ffffffff810e8a55 0000000000000021
 movi_i32 cc_op,$0x21
 movi_i32 tmp20,$0x0
 movi_i32 tmp21,$0x0
 brcond2_i32 cc_dst_0,cc_dst_1,tmp20,tmp21,eq,$L1
 goto_tb $0x0
 movi_i32 tmp6,$0x810e8a57
 movi_i32 tmp7,$0xffffffff
 st_i32 tmp6,env,$0x80
 st_i32 tmp7,env,$0x84
 exit_tb $0xf2f1c180
 set_label $L1
 goto_tb $0x1
 movi_i32 tmp6,$0x810e8a63
 movi_i32 tmp7,$0xffffffff
 st_i32 tmp6,env,$0x80
 st_i32 tmp7,env,$0x84
 exit_tb $0xf2f1c181
 set_label $L0
 exit_tb $0xf2f1c183

OP after optimization and liveness analysis:
 ld_i32 tmp18,env,$0xfffffff0 dead: 1 pref=0xff
 movi_i32 tmp19,$0x0 pref=0xff
 brcond_i32 tmp18,tmp19,lt,$L0 dead: 0 1

 ---- ffffffff810e8a4c 0000000000000000

 ---- ffffffff810e8a52 0000000000000000
 movi_i32 tmp1,$0x0 pref=0xff
 movi_i32 tmp0,$0x64 pref=0xff
 mov_i32 r14_0,tmp0 sync: 0 dead: 1 pref=0xf8
 mov_i32 r14_1,tmp1 sync: 0 dead: 1 pref=0xf8
 call cc_compute_c,$0x5,$2,cc_src_0,cc_src_1,cc_dst_0,cc_dst_1,cc_src_0,cc_src_1,cc_src2_0,cc_src2_1,cc_op sync: 0 1 dead: 0 1 2 3 4 5 6 7 8 pref=none,none
 mov_i32 cc_dst_0,r14_0 sync: 0 dead: 0 1 pref=0xff
 mov_i32 cc_dst_1,r14_1 sync: 0 dead: 0 1 pref=0xffУбито

(killed by me)

==================

IN:
0xffffffff810e8a61: eb ef jmp 0xffffffff810e8a52

OP:
 ld_i32 tmp18,env,$0xfffffff0
 movi_i32 tmp19,$0x0
 brcond_i32 tmp18,tmp19,lt,$L0

 ---- ffffffff810e8a61 0000000000000000
 goto_tb $0x0
 movi_i32 tmp6,$0x810e8a52
 movi_i32 tmp7,$0xffffffff
 st_i32 tmp6,env,$0x80
 st_i32 tmp7,env,$0x84
 exit_tb $0xf2f22900
 set_label $L0
 exit_tb $0xf2f22903

OP after optimization and liveness analysis:
 ld_i32 tmp18,env,$0xfffffff0 dead: 1 pref=0xff
 movi_i32 tmp19,$0x0 pref=0xff
 brcond_i32 tmp18,tmp19,lt,$L0 dead: 0 1

 ---- ffffffff810e8a61 0000000000000000
 goto_tb $0x0
 movi_i32 tmp6,$0x810e8a52 pref=0xff
 movi_i32 tmp7,$0xffffffff pref=0xff
 st_i32 tmp6,env,$0x80 dead: 0
 st_i32 tmp7,env,$0x84 dead: 0 1
 exit_tb $0xf2f22900
 set_label $L0
 exit_tb $0xf2f22903

OUT: [size=56]
0xf2f22980: 8b 5d f0 movl -0x10(%ebp), %ebx
0xf2f22983: 85 db testl %ebx, %ebx
0xf2f22985: 0f 8c 23 00 00 00 jl 0xf2f229ae
0xf2f2298b: e9 00 00 00 00 jmp 0xf2f22990
0xf2f22990: c7 85 80 00 00 00 52 8a movl $0x810e8a52, 0x80(%ebp)
0xf2f22998: 0e 81
0xf2f2299a: c7 85 84 00 00 00 ff ff movl $0xffffffff, 0x84(%ebp)
0xf2f229a2: ff ff
0xf2f229a4: b8 00 29 f2 f2 movl $0xf2f22900, %eax
0xf2f229a9: e9 69 46 c9 ff jmp 0xf2bb7017
0xf2f229ae: b8 03 29 f2 f2 movl $0xf2f22903, %eax
0xf2f229b3: e9 5f 46 c9 ff jmp 0xf2bb7017

----------------
IN:
0xffffffff810e8a52: 49 ff ce decq %r14
0xffffffff810e8a55: 74 0c je 0xffffffff810e8a63

OP:
 ld_i32 tmp18,env,$0xfffffff0
 movi_i32 tmp19,$0x0
 brcond_i32 tmp18,tmp19,lt,$L0

 ---- ffffffff810e8a52 0000000000000000
 mov_i32 tmp0,r14_0
 mov_i32 tmp1,r14_1
 mov_i32 tmp0,r14_0
 mov_i32 tmp1,r14_1
 movi_i32 tmp20,$0xffffffff
 movi_i32 tmp21,$0xffffffff
 add2_i32 tmp0,tmp1,tmp0,tmp1,tmp20,tmp21
 mov_i32 r14_0,tmp0
 mov_i32 r14_1,tmp1
 call cc_compute_c,$0x5,$2,cc_src_0,cc_src_1,cc_dst_0,cc_dst_1,cc_src_0,cc_src_1,cc_src2_0,cc_src2_1,cc_op
 mov_i32 cc_dst_0,tmp0
 mov_i32 cc_dst_1,tmp1
 discard cc_src2_0
 discard cc_src2_1
 discard cc_op

 ---- ffffffff810e8a55 0000000000000021 mov_i32 cc_dst_0,r14_0 sync: 0 dead: 1 pref=0xff
 mov_i32 cc_dst_1,r14_1 sync: 0 dead: 1 pref=0xff
 discard cc_src2_0 pref=0xff
 discard cc_src2_1 pref=0xff
 discard cc_op pref=0xff

 ---- ffffffff810e8a55 0000000000000021
 movi_i32 cc_op,$0x21 sync: 0 dead: 0 pref=0xff
 movi_i32 tmp20,$0x0 pref=0xff
 movi_i32 tmp21,$0x0 pref=0xff
 brcond2_i32 cc_dst_0,cc_dst_1,tmp20,tmp21,eq,$L1 dead: 0 1 2 3
 goto_tb $0x0
 movi_i32 tmp6,$0x810e8a57 pref=0xff
 movi_i32 tmp7,$0xffffffff pref=0xff
 st_i32 tmp6,env,$0x80 dead: 0
 st_i32 tmp7,env,$0x84 dead: 0 1
 exit_tb $0xf2f229c0
 set_label $L1
 goto_tb $0x1
 movi_i32 tmp6,$0x810e8a63 pref=0xff movi_i32 cc_op,$0x9 sync: 0 dead: 0 pref=0xff
 goto_tb $0x0
 movi_i32 tmp6,$0x810e8a2b pref=0xff
 movi_i32 tmp7,$0xffffffff pref=0xff
 st_i32 tmp6,env,$0x80 dead: 0
 st_i32 tmp7,env,$0x84 dead: 0 1
 exit_tb $0xf2f22b40
 set_label $L0
 exit_tb $0xf2f22b43

OUT: [size=116]
0xf2f22bc0: 8b 5d f0 movl -0x10(%ebp), %ebx
0xf2f22bc3: 85 db testl %ebx, %ebx
0xf2f22bc5: 0f 8c 5f 00 00 00 jl 0xf2f22c2a
0xf2f22bcb: 8b 5d 18 movl 0x18(%ebp), %ebx
0xf2f22bce: 8b 75 1c movl 0x1c(%ebp), %esi
0xf2f22bd1: 83 c3 64 addl $0x64, %ebx
0xf2f22bd4: 83 d6 00 adcl $0, %esi
0xf2f22bd7: 89 5d 18 movl %ebx, 0x18(%ebp)
Убито

=============================

try kernel I use (it works with qemu compiiled under 64-bit Slackware, and also with kvm on 32-bit x86)

sha256sum /boot/bzImage-4.12.0-x64
b4183376de17e8ea7a25094b7a526e99bcb8339b8703090684c93e0e0a50d284 /boot/bzImage-4.12.0-x64