Message ID | 1435657794-6230-1-git-send-email-laurent@vivier.eu |
---|---|
State | New |
Headers | show |
On 06/30/15 11:49, Laurent Vivier wrote: > In qemu-linux-user, when calling gethostbyname2(), > it was hanging in .__res_nmkquery. > > (gdb) bt > 0 in .__res_nmkquery () from /lib64/libresolv.so.2 > 1 in .__libc_res_nquery () from /lib64/libresolv.so.2 > 2 in .__libc_res_nsearch () from /lib64/libresolv.so.2 > 3 in ._nss_dns_gethostbyname3_r () from /lib64/libnss_dns.so.2 > 4 in ._nss_dns_gethostbyname2_r () from /lib64/libnss_dns.so.2 > 5 in .gethostbyname2_r () from /lib64/libc.so.6 > 6 in .gethostbyname2 () from /lib64/libc.so.6 > > .__res_nmkquery() is: > > ... > do { RANDOM_BITS (randombits); } while ((randombits & 0xffff) == 0); > ... > > <.__res_nmkquery+112>: mftbl r11 > <.__res_nmkquery+116>: clrlwi r10,r11,16 > <.__res_nmkquery+120>: cmpwi cr7,r10,0 > <.__res_nmkquery+124>: beq cr7,<.__res_nmkquery+112> > > but as mftbl (Move From Time Base Lower) is not implemented, > r11 is always 0, so we have an infinite loop. > > This patch fills the Time Base register with cpu_get_real_ticks(). > > Signed-off-by: Laurent Vivier <laurent@vivier.eu> Thanks, applied to ppc-next. Riku, if you want to veto, feel free to :). Alex
diff --git a/linux-user/main.c b/linux-user/main.c index 47ab017..9879370 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -1424,8 +1424,7 @@ void cpu_loop (CPUSPARCState *env) #ifdef TARGET_PPC static inline uint64_t cpu_ppc_get_tb(CPUPPCState *env) { - /* TO FIX */ - return 0; + return cpu_get_real_ticks(); } uint64_t cpu_ppc_load_tbl(CPUPPCState *env)
In qemu-linux-user, when calling gethostbyname2(), it was hanging in .__res_nmkquery. (gdb) bt 0 in .__res_nmkquery () from /lib64/libresolv.so.2 1 in .__libc_res_nquery () from /lib64/libresolv.so.2 2 in .__libc_res_nsearch () from /lib64/libresolv.so.2 3 in ._nss_dns_gethostbyname3_r () from /lib64/libnss_dns.so.2 4 in ._nss_dns_gethostbyname2_r () from /lib64/libnss_dns.so.2 5 in .gethostbyname2_r () from /lib64/libc.so.6 6 in .gethostbyname2 () from /lib64/libc.so.6 .__res_nmkquery() is: ... do { RANDOM_BITS (randombits); } while ((randombits & 0xffff) == 0); ... <.__res_nmkquery+112>: mftbl r11 <.__res_nmkquery+116>: clrlwi r10,r11,16 <.__res_nmkquery+120>: cmpwi cr7,r10,0 <.__res_nmkquery+124>: beq cr7,<.__res_nmkquery+112> but as mftbl (Move From Time Base Lower) is not implemented, r11 is always 0, so we have an infinite loop. This patch fills the Time Base register with cpu_get_real_ticks(). Signed-off-by: Laurent Vivier <laurent@vivier.eu> --- linux-user/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)