From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>
Cc: passt-dev@passt.top
Subject: Re: [PATCH 08/11] tcp_splice: Exploit side symmetry in tcp_splice_timer()
Date: Sat, 4 Nov 2023 16:59:22 +1100 [thread overview]
Message-ID: <ZUXduh25LZKVQiMI@zatzit> (raw)
In-Reply-To: <20231103172153.2f9894a8@elisabeth>
[-- Attachment #1: Type: text/plain, Size: 2207 bytes --]
On Fri, Nov 03, 2023 at 05:21:53PM +0100, Stefano Brivio wrote:
> On Thu, 12 Oct 2023 12:51:11 +1100
> David Gibson <david@gibson.dropbear.id.au> wrote:
>
> > tcp_splice_timer() has two very similar blocks one after another that
> > handle the SO_RCVLOWAT flags for the two sides of the connection. We can
> > deduplicate this with a loop across the two sides.
> >
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > ---
> > tcp_splice.c | 27 +++++++++++----------------
> > 1 file changed, 11 insertions(+), 16 deletions(-)
> >
> > diff --git a/tcp_splice.c b/tcp_splice.c
> > index 4a0580c..259d774 100644
> > --- a/tcp_splice.c
> > +++ b/tcp_splice.c
> > @@ -835,30 +835,25 @@ void tcp_splice_init(struct ctx *c)
> > void tcp_splice_timer(struct ctx *c, union tcp_conn *conn_union)
> > {
> > struct tcp_splice_conn *conn = &conn_union->splice;
> > + int side;
> >
> > if (conn->flags & CLOSING) {
> > tcp_splice_destroy(c, conn_union);
> > return;
> > }
> >
> > - if ( (conn->flags & RCVLOWAT_SET_0) &&
> > - !(conn->flags & RCVLOWAT_ACT_0)) {
> > - if (setsockopt(conn->s[0], SOL_SOCKET, SO_RCVLOWAT,
> > - &((int){ 1 }), sizeof(int))) {
> > - trace("TCP (spliced): can't set SO_RCVLOWAT on "
> > - "%i", conn->s[0]);
> > - }
> > - conn_flag(c, conn, ~RCVLOWAT_SET_0);
> > - }
> > + for (side = 0; side < SIDES; side++) {
> > + uint8_t set = side == 0 ? RCVLOWAT_SET_0 : RCVLOWAT_SET_1;
> > + uint8_t act = side == 0 ? RCVLOWAT_ACT_0 : RCVLOWAT_ACT_1;
> >
> > - if ( (conn->flags & RCVLOWAT_SET_1) &&
> > - !(conn->flags & RCVLOWAT_ACT_1)) {
> > - if (setsockopt(conn->s[1], SOL_SOCKET, SO_RCVLOWAT,
> > - &((int){ 1 }), sizeof(int))) {
> > - trace("TCP (spliced): can't set SO_RCVLOWAT on "
> > - "%i", conn->s[1]);
> > + if ( (conn->flags & set) && !(conn->flags & act)) {
> ^
>
> Nit: this extra whitespace is now useless.
Corrected.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2023-11-04 6:11 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-12 1:51 [PATCH 00/11] tcp_splice: Better exploit symmetry between sides of connection David Gibson
2023-10-12 1:51 ` [PATCH 01/11] tcp_splice: Remove redundant tcp_splice_epoll_ctl() David Gibson
2023-10-12 1:51 ` [PATCH 02/11] tcp_splice: Correct error handling in tcp_splice_epoll_ctl() David Gibson
2023-10-12 1:51 ` [PATCH 03/11] tcp_splice: Don't handle EPOLL_CTL_DEL as part of tcp_splice_epoll_ctl() David Gibson
2023-11-03 16:20 ` Stefano Brivio
2023-11-04 5:56 ` David Gibson
2023-10-12 1:51 ` [PATCH 04/11] tcp_splice: Remove unnecessary forward declaration David Gibson
2023-10-12 1:51 ` [PATCH 05/11] tcp_splice: Avoid awkward temporaries in tcp_splice_epoll_ctl() David Gibson
2023-11-03 16:21 ` Stefano Brivio
2023-11-04 5:58 ` David Gibson
2023-10-12 1:51 ` [PATCH 06/11] tcp_splice: Don't pool pipes in pairs David Gibson
2023-10-12 1:51 ` [PATCH 07/11] tcp_splice: Rename sides of connection from a/b to 0/1 David Gibson
2023-10-12 1:51 ` [PATCH 08/11] tcp_splice: Exploit side symmetry in tcp_splice_timer() David Gibson
2023-11-03 16:21 ` Stefano Brivio
2023-11-04 5:59 ` David Gibson [this message]
2023-10-12 1:51 ` [PATCH 09/11] tcp_splice: Exploit side symmetry in tcp_splice_connect_finish() David Gibson
2023-10-12 1:51 ` [PATCH 10/11] tcp_splice: Exploit side symmetry in tcp_splice_destroy() David Gibson
2023-11-03 16:22 ` Stefano Brivio
2023-11-06 2:39 ` David Gibson
2023-11-06 13:21 ` Stefano Brivio
2023-10-12 1:51 ` [PATCH 11/11] tcp_splice: Simplify selection of socket and pipe sides in socket handler David Gibson
2023-11-03 16:21 ` Stefano Brivio
2023-11-04 6:02 ` David Gibson
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=ZUXduh25LZKVQiMI@zatzit \
--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).