From: Stefan Hajnoczi <stefanha@redhat.com>
To: kraxel@redhat.com, Daniel Berrange <berrange@redhat.com>
Cc: Juan Quintela <quintela@redhat.com>,
qemu-devel@nongnu.org,
"Richard W . M . Jones" <rjones@redhat.com>
Subject: Re: [PATCH] sockets: update SOCKET_ADDRESS_TYPE_FD listen(2) backlog
Date: Tue, 16 Mar 2021 09:10:05 +0000 [thread overview]
Message-ID: <YFB17aYnCZlyp8b4@stefanha-x1.localdomain> (raw)
In-Reply-To: <20210310173004.420190-1-stefanha@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 3445 bytes --]
On Wed, Mar 10, 2021 at 05:30:04PM +0000, Stefan Hajnoczi wrote:
> socket_get_fd() fails with the error "socket_get_fd: too many
> connections" if the given listen backlog value is not 1.
>
> Not all callers set the backlog to 1. For example, commit
> 582d4210eb2f2ab5baac328fe4b479cd86da1647 ("qemu-nbd: Use SOMAXCONN for
> socket listen() backlog") uses SOMAXCONN. This will always fail with in
> socket_get_fd().
>
> This patch calls listen(2) on the fd to update the backlog value. The
> socket may already be in the listen state. I have tested that this works
> on Linux 5.10 and macOS Catalina.
>
> As a bonus this allows us to detect when the fd cannot listen. Now we'll
> be able to catch unbound or connected fds in socket_listen().
>
> Drop the num argument from socket_get_fd() since this function is also
> called by socket_connect() where a listen backlog value does not make
> sense.
>
> Fixes: e5b6353cf25c99c3f08bf51e29933352f7140e8f ("socket: Add backlog parameter to socket_listen")
> Reported-by: Richard W.M. Jones <rjones@redhat.com>
> Cc: Juan Quintela <quintela@redhat.com>
> Cc: Eric Blake <eblake@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
> util/qemu-sockets.c | 29 ++++++++++++++++++++++-------
> 1 file changed, 22 insertions(+), 7 deletions(-)
Dan and Gerd: Can this go via one of your trees?
Thanks,
Stefan
> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
> index 8af0278f15..2463c49773 100644
> --- a/util/qemu-sockets.c
> +++ b/util/qemu-sockets.c
> @@ -1116,14 +1116,10 @@ fail:
> return NULL;
> }
>
> -static int socket_get_fd(const char *fdstr, int num, Error **errp)
> +static int socket_get_fd(const char *fdstr, Error **errp)
> {
> Monitor *cur_mon = monitor_cur();
> int fd;
> - if (num != 1) {
> - error_setg_errno(errp, EINVAL, "socket_get_fd: too many connections");
> - return -1;
> - }
> if (cur_mon) {
> fd = monitor_get_fd(cur_mon, fdstr, errp);
> if (fd < 0) {
> @@ -1159,7 +1155,7 @@ int socket_connect(SocketAddress *addr, Error **errp)
> break;
>
> case SOCKET_ADDRESS_TYPE_FD:
> - fd = socket_get_fd(addr->u.fd.str, 1, errp);
> + fd = socket_get_fd(addr->u.fd.str, errp);
> break;
>
> case SOCKET_ADDRESS_TYPE_VSOCK:
> @@ -1187,7 +1183,26 @@ int socket_listen(SocketAddress *addr, int num, Error **errp)
> break;
>
> case SOCKET_ADDRESS_TYPE_FD:
> - fd = socket_get_fd(addr->u.fd.str, num, errp);
> + fd = socket_get_fd(addr->u.fd.str, errp);
> + if (fd < 0) {
> + return -1;
> + }
> +
> + /*
> + * If the socket is not yet in the listen state, then transition it to
> + * the listen state now.
> + *
> + * If it's already listening then this updates the backlog value as
> + * requested.
> + *
> + * If this socket cannot listen because it's already in another state
> + * (e.g. unbound or connected) then we'll catch the error here.
> + */
> + if (listen(fd, num) != 0) {
> + error_setg_errno(errp, errno, "Failed to listen on fd socket");
> + closesocket(fd);
> + return -1;
> + }
> break;
>
> case SOCKET_ADDRESS_TYPE_VSOCK:
> --
> 2.29.2
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-03-16 9:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 17:30 [PATCH] sockets: update SOCKET_ADDRESS_TYPE_FD listen(2) backlog Stefan Hajnoczi
2021-03-10 17:56 ` Richard W.M. Jones
2021-03-10 18:17 ` Eric Blake
2021-03-12 9:01 ` Stefano Garzarella
2021-03-16 9:10 ` Stefan Hajnoczi [this message]
2021-03-16 13:35 ` Eric Blake
2021-03-17 9:51 ` Stefan Hajnoczi
2021-03-31 10:08 ` Stefan Hajnoczi
2021-05-11 8:23 ` Stefan Hajnoczi
2021-05-11 18:10 ` Richard W.M. Jones
2021-05-18 7:56 ` Richard W.M. Jones
2021-06-01 14:24 ` Stefan Hajnoczi
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=YFB17aYnCZlyp8b4@stefanha-x1.localdomain \
--to=stefanha@redhat.com \
--cc=berrange@redhat.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=rjones@redhat.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;
as well as URLs for NNTP newsgroup(s).