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=ZVCCC+uQ; 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 033365A0262 for ; Fri, 22 May 2026 11:41:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779442918; 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=QW58eV4mIB+cPWAoBSQR4K87UDdjLCT+zlvWDnAcgk8=; b=ZVCCC+uQ6h0Pxw2AvpTAQFkagqkHISLksQ0VIyf6QsJACwyEI7gti+Tub0HOIC3dgUoBCT nhh8s9V7Cp8fP9nDQluZh5s7JcOvXQL8C85oIcjH4Too31m+aoZjfhLu0BmnVg4+8GtVSy XDY40p05omFeRie1qK9fT1g1PiiVH7k= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-618-MnJat3lGP0CQTamz-0DWuQ-1; Fri, 22 May 2026 05:41:57 -0400 X-MC-Unique: MnJat3lGP0CQTamz-0DWuQ-1 X-Mimecast-MFC-AGG-ID: MnJat3lGP0CQTamz-0DWuQ_1779442917 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-48e79219704so49461855e9.1 for ; Fri, 22 May 2026 02:41:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779442916; x=1780047716; 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=QW58eV4mIB+cPWAoBSQR4K87UDdjLCT+zlvWDnAcgk8=; b=D20pTdHX+pPXPAlymUaptzRLOXpd2TLNr72yYHXkYuvC6fG7IKjac0lyN0Sh836+N7 Vo9wpuGVwsKEYj/cWnBEcI0TlBoHigaJuAAvCLYT/awBOiUieYq+rnG7ciBWDAj8gU3b vsucpmWOpwlF0cFb6R1QaDJ35vwTPIBNxp2m7Dn1TH6ufILOUmNyU18vC9giKeTDxyZP zZlNLk1xAUlnwB8C5PYJQKfsrjAF93EvHsD3PEz7iRAlwL0j1DTr59+jRGIAgVYW/VEG 3b2IMg0O4/otTu9lKWMXTJNqi4baPIPahnVjTWEa0kqXJN6FNy0/82fckHSw/FVEMoIj yJFA== X-Gm-Message-State: AOJu0YyV0yxJVb9X/C8b6INQJnQnwPOKq3y1T0mDF+l136yEOaPBEVqb ANtPDhGfq21ugjqFZI26gT60RpYOSCDpow+dEfrUHitMjSlQyY+D8Qe3mutmyq7jN3u9/TxFTOH 20xX8pEIuOPu3GoP/MrkYMO73hQSZtDf52uQF/fORO6yhh3ezdgz9hA== X-Gm-Gg: Acq92OEn189WzEwYpKs1AVoBWLMrMLiow48oGrYuIKsdBMB2sxU0xG2tAfyOYZvBI97 Jb2ZrX8jout8nGNwgnA/lWNEEed4VVlPdeBZ4QVeRlbLjG7867cbis8KxY5Vi3mz/ZdPocBZENK DtX8RKDgVhfmdFVavX1SOL1F85LuajWeUKGkGHpcx3LpIph0n3moJLOTLNRwR6iI1/edR+4d9vi qxAJeGo69iGw6tXBTHpjGfvaNs+FKMG3JgxeRSfhvYU5pOl+5Lqb0/PnLpp7L7fvxLaXDxh1P9t 9LOh7XaHtnSrGyzRq3H+lBT0oFxGwDVWFr0x0lWPi5Qhz6N7pMJEtdOhDMu4nlcoAuKVzW1jFeY PopJE0Pv8uj00i4nRk4Wa+gWhe3WBKlIY75Hj+DN1WP8aoUR2BzreOxo= X-Received: by 2002:a05:600c:3515:b0:48f:d410:6065 with SMTP id 5b1f17b1804b1-490428d7652mr35012575e9.29.1779442916201; Fri, 22 May 2026 02:41:56 -0700 (PDT) X-Received: by 2002:a05:600c:3515:b0:48f:d410:6065 with SMTP id 5b1f17b1804b1-490428d7652mr35012225e9.29.1779442915653; Fri, 22 May 2026 02:41:55 -0700 (PDT) Received: from [192.168.100.100] (82-64-211-94.subs.proxad.net. [82.64.211.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490424974a8sm17703205e9.4.2026.05.22.02.41.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 May 2026 02:41:54 -0700 (PDT) Message-ID: Date: Fri, 22 May 2026 11:41:54 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 4/4] tcp_vu: Support multibuffer frames in tcp_vu_send_flag() To: David Gibson References: <20260520151827.496828-1-lvivier@redhat.com> <20260520151827.496828-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: 47AWy6SQ_w6TM73K8p1cBS8ud9qoNvyyXnzy3g5-pp0_1779442917 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: IE6UCYT3QOP5QB2GHQO23JCDCLM6HWBH X-Message-ID-Hash: IE6UCYT3QOP5QB2GHQO23JCDCLM6HWBH 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, Jon Maloy 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 5/22/26 03:24, David Gibson wrote: > On Wed, May 20, 2026 at 05:18:27PM +0200, Laurent Vivier wrote: >> Build the Ethernet, IP, and TCP headers on the stack instead of >> directly in the buffer via pointer casts, then write them into the >> iovec with IOV_PUSH_HEADER(). This mirrors the approach already used >> in tcp_vu_prepare() and udp_vu_prepare(). >> >> Remove the vu_eth(), vu_ip(), vu_payloadv4() and vu_payloadv6() helpers >> from vu_common.h, as they are no longer used anywhere. >> >> Introduce tcp_vu_send_dup() to handle DUP_ACK duplication using >> vu_collect() and iov_memcpy() instead of a plain memcpy(), so that >> the duplicated frame is also properly scattered across multiple iovecs. >> >> Signed-off-by: Laurent Vivier >> Reviewed-by: Jon Maloy > > One query below. But at worst it can be addressed as a follow up, so > > Reviewed-by: David Gibson > >> --- >> iov.c | 1 - >> tcp_vu.c | 156 ++++++++++++++++++++++++++++++---------------------- >> vu_common.h | 20 ------- >> 3 files changed, 91 insertions(+), 86 deletions(-) >> >> diff --git a/iov.c b/iov.c >> index 9248ba95a9f2..6fd684ad1a6b 100644 >> --- a/iov.c >> +++ b/iov.c >> @@ -208,7 +208,6 @@ void iov_memset(const struct iovec *iov, size_t iov_cnt, size_t offset, int c, >> * >> * Return: total number of bytes copied >> */ >> -/* cppcheck-suppress unusedFunction */ >> size_t iov_memcpy(struct iovec *dst_iov, size_t dst_iov_cnt, size_t dst_offset, >> const struct iovec *src_iov, size_t src_iov_cnt, >> size_t src_offset, size_t length) >> diff --git a/tcp_vu.c b/tcp_vu.c >> index 55242ec40410..30633760e4ec 100644 >> --- a/tcp_vu.c >> +++ b/tcp_vu.c >> @@ -74,6 +74,43 @@ static size_t tcp_vu_hdrlen(bool v6) >> return hdrlen; >> } >> >> +/** >> + * tcp_vu_send_dup() - Duplicate a frame into a new virtqueue element >> + * @c: Execution context >> + * @vq: Receive virtqueue >> + * @dest_elem: Destination virtqueue element to collect >> + * @dest_iov: Destination iovec array for collected buffers >> + * @max_dest_iov: Maximum number of entries in @dest_iov >> + * @src_iov: Source iovec array containing the frame to duplicate >> + * @src_cnt: Number of entries in @src_iov >> + * @vnlen: Total frame length including virtio-net header >> + * >> + * Return: number of virtqueue elements collected (0 if none available) >> + */ >> +static int tcp_vu_send_dup(const struct ctx *c, struct vu_virtq *vq, >> + struct vu_virtq_element *dest_elem, >> + struct iovec *dest_iov, size_t max_dest_iov, >> + const struct iovec *src_iov, size_t src_cnt, >> + size_t vnlen) >> +{ >> + const struct vu_dev *vdev = c->vdev; >> + size_t dest_cnt; >> + int elem_cnt; >> + >> + elem_cnt = vu_collect(vdev, vq, dest_elem, 1, dest_iov, max_dest_iov, >> + &dest_cnt, vnlen, NULL); > > This (and the one in tcp_vu_send_flag()) still allows a maximum of 1 > element, although it now allows multiple iovs. That differs from the > main data path, as of the previous patch.. Is that intentional, or > just a gap? It's intentionnal, 1 element will always have enough space to send flags. Thanks, Laurent > >> + if (elem_cnt == 0) >> + return 0; >> + >> + iov_memcpy(dest_iov, dest_cnt, 0, src_iov, src_cnt, 0, >> + MAX(VNET_HLEN + ETH_ZLEN, vnlen)); >> + >> + if (*c->pcap) >> + pcap_iov(dest_iov, dest_cnt, VNET_HLEN, vnlen - VNET_HLEN); >> + >> + return elem_cnt; >> +} >> + >> /** >> * tcp_vu_send_flag() - Send segment with flags to vhost-user (no payload) >> * @c: Execution context >> @@ -88,97 +125,86 @@ int tcp_vu_send_flag(const struct ctx *c, struct tcp_tap_conn *conn, int flags) >> { >> struct vu_dev *vdev = c->vdev; >> struct vu_virtq *vq = &vdev->vq[VHOST_USER_RX_QUEUE]; >> + size_t optlen, hdrlen, iov_cnt, iov_used; >> struct vu_virtq_element flags_elem[2]; >> - size_t optlen, hdrlen, l2len; >> - struct ipv6hdr *ip6h = NULL; >> - struct iphdr *ip4h = NULL; >> - struct iovec flags_iov[2]; >> - struct tcp_syn_opts *opts; >> - struct iov_tail payload; >> - struct tcphdr *th; >> - struct ethhdr *eh; >> + struct iov_tail payload, l2frame; >> + int elem_cnt, dup_elem_cnt = 0; >> + struct iovec flags_iov[64]; >> + struct tcp_syn_opts opts; >> + struct tcphdr th = { 0 }; >> + struct ipv6hdr ip6h; >> + struct iphdr ip4h; >> + struct ethhdr eh; >> uint32_t seq; >> - int elem_cnt; >> int ret; >> >> hdrlen = tcp_vu_hdrlen(CONN_V6(conn)); >> >> elem_cnt = vu_collect(vdev, vq, &flags_elem[0], 1, >> - &flags_iov[0], 1, NULL, >> - hdrlen + sizeof(*opts), NULL); >> - if (elem_cnt != 1) >> + flags_iov, ARRAY_SIZE(flags_iov), &iov_cnt, >> + hdrlen + sizeof(opts), NULL); >> + if (elem_cnt == 0) >> return -EAGAIN; >> >> - assert(flags_elem[0].in_num == 1); >> - assert(flags_elem[0].in_sg[0].iov_len >= >> - MAX(hdrlen + sizeof(*opts), ETH_ZLEN + VNET_HLEN)); >> - >> - eh = vu_eth(flags_elem[0].in_sg[0].iov_base); >> - >> - memcpy(eh->h_dest, c->guest_mac, sizeof(eh->h_dest)); >> - memcpy(eh->h_source, c->our_tap_mac, sizeof(eh->h_source)); >> - >> - if (CONN_V4(conn)) { >> - eh->h_proto = htons(ETH_P_IP); >> - >> - ip4h = vu_ip(flags_elem[0].in_sg[0].iov_base); >> - *ip4h = (struct iphdr)L2_BUF_IP4_INIT(IPPROTO_TCP); >> - >> - th = vu_payloadv4(flags_elem[0].in_sg[0].iov_base); >> - } else { >> - eh->h_proto = htons(ETH_P_IPV6); >> - >> - ip6h = vu_ip(flags_elem[0].in_sg[0].iov_base); >> - *ip6h = (struct ipv6hdr)L2_BUF_IP6_INIT(IPPROTO_TCP); >> - th = vu_payloadv6(flags_elem[0].in_sg[0].iov_base); >> - } >> + memcpy(eh.h_dest, c->guest_mac, sizeof(eh.h_dest)); >> >> - memset(th, 0, sizeof(*th)); >> - th->doff = sizeof(*th) / 4; >> - th->ack = 1; >> + if (CONN_V4(conn)) >> + ip4h = (struct iphdr)L2_BUF_IP4_INIT(IPPROTO_TCP); >> + else >> + ip6h = (struct ipv6hdr)L2_BUF_IP6_INIT(IPPROTO_TCP); >> >> seq = conn->seq_to_tap; >> - opts = (struct tcp_syn_opts *)(th + 1); >> - ret = tcp_prepare_flags(c, conn, flags, th, opts, &optlen); >> + ret = tcp_prepare_flags(c, conn, flags, &th, &opts, &optlen); >> if (ret <= 0) { >> - vu_queue_rewind(vq, 1); >> + vu_queue_rewind(vq, elem_cnt); >> return ret; >> } >> >> - payload = IOV_TAIL(flags_elem[0].in_sg, 1, hdrlen); >> - >> if (flags & KEEPALIVE) >> seq--; >> >> - tcp_fill_headers(c, conn, eh, ip4h, ip6h, th, &payload, >> + iov_used = iov_skip_bytes(flags_iov, iov_cnt, >> + MAX(optlen + hdrlen, VNET_HLEN + ETH_ZLEN), >> + NULL); >> + if (iov_used < iov_cnt) >> + iov_used++; >> + iov_cnt = iov_used; >> + >> + payload = IOV_TAIL(flags_elem[0].in_sg, iov_cnt, hdrlen); >> + iov_from_buf(payload.iov, payload.cnt, payload.off, &opts, optlen); >> + tcp_fill_headers(c, conn, &eh, CONN_V4(conn) ? &ip4h : NULL, >> + CONN_V6(conn) ? &ip6h : NULL, &th, &payload, >> optlen, IP4_CSUM | (*c->pcap ? TCP_CSUM : 0), seq); >> >> - vu_pad(flags_elem[0].in_sg, 1, hdrlen + optlen); >> - vu_flush(vdev, vq, flags_elem, 1, hdrlen + optlen); >> + vu_pad(flags_elem[0].in_sg, iov_cnt, hdrlen + optlen); >> + >> + /* write headers */ >> + l2frame = IOV_TAIL(flags_elem[0].in_sg, iov_cnt, VNET_HLEN); >> + >> + IOV_PUSH_HEADER(&l2frame, eh); >> + if (CONN_V4(conn)) >> + IOV_PUSH_HEADER(&l2frame, ip4h); >> + else >> + IOV_PUSH_HEADER(&l2frame, ip6h); >> + IOV_PUSH_HEADER(&l2frame, th); >> >> - l2len = hdrlen + optlen - VNET_HLEN; >> if (*c->pcap) >> - pcap_iov(&flags_elem[0].in_sg[0], 1, VNET_HLEN, l2len); >> + pcap_iov(flags_elem[0].in_sg, iov_cnt, VNET_HLEN, >> + hdrlen + optlen - VNET_HLEN); >> >> if (flags & DUP_ACK) { >> - elem_cnt = vu_collect(vdev, vq, &flags_elem[1], 1, >> - &flags_iov[1], 1, NULL, >> - hdrlen + optlen, NULL); >> - if (elem_cnt == 1 && >> - flags_elem[1].in_sg[0].iov_len >= >> - flags_elem[0].in_sg[0].iov_len) { >> - memcpy(flags_elem[1].in_sg[0].iov_base, >> - flags_elem[0].in_sg[0].iov_base, >> - flags_elem[0].in_sg[0].iov_len); >> - >> - vu_flush(vdev, vq, &flags_elem[1], 1, hdrlen + optlen); >> - >> - if (*c->pcap) { >> - pcap_iov(&flags_elem[1].in_sg[0], 1, VNET_HLEN, >> - l2len); >> - } >> - } >> + dup_elem_cnt = tcp_vu_send_dup(c, vq, &flags_elem[elem_cnt], >> + &flags_iov[iov_cnt], >> + ARRAY_SIZE(flags_iov) - iov_cnt, >> + flags_elem[0].in_sg, iov_cnt, >> + hdrlen + optlen); >> } >> + vu_flush(vdev, vq, flags_elem, elem_cnt, hdrlen + optlen); >> + if (dup_elem_cnt) { >> + vu_flush(vdev, vq, &flags_elem[elem_cnt], dup_elem_cnt, >> + hdrlen + optlen); >> + } >> + >> vu_queue_notify(vdev, vq); >> >> return 0; >> diff --git a/vu_common.h b/vu_common.h >> index 51f70084a7cb..817384175a1d 100644 >> --- a/vu_common.h >> +++ b/vu_common.h >> @@ -15,26 +15,6 @@ >> #include "ip.h" >> #include "virtio.h" >> >> -static inline void *vu_eth(void *base) >> -{ >> - return ((char *)base + VNET_HLEN); >> -} >> - >> -static inline void *vu_ip(void *base) >> -{ >> - return (struct ethhdr *)vu_eth(base) + 1; >> -} >> - >> -static inline void *vu_payloadv4(void *base) >> -{ >> - return (struct iphdr *)vu_ip(base) + 1; >> -} >> - >> -static inline void *vu_payloadv6(void *base) >> -{ >> - return (struct ipv6hdr *)vu_ip(base) + 1; >> -} >> - >> int vu_collect(const struct vu_dev *vdev, struct vu_virtq *vq, >> struct vu_virtq_element *elem, int max_elem, >> struct iovec *in_sg, size_t max_in_sg, size_t *in_total, >> -- >> 2.54.0 >> >