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=TGvBxmEd; 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 226D45A026D for ; Mon, 15 Jun 2026 10:50:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1781513415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to: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=qy8u7nhbrXjdqvicsdMBFMg9X1vRjxdwMYkxeaLC7og=; b=TGvBxmEdo57s94wsEQLya4yrJLw5T7uNmjX3bAMFhKnfplRMKj9sIUnaF0n7UhqeuixKfc s5+AWC+rOnRssy0FeR6JCNMRY6GxhPHR1UvCgCIvtJkrQ6LX7h7/vgL/Uy1t4aj6nLDReX WK1yDm8Q6dXDSSxP4iTWCVKtq7QEfbM= 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-528-yp1tWX5YMiKoMMQ7K6bu2A-1; Mon, 15 Jun 2026 04:50:13 -0400 X-MC-Unique: yp1tWX5YMiKoMMQ7K6bu2A-1 X-Mimecast-MFC-AGG-ID: yp1tWX5YMiKoMMQ7K6bu2A_1781513412 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-490bde3d239so20374125e9.1 for ; Mon, 15 Jun 2026 01:50:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781513412; x=1782118212; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references: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=qy8u7nhbrXjdqvicsdMBFMg9X1vRjxdwMYkxeaLC7og=; b=ZeibROtHD0Gj4ap8+ns+PrvUOH6EKeoo3kEi8fS+NSW0ADGYbo/ZEzAqOmgp/EyipB qS6pbofRzs3R3Z3wXlA4qlxxTZuAke9E/nj16RH7UqhZJRYT9Vr8Qdczrs0RhUb3YoLF HmMz5fhA1Tb/LcZNV2iSaj5p47n14xA20eGNHGxVvEVjKmI+Xv5nu0S+mfqEkjUazEiD XyqlQF5zBUofN0KyKLPi9gWAiEQwCigcVoqX2+by3p7Buhh/Svam0eSh5yKGZy+ANlSr lNGYsUimdUQYoy4Ho6X8F2jhJTnIJipOkBhwb9/rApfo5rzpgvimj2kPzLic3SZZMyKp eOXA== X-Forwarded-Encrypted: i=1; AFNElJ/PNUex5s+5+fYZj35dpjX6Zp/teKqqPQpZIJNPoLZfa81sEDWrDPry6baHpS4l0okjr67ZMn231pk=@passt.top X-Gm-Message-State: AOJu0YywMBx1TsyFhSGabtGS0Qo8vhxL71C/bBpFCYPcoT/cFqfrseUL TqoWuJRcRM6be4GfG0tta5mZ3GkhiKd/W+8v/mF4SVt0L8v54NbLQdfbl379Lm0R2HpoBQhi5Yt 6sQwnnd8JsEvEQ4wBHvQ4gTZjYs+VKbkbLwNlpx0m3EvjYT4ae+jBwQ== X-Gm-Gg: Acq92OGFfpaQ6PhtlY5VE4VUpRiJ12sYkFiAt1NxAY4dYq6jYd1q4Ks63X7bU7VJdiu 71yHS8iH+2vokTLfVVDiWWb3IQnKhieq2VFDHp6YqT7lhaf2CkpzJvkaR9JOEt5BvnEF+Z0gU8D ujvVQ4CSv42NYG+yoVDw/LbTUbJwcUJ8XqE9KBDLcUhV07c/p5bLvnHZmdZ/LIlZSWfBuzTTMXW /lkS2OlzxJ/pjqAbNNw51wvHFCnFgA1819TCdEaFS2f6oR3tOVkTvAQD1J/jlOlcBVEVQbipRI5 jLFlkrlYUFSNgvnx4gNKSxflLl5AFbHQaV4AMqwE5pl5FUhs8vfC2joRWWF0gI9oXmHfBlAn2+d SMDfJ1C/aHaQmu3qE6XXu66kiowmKOtrLnMCRfI509Fo74tQyK6ME/7nSid1E X-Received: by 2002:a05:600c:3512:b0:490:bb45:79da with SMTP id 5b1f17b1804b1-490ec4d650amr172533855e9.13.1781513411956; Mon, 15 Jun 2026 01:50:11 -0700 (PDT) X-Received: by 2002:a05:600c:3512:b0:490:bb45:79da with SMTP id 5b1f17b1804b1-490ec4d650amr172533195e9.13.1781513411339; Mon, 15 Jun 2026 01:50:11 -0700 (PDT) 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-492202e5d6csm253792615e9.3.2026.06.15.01.50.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 Jun 2026 01:50:10 -0700 (PDT) Message-ID: Date: Mon, 15 Jun 2026 10:50:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 3/5] tcp: Merge common sequence logic from tcp_{buf,vu}_data_from_sock() To: David Gibson , Stefano Brivio , passt-dev@passt.top References: <20260615081833.1061725-1-david@gibson.dropbear.id.au> <20260615081833.1061725-4-david@gibson.dropbear.id.au> From: Laurent Vivier Autocrypt: addr=lvivier@redhat.com; keydata= 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 In-Reply-To: <20260615081833.1061725-4-david@gibson.dropbear.id.au> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: UVZZt6Jp8Po5hzttM9LjLB_b1ul6EWarm1QmDK8HOIE_1781513412 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: FVFTR3KVQQYY4IEF5FMTW2GYLMNB363P X-Message-ID-Hash: FVFTR3KVQQYY4IEF5FMTW2GYLMNB363P 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 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 6/15/26 10:18, David Gibson wrote: > tcp_buf_data_from_sock() and tcp_vu_data_from_sock() start with some > identical logic to compute the amount of data from the socket that has > already been sent to tap but not acked. Replace it with a single copy in > their common caller tcp_data_from_sock(), passing the already_sent amount > in as a parameter. > > This does mean that we now execute this logic in the VU case even if the > queue is not active. The logic is still valid in this case, and we don't > need to worry too much about wasting cycles in this edge case. > > Cc: Laurent Vivier > > Signed-off-by: David Gibson Reviewed-by: Laurent Vivier > --- > tcp.c | 29 +++++++++++++++++++++++++++-- > tcp_buf.c | 28 ++++------------------------ > tcp_buf.h | 3 ++- > tcp_vu.c | 27 ++++----------------------- > tcp_vu.h | 3 ++- > 5 files changed, 39 insertions(+), 51 deletions(-) > > diff --git a/tcp.c b/tcp.c > index c4000754..dcadc765 100644 > --- a/tcp.c > +++ b/tcp.c > @@ -1837,10 +1837,35 @@ static int tcp_sock_consume(const struct tcp_tap_conn *conn, uint32_t ack_seq) > */ > static int tcp_data_from_sock(const struct ctx *c, struct tcp_tap_conn *conn) > { > + uint32_t wnd_scaled = conn->wnd_from_tap << conn->ws_from_tap; > + uint32_t already_sent; > + > + /* How much have we read/sent since last received ack ? */ > + already_sent = conn->seq_to_tap - conn->seq_ack_from_tap; > + > + if (SEQ_LT(already_sent, 0)) { > + /* RFC 761, section 2.1. */ > + flow_trace(conn, "ACK sequence gap: ACK for %u, sent: %u", > + conn->seq_ack_from_tap, conn->seq_to_tap); > + conn->seq_to_tap = conn->seq_ack_from_tap; > + already_sent = 0; > + if (tcp_set_peek_offset(conn, 0)) { > + tcp_rst(c, conn); > + return -1; > + } > + } > + > + if (!wnd_scaled || already_sent >= wnd_scaled) { > + conn_flag(c, conn, ACK_FROM_TAP_BLOCKS); > + conn_flag(c, conn, STALLED); > + conn_flag(c, conn, ACK_FROM_TAP_DUE); > + return 0; > + } > + > if (c->mode == MODE_VU) > - return tcp_vu_data_from_sock(c, conn); > + return tcp_vu_data_from_sock(c, conn, already_sent); > > - return tcp_buf_data_from_sock(c, conn); > + return tcp_buf_data_from_sock(c, conn, already_sent); > } > > /** > diff --git a/tcp_buf.c b/tcp_buf.c > index ca356089..1fc49959 100644 > --- a/tcp_buf.c > +++ b/tcp_buf.c > @@ -309,42 +309,22 @@ static void tcp_data_to_tap(const struct ctx *c, struct tcp_tap_conn *conn, > * tcp_buf_data_from_sock() - Handle new data from socket, queue to tap, in window > * @c: Execution context > * @conn: Connection pointer > + * @already_sent: Number of bytes already sent to tap, but not acked > * > * Return: negative on connection reset, 0 otherwise > * > * #syscalls recvmsg > */ > -int tcp_buf_data_from_sock(const struct ctx *c, struct tcp_tap_conn *conn) > +int tcp_buf_data_from_sock(const struct ctx *c, struct tcp_tap_conn *conn, > + uint32_t already_sent) > { > uint32_t wnd_scaled = conn->wnd_from_tap << conn->ws_from_tap; > int fill_bufs, send_bufs = 0, last_len, iov_rem = 0; > int len, dlen, i, s = conn->sock; > struct msghdr mh_sock = { 0 }; > uint16_t mss = MSS_GET(conn); > - uint32_t already_sent, seq; > struct iovec *iov; > - > - /* How much have we read/sent since last received ack ? */ > - already_sent = conn->seq_to_tap - conn->seq_ack_from_tap; > - > - if (SEQ_LT(already_sent, 0)) { > - /* RFC 761, section 2.1. */ > - flow_trace(conn, "ACK sequence gap: ACK for %u, sent: %u", > - conn->seq_ack_from_tap, conn->seq_to_tap); > - conn->seq_to_tap = conn->seq_ack_from_tap; > - already_sent = 0; > - if (tcp_set_peek_offset(conn, 0)) { > - tcp_rst(c, conn); > - return -1; > - } > - } > - > - if (!wnd_scaled || already_sent >= wnd_scaled) { > - conn_flag(c, conn, ACK_FROM_TAP_BLOCKS); > - conn_flag(c, conn, STALLED); > - conn_flag(c, conn, ACK_FROM_TAP_DUE); > - return 0; > - } > + uint32_t seq; > > /* Set up buffer descriptors we'll fill completely and partially. */ > fill_bufs = DIV_ROUND_UP(wnd_scaled - already_sent, mss); > diff --git a/tcp_buf.h b/tcp_buf.h > index 54f5e53f..710ed377 100644 > --- a/tcp_buf.h > +++ b/tcp_buf.h > @@ -8,7 +8,8 @@ > > void tcp_sock_iov_init(const struct ctx *c); > void tcp_payload_flush(const struct ctx *c); > -int tcp_buf_data_from_sock(const struct ctx *c, struct tcp_tap_conn *conn); > +int tcp_buf_data_from_sock(const struct ctx *c, struct tcp_tap_conn *conn, > + uint32_t already_sent); > int tcp_buf_send_flag(const struct ctx *c, struct tcp_tap_conn *conn, int flags); > > #endif /*TCP_BUF_H */ > diff --git a/tcp_vu.c b/tcp_vu.c > index 7e2a7dbc..00616955 100644 > --- a/tcp_vu.c > +++ b/tcp_vu.c > @@ -423,46 +423,27 @@ static void tcp_vu_prepare(const struct ctx *c, struct tcp_tap_conn *conn, > * in window > * @c: Execution context > * @conn: Connection pointer > + * @already_sent: Number of bytes already sent to tap, but not acked > * > * Return: negative on connection reset, 0 otherwise > */ > -int tcp_vu_data_from_sock(const struct ctx *c, struct tcp_tap_conn *conn) > +int tcp_vu_data_from_sock(const struct ctx *c, struct tcp_tap_conn *conn, > + uint32_t already_sent) > { > uint32_t wnd_scaled = conn->wnd_from_tap << conn->ws_from_tap; > struct vu_dev *vdev = c->vdev; > struct vu_virtq *vq = &vdev->vq[VHOST_USER_RX_QUEUE]; > - uint32_t already_sent, check; > ssize_t len, previous_dlen; > int i, elem_cnt, frame_cnt; > size_t hdrlen, fillsize; > int v6 = CONN_V6(conn); > + uint32_t check; > > if (!vu_queue_enabled(vq) || !vu_queue_started(vq)) { > debug("Got packet, but RX virtqueue not usable yet"); > return 0; > } > > - already_sent = conn->seq_to_tap - conn->seq_ack_from_tap; > - > - if (SEQ_LT(already_sent, 0)) { > - /* RFC 761, section 2.1. */ > - flow_trace(conn, "ACK sequence gap: ACK for %u, sent: %u", > - conn->seq_ack_from_tap, conn->seq_to_tap); > - conn->seq_to_tap = conn->seq_ack_from_tap; > - already_sent = 0; > - if (tcp_set_peek_offset(conn, 0)) { > - tcp_rst(c, conn); > - return -1; > - } > - } > - > - if (!wnd_scaled || already_sent >= wnd_scaled) { > - conn_flag(c, conn, ACK_FROM_TAP_BLOCKS); > - conn_flag(c, conn, STALLED); > - conn_flag(c, conn, ACK_FROM_TAP_DUE); > - return 0; > - } > - > /* Set up buffer descriptors we'll fill completely and partially. */ > > fillsize = wnd_scaled - already_sent; > diff --git a/tcp_vu.h b/tcp_vu.h > index 6ab6057f..30e46925 100644 > --- a/tcp_vu.h > +++ b/tcp_vu.h > @@ -7,6 +7,7 @@ > #define TCP_VU_H > > int tcp_vu_send_flag(const struct ctx *c, struct tcp_tap_conn *conn, int flags); > -int tcp_vu_data_from_sock(const struct ctx *c, struct tcp_tap_conn *conn); > +int tcp_vu_data_from_sock(const struct ctx *c, struct tcp_tap_conn *conn, > + uint32_t already_sent); > > #endif /*TCP_VU_H */