Skip to content

Commit

Permalink
linux-user: fix eventfd
Browse files Browse the repository at this point in the history
When a fd is opened using eventfd(), a read provides
a 64bit counter in the host byte order, and a
write increase the internal counter by the provided
64bit value.

Signed-off-by: Laurent Vivier <[email protected]>
Signed-off-by: Riku Voipio <[email protected]>
  • Loading branch information
vivier authored and Riku Voipio committed May 29, 2017
1 parent 04b9bcf commit 562a20b
Showing 1 changed file with 24 additions and 2 deletions.
26 changes: 24 additions & 2 deletions linux-user/syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -7671,6 +7671,28 @@ static target_timer_t get_timer_id(abi_long arg)
return timerid;
}

static abi_long swap_data_eventfd(void *buf, size_t len)
{
uint64_t *counter = buf;
int i;

if (len < sizeof(uint64_t)) {
return -EINVAL;
}

for (i = 0; i < len; i += sizeof(uint64_t)) {
*counter = tswap64(*counter);
counter++;
}

return len;
}

static TargetFdTrans target_eventfd_trans = {
.host_to_target_data = swap_data_eventfd,
.target_to_host_data = swap_data_eventfd,
};

/* do_syscall() should always have a single exit point at the end so
that actions, such as logging of syscall results, can be performed.
All errnos that do_syscall() returns must be -TARGET_<errcode>. */
Expand Down Expand Up @@ -11876,7 +11898,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
#if defined(TARGET_NR_eventfd)
case TARGET_NR_eventfd:
ret = get_errno(eventfd(arg1, 0));
fd_trans_unregister(ret);
fd_trans_register(ret, &target_eventfd_trans);
break;
#endif
#if defined(TARGET_NR_eventfd2)
Expand All @@ -11890,7 +11912,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
host_flags |= O_CLOEXEC;
}
ret = get_errno(eventfd(arg1, host_flags));
fd_trans_unregister(ret);
fd_trans_register(ret, &target_eventfd_trans);
break;
}
#endif
Expand Down

0 comments on commit 562a20b

Please sign in to comment.