linux-user: SO_TIMESTAMP/NS/ING sockopt
v3 cover linux-user: SO_TIMESTAMP/NS/ING sockopt
Hi Laurent,
This is the two timestamp-related patches splitted off per
https://lists.nongnu.org/archive/html/qemu-devel/2020-12/msg05149.html
v1 -> v2:
Address comments on the first 5 (was 3) patches. Fix style problems.
v2 -> v3:
Split off into own group per
https://lists.nongnu.org/archive/html/qemu-devel/2020-12/msg05149.html
Rebase to master on Dec 18, 2020
Shu-Chun Weng (2):
linux-user: Update SO_TIMESTAMP to SO_TIMESTAMP_OLD/NEW
linux-user: setsockopt() SO_TIMESTAMPNS and SO_TIMESTAMPING
linux-user/alpha/sockbits.h | 21 +- linux-user/generic/sockbits.h | 17 +- linux-user/hppa/sockbits.h | 20 +- linux-user/mips/sockbits.h | 16 +- linux-user/sparc/sockbits.h | 21 +- linux-user/strace.c | 19 +- linux-user/syscall.c | 230 ++++++++++- tests/tcg/multiarch/socket_timestamp.c | 540 +++++++++++++++++++++++++ 8 files changed, 844 insertions(+), 40 deletions(-) create mode 100644 tests/tcg/multiarch/socket_timestamp.c
Signature · 1 line
2.29.2.684.gfbc64c5ab5-goog
PATCH v3 1/2 linux-user: Update SO_TIMESTAMP to SO_TIMESTAMP_OLD/NEW
Both guest options map to host SO_TIMESTAMP while keeping a global bit to remember if the guest expects the old or the new format. Don't support programs mixing two formats.
Added a multiarch test to verify.
---
v1 -> v2:
Only keep track of old or new format globally, remove support for different sockets mixing different formats.
Fix style problems.
v2 -> v3:
Rebase to master on Dec 18, 2020
linux-user/alpha/sockbits.h | 8 +- linux-user/generic/sockbits.h | 9 +- linux-user/hppa/sockbits.h | 8 +- linux-user/mips/sockbits.h | 8 +- linux-user/sparc/sockbits.h | 8 +- linux-user/strace.c | 7 +- linux-user/syscall.c | 91 ++++++-- tests/tcg/multiarch/socket_timestamp.c | 296 +++++++++++++++++++++++++ 8 files changed, 408 insertions(+), 27 deletions(-) create mode 100644 tests/tcg/multiarch/socket_timestamp.c
linux-user/alpha/sockbits.h +6 -2
@@ -48,8 +48,6 @@#define TARGET_SO_DETACH_FILTER 27#define TARGET_SO_PEERNAME 28 -#define TARGET_SO_TIMESTAMP 29 -#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP#define TARGET_SO_PEERSEC 30#define TARGET_SO_PASSSEC 34
@@ -75,6 +73,12 @@/* Instruct lower device to use last 4-bytes of skb data as FCS */ #define TARGET_SO_NOFCS 43 +#define TARGET_SO_TIMESTAMP_OLD 29 +#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD + +#define TARGET_SO_TIMESTAMP_NEW 63 +#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +/* TARGET_O_NONBLOCK clashes with the bits used for socket types. Therefore we * have to define SOCK_NONBLOCK to a different value here. */
linux-user/generic/sockbits.h +7 -2
@@ -49,10 +49,15 @@#define TARGET_SO_DETACH_FILTER 27#define TARGET_SO_PEERNAME 28 -#define TARGET_SO_TIMESTAMP 29 -#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP#define TARGET_SO_ACCEPTCONN 30#define TARGET_SO_PEERSEC 31 + +#define TARGET_SO_TIMESTAMP_OLD 29 +#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD + +#define TARGET_SO_TIMESTAMP_NEW 63 +#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +#endif
linux-user/hppa/sockbits.h +6 -2
@@ -29,8 +29,6 @@#define TARGET_SO_BSDCOMPAT 0x400e#define TARGET_SO_PASSCRED 0x4010#define TARGET_SO_PEERCRED 0x4011 -#define TARGET_SO_TIMESTAMP 0x4012 -#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP#define TARGET_SO_TIMESTAMPNS 0x4013#define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS
@@ -67,6 +65,12 @@#define TARGET_SO_CNX_ADVICE 0x402E +#define TARGET_SO_TIMESTAMP_OLD 0x4012 +#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD + +#define TARGET_SO_TIMESTAMP_NEW 0x4038 +#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +/* TARGET_O_NONBLOCK clashes with the bits used for socket types. Therefore we * have to define SOCK_NONBLOCK to a different value here. */
linux-user/mips/sockbits.h +6 -2
@@ -61,14 +61,18 @@#define TARGET_SO_DETACH_FILTER 27#define TARGET_SO_PEERNAME 28 -#define TARGET_SO_TIMESTAMP 29 -#define SCM_TIMESTAMP SO_TIMESTAMP#define TARGET_SO_PEERSEC 30#define TARGET_SO_SNDBUFFORCE 31#define TARGET_SO_RCVBUFFORCE 33#define TARGET_SO_PASSSEC 34 +#define TARGET_SO_TIMESTAMP_OLD 29 +#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD + +#define TARGET_SO_TIMESTAMP_NEW 63 +#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +/** sock_type - Socket types * * Please notice that for binary compat reasons MIPS has to
linux-user/sparc/sockbits.h +6 -2
@@ -48,8 +48,6 @@#define TARGET_SO_GET_FILTER TARGET_SO_ATTACH_FILTER#define TARGET_SO_PEERNAME 0x001c -#define TARGET_SO_TIMESTAMP 0x001d -#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP#define TARGET_SO_PEERSEC 0x001e#define TARGET_SO_PASSSEC 0x001f
@@ -104,6 +102,12 @@#define TARGET_SO_ZEROCOPY 0x003e +#define TARGET_SO_TIMESTAMP_OLD 0x001d +#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD + +#define TARGET_SO_TIMESTAMP_NEW 0x0046 +#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +/* Security levels - as per NRL IPv6 - don't actually do anything */ #define TARGET_SO_SECURITY_AUTHENTICATION 0x5001#define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002
linux-user/strace.c +5 -2
@@ -2679,8 +2679,11 @@ print_optint:case TARGET_SO_PASSCRED :qemu_log ("SO_PASSCRED," ); goto print_optint; -case TARGET_SO_TIMESTAMP : -qemu_log ("SO_TIMESTAMP," ); +case TARGET_SO_TIMESTAMP_OLD : +qemu_log ("SO_TIMESTAMP_OLD," ); + goto print_optint; +case TARGET_SO_TIMESTAMP_NEW : +qemu_log ("SO_TIMESTAMP_NEW," ); goto print_optint;case TARGET_SO_RCVLOWAT :qemu_log ("SO_RCVLOWAT," );
linux-user/syscall.c +76 -15
150 lines not on this page · raw message
tests/tcg/multiarch/socket_timestamp.c new file +296 -0
296 lines not on this page · raw message
Signature · 1 line
2.29.2.684.gfbc64c5ab5-goog
PATCH v3 2/2 linux-user: setsockopt() SO_TIMESTAMPNS and SO_TIMESTAMPING
In reply to Shu-Chun Weng viaThis change supports SO_TIMESTAMPNS_OLD/NEW and SO_TIMESTAMPING_OLD/NEW for setsocketopt() with SOL_SOCKET. Based on the SO_TIMESTAMP_OLD/NEW framework. The three pairs share the same flag SOCK_TSTAMP_NEW in linux kernel for deciding if the old or the new format is used.
---
v1 -> v2:
Only keep track of old/new format in a global state. Fix style problems.
v2 -> v3:
Rebase to master on Dec 18, 2020
linux-user/alpha/sockbits.h | 13 +- linux-user/generic/sockbits.h | 8 + linux-user/hppa/sockbits.h | 12 +- linux-user/mips/sockbits.h | 8 + linux-user/sparc/sockbits.h | 13 +- linux-user/strace.c | 12 + linux-user/syscall.c | 149 ++++++++- tests/tcg/multiarch/socket_timestamp.c | 442 +++++++++++++++++++------ 8 files changed, 540 insertions(+), 117 deletions(-)
linux-user/alpha/sockbits.h +8 -5
@@ -51,8 +51,6 @@#define TARGET_SO_PEERSEC 30#define TARGET_SO_PASSSEC 34 -#define TARGET_SO_TIMESTAMPNS 35 -#define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS/* Security levels - as per NRL IPv6 - don't actually do anything */ #define TARGET_SO_SECURITY_AUTHENTICATION 19
@@ -61,9 +59,6 @@#define TARGET_SO_MARK 36 -#define TARGET_SO_TIMESTAMPING 37 -#define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING -#define TARGET_SO_RXQ_OVFL 40#define TARGET_SO_WIFI_STATUS 41
@@ -75,9 +70,17 @@#define TARGET_SO_TIMESTAMP_OLD 29#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD +#define TARGET_SO_TIMESTAMPNS_OLD 35 +#define TARGET_SCM_TIMESTAMPNS_OLD TARGET_SO_TIMESTAMPNS_OLD +#define TARGET_SO_TIMESTAMPING_OLD 37 +#define TARGET_SCM_TIMESTAMPING_OLD TARGET_SO_TIMESTAMPING_OLD#define TARGET_SO_TIMESTAMP_NEW 63#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +#define TARGET_SO_TIMESTAMPNS_NEW 64 +#define TARGET_SCM_TIMESTAMPNS_NEW TARGET_SO_TIMESTAMPNS_NEW +#define TARGET_SO_TIMESTAMPING_NEW 65 +#define TARGET_SCM_TIMESTAMPING_NEW TARGET_SO_TIMESTAMPING_NEW/* TARGET_O_NONBLOCK clashes with the bits used for socket types. Therefore we * have to define SOCK_NONBLOCK to a different value here.
linux-user/generic/sockbits.h +8 -0
@@ -56,8 +56,16 @@#define TARGET_SO_TIMESTAMP_OLD 29#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD +#define TARGET_SO_TIMESTAMPNS_OLD 35 +#define TARGET_SCM_TIMESTAMPNS_OLD TARGET_SO_TIMESTAMPNS_OLD +#define TARGET_SO_TIMESTAMPING_OLD 37 +#define TARGET_SCM_TIMESTAMPING_OLD TARGET_SO_TIMESTAMPING_OLD#define TARGET_SO_TIMESTAMP_NEW 63#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +#define TARGET_SO_TIMESTAMPNS_NEW 64 +#define TARGET_SCM_TIMESTAMPNS_NEW TARGET_SO_TIMESTAMPNS_NEW +#define TARGET_SO_TIMESTAMPING_NEW 65 +#define TARGET_SCM_TIMESTAMPING_NEW TARGET_SO_TIMESTAMPING_NEW#endif
linux-user/hppa/sockbits.h +8 -4
@@ -29,8 +29,6 @@#define TARGET_SO_BSDCOMPAT 0x400e#define TARGET_SO_PASSCRED 0x4010#define TARGET_SO_PEERCRED 0x4011 -#define TARGET_SO_TIMESTAMPNS 0x4013 -#define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS#define TARGET_SO_SECURITY_AUTHENTICATION 0x4016#define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 0x4017
@@ -44,8 +42,6 @@#define TARGET_SO_PEERSEC 0x401d#define TARGET_SO_PASSSEC 0x401e#define TARGET_SO_MARK 0x401f -#define TARGET_SO_TIMESTAMPING 0x4020 -#define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING#define TARGET_SO_RXQ_OVFL 0x4021#define TARGET_SO_WIFI_STATUS 0x4022#define TARGET_SCM_WIFI_STATUS TARGET_SO_WIFI_STATUS
@@ -67,9 +63,17 @@#define TARGET_SO_TIMESTAMP_OLD 0x4012#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD +#define TARGET_SO_TIMESTAMPNS_OLD 0x4013 +#define TARGET_SCM_TIMESTAMPNS_OLD TARGET_SO_TIMESTAMPNS_OLD +#define TARGET_SO_TIMESTAMPING_OLD 0x4020 +#define TARGET_SCM_TIMESTAMPING_OLD TARGET_SO_TIMESTAMPING_OLD#define TARGET_SO_TIMESTAMP_NEW 0x4038#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +#define TARGET_SO_TIMESTAMPNS_NEW 0x4039 +#define TARGET_SCM_TIMESTAMPNS_NEW TARGET_SO_TIMESTAMPNS_NEW +#define TARGET_SO_TIMESTAMPING_NEW 0x403A +#define TARGET_SCM_TIMESTAMPING_NEW TARGET_SO_TIMESTAMPING_NEW/* TARGET_O_NONBLOCK clashes with the bits used for socket types. Therefore we * have to define SOCK_NONBLOCK to a different value here.
linux-user/mips/sockbits.h +8 -0
@@ -69,9 +69,17 @@#define TARGET_SO_TIMESTAMP_OLD 29#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD +#define TARGET_SO_TIMESTAMPNS_OLD 35 +#define TARGET_SCM_TIMESTAMPNS_OLD TARGET_SO_TIMESTAMPNS_OLD +#define TARGET_SO_TIMESTAMPING_OLD 37 +#define TARGET_SCM_TIMESTAMPING_OLD TARGET_SO_TIMESTAMPING_OLD#define TARGET_SO_TIMESTAMP_NEW 63#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +#define TARGET_SO_TIMESTAMPNS_NEW 64 +#define TARGET_SCM_TIMESTAMPNS_NEW TARGET_SO_TIMESTAMPNS_NEW +#define TARGET_SO_TIMESTAMPING_NEW 65 +#define TARGET_SCM_TIMESTAMPING_NEW TARGET_SO_TIMESTAMPING_NEW/** sock_type - Socket types *
linux-user/sparc/sockbits.h +8 -5
@@ -51,14 +51,9 @@#define TARGET_SO_PEERSEC 0x001e#define TARGET_SO_PASSSEC 0x001f -#define TARGET_SO_TIMESTAMPNS 0x0021 -#define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS#define TARGET_SO_MARK 0x0022 -#define TARGET_SO_TIMESTAMPING 0x0023 -#define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING -#define TARGET_SO_RXQ_OVFL 0x0024#define TARGET_SO_WIFI_STATUS 0x0025
@@ -104,9 +99,17 @@#define TARGET_SO_TIMESTAMP_OLD 0x001d#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD +#define TARGET_SO_TIMESTAMPNS_OLD 0x0021 +#define TARGET_SCM_TIMESTAMPNS_OLD TARGET_SO_TIMESTAMPNS_OLD +#define TARGET_SO_TIMESTAMPING_OLD 0x0023 +#define TARGET_SCM_TIMESTAMPING_OLD TARGET_SO_TIMESTAMPING_OLD#define TARGET_SO_TIMESTAMP_NEW 0x0046#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +#define TARGET_SO_TIMESTAMPNS_NEW 0x0042 +#define TARGET_SCM_TIMESTAMPNS_NEW TARGET_SO_TIMESTAMPNS_NEW +#define TARGET_SO_TIMESTAMPING_NEW 0x0043 +#define TARGET_SCM_TIMESTAMPING_NEW TARGET_SO_TIMESTAMPING_NEW/* Security levels - as per NRL IPv6 - don't actually do anything */ #define TARGET_SO_SECURITY_AUTHENTICATION 0x5001
linux-user/strace.c +12 -0
@@ -2682,9 +2682,21 @@ print_optint:case TARGET_SO_TIMESTAMP_OLD :qemu_log ("SO_TIMESTAMP_OLD," ); goto print_optint; +case TARGET_SO_TIMESTAMPNS_OLD : +qemu_log ("SO_TIMESTAMPNS_OLD," ); + goto print_optint; +case TARGET_SO_TIMESTAMPING_OLD : +qemu_log ("SO_TIMESTAMPING_OLD," ); + goto print_optint;case TARGET_SO_TIMESTAMP_NEW :qemu_log ("SO_TIMESTAMP_NEW," ); goto print_optint; +case TARGET_SO_TIMESTAMPNS_NEW : +qemu_log ("SO_TIMESTAMPNS_NEW," ); + goto print_optint; +case TARGET_SO_TIMESTAMPING_NEW : +qemu_log ("SO_TIMESTAMPING_NEW," ); + goto print_optint;case TARGET_SO_RCVLOWAT :qemu_log ("SO_RCVLOWAT," ); goto print_optint;
linux-user/syscall.c +145 -4
185 lines not on this page · raw message
tests/tcg/multiarch/socket_timestamp.c +343 -99
560 lines not on this page · raw message
Signature · 1 line
2.29.2.684.gfbc64c5ab5-goog