From: Eric Dumazet <eric.dumazet@gmail.com>
To: Alban Crequy <alban.crequy@collabora.co.uk>
Cc: "David S. Miller" <davem@davemloft.net>,
Stephen Hemminger <shemminger@vyatta.com>,
Cyrill Gorcunov <gorcunov@openvz.org>,
Alexey Dobriyan <adobriyan@gmail.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Pauli Nieminen <pauli.nieminen@collabora.co.uk>,
Rainer Weikusat <rweikusat@mssgmbh.com>,
Davide Libenzi <davidel@xmailserver.org>
Subject: Re: [PATCH 0/1] RFC: poll/select performance on datagram sockets
Date: Sat, 30 Oct 2010 15:17:58 +0200 [thread overview]
Message-ID: <1288444678.2680.966.camel@edumazet-laptop> (raw)
In-Reply-To: <1288443217.2680.962.camel@edumazet-laptop>
> Problem is the peer_wait, that epoll doesnt seem to be plugged into.
>
> Bug is in unix_dgram_poll()
>
> It calls sock_poll_wait( ... &unix_sk(other)->peer_wait,) only if socket
> is 'writable'. Its a clear bug
>
> Try this patch please ?
>
> diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
> index 0ebc777..315716c 100644
> --- a/net/unix/af_unix.c
> +++ b/net/unix/af_unix.c
> @@ -2092,7 +2092,7 @@ static unsigned int unix_dgram_poll(struct file *file, struct socket *sock,
>
> /* writable? */
> writable = unix_writable(sk);
> - if (writable) {
> + if (1 /*writable*/) {
> other = unix_peer_get(sk);
> if (other) {
> if (unix_peer(other) != sk) {
>
>
>
Also you'll need to change your program to make the epoll registrations
_after_ sockets connect(), or else you can see that epoll() wont know
about the other peer stuff.
for (i = 0 ; i < NB_CLIENTS ; i++) {
client_fds[i] = socket(AF_UNIX, SOCK_DGRAM, 0);
}
for (i = 0 ; i < NB_CLIENTS ; i++) {
connect(client_fds[i], (struct sockaddr*)&addr_server, sizeof(addr_server));
}
ev.events = EPOLLOUT;
ev.data.fd = client_fds[NB_CLIENTS-1];
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, client_fds[NB_CLIENTS-1], &ev) == -1) {
perror("epoll_ctl: client_fds max");
exit(EXIT_FAILURE);
}
if (trigger == 0) {
ev.events = EPOLLOUT;
ev.data.fd = client_fds[0];
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, client_fds[0], &ev) == -1) {
perror("epoll_ctl: client_fds 0");
exit(EXIT_FAILURE);
}
}
next prev parent reply other threads:[~2010-10-30 13:18 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-29 18:18 [PATCH 0/1] RFC: poll/select performance on datagram sockets Alban Crequy
2010-10-29 18:21 ` [PATCH] " Alban Crequy
2010-10-29 19:27 ` [PATCH 0/1] RFC: " Eric Dumazet
2010-10-29 20:08 ` Davide Libenzi
2010-10-29 20:20 ` Eric Dumazet
2010-10-29 20:46 ` Davide Libenzi
2010-10-29 21:05 ` Eric Dumazet
2010-10-29 21:57 ` Davide Libenzi
2010-10-29 22:08 ` Eric Dumazet
2010-10-30 9:53 ` [PATCH] af_unix: optimize unix_dgram_poll() Eric Dumazet
2010-10-30 17:45 ` Davide Libenzi
2010-10-29 20:20 ` [PATCH 0/1] RFC: poll/select performance on datagram sockets Jesper Juhl
2010-10-29 20:40 ` David Miller
2010-10-29 20:45 ` Eric Dumazet
2010-10-30 6:44 ` [PATCH] af_unix: unix_write_space() use keyed wakeups Eric Dumazet
2010-10-30 15:03 ` Davide Libenzi
2010-11-08 21:44 ` David Miller
2010-10-30 21:36 ` Alban Crequy
[not found] ` <1290554876.2158.5.camel@Nokia-N900-51-1>
2010-11-24 0:20 ` Alban Crequy
2010-11-24 0:28 ` Eric Dumazet
2010-10-30 11:34 ` [PATCH 0/1] RFC: poll/select performance on datagram sockets Alban Crequy
2010-10-30 12:53 ` Eric Dumazet
2010-10-30 13:17 ` Eric Dumazet [this message]
[not found] ` <20101030224703.065e70f6@chocolatine.cbg.collabora.co.uk>
2010-10-31 15:36 ` [PATCH 1/2] af_unix: fix unix_dgram_poll() behavior for EPOLLOUT event Eric Dumazet
2010-10-31 19:07 ` Davide Libenzi
2010-11-08 21:44 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1288444678.2680.966.camel@edumazet-laptop \
--to=eric.dumazet@gmail.com \
--cc=adobriyan@gmail.com \
--cc=alban.crequy@collabora.co.uk \
--cc=davem@davemloft.net \
--cc=davidel@xmailserver.org \
--cc=gorcunov@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pauli.nieminen@collabora.co.uk \
--cc=rweikusat@mssgmbh.com \
--cc=shemminger@vyatta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox