d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux(4): Implement recvmmsg_time64 syscall.

Browse Source 
MFC after:		2 weeks
This commit is contained in:
Dmitry Chagin 2022-05-04 13:06:53 +03:00
parent 79695e9585
commit 1744f14e26
3 changed files with 61 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/amd64/linux32/linux32_dummy_machdep.c
View File

@ -69,7 +69,6 @@ DUMMY(arch_prctl);
/* Linux 5.0: */
DUMMY(clock_adjtime64);
DUMMY(io_pgetevents_time64);
DUMMY(recvmmsg_time64);
DUMMY(mq_timedsend_time64);
DUMMY(mq_timedreceive_time64);
DUMMY(semtimedop_time64);

85
sys/compat/linux/linux_socket.c
View File

@ -1736,32 +1736,19 @@ linux_recvmsg(struct thread *td, struct linux_recvmsg_args *args)
args->flags, &bsd_msg));
}
int
linux_recvmmsg(struct thread *td, struct linux_recvmmsg_args *args)
static int
linux_recvmmsg_common(struct thread *td, l_int s, struct l_mmsghdr *msg,
l_uint vlen, l_uint flags, struct timespec *tts)
{
struct l_mmsghdr *msg;
struct msghdr bsd_msg;
struct l_timespec lts;
struct timespec ts, tts;
struct timespec ts;
l_uint retval;
int error, datagrams;
if (args->timeout) {
error = copyin(args->timeout, &lts, sizeof(struct l_timespec));
if (error != 0)
return (error);
error = linux_to_native_timespec(&ts, &lts);
if (error != 0)
return (error);
getnanotime(&tts);
timespecadd(&tts, &ts, &tts);
}
msg = PTRIN(args->msg);
datagrams = 0;
while (datagrams < args->vlen) {
error = linux_recvmsg_common(td, args->s, &msg->msg_hdr,
args->flags & ~LINUX_MSG_WAITFORONE, &bsd_msg);
while (datagrams < vlen) {
error = linux_recvmsg_common(td, s, &msg->msg_hdr,
flags & ~LINUX_MSG_WAITFORONE, &bsd_msg);
if (error != 0)
break;
@ -1775,15 +1762,15 @@ linux_recvmmsg(struct thread *td, struct linux_recvmmsg_args *args)
/*
* MSG_WAITFORONE turns on MSG_DONTWAIT after one packet.
*/
if (args->flags & LINUX_MSG_WAITFORONE)
args->flags |= LINUX_MSG_DONTWAIT;
if (flags & LINUX_MSG_WAITFORONE)
flags |= LINUX_MSG_DONTWAIT;
/*
* See BUGS section of recvmmsg(2).
*/
if (args->timeout) {
if (tts) {
getnanotime(&ts);
timespecsub(&ts, &tts, &ts);
timespecsub(&ts, tts, &ts);
if (!timespecisset(&ts) || ts.tv_sec > 0)
break;
}
@ -1796,6 +1783,56 @@ linux_recvmmsg(struct thread *td, struct linux_recvmmsg_args *args)
return (error);
}
int
linux_recvmmsg(struct thread *td, struct linux_recvmmsg_args *args)
{
struct l_timespec lts;
struct timespec ts, tts, *ptts;
int error;
if (args->timeout) {
error = copyin(args->timeout, &lts, sizeof(struct l_timespec));
if (error != 0)
return (error);
error = linux_to_native_timespec(&ts, &lts);
if (error != 0)
return (error);
getnanotime(&tts);
timespecadd(&tts, &ts, &tts);
ptts = &tts;
}
else ptts = NULL;
return (linux_recvmmsg_common(td, args->s, PTRIN(args->msg),
args->vlen, args->flags, ptts));
}
#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32))
int
linux_recvmmsg_time64(struct thread *td, struct linux_recvmmsg_time64_args *args)
{
struct l_timespec64 lts;
struct timespec ts, tts, *ptts;
int error;
if (args->timeout) {
error = copyin(args->timeout, &lts, sizeof(struct l_timespec));
if (error != 0)
return (error);
error = linux_to_native_timespec64(&ts, &lts);
if (error != 0)
return (error);
getnanotime(&tts);
timespecadd(&tts, &ts, &tts);
ptts = &tts;
}
else ptts = NULL;
return (linux_recvmmsg_common(td, args->s, PTRIN(args->msg),
args->vlen, args->flags, ptts));
}
#endif
int
linux_shutdown(struct thread *td, struct linux_shutdown_args *args)
{

1
sys/i386/linux/linux_dummy_machdep.c
View File

@ -71,7 +71,6 @@ DUMMY(arch_prctl);
/* Linux 5.0: */
DUMMY(clock_adjtime64);
DUMMY(io_pgetevents_time64);
DUMMY(recvmmsg_time64);
DUMMY(mq_timedsend_time64);
DUMMY(mq_timedreceive_time64);
DUMMY(semtimedop_time64);