From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTP id F17D55A0271 for ; Wed, 9 Aug 2023 21:59:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691611172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MdGcAtVcCUJGtFPYHNNI5OUuV3Yc3Th5PUAlxjeEpsY=; b=XEH9QPO3icQj7X/2eKtKZ8pFaZ1Bu5ue9W0/rfuh6Z2mOc/DM3Mdw/OxZENFhXTxOOEIBW CIHNL1vKoWRbxZnB1Porw+Fsk/Dyy/80+2fUE9qLPSfyl9SQc/UI13fZiqMk5zPqBLARkq 1zaDniLja00tO0FHQt4gasRTsgIx780= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-558-ZhiIKzObN-KtmKBczEwO8A-1; Wed, 09 Aug 2023 15:59:31 -0400 X-MC-Unique: ZhiIKzObN-KtmKBczEwO8A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 790E11C05AE7; Wed, 9 Aug 2023 19:59:31 +0000 (UTC) Received: from elisabeth (unknown [10.39.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 74E9840C6F4E; Wed, 9 Aug 2023 19:59:30 +0000 (UTC) Date: Wed, 9 Aug 2023 21:59:27 +0200 From: Stefano Brivio To: David Gibson Subject: Re: [PATCH 8/9] epoll: Split listening Unix domain socket into its own type Message-ID: <20230809215927.006be951@elisabeth> In-Reply-To: <20230807134631.1400119-9-david@gibson.dropbear.id.au> References: <20230807134631.1400119-1-david@gibson.dropbear.id.au> <20230807134631.1400119-9-david@gibson.dropbear.id.au> Organization: Red Hat MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: PQMIGDI7HW3VLDDOAPDCXI25R5WACLZG X-Message-ID-Hash: PQMIGDI7HW3VLDDOAPDCXI25R5WACLZG X-MailFrom: sbrivio@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On Mon, 7 Aug 2023 23:46:30 +1000 David Gibson wrote: > tap_handler() actually handles events on three different types of object: > the /dev/tap character device (pasta), a connected Unix domain socket > (passt) or a listening Unix domain socket (passt). > > The last, in particular, really has no handling in common with the others, > so split it into its own epoll type and directly dispatch to the relevant > handler from the top level. > > Signed-off-by: David Gibson > --- > passt.c | 6 +++++- > passt.h | 6 ++++-- > tap.c | 20 ++++++++------------ > tap.h | 4 ++-- > 4 files changed, 19 insertions(+), 17 deletions(-) > > diff --git a/passt.c b/passt.c > index c32981d..c60f346 100644 > --- a/passt.c > +++ b/passt.c > @@ -64,6 +64,7 @@ char *epoll_type_str[EPOLL_TYPE_MAX+1] = { > [EPOLL_TYPE_ICMPV6] = "ICMPv6 socket", > [EPOLL_TYPE_NSQUIT] = "namespace inotify", > [EPOLL_TYPE_TAP] = "tap device", > + [EPOLL_TYPE_TAP_LISTEN] = "listening qemu socket", > }; > > /** > @@ -317,7 +318,10 @@ loop: > > switch (ref.type) { > case EPOLL_TYPE_TAP: > - tap_handler(&c, ref.fd, events[i].events, &now); > + tap_handler(&c, events[i].events, &now); > + break; > + case EPOLL_TYPE_TAP_LISTEN: > + tap_listen_handler(&c, eventmask); > break; > case EPOLL_TYPE_NSQUIT: > pasta_netns_quit_handler(&c, quit_fd); > diff --git a/passt.h b/passt.h > index 176bc85..7dae08b 100644 > --- a/passt.h > +++ b/passt.h > @@ -61,10 +61,12 @@ enum epoll_type { > EPOLL_TYPE_ICMPV6, > /* inotify fd watching for end of netns (pasta) */ > EPOLL_TYPE_NSQUIT, > - /* tap char device, or qemu socket fd */ > + /* tap char device, or connected qemu socket fd */ > EPOLL_TYPE_TAP, > + /* socket listening for qemu socket connections */ > + EPOLL_TYPE_TAP_LISTEN, > > - EPOLL_TYPE_MAX = EPOLL_TYPE_TAP, > + EPOLL_TYPE_MAX = EPOLL_TYPE_TAP_LISTEN, > }; > > /** > diff --git a/tap.c b/tap.c > index ad0decf..8468f86 100644 > --- a/tap.c > +++ b/tap.c > @@ -1076,7 +1076,7 @@ restart: > static void tap_sock_unix_init(struct ctx *c) > { > int fd = socket(AF_UNIX, SOCK_STREAM, 0); > - union epoll_ref ref = { .type = EPOLL_TYPE_TAP }; > + union epoll_ref ref = { .type = EPOLL_TYPE_TAP_LISTEN }; > struct epoll_event ev = { 0 }; > struct sockaddr_un addr = { > .sun_family = AF_UNIX, > @@ -1142,10 +1142,11 @@ static void tap_sock_unix_init(struct ctx *c) > } > > /** > - * tap_sock_unix_new() - Handle new connection on listening socket > + * tap_listen_handler() - Handle new connection on listening socket > * @c: Execution context > + * @events: epoll events on the socket > */ > -static void tap_sock_unix_new(struct ctx *c) > +void tap_listen_handler(struct ctx *c, uint32_t events) > { > union epoll_ref ref = { .type = EPOLL_TYPE_TAP }; > struct epoll_event ev = { 0 }; > @@ -1153,6 +1154,9 @@ static void tap_sock_unix_new(struct ctx *c) > struct ucred ucred; > socklen_t len; > > + if (events != EPOLLIN) > + return; > + This comment actually belongs to 2/4 of the tap reset clean-up series, but posting it here for clarity: ...wouldn't it be appropriate to handle errors while at it? Otherwise I guess we'll just spin on EPOLLERR or EPOLLRDHUP. I didn't realise before that other series that we didn't actually handle errors on this path -- that's the reason why error handling is missing, nothing else. The rest of the series looks good to me, thanks -- waiting for v2. -- Stefano