qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux: Only use 64-bit syscall if required for mq_timedsend 

For !__ASSUME_TIME64_SYSCALLS there is no need to issue a 64-bit syscall
if the provided timeout fits in a 32-bit one.  The 64-bit usage should
be rare since the timeout is a relative one.

Checked on i686-linux-gnu on a 4.15 kernel and on a 5.11 kernel
(with and without --enable-kernel=5.1) and on x86_64-linux-gnu.

Reviewed-by: Lukasz Majewski <lukma@denx.de>
This commit is contained in:
Adhemerval Zanella 2021-06-16 09:50:53 -03:00
parent e9e912d334
commit 1faff27011
2 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rt/tst-mqueue10.c
View File

@ -54,6 +54,16 @@ do_test (void)
support_delete_timer (timer); support_delete_timer (timer);
} }
{
timer_t timer = support_create_timer (0, 100000000, false, NULL);
/* Fill the internal buffer first. */
TEST_COMPARE (mq_timedsend (q, msg, sizeof (msg), 0,
&(struct timespec) { 0, 0 }), 0);
TEST_COMPARE (mq_timedsend (q, msg, sizeof (msg), 0, &ts), -1);
TEST_VERIFY (errno == EINTR || errno == EOVERFLOW);
support_delete_timer (timer);
}
mq_unlink (name); mq_unlink (name);
return 0; return 0;

41
sysdeps/unix/sysv/linux/mq_timedsend.c
View File

@ -29,30 +29,33 @@ __mq_timedsend_time64 (mqd_t mqdes, const char *msg_ptr, size_t msg_len,
# ifndef __NR_mq_timedsend_time64 # ifndef __NR_mq_timedsend_time64
# define __NR_mq_timedsend_time64 __NR_mq_timedsend # define __NR_mq_timedsend_time64 __NR_mq_timedsend
# endif # endif
int ret = SYSCALL_CANCEL (mq_timedsend_time64, mqdes, msg_ptr, msg_len,
msg_prio, abs_timeout);
#ifndef __ASSUME_TIME64_SYSCALLS #ifdef __ASSUME_TIME64_SYSCALLS
if (ret == 0 || errno != ENOSYS) return SYSCALL_CANCEL (mq_timedsend_time64, mqdes, msg_ptr, msg_len,
return ret; msg_prio, abs_timeout);
#else
struct timespec ts32; bool need_time64 = abs_timeout != NULL
if (abs_timeout != NULL) && !in_time_t_range (abs_timeout->tv_sec);
if (need_time64)
{ {
if (! in_time_t_range (abs_timeout->tv_sec)) int r = SYSCALL_CANCEL (mq_timedsend_time64, mqdes, msg_ptr, msg_len,
{ msg_prio, abs_timeout);
__set_errno (EOVERFLOW); if (r == 0 || errno != ENOSYS)
return -1; return r;
} __set_errno (EOVERFLOW);
return -1;
ts32 = valid_timespec64_to_timespec (*abs_timeout);
} }
ret = SYSCALL_CANCEL (mq_timedsend, mqdes, msg_ptr, msg_len, msg_prio, struct timespec ts32, *pts32 = NULL;
abs_timeout != NULL ? &ts32 : NULL); if (abs_timeout != NULL)
#endif {
ts32 = valid_timespec64_to_timespec (*abs_timeout);
pts32 = &ts32;
}
return ret; return SYSCALL_CANCEL (mq_timedsend, mqdes, msg_ptr, msg_len, msg_prio,
pts32);
#endif
} }
#if __TIMESIZE != 64 #if __TIMESIZE != 64