linux-user: strace improvements
v8 cover linux-user: strace improvements
Hi Laurent,
Few patches I'v been writting while trying to figure out this issue:
http://lists.nongnu.org/archive/html/qemu-arm/2018-01/msg00514.html
As usual with linux-user files, this series will trigger some checkpatch benign warnings.
Regards,
Phil.
Since v7:
- use tswap32,
- do not name print_sockaddr prototype arguments
- use abi_int for target_sockaddr_ll.sll_ifindex
- added R-b tags
Since v6:
- Use ABI types in sockaddr
Since v5:
- dropped 'Verify recvfrom(addr)' since failing LTP testsuite (see [1])
- also define print_sockfd() for bind() (patches #6 and #7)
Since v4:
- rebased on master (no change)
Since v3:
- addressed Laurent comments
- added print_sockfd()
- removed the print_sockaddr_ptr() patch, also the two getsockname()/recvfrom() patches for after 3.0.
Since v2:
- display invalid pointer in print_timeval() and print_timezone()
- do not display gettimeofday() arguments
Since v1:
- addressed Laurent comments
- added 'last' argument to print_sockaddr()
- reordered series, so patches already correct can get applied directly
- dropped "linux-user/syscall: simplify recvfrom()" for now
v1: http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg05855.html
v2: http://lists.nongnu.org/archive/html/qemu-devel/2018-06/msg08216.html
v3: http://lists.nongnu.org/archive/html/qemu-devel/2018-07/msg00411.html
v5: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg02067.html
v6: https://lists.gnu.org/archive/html/qemu-devel/2019-09/msg01346.html
v7: https://lists.gnu.org/archive/html/qemu-devel/2019-09/msg03114.html
[1] https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg02807.html
Philippe Mathieu-Daudé (9):
linux-user/strace: Display invalid pointer in print_timeval() linux-user/strace: Add print_timezone() linux-user/strace: Improve settimeofday() linux-user/syscall: Introduce target_sockaddr_nl linux-user/strace: Dump AF_NETLINK sockaddr content linux-user/strace: Add print_sockfd() linux-user/strace: Improve bind() output linux-user/strace: Let print_sockaddr() have a 'last' argument linux-user/syscall: Align target_sockaddr fields using ABI types
linux-user/strace.c | 120 +++++++++++++++++++++++++++++++++----- linux-user/strace.list | 4 +- linux-user/syscall.c | 6 +- linux-user/syscall_defs.h | 41 +++++++------ 4 files changed, 137 insertions(+), 34 deletions(-)
Signature · 1 line
2.21.0
PATCH v8 1/9 linux-user/strace: Display invalid pointer in print_timeval()
--- linux-user/strace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
linux-user/strace.c +3 -1
@@ -1243,8 +1243,10 @@ print_timeval(abi_ulong tv_addr, int last)struct target_timeval *tv; tv =lock_user (VERIFY_READ , tv_addr,sizeof (*tv),1 ); -if (!tv) +if (!tv) { +print_pointer (tv_addr, last);return ; + }gemu_log ("{" TARGET_ABI_FMT_ld"," TARGET_ABI_FMT_ld"}%s" ,tswapal (tv->tv_sec),tswapal (tv->tv_usec),get_comma (last));unlock_user (tv, tv_addr,0 );
Signature · 1 line
2.21.0
Laurent Vivier
AppliedRe: [PATCH v8 1/9] linux-user/strace: Display invalid pointer in print_timeval()
Le 21/10/2019 à 13:48, Philippe Mathieu-Daudé a écrit :
Quoted 14 lines
Suggested-by Laurent Vivier <[email protected]>Reviewed-by Laurent Vivier <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- linux-user/strace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)linux-user/strace.c +0
-0@@ -1243,8 +1243,10 @@ print_timeval(abi_ulong tv_addr, int last)struct target_timeval *tv;
linux-user/strace.c print_timeval(abi_ulong tv_addr, int last) · line 1252
Quoted 10 lines
linux-user/strace.c +3
-1tv =lock_user (VERIFY_READ , tv_addr,sizeof (*tv),1 ); -if (!tv) +if (!tv) { +print_pointer (tv_addr, last);return ; + }gemu_log ("{" TARGET_ABI_FMT_ld"," TARGET_ABI_FMT_ld"}%s" ,tswapal (tv->tv_sec),tswapal (tv->tv_usec),get_comma (last));unlock_user (tv, tv_addr,0 );
Applied to my linux-user branch.
Thanks,
Laurent
PATCH v8 2/9 linux-user/strace: Add print_timezone()
In reply to Philippe Mathieu-Daudé---
v7: tz_minuteswest and tz_dsttime are abi_int -> %d/tswap32 (lvivier)
checkpatch error:
ERROR: storage class should be at the beginning of the declaration #9: FILE: linux-user/strace.c:66:
+UNUSED static void print_timezone(abi_ulong, int);
--- linux-user/strace.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
linux-user/strace.c +20 -0
@@ -63,6 +63,7 @@ UNUSED static void print_string(abi_long, int); UNUSED static void print_buf(abi_long addr, abi_long len, int last); UNUSED static void print_raw_param(const char *, abi_long, int); UNUSED static void print_timeval(abi_ulong, int); +UNUSED static void print_timezone(abi_ulong, int); UNUSED static void print_number(abi_long, int); UNUSED static void print_signal(abi_ulong, int); UNUSED static void print_sockaddr(abi_ulong addr, abi_long addrlen);
@@ -1254,6 +1255,25 @@ print_timeval(abi_ulong tv_addr, int last)gemu_log ("NULL%s" ,get_comma (last)); } +static void +print_timezone (abi_ulong tz_addr,int last) +{ +if (tz_addr) { +struct target_timezone *tz; + + tz =lock_user (VERIFY_READ , tz_addr,sizeof (*tz),1 ); +if (!tz) { +print_pointer (tz_addr, last); +return ; + } +gemu_log ("{%d,%d}%s" ,tswap32 (tz->tz_minuteswest), +tswap32 (tz->tz_dsttime),get_comma (last)); +unlock_user (tz, tz_addr,0 ); + }else { +gemu_log ("NULL%s" ,get_comma (last)); + } +} +#undef UNUSED#ifdef TARGET_NR_accept
Signature · 1 line
2.21.0
Re: [PATCH v8 2/9] linux-user/strace: Add print_timezone()
Le 21/10/2019 à 13:48, Philippe Mathieu-Daudé a écrit :
Quoted 43 lines
Suggested-by Laurent Vivier <[email protected]>Reviewed-by Laurent Vivier <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v7:tz_minuteswestandtz_dsttimeareabi_int-> %d/tswap32 (lvivier)checkpatch error:
ERROR: storage class should be at the beginning of the declaration #9: FILE:linux-user/strace.c:66:
+UNUSED static voidprint_timezone(abi_ulong, int);--- linux-user/strace.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)linux-user/strace.c +13
-0@@ -63,6 +63,7 @@ UNUSED static void print_string(abi_long, int); UNUSED static void print_buf(abi_long addr, abi_long len, int last); UNUSED static void print_raw_param(const char *, abi_long, int); UNUSED static void print_timeval(abi_ulong, int); +UNUSED static void print_timezone(abi_ulong, int); UNUSED static void print_number(abi_long, int); UNUSED static void print_signal(abi_ulong, int); UNUSED static void print_sockaddr(abi_ulong addr, abi_long addrlen);@@ -1254,6 +1255,25 @@ print_timeval(abi_ulong tv_addr, int last)gemu_log ("NULL%s" ,get_comma (last)); } +static void +print_timezone (abi_ulong tz_addr,int last) +{ +if (tz_addr) { +struct target_timezone *tz; + + tz =lock_user (VERIFY_READ , tz_addr,sizeof (*tz),1 ); +if (!tz) { +print_pointer (tz_addr, last); +return ; + } + gemu_log("{%d,%d}%s", tswap32(tz->tz_minuteswest),
linux-user/strace.c print_timeval(abi_ulong tv_addr, int last) · line 1279
Quoted 10 lines
linux-user/strace.c +7
-0+ tswap32(tz->tz_dsttime), get_comma(last)); +unlock_user (tz, tz_addr,0 ); + }else { +gemu_log ("NULL%s" ,get_comma (last)); + } +} +#undef UNUSED#ifdef TARGET_NR_accept
Laurent Vivier
AppliedRe: [PATCH v8 2/9] linux-user/strace: Add print_timezone()
In reply to Philippe Mathieu-DaudéLe 21/10/2019 à 13:48, Philippe Mathieu-Daudé a écrit :
Quoted 43 lines
Suggested-by Laurent Vivier <[email protected]>Reviewed-by Laurent Vivier <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v7:tz_minuteswestandtz_dsttimeareabi_int-> %d/tswap32 (lvivier)checkpatch error:
ERROR: storage class should be at the beginning of the declaration #9: FILE:linux-user/strace.c:66:
+UNUSED static voidprint_timezone(abi_ulong, int);--- linux-user/strace.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)linux-user/strace.c +13
-0@@ -63,6 +63,7 @@ UNUSED static void print_string(abi_long, int); UNUSED static void print_buf(abi_long addr, abi_long len, int last); UNUSED static void print_raw_param(const char *, abi_long, int); UNUSED static void print_timeval(abi_ulong, int); +UNUSED static void print_timezone(abi_ulong, int); UNUSED static void print_number(abi_long, int); UNUSED static void print_signal(abi_ulong, int); UNUSED static void print_sockaddr(abi_ulong addr, abi_long addrlen);@@ -1254,6 +1255,25 @@ print_timeval(abi_ulong tv_addr, int last)gemu_log ("NULL%s" ,get_comma (last)); } +static void +print_timezone (abi_ulong tz_addr,int last) +{ +if (tz_addr) { +struct target_timezone *tz; + + tz =lock_user (VERIFY_READ , tz_addr,sizeof (*tz),1 ); +if (!tz) { +print_pointer (tz_addr, last); +return ; + } + gemu_log("{%d,%d}%s", tswap32(tz->tz_minuteswest),
linux-user/strace.c print_timeval(abi_ulong tv_addr, int last) · line 1279
Quoted 10 lines
linux-user/strace.c +7
-0+ tswap32(tz->tz_dsttime), get_comma(last)); +unlock_user (tz, tz_addr,0 ); + }else { +gemu_log ("NULL%s" ,get_comma (last)); + } +} +#undef UNUSED#ifdef TARGET_NR_accept
Applied to my linux-user branch.
Thanks,
Laurent
PATCH v8 3/9 linux-user/strace: Improve settimeofday()
In reply to Philippe Mathieu-Daudé--- linux-user/strace.c | 13 +++++++++++++ linux-user/strace.list | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-)
linux-user/strace.c +13 -0
@@ -1583,6 +1583,19 @@ print_futimesat(const struct syscallname *name, }#endif +#ifdef TARGET_NR_settimeofday +static void +print_settimeofday (const struct syscallname *name, +abi_long arg0,abi_long arg1,abi_long arg2, +abi_long arg3,abi_long arg4,abi_long arg5) +{ +print_syscall_prologue (name); +print_timeval (arg0,0 ); +print_timezone (arg1,1 ); +print_syscall_epilogue (name); +} +#endif +#ifdef TARGET_NR_link static void print_link(const struct syscallname *name,
linux-user/strace.list +1 -1
@@ -1345,7 +1345,7 @@ { TARGET_NR_set_tid_address, "set_tid_address" , NULL, NULL, NULL }, #endif #ifdef TARGET_NR_settimeofday -{ TARGET_NR_settimeofday, "settimeofday" , NULL, NULL, NULL }, +{ TARGET_NR_settimeofday, "settimeofday" , NULL, print_settimeofday, NULL }, #endif #ifdef TARGET_NR_setuid { TARGET_NR_setuid, "setuid" , NULL, NULL, NULL },
Signature · 1 line
2.21.0
Laurent Vivier
AppliedRe: [PATCH v8 3/9] linux-user/strace: Improve settimeofday()
Le 21/10/2019 à 13:48, Philippe Mathieu-Daudé a écrit :
Quoted 38 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>Tested-by Guido Günther <[email protected]>Reviewed-by Laurent Vivier <[email protected]>--- linux-user/strace.c | 13 +++++++++++++ linux-user/strace.list | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-)linux-user/strace.c +13
-0@@ -1583,6 +1583,19 @@ print_futimesat(const struct syscallname *name, }#endif +#ifdef TARGET_NR_settimeofday +static void +print_settimeofday (const struct syscallname *name, +abi_long arg0,abi_long arg1,abi_long arg2, +abi_long arg3,abi_long arg4,abi_long arg5) +{ +print_syscall_prologue (name); +print_timeval (arg0,0 ); +print_timezone (arg1,1 ); +print_syscall_epilogue (name); +} +#endif +#ifdef TARGET_NR_link static void print_link(const struct syscallname *name,linux-user/strace.list +0
-0
linux-user/strace.list line 1351
Quoted 8 lines
linux-user/strace.list +1
-1@@ -1345,7 +1345,7 @@ { TARGET_NR_set_tid_address, "set_tid_address" , NULL, NULL, NULL }, #endif #ifdef TARGET_NR_settimeofday -{ TARGET_NR_settimeofday, "settimeofday" , NULL, NULL, NULL }, +{ TARGET_NR_settimeofday, "settimeofday" , NULL, print_settimeofday, NULL }, #endif #ifdef TARGET_NR_setuid { TARGET_NR_setuid, "setuid" , NULL, NULL, NULL },
Applied to my linux-user branch.
Thanks,
Laurent
PATCH v8 4/9 linux-user/syscall: Introduce target_sockaddr_nl
In reply to Philippe Mathieu-Daudé---
v7: use abi_ushort and abi_uint to keep alignments good (lvivier)
--- linux-user/syscall.c | 6 ++++-- linux-user/syscall_defs.h | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-)
linux-user/syscall.c +4 -2
@@ -1496,8 +1496,10 @@ static inline abi_long host_to_target_sockaddr(abi_ulong target_addr, sizeof(target_saddr->sa_family)) { target_saddr->sa_family =tswap16 (addr->sa_family); } -if (addr->sa_family ==AF_NETLINK && len >=sizeof (struct sockaddr_nl )) { -struct sockaddr_nl *target_nl = (struct sockaddr_nl *)target_saddr; +if (addr->sa_family ==AF_NETLINK && + len >=sizeof (struct target_sockaddr_nl )) { +struct target_sockaddr_nl *target_nl = + (struct target_sockaddr_nl *)target_saddr; target_nl->nl_pid =tswap32 (target_nl->nl_pid); target_nl->nl_groups =tswap32 (target_nl->nl_groups); }else if (addr->sa_family ==AF_PACKET ) {
linux-user/syscall_defs.h +7 -0
@@ -153,6 +153,13 @@ struct target_sockaddr_un {uint8_t sun_path[108 ]; }; +struct target_sockaddr_nl { +abi_ushort nl_family;/* AF_NETLINK */ +abi_ushort __pad; +abi_uint nl_pid; +abi_uint nl_groups; +}; +struct target_in_addr {uint32_t s_addr;/* big endian */ };
Signature · 1 line
2.21.0
Laurent Vivier
AppliedRe: [PATCH v8 4/9] linux-user/syscall: Introduce target_sockaddr_nl
Le 21/10/2019 à 13:48, Philippe Mathieu-Daudé a écrit :
Quoted 36 lines
Tested-by Guido Günther <[email protected]>Reviewed-by Laurent Vivier <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v7: useabi_ushortandabi_uintto keep alignments good (lvivier)--- linux-user/syscall.c | 6 ++++-- linux-user/syscall_defs.h | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-)linux-user/syscall.c +4
-2@@ -1496,8 +1496,10 @@ static inline abi_long host_to_target_sockaddr(abi_ulong target_addr, sizeof(target_saddr->sa_family)) { target_saddr->sa_family =tswap16 (addr->sa_family); } -if (addr->sa_family ==AF_NETLINK && len >=sizeof (struct sockaddr_nl )) { -struct sockaddr_nl *target_nl = (struct sockaddr_nl *)target_saddr; +if (addr->sa_family ==AF_NETLINK && + len >=sizeof (struct target_sockaddr_nl )) { +struct target_sockaddr_nl *target_nl = + (struct target_sockaddr_nl *)target_saddr; target_nl->nl_pid =tswap32 (target_nl->nl_pid); target_nl->nl_groups =tswap32 (target_nl->nl_groups); }else if (addr->sa_family ==AF_PACKET ) {linux-user/syscall_defs.h +0
-0@@ -153,6 +153,13 @@ struct target_sockaddr_un {uint8_t sun_path[108 ]; };
linux-user/syscall_defs.h struct target_sockaddr_un { · line 165
Quoted 10 lines
linux-user/syscall_defs.h +7
-0+struct target_sockaddr_nl { +abi_ushort nl_family;/* AF_NETLINK */ +abi_ushort __pad; +abi_uint nl_pid; +abi_uint nl_groups; +}; +struct target_in_addr {uint32_t s_addr;/* big endian */ };
Applied to my linux-user branch.
Thanks,
Laurent
PATCH v8 5/9 linux-user/strace: Dump AF_NETLINK sockaddr content
In reply to Philippe Mathieu-Daudé---
v8: use tswap32 (lvivier)
--- linux-user/strace.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
linux-user/strace.c +37 -0
@@ -8,6 +8,7 @@#include <arpa/inet.h> #include <netinet/tcp.h> #include <linux/if_packet.h> +#include <linux/netlink.h> #include <sched.h> #include "qemu.h"
@@ -398,6 +399,12 @@ print_sockaddr(abi_ulong addr, abi_long addrlen)gemu_log ("}" );break ; } +case AF_NETLINK : { +struct target_sockaddr_nl *nl = (struct target_sockaddr_nl *)sa; +gemu_log ("{nl_family=AF_NETLINK,nl_pid=%u,nl_groups=%u}" , +tswap32 (nl->nl_pid),tswap32 (nl->nl_groups)); +break ; + }default :gemu_log ("{sa_family=%d, sa_data={" , sa->sa_family);for (i =0 ; i <13 ; i++) {
@@ -424,6 +431,9 @@ print_socket_domain(int domain)case PF_INET :gemu_log ("PF_INET" );break ; +case PF_NETLINK : +gemu_log ("PF_NETLINK" ); +break ;case PF_PACKET :gemu_log ("PF_PACKET" );break ;
@@ -473,6 +483,33 @@ print_socket_protocol(int domain, int type, int protocol)return ; } +if (domain ==PF_NETLINK ) { +switch (protocol) { +case NETLINK_ROUTE : +gemu_log ("NETLINK_ROUTE" ); +break ; +case NETLINK_AUDIT : +gemu_log ("NETLINK_AUDIT" ); +break ; +case NETLINK_NETFILTER : +gemu_log ("NETLINK_NETFILTER" ); +break ; +case NETLINK_KOBJECT_UEVENT : +gemu_log ("NETLINK_KOBJECT_UEVENT" ); +break ; +case NETLINK_RDMA : +gemu_log ("NETLINK_RDMA" ); +break ; +case NETLINK_CRYPTO : +gemu_log ("NETLINK_CRYPTO" ); +break ; +default : +gemu_log ("%d" , protocol); +break ; + } +return ; + } +switch (protocol) {case IPPROTO_IP :gemu_log ("IPPROTO_IP" );
Signature · 1 line
2.21.0
Re: [PATCH v8 5/9] linux-user/strace: Dump AF_NETLINK sockaddr content
Le 21/10/2019 à 13:48, Philippe Mathieu-Daudé a écrit :
Quoted 68 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>Tested-by Guido Günther <[email protected]>---
v8: use tswap32 (lvivier)--- linux-user/strace.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)linux-user/strace.c +30
-0@@ -8,6 +8,7 @@#include <arpa/inet.h> #include <netinet/tcp.h> #include <linux/if_packet.h> +#include <linux/netlink.h> #include <sched.h> #include "qemu.h" @@ -398,6 +399,12 @@ print_sockaddr(abi_ulong addr, abi_long addrlen)gemu_log ("}" );break ; } +case AF_NETLINK : { +struct target_sockaddr_nl *nl = (struct target_sockaddr_nl *)sa; +gemu_log ("{nl_family=AF_NETLINK,nl_pid=%u,nl_groups=%u}" , +tswap32 (nl->nl_pid),tswap32 (nl->nl_groups)); +break ; + }default :gemu_log ("{sa_family=%d, sa_data={" , sa->sa_family);for (i =0 ; i <13 ; i++) {@@ -424,6 +431,9 @@ print_socket_domain(int domain)case PF_INET :gemu_log ("PF_INET" );break ; +case PF_NETLINK : +gemu_log ("PF_NETLINK" ); +break ;case PF_PACKET :gemu_log ("PF_PACKET" );break ;@@ -473,6 +483,33 @@ print_socket_protocol(int domain, int type, int protocol)return ; } +if (domain ==PF_NETLINK ) { +switch (protocol) { +case NETLINK_ROUTE : +gemu_log ("NETLINK_ROUTE" ); +break ; +case NETLINK_AUDIT : +gemu_log ("NETLINK_AUDIT" ); +break ; +case NETLINK_NETFILTER : +gemu_log ("NETLINK_NETFILTER" ); +break ; +case NETLINK_KOBJECT_UEVENT : +gemu_log ("NETLINK_KOBJECT_UEVENT" ); +break ; +case NETLINK_RDMA : +gemu_log ("NETLINK_RDMA" ); +break ; +case NETLINK_CRYPTO : +gemu_log ("NETLINK_CRYPTO" ); +break ;
linux-user/strace.c print_socket_protocol(int domain, int type, int protocol) · line 515
Quoted 10 lines
linux-user/strace.c +7
-0+default : +gemu_log ("%d" , protocol); +break ; + } +return ; + } +switch (protocol) {case IPPROTO_IP :gemu_log ("IPPROTO_IP" );
PATCH v8 6/9 linux-user/strace: Add print_sockfd()
In reply to Philippe Mathieu-DaudéExtract common print_sockfd() from various socket related syscalls.
---
v6: use another ifdef TARGET_NR_socketcall
--- linux-user/strace.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
linux-user/strace.c +16 -7
@@ -1709,6 +1709,15 @@ print_socket(const struct syscallname *name,#if defined(TARGET_NR_socketcall) +static void print_sockfd (abi_long sockfd,int last) +{ +print_raw_param (TARGET_ABI_FMT_ld, sockfd, last); +} + +#endif + +#if defined(TARGET_NR_socketcall) +#define get_user_ualx (x, gaddr, idx) \ get_user_ual(x, (gaddr) + (idx) * sizeof(abi_long))
@@ -1741,7 +1750,7 @@ static void do_print_sockaddr(const char *name, abi_long arg1)get_user_ualx (addrlen, arg1,2 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_sockaddr (addr, addrlen);gemu_log (")" ); }
@@ -1754,7 +1763,7 @@ static void do_print_listen(const char *name, abi_long arg1)get_user_ualx (backlog, arg1,1 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_raw_param (TARGET_ABI_FMT_ld, backlog,1 );gemu_log (")" ); }
@@ -1789,7 +1798,7 @@ static void do_print_sendrecv(const char *name, abi_long arg1)get_user_ualx (flags, arg1,3 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_buf (msg, len,0 );print_raw_param (TARGET_ABI_FMT_ld, len,0 );print_flags (msg_flags, flags,1 );
@@ -1808,7 +1817,7 @@ static void do_print_msgaddr(const char *name, abi_long arg1)get_user_ualx (addrlen, arg1,5 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_buf (msg, len,0 );print_raw_param (TARGET_ABI_FMT_ld, len,0 );print_flags (msg_flags, flags,0 );
@@ -1824,7 +1833,7 @@ static void do_print_shutdown(const char *name, abi_long arg1)get_user_ualx (how, arg1,1 );gemu_log ("shutdown(" ); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );switch (how) {case SHUT_RD :gemu_log ("SHUT_RD" );
@@ -1851,7 +1860,7 @@ static void do_print_msg(const char *name, abi_long arg1)get_user_ualx (flags, arg1,2 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_pointer (msg,0 );print_flags (msg_flags, flags,1 );gemu_log (")" );
@@ -1868,7 +1877,7 @@ static void do_print_sockopt(const char *name, abi_long arg1)get_user_ualx (optlen, arg1,4 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );switch (level) {case SOL_TCP :gemu_log ("SOL_TCP," );
Signature · 1 line
2.21.0
Laurent Vivier
AppliedRe: [PATCH v8 6/9] linux-user/strace: Add print_sockfd()
Le 21/10/2019 à 13:48, Philippe Mathieu-Daudé a écrit :
Quoted 86 lines
Extract common
print_sockfd()from various socket related syscalls.Reviewed-by Laurent Vivier <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v6: use another ifdefTARGET_NR_socketcall--- linux-user/strace.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)linux-user/strace.c +15
-6@@ -1709,6 +1709,15 @@ print_socket(const struct syscallname *name,#if defined(TARGET_NR_socketcall) +static void print_sockfd (abi_long sockfd,int last) +{ +print_raw_param (TARGET_ABI_FMT_ld, sockfd, last); +} + +#endif + +#if defined(TARGET_NR_socketcall) +#define get_user_ualx (x, gaddr, idx) \ get_user_ual(x, (gaddr) + (idx) * sizeof(abi_long))@@ -1741,7 +1750,7 @@ static void do_print_sockaddr(const char *name, abi_long arg1)get_user_ualx (addrlen, arg1,2 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_sockaddr (addr, addrlen);gemu_log (")" ); }@@ -1754,7 +1763,7 @@ static void do_print_listen(const char *name, abi_long arg1)get_user_ualx (backlog, arg1,1 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_raw_param (TARGET_ABI_FMT_ld, backlog,1 );gemu_log (")" ); }@@ -1789,7 +1798,7 @@ static void do_print_sendrecv(const char *name, abi_long arg1)get_user_ualx (flags, arg1,3 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_buf (msg, len,0 );print_raw_param (TARGET_ABI_FMT_ld, len,0 );print_flags (msg_flags, flags,1 );@@ -1808,7 +1817,7 @@ static void do_print_msgaddr(const char *name, abi_long arg1)get_user_ualx (addrlen, arg1,5 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_buf (msg, len,0 );print_raw_param (TARGET_ABI_FMT_ld, len,0 );print_flags (msg_flags, flags,0 );@@ -1824,7 +1833,7 @@ static void do_print_shutdown(const char *name, abi_long arg1)get_user_ualx (how, arg1,1 );gemu_log ("shutdown(" ); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );switch (how) {case SHUT_RD :gemu_log ("SHUT_RD" );@@ -1851,7 +1860,7 @@ static void do_print_msg(const char *name, abi_long arg1)get_user_ualx (flags, arg1,2 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_pointer (msg,0 );print_flags (msg_flags, flags,1 );gemu_log (")" );
linux-user/strace.c static void do_print_sockopt(const char *name, abi_long arg1) · line 1883
Quoted 8 lines
linux-user/strace.c +1
-1@@ -1868,7 +1877,7 @@ static void do_print_sockopt(const char *name, abi_long arg1)get_user_ualx (optlen, arg1,4 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );switch (level) {case SOL_TCP :gemu_log ("SOL_TCP," );
Applied to my linux-user branch.
Thanks,
Laurent
PATCH v8 7/9 linux-user/strace: Improve bind() output
In reply to Philippe Mathieu-Daudé---
v6: use TARGET_NR_socketcall || TARGET_NR_bind (lvivier)
--- linux-user/strace.c | 15 ++++++++++++++- linux-user/strace.list | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-)
linux-user/strace.c +14 -1
@@ -1707,7 +1707,7 @@ print_socket(const struct syscallname *name,#endif -#if defined(TARGET_NR_socketcall) +#if defined(TARGET_NR_socketcall) || defined(TARGET_NR_bind)static void print_sockfd (abi_long sockfd,int last) {
@@ -2054,6 +2054,19 @@ print_socketcall(const struct syscallname *name, }#endif +#if defined(TARGET_NR_bind) +static void +print_bind (const struct syscallname *name, +abi_long arg0,abi_long arg1,abi_long arg2, +abi_long arg3,abi_long arg4,abi_long arg5) +{ +print_syscall_prologue (name); +print_sockfd (arg0,0 ); +print_sockaddr (arg1, arg2,1 ); +print_syscall_epilogue (name); +} +#endif +#if defined(TARGET_NR_stat) || defined(TARGET_NR_stat64) || \ defined(TARGET_NR_lstat) || defined(TARGET_NR_lstat64) static void
linux-user/strace.list +1 -1
@@ -41,7 +41,7 @@ { TARGET_NR_bdflush, "bdflush" , NULL, NULL, NULL }, #endif #ifdef TARGET_NR_bind -{ TARGET_NR_bind, "bind" , NULL, NULL, NULL }, +{ TARGET_NR_bind, "bind" , NULL, print_bind, NULL }, #endif #ifdef TARGET_NR_bpf { TARGET_NR_bpf, "bpf" , NULL, NULL, NULL },
Signature · 1 line
2.21.0
Laurent Vivier
AppliedRe: [PATCH v8 7/9] linux-user/strace: Improve bind() output
Le 21/10/2019 à 13:48, Philippe Mathieu-Daudé a écrit :
Quoted 49 lines
Tested-by Guido Günther <[email protected]>Reviewed-by Laurent Vivier <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v6: useTARGET_NR_socketcall||TARGET_NR_bind(lvivier)--- linux-user/strace.c | 15 ++++++++++++++- linux-user/strace.list | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-)linux-user/strace.c +14
-1@@ -1707,7 +1707,7 @@ print_socket(const struct syscallname *name,#endif -#if defined(TARGET_NR_socketcall) +#if defined(TARGET_NR_socketcall) || defined(TARGET_NR_bind)static void print_sockfd (abi_long sockfd,int last) {@@ -2054,6 +2054,19 @@ print_socketcall(const struct syscallname *name, }#endif +#if defined(TARGET_NR_bind) +static void +print_bind (const struct syscallname *name, +abi_long arg0,abi_long arg1,abi_long arg2, +abi_long arg3,abi_long arg4,abi_long arg5) +{ +print_syscall_prologue (name); +print_sockfd (arg0,0 ); +print_sockaddr (arg1, arg2,1 ); +print_syscall_epilogue (name); +} +#endif +#if defined(TARGET_NR_stat) || defined(TARGET_NR_stat64) || \ defined(TARGET_NR_lstat) || defined(TARGET_NR_lstat64) static voidlinux-user/strace.list +0
-0
linux-user/strace.list line 47
Quoted 8 lines
linux-user/strace.list +1
-1@@ -41,7 +41,7 @@ { TARGET_NR_bdflush, "bdflush" , NULL, NULL, NULL }, #endif #ifdef TARGET_NR_bind -{ TARGET_NR_bind, "bind" , NULL, NULL, NULL }, +{ TARGET_NR_bind, "bind" , NULL, print_bind, NULL }, #endif #ifdef TARGET_NR_bpf { TARGET_NR_bpf, "bpf" , NULL, NULL, NULL },
Applied to my linux-user branch.
Thanks,
Laurent
PATCH v8 8/9 linux-user/strace: Let print_sockaddr() have a 'last' argument
In reply to Philippe Mathieu-DaudéIf the format is not the syscall last argument, a comma is append.
---
v8: do not name prototype arguments
checkpatch error:
ERROR: storage class should be at the beginning of the declaration #10: FILE: linux-user/strace.c:70:
+UNUSED static void print_sockaddr(abi_ulong, abi_long, int);
--- linux-user/strace.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
linux-user/strace.c +5 -5
@@ -67,7 +67,7 @@ UNUSED static void print_timeval(abi_ulong, int); UNUSED static void print_timezone(abi_ulong, int); UNUSED static void print_number(abi_long, int); UNUSED static void print_signal(abi_ulong, int); -UNUSED static void print_sockaddr(abi_ulong addr, abi_long addrlen); +UNUSED static void print_sockaddr(abi_ulong, abi_long, int); UNUSED static void print_socket_domain(int domain); UNUSED static void print_socket_type(int type); UNUSED static void print_socket_protocol(int domain, int type, int protocol);
@@ -336,7 +336,7 @@ static void print_siginfo(const target_siginfo_t *tinfo) }static void -print_sockaddr (abi_ulong addr,abi_long addrlen) +print_sockaddr (abi_ulong addr,abi_long addrlen,int last) {struct target_sockaddr *sa;int i;
@@ -418,7 +418,7 @@ print_sockaddr(abi_ulong addr, abi_long addrlen) }else {print_raw_param ("0x" TARGET_ABI_FMT_lx, addr,0 ); } -gemu_log (", " TARGET_ABI_FMT_ld, addrlen); +gemu_log (", " TARGET_ABI_FMT_ld"%s" , addrlen,get_comma (last)); } static void
@@ -1751,7 +1751,7 @@ static void do_print_sockaddr(const char *name, abi_long arg1)gemu_log ("%s(" , name);print_sockfd (sockfd,0 ); -print_sockaddr (addr, addrlen); +print_sockaddr (addr, addrlen,0 );gemu_log (")" ); }
@@ -1821,7 +1821,7 @@ static void do_print_msgaddr(const char *name, abi_long arg1)print_buf (msg, len,0 );print_raw_param (TARGET_ABI_FMT_ld, len,0 );print_flags (msg_flags, flags,0 ); -print_sockaddr (addr, addrlen); +print_sockaddr (addr, addrlen,0 );gemu_log (")" ); }
Signature · 1 line
2.21.0
Re: [PATCH v8 8/9] linux-user/strace: Let print_sockaddr() have a 'last' argument
Le 21/10/2019 à 13:48, Philippe Mathieu-Daudé a écrit :
Quoted 57 lines
If the format is not the syscall last argument, a comma is append.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Laurent Vivier <[email protected]>---
v8: do not name prototype argumentscheckpatch error:
ERROR: storage class should be at the beginning of the declaration #10: FILE:linux-user/strace.c:70:
+UNUSED static voidprint_sockaddr(abi_ulong, abi_long, int);--- linux-user/strace.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)linux-user/strace.c +4
-4@@ -67,7 +67,7 @@ UNUSED static void print_timeval(abi_ulong, int); UNUSED static void print_timezone(abi_ulong, int); UNUSED static void print_number(abi_long, int); UNUSED static void print_signal(abi_ulong, int); -UNUSED static void print_sockaddr(abi_ulong addr, abi_long addrlen); +UNUSED static void print_sockaddr(abi_ulong, abi_long, int); UNUSED static void print_socket_domain(int domain); UNUSED static void print_socket_type(int type); UNUSED static void print_socket_protocol(int domain, int type, int protocol);@@ -336,7 +336,7 @@ static void print_siginfo(const target_siginfo_t *tinfo) }static void -print_sockaddr (abi_ulong addr,abi_long addrlen) +print_sockaddr (abi_ulong addr,abi_long addrlen,int last) {struct target_sockaddr *sa;int i;@@ -418,7 +418,7 @@ print_sockaddr(abi_ulong addr, abi_long addrlen) }else {print_raw_param ("0x" TARGET_ABI_FMT_lx, addr,0 ); } -gemu_log (", " TARGET_ABI_FMT_ld, addrlen); +gemu_log (", " TARGET_ABI_FMT_ld"%s" , addrlen,get_comma (last)); } static void@@ -1751,7 +1751,7 @@ static void do_print_sockaddr(const char *name, abi_long arg1)gemu_log ("%s(" , name);print_sockfd (sockfd,0 ); -print_sockaddr (addr, addrlen); +print_sockaddr (addr, addrlen,0 );gemu_log (")" ); }
linux-user/strace.c static void do_print_msgaddr(const char *name, abi_long arg1) · line 1827
Quoted 8 lines
linux-user/strace.c +1
-1@@ -1821,7 +1821,7 @@ static void do_print_msgaddr(const char *name, abi_long arg1)print_buf (msg, len,0 );print_raw_param (TARGET_ABI_FMT_ld, len,0 );print_flags (msg_flags, flags,0 ); -print_sockaddr (addr, addrlen); +print_sockaddr (addr, addrlen,0 );gemu_log (")" ); }
Laurent Vivier
AppliedRe: [PATCH v8 8/9] linux-user/strace: Let print_sockaddr() have a 'last' argument
In reply to Philippe Mathieu-DaudéLe 21/10/2019 à 13:48, Philippe Mathieu-Daudé a écrit :
Quoted 57 lines
If the format is not the syscall last argument, a comma is append.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Laurent Vivier <[email protected]>---
v8: do not name prototype argumentscheckpatch error:
ERROR: storage class should be at the beginning of the declaration #10: FILE:linux-user/strace.c:70:
+UNUSED static voidprint_sockaddr(abi_ulong, abi_long, int);--- linux-user/strace.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)linux-user/strace.c +4
-4@@ -67,7 +67,7 @@ UNUSED static void print_timeval(abi_ulong, int); UNUSED static void print_timezone(abi_ulong, int); UNUSED static void print_number(abi_long, int); UNUSED static void print_signal(abi_ulong, int); -UNUSED static void print_sockaddr(abi_ulong addr, abi_long addrlen); +UNUSED static void print_sockaddr(abi_ulong, abi_long, int); UNUSED static void print_socket_domain(int domain); UNUSED static void print_socket_type(int type); UNUSED static void print_socket_protocol(int domain, int type, int protocol);@@ -336,7 +336,7 @@ static void print_siginfo(const target_siginfo_t *tinfo) }static void -print_sockaddr (abi_ulong addr,abi_long addrlen) +print_sockaddr (abi_ulong addr,abi_long addrlen,int last) {struct target_sockaddr *sa;int i;@@ -418,7 +418,7 @@ print_sockaddr(abi_ulong addr, abi_long addrlen) }else {print_raw_param ("0x" TARGET_ABI_FMT_lx, addr,0 ); } -gemu_log (", " TARGET_ABI_FMT_ld, addrlen); +gemu_log (", " TARGET_ABI_FMT_ld"%s" , addrlen,get_comma (last)); } static void@@ -1751,7 +1751,7 @@ static void do_print_sockaddr(const char *name, abi_long arg1)gemu_log ("%s(" , name);print_sockfd (sockfd,0 ); -print_sockaddr (addr, addrlen); +print_sockaddr (addr, addrlen,0 );gemu_log (")" ); }
linux-user/strace.c static void do_print_msgaddr(const char *name, abi_long arg1) · line 1827
Quoted 8 lines
linux-user/strace.c +1
-1@@ -1821,7 +1821,7 @@ static void do_print_msgaddr(const char *name, abi_long arg1)print_buf (msg, len,0 );print_raw_param (TARGET_ABI_FMT_ld, len,0 );print_flags (msg_flags, flags,0 ); -print_sockaddr (addr, addrlen); +print_sockaddr (addr, addrlen,0 );gemu_log (")" ); }
Applied to my linux-user branch.
Thanks,
Laurent
PATCH v8 9/9 linux-user/syscall: Align target_sockaddr fields using ABI types
In reply to Philippe Mathieu-DaudéTarget architectures align types differently for instance m68k aligns on 16bit whereas others on 32bit).
Use ABI types to keep alignments good.
---
v8: Use abi_int for target_sockaddr_ll.sll_ifindex
--- linux-user/syscall_defs.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
linux-user/syscall_defs.h +17 -17
@@ -134,22 +134,22 @@#define TARGET_IOWRU (type,nr) TARGET_IOC(TARGET_IOC_READ|TARGET_IOC_WRITE,(type),(nr),TARGET_IOC_SIZEMASK)struct target_sockaddr { -uint16_t sa_family; +abi_ushort sa_family;uint8_t sa_data[14 ]; };struct target_sockaddr_ll { -uint16_t sll_family;/* Always AF_PACKET */ -uint16_t sll_protocol;/* Physical layer protocol */ -int sll_ifindex;/* Interface number */ -uint16_t sll_hatype;/* ARP hardware type */ -uint8_t sll_pkttype;/* Packet type */ -uint8_t sll_halen;/* Length of address */ -uint8_t sll_addr[8 ];/* Physical layer address */ +abi_ushort sll_family;/* Always AF_PACKET */ +abi_ushort sll_protocol;/* Physical layer protocol */ +abi_int sll_ifindex;/* Interface number */ +abi_ushort sll_hatype;/* ARP hardware type */ +uint8_t sll_pkttype;/* Packet type */ +uint8_t sll_halen;/* Length of address */ +uint8_t sll_addr[8 ];/* Physical layer address */ };struct target_sockaddr_un { -uint16_t su_family; +abi_ushort su_family;uint8_t sun_path[108 ]; };
@@ -161,24 +161,24 @@ struct target_sockaddr_nl { };struct target_in_addr { -uint32_t s_addr;/* big endian */ +abi_uint s_addr;/* big endian */ };struct target_sockaddr_in { -uint16_t sin_family; -int16_t sin_port;/* big endian */ +abi_ushort sin_family; +abi_short sin_port;/* big endian */ struct target_in_addr sin_addr;uint8_t __pad[sizeof (struct target_sockaddr ) - -sizeof (uint16_t ) -sizeof (int16_t ) - +sizeof (abi_ushort) -sizeof (abi_short) -sizeof (struct target_in_addr )]; };struct target_sockaddr_in6 { -uint16_t sin6_family; -uint16_t sin6_port;/* big endian */ -uint32_t sin6_flowinfo;/* big endian */ +abi_ushort sin6_family; +abi_ushort sin6_port;/* big endian */ +abi_uint sin6_flowinfo;/* big endian */ struct in6_addr sin6_addr;/* IPv6 address, big endian */ -uint32_t sin6_scope_id; +abi_uint sin6_scope_id; };struct target_sock_filter {
Signature · 1 line
2.21.0
Re: [PATCH v8 9/9] linux-user/syscall: Align target_sockaddr fields using ABI types
Le 21/10/2019 à 13:48, Philippe Mathieu-Daudé a écrit :
Quoted 72 lines
Target architectures align types differently for instance m68k aligns on 16bit whereas others on 32bit).
Use ABI types to keep alignments good.Suggested-by Laurent Vivier <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v8: Useabi_intfor target_sockaddr_ll.sll_ifindex--- linux-user/syscall_defs.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)linux-user/syscall_defs.h +13
-15@@ -134,22 +134,22 @@#define TARGET_IOWRU (type,nr) TARGET_IOC(TARGET_IOC_READ|TARGET_IOC_WRITE,(type),(nr),TARGET_IOC_SIZEMASK)struct target_sockaddr { -uint16_t sa_family; +abi_ushort sa_family;uint8_t sa_data[14 ]; };struct target_sockaddr_ll { -uint16_t sll_family;/* Always AF_PACKET */ -uint16_t sll_protocol;/* Physical layer protocol */ -int sll_ifindex;/* Interface number */ -uint16_t sll_hatype;/* ARP hardware type */ -uint8_t sll_pkttype;/* Packet type */ -uint8_t sll_halen;/* Length of address */ -uint8_t sll_addr[8 ];/* Physical layer address */ +abi_ushort sll_family;/* Always AF_PACKET */ +abi_ushort sll_protocol;/* Physical layer protocol */ +abi_int sll_ifindex;/* Interface number */ +abi_ushort sll_hatype;/* ARP hardware type */ +uint8_t sll_pkttype;/* Packet type */ +uint8_t sll_halen;/* Length of address */ +uint8_t sll_addr[8 ];/* Physical layer address */ };struct target_sockaddr_un { -uint16_t su_family; +abi_ushort su_family;uint8_t sun_path[108 ]; };@@ -161,24 +161,24 @@ struct target_sockaddr_nl { };struct target_in_addr { -uint32_t s_addr;/* big endian */ +abi_uint s_addr;/* big endian */ };struct target_sockaddr_in { -uint16_t sin_family; -int16_t sin_port;/* big endian */ +abi_ushort sin_family; +abi_short sin_port;/* big endian */ struct target_in_addr sin_addr;uint8_t __pad[sizeof (struct target_sockaddr ) - -sizeof (uint16_t ) -sizeof (int16_t ) - +sizeof (abi_ushort) -sizeof (abi_short) -sizeof (struct target_in_addr )]; };struct target_sockaddr_in6 { -uint16_t sin6_family; -uint16_t sin6_port;/* big endian */
linux-user/syscall_defs.h struct target_sockaddr_nl { · line 184
Quoted 10 lines
linux-user/syscall_defs.h +4
-2-uint32_t sin6_flowinfo;/* big endian */ +abi_ushort sin6_family; +abi_ushort sin6_port;/* big endian */ +abi_uint sin6_flowinfo;/* big endian */ struct in6_addr sin6_addr;/* IPv6 address, big endian */ -uint32_t sin6_scope_id; +abi_uint sin6_scope_id; };struct target_sock_filter {
Laurent Vivier
AppliedRe: [PATCH v8 9/9] linux-user/syscall: Align target_sockaddr fields using ABI types
In reply to Philippe Mathieu-DaudéLe 21/10/2019 à 13:48, Philippe Mathieu-Daudé a écrit :
Quoted 72 lines
Target architectures align types differently for instance m68k aligns on 16bit whereas others on 32bit).
Use ABI types to keep alignments good.Suggested-by Laurent Vivier <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v8: Useabi_intfor target_sockaddr_ll.sll_ifindex--- linux-user/syscall_defs.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)linux-user/syscall_defs.h +13
-15@@ -134,22 +134,22 @@#define TARGET_IOWRU (type,nr) TARGET_IOC(TARGET_IOC_READ|TARGET_IOC_WRITE,(type),(nr),TARGET_IOC_SIZEMASK)struct target_sockaddr { -uint16_t sa_family; +abi_ushort sa_family;uint8_t sa_data[14 ]; };struct target_sockaddr_ll { -uint16_t sll_family;/* Always AF_PACKET */ -uint16_t sll_protocol;/* Physical layer protocol */ -int sll_ifindex;/* Interface number */ -uint16_t sll_hatype;/* ARP hardware type */ -uint8_t sll_pkttype;/* Packet type */ -uint8_t sll_halen;/* Length of address */ -uint8_t sll_addr[8 ];/* Physical layer address */ +abi_ushort sll_family;/* Always AF_PACKET */ +abi_ushort sll_protocol;/* Physical layer protocol */ +abi_int sll_ifindex;/* Interface number */ +abi_ushort sll_hatype;/* ARP hardware type */ +uint8_t sll_pkttype;/* Packet type */ +uint8_t sll_halen;/* Length of address */ +uint8_t sll_addr[8 ];/* Physical layer address */ };struct target_sockaddr_un { -uint16_t su_family; +abi_ushort su_family;uint8_t sun_path[108 ]; };@@ -161,24 +161,24 @@ struct target_sockaddr_nl { };struct target_in_addr { -uint32_t s_addr;/* big endian */ +abi_uint s_addr;/* big endian */ };struct target_sockaddr_in { -uint16_t sin_family; -int16_t sin_port;/* big endian */ +abi_ushort sin_family; +abi_short sin_port;/* big endian */ struct target_in_addr sin_addr;uint8_t __pad[sizeof (struct target_sockaddr ) - -sizeof (uint16_t ) -sizeof (int16_t ) - +sizeof (abi_ushort) -sizeof (abi_short) -sizeof (struct target_in_addr )]; };struct target_sockaddr_in6 { -uint16_t sin6_family; -uint16_t sin6_port;/* big endian */
linux-user/syscall_defs.h struct target_sockaddr_nl { · line 184
Quoted 10 lines
linux-user/syscall_defs.h +4
-2-uint32_t sin6_flowinfo;/* big endian */ +abi_ushort sin6_family; +abi_ushort sin6_port;/* big endian */ +abi_uint sin6_flowinfo;/* big endian */ struct in6_addr sin6_addr;/* IPv6 address, big endian */ -uint32_t sin6_scope_id; +abi_uint sin6_scope_id; };struct target_sock_filter {
Applied to my linux-user branch.
Thanks,
Laurent
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [PATCH v8 0/9] linux-user: strace improvements
Type: series
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
- [tag update] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'
913f184 linux-user/syscall: Align target_sockaddr fields using ABI types 1ffb986b7 linux-user/strace: Let print_sockaddr() have a 'last' argument 6a05283 linux-user/strace: Improve bind() output
8f9f5d1 linux-user/strace: Add print_sockfd()
e7640cd linux-user/strace: Dump AF_NETLINK sockaddr content d07e763 linux-user/syscall: Introduce target_sockaddr_nl a891f9e linux-user/strace: Improve settimeofday()
3b44a6e linux-user/strace: Add print_timezone()
78d8647 linux-user/strace: Display invalid pointer in print_timeval()
=== OUTPUT BEGIN ===
1/9 Checking commit 78d864717f4d (linux-user/strace: Display invalid pointer in print_timeval()) 2/9 Checking commit 3b44a6e3332c (linux-user/strace: Add print_timezone())
ERROR: storage class should be at the beginning of the declaration
#20: FILE: linux-user/strace.c:66:
+UNUSED static void print_timezone(abi_ulong, int);
total: 1 errors, 0 warnings, 32 lines checked
Patch 2/9 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
3/9 Checking commit a891f9efdcfb (linux-user/strace: Improve settimeofday())
4/9 Checking commit d07e763ac485 (linux-user/syscall: Introduce target_sockaddr_nl) 5/9 Checking commit e7640cd46083 (linux-user/strace: Dump AF_NETLINK sockaddr content) 6/9 Checking commit 8f9f5d162d99 (linux-user/strace: Add print_sockfd())
7/9 Checking commit 6a05283378ef (linux-user/strace: Improve bind() output)
8/9 Checking commit 1ffb986b76b2 (linux-user/strace: Let print_sockaddr() have a 'last' argument)
ERROR: storage class should be at the beginning of the declaration
#22: FILE: linux-user/strace.c:70:
+UNUSED static void print_sockaddr(abi_ulong, abi_long, int);
total: 1 errors, 0 warnings, 40 lines checked
Patch 8/9 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
9/9 Checking commit 913f1840d1be (linux-user/syscall: Align target_sockaddr fields using ABI types) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]