1. Patchew
  2. QEMU
  3. [PATCH v2 0/4] Missing endianness conversions in user mode
  4. View patch

[PATCH v2 1/4] linux-user: fix timerfd read endianness conversion

Mathis Marion posted 4 patches 2 years, 11 months ago
Maintainers: Laurent Vivier <laurent@vivier.eu>
There is a newer version of this series
[PATCH v2 1/4] linux-user: fix timerfd read endianness conversion
Posted by Mathis Marion 2 years, 11 months ago 
From: Mathis Marion <mathis.marion@silabs.com>

When reading the expiration count from a timerfd, the endianness of the
64bit value read is the one of the host, just as for eventfds.

Signed-off-by: Mathis Marion <mathis.marion@silabs.com>
---
 linux-user/fd-trans.c | 10 +++++++---
 linux-user/fd-trans.h |  1 +
 linux-user/syscall.c  |  8 ++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
index 7b25468d02..146aaaafaa 100644
--- a/linux-user/fd-trans.c
+++ b/linux-user/fd-trans.c
@@ -1622,7 +1622,7 @@ TargetFdTrans target_signalfd_trans = {
     .host_to_target_data = host_to_target_data_signalfd,
 };
 
-static abi_long swap_data_eventfd(void *buf, size_t len)
+static abi_long swap_data_u64(void *buf, size_t len)
 {
     uint64_t *counter = buf;
     int i;
@@ -1640,8 +1640,12 @@ static abi_long swap_data_eventfd(void *buf, size_t len)
 }
 
 TargetFdTrans target_eventfd_trans = {
-    .host_to_target_data = swap_data_eventfd,
-    .target_to_host_data = swap_data_eventfd,
+    .host_to_target_data = swap_data_u64,
+    .target_to_host_data = swap_data_u64,
+};
+
+TargetFdTrans target_timerfd_trans = {
+    .host_to_target_data = swap_data_u64,
 };
 
 #if defined(CONFIG_INOTIFY) && (defined(TARGET_NR_inotify_init) || \
diff --git a/linux-user/fd-trans.h b/linux-user/fd-trans.h
index 1b9fa2041c..910faaf237 100644
--- a/linux-user/fd-trans.h
+++ b/linux-user/fd-trans.h
@@ -130,6 +130,7 @@ extern TargetFdTrans target_netlink_route_trans;
 extern TargetFdTrans target_netlink_audit_trans;
 extern TargetFdTrans target_signalfd_trans;
 extern TargetFdTrans target_eventfd_trans;
+extern TargetFdTrans target_timerfd_trans;
 #if (defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init)) || \
     (defined(CONFIG_INOTIFY1) && defined(TARGET_NR_inotify_init1) && \
      defined(__NR_inotify_init1))
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1e868e9b0e..58549de125 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -13117,8 +13117,12 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
 
 #if defined(TARGET_NR_timerfd_create) && defined(CONFIG_TIMERFD)
     case TARGET_NR_timerfd_create:
-        return get_errno(timerfd_create(arg1,
-                          target_to_host_bitmask(arg2, fcntl_flags_tbl)));
+        ret = get_errno(timerfd_create(arg1,
+                        target_to_host_bitmask(arg2, fcntl_flags_tbl)));
+        if (ret >= 0) {
+            fd_trans_register(ret, &target_timerfd_trans);
+        }
+        return ret;
 #endif
 
 #if defined(TARGET_NR_timerfd_gettime) && defined(CONFIG_TIMERFD)
-- 
2.39.1
Re: [PATCH v2 1/4] linux-user: fix timerfd read endianness conversion
Posted by Laurent Vivier 2 years, 11 months ago 
Le 20/02/2023 à 09:58, Mathis Marion a écrit :
> From: Mathis Marion <mathis.marion@silabs.com>
> 
> When reading the expiration count from a timerfd, the endianness of the
> 64bit value read is the one of the host, just as for eventfds.
> 
> Signed-off-by: Mathis Marion <mathis.marion@silabs.com>
> ---
>   linux-user/fd-trans.c | 10 +++++++---
>   linux-user/fd-trans.h |  1 +
>   linux-user/syscall.c  |  8 ++++++--
>   3 files changed, 14 insertions(+), 5 deletions(-)
> 
> diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
> index 7b25468d02..146aaaafaa 100644
> --- a/linux-user/fd-trans.c
> +++ b/linux-user/fd-trans.c
> @@ -1622,7 +1622,7 @@ TargetFdTrans target_signalfd_trans = {
>       .host_to_target_data = host_to_target_data_signalfd,
>   };
>   
> -static abi_long swap_data_eventfd(void *buf, size_t len)
> +static abi_long swap_data_u64(void *buf, size_t len)
>   {
>       uint64_t *counter = buf;
>       int i;
> @@ -1640,8 +1640,12 @@ static abi_long swap_data_eventfd(void *buf, size_t len)
>   }
>   
>   TargetFdTrans target_eventfd_trans = {
> -    .host_to_target_data = swap_data_eventfd,
> -    .target_to_host_data = swap_data_eventfd,
> +    .host_to_target_data = swap_data_u64,
> +    .target_to_host_data = swap_data_u64,
> +};
> +
> +TargetFdTrans target_timerfd_trans = {
> +    .host_to_target_data = swap_data_u64,
>   };
>   
>   #if defined(CONFIG_INOTIFY) && (defined(TARGET_NR_inotify_init) || \
> diff --git a/linux-user/fd-trans.h b/linux-user/fd-trans.h
> index 1b9fa2041c..910faaf237 100644
> --- a/linux-user/fd-trans.h
> +++ b/linux-user/fd-trans.h
> @@ -130,6 +130,7 @@ extern TargetFdTrans target_netlink_route_trans;
>   extern TargetFdTrans target_netlink_audit_trans;
>   extern TargetFdTrans target_signalfd_trans;
>   extern TargetFdTrans target_eventfd_trans;
> +extern TargetFdTrans target_timerfd_trans;
>   #if (defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init)) || \
>       (defined(CONFIG_INOTIFY1) && defined(TARGET_NR_inotify_init1) && \
>        defined(__NR_inotify_init1))
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 1e868e9b0e..58549de125 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -13117,8 +13117,12 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
>   
>   #if defined(TARGET_NR_timerfd_create) && defined(CONFIG_TIMERFD)
>       case TARGET_NR_timerfd_create:
> -        return get_errno(timerfd_create(arg1,
> -                          target_to_host_bitmask(arg2, fcntl_flags_tbl)));
> +        ret = get_errno(timerfd_create(arg1,
> +                        target_to_host_bitmask(arg2, fcntl_flags_tbl)));
> +        if (ret >= 0) {
> +            fd_trans_register(ret, &target_timerfd_trans);
> +        }
> +        return ret;
>   #endif
>   
>   #if defined(TARGET_NR_timerfd_gettime) && defined(CONFIG_TIMERFD)

Applied to my linux-user-for-8.0 branch.

Thanks,
Laurent
Re: [PATCH v2 1/4] linux-user: fix timerfd read endianness conversion
Posted by Laurent Vivier 2 years, 11 months ago 
Le 20/02/2023 à 09:58, Mathis Marion a écrit :
> From: Mathis Marion <mathis.marion@silabs.com>
> 
> When reading the expiration count from a timerfd, the endianness of the
> 64bit value read is the one of the host, just as for eventfds.
> 
> Signed-off-by: Mathis Marion <mathis.marion@silabs.com>
> ---
>   linux-user/fd-trans.c | 10 +++++++---
>   linux-user/fd-trans.h |  1 +
>   linux-user/syscall.c  |  8 ++++++--
>   3 files changed, 14 insertions(+), 5 deletions(-)
> 
> diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
> index 7b25468d02..146aaaafaa 100644
> --- a/linux-user/fd-trans.c
> +++ b/linux-user/fd-trans.c
> @@ -1622,7 +1622,7 @@ TargetFdTrans target_signalfd_trans = {
>       .host_to_target_data = host_to_target_data_signalfd,
>   };
>   
> -static abi_long swap_data_eventfd(void *buf, size_t len)
> +static abi_long swap_data_u64(void *buf, size_t len)
>   {
>       uint64_t *counter = buf;
>       int i;
> @@ -1640,8 +1640,12 @@ static abi_long swap_data_eventfd(void *buf, size_t len)
>   }
>   
>   TargetFdTrans target_eventfd_trans = {
> -    .host_to_target_data = swap_data_eventfd,
> -    .target_to_host_data = swap_data_eventfd,
> +    .host_to_target_data = swap_data_u64,
> +    .target_to_host_data = swap_data_u64,
> +};
> +
> +TargetFdTrans target_timerfd_trans = {
> +    .host_to_target_data = swap_data_u64,
>   };
>   
>   #if defined(CONFIG_INOTIFY) && (defined(TARGET_NR_inotify_init) || \
> diff --git a/linux-user/fd-trans.h b/linux-user/fd-trans.h
> index 1b9fa2041c..910faaf237 100644
> --- a/linux-user/fd-trans.h
> +++ b/linux-user/fd-trans.h
> @@ -130,6 +130,7 @@ extern TargetFdTrans target_netlink_route_trans;
>   extern TargetFdTrans target_netlink_audit_trans;
>   extern TargetFdTrans target_signalfd_trans;
>   extern TargetFdTrans target_eventfd_trans;
> +extern TargetFdTrans target_timerfd_trans;
>   #if (defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init)) || \
>       (defined(CONFIG_INOTIFY1) && defined(TARGET_NR_inotify_init1) && \
>        defined(__NR_inotify_init1))
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 1e868e9b0e..58549de125 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -13117,8 +13117,12 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
>   
>   #if defined(TARGET_NR_timerfd_create) && defined(CONFIG_TIMERFD)
>       case TARGET_NR_timerfd_create:
> -        return get_errno(timerfd_create(arg1,
> -                          target_to_host_bitmask(arg2, fcntl_flags_tbl)));
> +        ret = get_errno(timerfd_create(arg1,
> +                        target_to_host_bitmask(arg2, fcntl_flags_tbl)));
> +        if (ret >= 0) {
> +            fd_trans_register(ret, &target_timerfd_trans);
> +        }
> +        return ret;
>   #endif
>   
>   #if defined(TARGET_NR_timerfd_gettime) && defined(CONFIG_TIMERFD)

Reviewed-by: Laurent Vivier <laurent@vivier.eu>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.