From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FlHIEWGj; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTPS id F1E4D5A0653 for ; Mon, 19 Jan 2026 09:56:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768812997; 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:autocrypt:autocrypt; bh=NG4ur1w0/0Pb09klYqo3Wu0Lv+IqsnL1LvM/qPWMCHE=; b=FlHIEWGj+voCpDASY28JdteqpubxmX96KL7lWpd+UdJOATfIh0KN7Fx33w9Z+Qip0OF+K7 RJZd5yW0WGmTOrhGvqln0YfTrBx1tdxA+jvro2C1ttlzA9D7J5I0D2bqQsL+X0imrsqQLs UfZPOm9o8YuWNVvOxzoH30u02MUTKRw= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-472-exVxcrNuNEKXSEk2ojJVYw-1; Mon, 19 Jan 2026 03:56:35 -0500 X-MC-Unique: exVxcrNuNEKXSEk2ojJVYw-1 X-Mimecast-MFC-AGG-ID: exVxcrNuNEKXSEk2ojJVYw_1768812994 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4802bb29400so20810025e9.0 for ; Mon, 19 Jan 2026 00:56:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768812994; x=1769417794; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=NG4ur1w0/0Pb09klYqo3Wu0Lv+IqsnL1LvM/qPWMCHE=; b=B5GRBIe78SoAyXwxsTJen5IIm5MftM7zfq3BhdX2lUtVFpy+wZA0jwLqjKU02GNZk2 kJtsBzs73E51P65aFH6lchDbfSbOtfe9x2dge+b9v/MCjJUjCAdnQxPII+3uHq4PEnU/ vP6H1YBTUgwK/sdKTJzA1IhFerF2hF11WeshsLcDiG4cMCIUGNIe2nZ9SuX3VLnrQmYZ tiHMAWylqvKDvLNPomr+XMQYgkV01c13mvZ7Dl73fIqbOyiYeO0ObPMre3YUbiNXi6om EBtM2OB5RsAuaARjaRAJlbvI10pEVCBDXT3kx4tcrolLj8DgC1dCy0X+L6QVEvEkRQE2 KJrQ== X-Gm-Message-State: AOJu0YwwNuVEDOBw5nJZNxPa9JA7zu0ghVRC7YS1z81LqJwoZ2Xlb9zM 1qFbq3F8/qCITDWyHO+Tc4agF/fsUdqWMdJhrBQLaE9u+2BJYt5np6P/ZsqE5VXAuYT7rcw0QYg D5uWuEJRr5zw4sk7jKFNK/AE/HiHqN4hAUHMWlfh/V8+tJ2f43Ggxjdauc8yVGw== X-Gm-Gg: AY/fxX79RSEOrzWEaXXfjg8lwxEpL4w0dsIvwW63Wij9sc87PgadJNMu4HiLYJrvaCr MmjK8LsWqQjA/qFOqEkYip2hxKK+7r6LhakPZyZDeCvWseT0Jzykfi00qF2/hiFeegmhAubGZ4O YTXzoE/TlCBHcF3ooToScz/nTzdXmeGuVgXIAAewMU2IFILqRJF5nxWNts3yAfEnef+EKKKHITT wonkHBjTcej5JIxEV1G2zxCMkbVV4F/vxLSfn5HtS43AiyOUhy73I3fFjYiVqyzlhPEUsqDO08L gekx05ifqIHWM2Fv2/qrt+PmheCcPRwxPu2orYs3DUDX76cSmFpdcGi/DgE7udubcQ3Ci3ljjCd JYY2ASI8LjY7eDcm9D47tKLgDLYZZndfzwE1gK4g81I7zxSw/ X-Received: by 2002:a05:600c:8b55:b0:47d:403e:90c9 with SMTP id 5b1f17b1804b1-4801e2fe345mr122954555e9.11.1768812993880; Mon, 19 Jan 2026 00:56:33 -0800 (PST) X-Received: by 2002:a05:600c:8b55:b0:47d:403e:90c9 with SMTP id 5b1f17b1804b1-4801e2fe345mr122954295e9.11.1768812993404; Mon, 19 Jan 2026 00:56:33 -0800 (PST) Received: from ?IPV6:2a01:e0a:e10:ef90:343a:68f:2e91:95c? ([2a01:e0a:e10:ef90:343a:68f:2e91:95c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801fd458aesm82779195e9.2.2026.01.19.00.56.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Jan 2026 00:56:32 -0800 (PST) Message-ID: <00ca81d1-f8ee-4d9a-8c82-b6ce3403be53@redhat.com> Date: Mon, 19 Jan 2026 09:56:31 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/3] tcp: Register fds with epoll at flow creation To: David Gibson References: <20260116155223.2717168-1-lvivier@redhat.com> <20260116155223.2717168-3-lvivier@redhat.com> From: Laurent Vivier Autocrypt: addr=lvivier@redhat.com; keydata= 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 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: WVCrzdDEpD0JD1KwUx5fohtqtmAnVwRqzU4JoGFrevc_1768812994 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Message-ID-Hash: GMSXJC4A5D2VL3BAJ6NYP4CGS7YGZG24 X-Message-ID-Hash: GMSXJC4A5D2VL3BAJ6NYP4CGS7YGZG24 X-MailFrom: lvivier@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 1/19/26 05:48, David Gibson wrote: > On Fri, Jan 16, 2026 at 04:52:22PM +0100, Laurent Vivier wrote: >> Register connection sockets with epoll using empty events >> (events=0) in tcp_conn_from_tap(), tcp_tap_conn_from_sock() >> and tcp_flow_repair_socket(). >> >> This allows tcp_epoll_ctl() to always use EPOLL_CTL_MOD, removing >> the need to check whether fds are already registered. As a result, the >> conditional ADD/MOD logic is no longer needed, simplifying the function. >> >> Signed-off-by: Laurent Vivier > > Couple of queries, but the concept looks good. > >> --- >> flow.c | 1 + >> tcp.c | 36 ++++++++++++++---------------------- >> 2 files changed, 15 insertions(+), 22 deletions(-) >> >> diff --git a/flow.c b/flow.c >> index cefe6c8b5b24..532339ce7fe1 100644 >> --- a/flow.c >> +++ b/flow.c >> @@ -357,6 +357,7 @@ static void flow_set_state(struct flow_common *f, enum flow_state state) >> * >> * Return: true if flow is registered with epoll, false otherwise >> */ >> +/* cppcheck-suppress unusedFunction */ >> bool flow_in_epoll(const struct flow_common *f) >> { >> return f->epollid != EPOLLFD_ID_INVALID; >> diff --git a/tcp.c b/tcp.c >> index 1db861705ddb..d9bca041dea8 100644 >> --- a/tcp.c >> +++ b/tcp.c >> @@ -528,37 +528,22 @@ static uint32_t tcp_conn_epoll_events(uint8_t events, uint8_t conn_flags) >> static int tcp_epoll_ctl(struct tcp_tap_conn *conn) >> { >> uint32_t events; >> - int m; >> >> if (conn->events == CLOSED) { >> - if (flow_in_epoll(&conn->f)) { >> - int epollfd = flow_epollfd(&conn->f); >> + int epollfd = flow_epollfd(&conn->f); >> >> - epoll_del(epollfd, conn->sock); >> - if (conn->timer != -1) >> - epoll_del(epollfd, conn->timer); >> - } >> + epoll_del(epollfd, conn->sock); >> + if (conn->timer != -1) >> + epoll_del(epollfd, conn->timer); >> >> return 0; >> } >> >> events = tcp_conn_epoll_events(conn->events, conn->flags); >> >> - if (flow_in_epoll(&conn->f)) { >> - m = EPOLL_CTL_MOD; >> - } else { >> - flow_epollid_set(&conn->f, EPOLLFD_ID_DEFAULT); >> - m = EPOLL_CTL_ADD; >> - } >> - >> - if (flow_epoll_set(&conn->f, m, events, conn->sock, >> - !TAPSIDE(conn)) < 0) { >> - int ret = -errno; >> - >> - if (m == EPOLL_CTL_ADD) >> - flow_epollid_clear(&conn->f); >> - return ret; >> - } >> + if (flow_epoll_set(&conn->f, EPOLL_CTL_MOD, events, conn->sock, >> + !TAPSIDE(conn)) < 0) >> + return -errno; >> >> return 0; >> } >> @@ -1710,6 +1695,8 @@ static void tcp_conn_from_tap(const struct ctx *c, sa_family_t af, >> conn->sock = s; >> conn->timer = -1; >> conn->listening_sock = -1; >> + flow_epollid_set(&conn->f, EPOLLFD_ID_DEFAULT); >> + flow_epoll_set(&conn->f, EPOLL_CTL_ADD, 0, s, !TAPSIDE(conn)); > > Do we need to handle errors here? It's a good question. If EPOLL_CTL_ADD fails, the subsequent EPOLL_CTL_MOD called from tcp_epoll_ctl() will fail, so we can rely on that to handle the error... but in conn_event(), tcp_epoll_ctl() error is not handler. So I think we need at least to handle the error here. > > Because this is conn_from_tap(), we know that !TAPSIDE() will always > be TGTSIDE in this case. > >> conn_event(c, conn, TAP_SYN_RCVD); >> >> conn->wnd_to_tap = WINDOW_DEFAULT; >> @@ -2433,6 +2420,8 @@ static void tcp_tap_conn_from_sock(const struct ctx *c, union flow *flow, >> conn->sock = s; >> conn->timer = -1; >> conn->ws_to_tap = conn->ws_from_tap = 0; >> + flow_epollid_set(&conn->f, EPOLLFD_ID_DEFAULT); >> + flow_epoll_set(&conn->f, EPOLL_CTL_ADD, 0, s, !TAPSIDE(conn)); > > Same comments as above, except here we know it's INISIDE. Same answer. > >> conn_event(c, conn, SOCK_ACCEPTED); >> >> hash = flow_hash_insert(c, TAP_SIDX(conn)); >> @@ -3825,6 +3814,9 @@ int tcp_flow_migrate_target(struct ctx *c, int fd) >> return 0; >> } >> >> + flow_epollid_set(&conn->f, EPOLLFD_ID_DEFAULT); >> + flow_epoll_set(&conn->f, EPOLL_CTL_ADD, 0, conn->sock, !TAPSIDE(conn)); >> + >> flow_hash_insert(c, TAP_SIDX(conn)); >> FLOW_ACTIVATE(conn); >> >> -- >> 2.52.0 >> >