| Message ID | 20100327021803.GA10866@xpc.home |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Brandon L Black <blblack@gmail.com> Date: Fri, 26 Mar 2010 21:18:03 -0500 > > From: Brandon L Black <blblack@gmail.com> > > 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. > > Signed-off-by: Brandon L Black <blblack@gmail.com> Arnaldo, please review this, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Mar 26, 2010 at 19:18, Brandon L Black <blblack@gmail.com> wrote: > 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. > > Signed-off-by: Brandon L Black <blblack@gmail.com> This is useful and looks OK to me. Acked-by: Ulrich Drepper <drepper@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Le vendredi 26 mars 2010 à 21:18 -0500, Brandon L Black a écrit : > From: Brandon L Black <blblack@gmail.com> > > 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. > > Signed-off-by: Brandon L Black <blblack@gmail.com> > Acked-by: Eric Dumazet <eric.dumazet@gmail.com> > --- > diff --git a/include/linux/socket.h b/include/linux/socket.h > index 7b3aae2..354cc56 100644 > --- a/include/linux/socket.h > +++ b/include/linux/socket.h > @@ -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 > > diff --git a/net/socket.c b/net/socket.c > index 769c386..f55ffe9 100644 > --- a/net/socket.c > +++ b/net/socket.c > @@ -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); > -- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em Fri, Mar 26, 2010 at 08:54:28PM -0700, David Miller escreveu: > From: Brandon L Black <blblack@gmail.com> > Date: Fri, 26 Mar 2010 21:18:03 -0500 > > > > > From: Brandon L Black <blblack@gmail.com> > > > > 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. > > > > Signed-off-by: Brandon L Black <blblack@gmail.com> > > Arnaldo, please review this, thanks. I'm ok with it. Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> - Arnaldo -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Arnaldo Carvalho de Melo <acme@redhat.com> Date: Sat, 27 Mar 2010 11:07:17 -0300 > Em Fri, Mar 26, 2010 at 08:54:28PM -0700, David Miller escreveu: >> From: Brandon L Black <blblack@gmail.com> >> Date: Fri, 26 Mar 2010 21:18:03 -0500 >> >> > >> > From: Brandon L Black <blblack@gmail.com> >> > >> > 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. >> > >> > Signed-off-by: Brandon L Black <blblack@gmail.com> >> >> Arnaldo, please review this, thanks. > > I'm ok with it. > > Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Applied, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/socket.h b/include/linux/socket.h index 7b3aae2..354cc56 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -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 diff --git a/net/socket.c b/net/socket.c index 769c386..f55ffe9 100644 --- a/net/socket.c +++ b/net/socket.c @@ -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);