From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v2 01/11] tcp_splice: Remove redundant tcp_splice_epoll_ctl()
Date: Tue, 7 Nov 2023 13:42:40 +1100 [thread overview]
Message-ID: <20231107024250.2290959-2-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20231107024250.2290959-1-david@gibson.dropbear.id.au>
tcp_splice_conn_update() calls tcp_splice_epoll_ctl() twice: first ignoring
the return value, then checking it. This serves no purpose. If the first
call succeeds, the second call will do exactly the same thing again, since
nothing has changed in conn. If the first call fails, then
tcp_splice_epoll_ctl() itself will EPOLL_CTL_DEL both fds, meaning when
the second call tries to EPOLL_CTL_MOD them it will necessarily fail.
It appears that this duplication was introduced by accident in an
otherwise unrelated patch.
Fixes: bb708111 ("treewide: Packet abstraction with mandatory boundary checks")
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
tcp_splice.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/tcp_splice.c b/tcp_splice.c
index 133e825..87fbd50 100644
--- a/tcp_splice.c
+++ b/tcp_splice.c
@@ -255,7 +255,6 @@ static void conn_event_do(const struct ctx *c, struct tcp_splice_conn *conn,
*/
void tcp_splice_conn_update(const struct ctx *c, struct tcp_splice_conn *new)
{
- tcp_splice_epoll_ctl(c, new);
if (tcp_splice_epoll_ctl(c, new))
conn_flag(c, new, CLOSING);
}
--
@@ -255,7 +255,6 @@ static void conn_event_do(const struct ctx *c, struct tcp_splice_conn *conn,
*/
void tcp_splice_conn_update(const struct ctx *c, struct tcp_splice_conn *new)
{
- tcp_splice_epoll_ctl(c, new);
if (tcp_splice_epoll_ctl(c, new))
conn_flag(c, new, CLOSING);
}
--
2.41.0
next prev parent reply other threads:[~2023-11-07 2:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-07 2:42 [PATCH v2 00/11] tcp_splice: Better exploit symmetry between sides of connection David Gibson
2023-11-07 2:42 ` David Gibson [this message]
2023-11-07 2:42 ` [PATCH v2 02/11] tcp_splice: Correct error handling in tcp_splice_epoll_ctl() David Gibson
2023-11-07 2:42 ` [PATCH v2 03/11] tcp_splice: Don't handle EPOLL_CTL_DEL as part of tcp_splice_epoll_ctl() David Gibson
2023-11-07 2:42 ` [PATCH v2 04/11] tcp_splice: Remove unnecessary forward declaration David Gibson
2023-11-07 2:42 ` [PATCH v2 05/11] tcp_splice: Avoid awkward temporaries in tcp_splice_epoll_ctl() David Gibson
2023-11-07 2:42 ` [PATCH v2 06/11] tcp_splice: Don't pool pipes in pairs David Gibson
2023-11-07 2:42 ` [PATCH v2 07/11] tcp_splice: Rename sides of connection from a/b to 0/1 David Gibson
2023-11-07 2:42 ` [PATCH v2 08/11] tcp_splice: Exploit side symmetry in tcp_splice_timer() David Gibson
2023-11-07 2:42 ` [PATCH v2 09/11] tcp_splice: Exploit side symmetry in tcp_splice_connect_finish() David Gibson
2023-11-07 2:42 ` [PATCH v2 10/11] tcp_splice: Exploit side symmetry in tcp_splice_destroy() David Gibson
2023-11-07 2:42 ` [PATCH v2 11/11] tcp_splice: Simplify selection of socket and pipe sides in socket handler David Gibson
2023-11-07 12:45 ` [PATCH v2 00/11] tcp_splice: Better exploit symmetry between sides of connection Stefano Brivio
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=20231107024250.2290959-2-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=sbrivio@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.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
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 IMAP folder(s).