From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751701Ab0C0GAM (ORCPT ); Sat, 27 Mar 2010 02:00:12 -0400 Received: from mail-bw0-f209.google.com ([209.85.218.209]:57785 "EHLO mail-bw0-f209.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750851Ab0C0GAJ (ORCPT ); Sat, 27 Mar 2010 02:00:09 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=WhyD3EQrZIHoxXmiVqyFxMFHWp2btKiZEqiRgahytsHtIEqmbrcs8UrGnnqZhtz8C9 DtjsK/PMes5juqX1qP4YAoiafsKOT2e5eolKjYtJS1Daw1+WmcyKh0boUhZ9LdTP9EOR Kfbo6IO9JNZtx1SPV1+HRnqTd4XLLQWcsCb8A= Subject: Re: [PATCH v2] Add MSG_WAITFORONE flag to recvmmsg From: Eric Dumazet To: Brandon L Black Cc: netdev@vger.kernel.org, "David S. Miller" , Arnaldo Carvalho de Melo , Ulrich Drepper , linux-kernel@vger.kernel.org In-Reply-To: <20100327021803.GA10866@xpc.home> References: <20100326223530.GA11817@xpc.home> <1269643470.2256.17.camel@edumazet-laptop> <84621a61003261555q2c78f6a8o5b438113bed6bd2@mail.gmail.com> <20100327021803.GA10866@xpc.home> Content-Type: text/plain; charset="UTF-8" Date: Sat, 27 Mar 2010 07:00:04 +0100 Message-ID: <1269669604.2256.20.camel@edumazet-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le vendredi 26 mars 2010 à 21:18 -0500, Brandon L Black a écrit : > From: Brandon L Black > > 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 > Acked-by: Eric Dumazet > --- > 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); > --