Add MSG_WAITFORONE flag to recvmmsg
Subsystems (3)
PATCH 1/1 Add MSG_WAITFORONE flag to recvmmsg
From: Brandon L Black <[email protected]>
Add new flag MSG_WAITFORONE for the recvmmsg() syscall. When this flag is specified for a blocking socket, recvmmsg() will only block until at least 1 packet is available. The default behavior is to block until all vlen packets are available. This flag has no effect on non-blocking sockets or when used in combination with MSG_DONTWAIT.
---
include/linux/socket.h +1 -0
@@ -255,6 +255,7 @@ struct ucred {#define MSG_ERRQUEUE 0x2000/* Fetch message from error queue */ #define MSG_NOSIGNAL 0x4000/* Do not generate SIGPIPE */ #define MSG_MORE 0x8000/* Sender will send more */ +#define MSG_WAITFORONE 0x10000/* recvmmsg(): block until 1+ packets avail */ #define MSG_EOF MSG_FIN
net/socket.c +4 -1
@@ -2133,7 +2133,10 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,if (err)break ; - ++datagrams; + +/* MSG_WAITFORONE turns on MSG_DONTWAIT after one packet */ +if (!datagrams++ && (flags &MSG_WAITFORONE )) + flags |=MSG_DONTWAIT ;if (timeout) {ktime_get_ts (timeout);
Quoted 31 lines · Brandon L Black
From: Brandon L Black <[email protected]>
Add new flag
MSG_WAITFORONEfor therecvmmsg()syscall. When this flag is specified for a blocking socket,recvmmsg()will only block until at least 1 packet is available. The default behavior is to block until all vlen packets are available. This flag has no effect on non-blocking sockets or when used in combination withMSG_DONTWAIT.Signed-off-by Brandon L Black <[email protected]>---
include/linux/socket.h +1
-0@@ -255,6 +255,7 @@ struct ucred {#define MSG_ERRQUEUE 0x2000/* Fetch message from error queue */ #define MSG_NOSIGNAL 0x4000/* Do not generate SIGPIPE */ #define MSG_MORE 0x8000/* Sender will send more */ +#define MSG_WAITFORONE 0x10000/* recvmmsg(): block until 1+ packets avail */ #define MSG_EOF MSG_FINnet/socket.c +0
-0
net/socket.c int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen, · line 2139
Quoted 8 lines
net/socket.c +4
-1@@ -2133,7 +2133,10 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,if (err)break ; - ++datagrams; + +/* MSG_WAITFORONE turns on MSG_DONTWAIT after one packet */ +if (!datagrams++ && (flags &MSG_WAITFORONE )) + flags |=MSG_DONTWAIT ;
Hmmm, no need to test !datagram, just do :
++datagrams; if (flags & MSG_WAITFORONE) flags |= MSG_DONTWAIT;
Quoted 7 lines · Eric Dumazet
Hmmm, no need to test !datagram, just do :
++datagrams;
if (flags &
MSG_WAITFORONE)
flags |=MSG_DONTWAIT;
Ok. I've never been through this process before. Do I resubmit a new subject/thread with the changed patch and [PATCH v2] at this point? Any other nits about how the patch was sent before I do?
Thanks,
-- Brandon
Quoted 2 lines · Brandon Black
Ok. I've never been through this process before. Do I resubmit a new subject/thread with the changed patch and [PATCH v2] at this point?
The patch is small enough for this to be OK.
PATCH v2 1/1 Add MSG_WAITFORONE flag to recvmmsg
From: Brandon L Black <[email protected]>
Add new flag MSG_WAITFORONE for the recvmmsg() syscall. When this flag is specified for a blocking socket, recvmmsg() will only block until at least 1 packet is available. The default behavior is to block until all vlen packets are available. This flag has no effect on non-blocking sockets or when used in combination with MSG_DONTWAIT.
---
include/linux/socket.h +1 -0
@@ -255,6 +255,7 @@ struct ucred {#define MSG_ERRQUEUE 0x2000/* Fetch message from error queue */ #define MSG_NOSIGNAL 0x4000/* Do not generate SIGPIPE */ #define MSG_MORE 0x8000/* Sender will send more */ +#define MSG_WAITFORONE 0x10000/* recvmmsg(): block until 1+ packets avail */ #define MSG_EOF MSG_FIN
net/socket.c +4 -0
@@ -2135,6 +2135,10 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,break ; ++datagrams; +/* MSG_WAITFORONE turns on MSG_DONTWAIT after one packet */ +if (flags &MSG_WAITFORONE ) + flags |=MSG_DONTWAIT ; +if (timeout) {ktime_get_ts (timeout); *timeout =timespec_sub (end_time, *timeout);
David Miller
maintainerFrom: Brandon L Black <[email protected]>
Date: Fri, 26 Mar 2010 21:18:03 -0500
Quoted 11 lines
From: Brandon L Black <[email protected]>
Add new flag
MSG_WAITFORONEfor therecvmmsg()syscall. When this flag is specified for a blocking socket,recvmmsg()will only block until at least 1 packet is available. The default behavior is to block until all vlen packets are available. This flag has no effect on non-blocking sockets or when used in combination withMSG_DONTWAIT.Signed-off-by Brandon L Black <[email protected]>
Arnaldo, please review this, thanks.
Quoted 8 lines · Brandon L Black
Add new flag
MSG_WAITFORONEfor therecvmmsg()syscall. When this flag is specified for a blocking socket,recvmmsg()will only block until at least 1 packet is available. The default behavior is to block until all vlen packets are available. This flag has no effect on non-blocking sockets or when used in combination withMSG_DONTWAIT.Signed-off-by Brandon L Black <[email protected]>
This is useful and looks OK to me.
Quoted 11 lines · Brandon L Black
From: Brandon L Black <[email protected]>
Add new flag
MSG_WAITFORONEfor therecvmmsg()syscall. When this flag is specified for a blocking socket,recvmmsg()will only block until at least 1 packet is available. The default behavior is to block until all vlen packets are available. This flag has no effect on non-blocking sockets or when used in combination withMSG_DONTWAIT.Signed-off-by Brandon L Black <[email protected]>
Quoted 29 lines
---
include/linux/socket.h +1
-0@@ -255,6 +255,7 @@ struct ucred {#define MSG_ERRQUEUE 0x2000/* Fetch message from error queue */ #define MSG_NOSIGNAL 0x4000/* Do not generate SIGPIPE */ #define MSG_MORE 0x8000/* Sender will send more */ +#define MSG_WAITFORONE 0x10000/* recvmmsg(): block until 1+ packets avail */ #define MSG_EOF MSG_FINnet/socket.c +4
-1@@ -2135,6 +2135,10 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,break ; ++datagrams; +/* MSG_WAITFORONE turns on MSG_DONTWAIT after one packet */ +if (flags &MSG_WAITFORONE ) + flags |=MSG_DONTWAIT ; +if (timeout) {ktime_get_ts (timeout); *timeout =timespec_sub (end_time, *timeout); --
Arnaldo Carvalho de Melo
Acked-byEm Fri, Mar 26, 2010 at 08:54:28PM -0700, David Miller escreveu:
Quoted 13 lines
From: Brandon L Black <[email protected]>
Date: Fri, 26 Mar 2010 21:18:03 -0500Quoted 10 lines
From: Brandon L Black <[email protected]>
Add new flag
MSG_WAITFORONEfor therecvmmsg()syscall. When this flag is specified for a blocking socket,recvmmsg()will only block until at least 1 packet is available. The default behavior is to block until all vlen packets are available. This flag has no effect on non-blocking sockets or when used in combination withMSG_DONTWAIT.
Quoted 3 lines
Quoted 1 line
Signed-off-by Brandon L Black <[email protected]>Arnaldo, please review this, thanks.
I'm ok with it.
- Arnaldo
From: Arnaldo Carvalho de Melo <[email protected]>
Date: Sat, 27 Mar 2010 11:07:17 -0300
Quoted 14 lines
Em Fri, Mar 26, 2010 at 08:54:28PM -0700, David Miller escreveu:
Quoted 13 lines
From: Brandon L Black <[email protected]>
Date: Fri, 26 Mar 2010 21:18:03 -0500Quoted 10 lines
From: Brandon L Black <[email protected]>
Add new flag
MSG_WAITFORONEfor therecvmmsg()syscall. When this flag is specified for a blocking socket,recvmmsg()will only block until at least 1 packet is available. The default behavior is to block until all vlen packets are available. This flag has no effect on non-blocking sockets or when used in combination withMSG_DONTWAIT.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Brandon L Black <[email protected]>Arnaldo, please review this, thanks.
I'm ok with it.
Applied, thanks everyone.