From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTP id 7A4685A004F for ; Fri, 12 Jul 2024 16:49:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720795752; 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=BvEBEk0rejGWmXBKimZK8YUvv2Bifay/L4rEjWQPuDQ=; b=V6OXpqwIG5DZQpc0Gh4mIhB+4swQweciCOIgBXnYdc/JcVJIKZU7qaSRQ8N7Yj7WzYftcQ 0N+Bc5qE2tN7ENXqAsJDtOu5dQ2IqbE0Nfh6QNTbFkOk6vCR4nrFSQAUX7DKflGAdLY1J9 tb3g9fd1Szqp/c6TqboiOP/AAkG74qc= Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-263-2DaDT5YVPm6-XRlWK4I5vg-1; Fri, 12 Jul 2024 10:49:10 -0400 X-MC-Unique: 2DaDT5YVPm6-XRlWK4I5vg-1 Received: by mail-lj1-f199.google.com with SMTP id 38308e7fff4ca-2ee81ff717fso22984921fa.3 for ; Fri, 12 Jul 2024 07:49:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720795749; x=1721400549; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=BvEBEk0rejGWmXBKimZK8YUvv2Bifay/L4rEjWQPuDQ=; b=IIW59jMQ3P5ERLncT6Gxb8V+YBTkp4uAq8z2jdowB46il/3DcL2EvNnhbpZrc5jqKG izbvoEKsszA28zNRbdWV9UaW6bGIQRBdBNtBFouszNiWIMTJsDl+6V1gGal4qBZBBKQh l7gOlqInsLEU++n/kqAOvOiL0d2IJl1S1jPpxrOX/XmdLCt6RKL/YKwHK0LwlWlevh6G K+NL4Q+HjOaqU8TLkgiPJJnnHO6LJf02POAtg50euQj+79EQt7pc346TN6rVvdAXZdA1 U33JAbgSJmddD89+BG3igKO7+h0fwZPBK+inhwD6ZXsTte/f/Jem9IxjCiJ+OfI6glDl heRw== X-Gm-Message-State: AOJu0YzvpB6gbX/Cmb+4YIbmsIihO9asUmUYckqgeoiAP+Y3zeXG3dnM 08IJO530nWBG5C8SlteJS8GNJ9jMOwozzu/ol77okybdXYBS/upGdQsXQ7QT7KbvaYUKXKeLmYD mEc8fwJUfILJKRFZZBvbbTJ5hdz+rO11h+kNhbT5cLls871lrduk/Szfuaw== X-Received: by 2002:a2e:9048:0:b0:2ee:6254:f9f1 with SMTP id 38308e7fff4ca-2eeb30b8afdmr88389421fa.6.1720795749008; Fri, 12 Jul 2024 07:49:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHADaySFuOH4I9zJWB2Iu2xemlgGQNlYpa9KcdlIdlwyVqRHnKbaRDD64IcsFYpgLrIEeuNKg== X-Received: by 2002:a2e:9048:0:b0:2ee:6254:f9f1 with SMTP id 38308e7fff4ca-2eeb30b8afdmr88389251fa.6.1720795748373; Fri, 12 Jul 2024 07:49:08 -0700 (PDT) Received: from ?IPV6:2a01:e0a:e10:ef90:8e19:3414:44f0:befd? ([2a01:e0a:e10:ef90:8e19:3414:44f0:befd]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4279f2bac02sm25901815e9.39.2024.07.12.07.49.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Jul 2024 07:49:07 -0700 (PDT) Message-ID: <66f54470-cf49-4a31-bb98-fa7b684100b5@redhat.com> Date: Fri, 12 Jul 2024 16:49:07 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 5/5] vhost-user: add vhost-user To: David Gibson References: <20240621145640.1914287-1-lvivier@redhat.com> <20240621145640.1914287-6-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-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Message-ID-Hash: UYCAATI76TM24PCPWKEYODFP4W2QKR7H X-Message-ID-Hash: UYCAATI76TM24PCPWKEYODFP4W2QKR7H 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 24/06/2024 07:05, David Gibson wrote: > On Fri, Jun 21, 2024 at 04:56:40PM +0200, Laurent Vivier wrote: >> add virtio and vhost-user functions to connect with QEMU. >> >> $ ./passt --vhost-user >> >> and >> >> # qemu-system-x86_64 ... -m 4G \ >> -object memory-backend-memfd,id=memfd0,share=on,size=4G \ >> -numa node,memdev=memfd0 \ >> -chardev socket,id=chr0,path=/tmp/passt_1.socket \ >> -netdev vhost-user,id=netdev0,chardev=chr0 \ >> -device virtio-net,mac=9a:2b:2c:2d:2e:2f,netdev=netdev0 \ >> ... >> >> Signed-off-by: Laurent Vivier >> --- >> Makefile | 4 +- >> checksum.c | 1 - >> conf.c | 18 +- >> iov.c | 1 - >> packet.c | 6 + >> packet.h | 2 + >> passt.c | 12 +- >> passt.h | 2 + >> pcap.c | 1 - >> tap.c | 87 ++++++-- >> tap.h | 3 +- >> tcp.c | 17 +- >> tcp_vu.c | 547 +++++++++++++++++++++++++++++++++++++++++++++++++ >> tcp_vu.h | 9 + >> udp.c | 54 +++-- >> udp_internal.h | 39 ++++ >> udp_vu.c | 237 +++++++++++++++++++++ >> udp_vu.h | 8 + >> vhost_user.c | 6 - >> virtio.c | 1 - >> 20 files changed, 988 insertions(+), 67 deletions(-) >> create mode 100644 tcp_vu.c >> create mode 100644 tcp_vu.h >> create mode 100644 udp_internal.h >> create mode 100644 udp_vu.c >> create mode 100644 udp_vu.h >> ... >> diff --git a/tcp_vu.c b/tcp_vu.c >> new file mode 100644 >> index 000000000000..f27890f63c0e >> --- /dev/null >> +++ b/tcp_vu.c >> @@ -0,0 +1,547 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later > > Needs Copyright notice, author information and general description here. > >> + >> +#include >> +#include >> +#include >> + >> +#include >> + >> +#include >> + >> +#include >> +#include >> + >> +#include "util.h" >> +#include "ip.h" >> +#include "passt.h" >> +#include "siphash.h" >> +#include "inany.h" >> +#include "vhost_user.h" >> +#include "tcp.h" >> +#include "pcap.h" >> +#include "flow.h" >> +#include "tcp_conn.h" >> +#include "flow_table.h" >> +#include "tcp_vu.h" >> +#include "tcp_internal.h" >> +#include "checksum.h" >> + >> +#define CONN_V4(conn) (!!inany_v4(&(conn)->faddr)) >> +#define CONN_V6(conn) (!CONN_V4(conn)) >> + >> +/** >> + * struct tcp_payload_t - TCP header and data to send segments with payload >> + * @th: TCP header >> + * @data: TCP data >> + */ >> +struct tcp_payload_t { >> + struct tcphdr th; >> + uint8_t data[IP_MAX_MTU - sizeof(struct tcphdr)]; >> +}; > > This could be common with tcp_buf.c, couldn't it? In fact, no: because we cannot have the ((aligned)) attribute as the address is provided by the guest. > >> + >> +/** >> + * struct tcp_flags_t - TCP header and data to send zero-length >> + * segments (flags) >> + * @th: TCP header >> + * @opts TCP options >> + */ >> +struct tcp_flags_t { >> + struct tcphdr th; >> + char opts[OPT_MSS_LEN + OPT_WS_LEN + 1]; >> +}; > > Likewise here. > >> + >> +/* vhost-user */ >> +static const struct virtio_net_hdr vu_header = { >> + .flags = VIRTIO_NET_HDR_F_DATA_VALID, >> + .gso_type = VIRTIO_NET_HDR_GSO_NONE, >> +}; >> + >> +int tcp_vu_send_flag(struct ctx *c, struct tcp_tap_conn *conn, int flags) >> +{ >> + VuDev *vdev = (VuDev *)&c->vdev; >> + VuVirtq *vq = &vdev->vq[VHOST_USER_RX_QUEUE]; >> + size_t tlen, vnet_hdrlen, l4len, optlen; >> + struct virtio_net_hdr_mrg_rxbuf *vh; >> + struct iovec l2_iov[TCP_NUM_IOVS]; >> + VuVirtqElement elem; >> + struct iovec in_sg; >> + struct ethhdr *eh; >> + int nb_ack; >> + int ret; >> + >> + elem.out_num = 0; >> + elem.out_sg = NULL; >> + elem.in_num = 1; >> + elem.in_sg = &in_sg; >> + ret = vu_queue_pop(vdev, vq, &elem); >> + if (ret < 0) >> + return 0; >> + >> + if (elem.in_num < 1) { >> + err("virtio-net receive queue contains no in buffers"); >> + vu_queue_rewind(vdev, vq, 1); >> + return 0; >> + } >> + >> + vh = elem.in_sg[0].iov_base; > > AFAICT, the code below requires that in_sg[0] be large enough to > contain the frame, plus a virtio_net_hdr_mrg_rxbuf. Seems like that > we should ASSERT() that somewhere. I agree > > If I'm understanding correctly that the virtio_net_hdr_mrg_rxbuf is a > kind of pseudo-header you need for each frame, I'm wondering if it > could be integrated into the tap_hdr mechanisms. I tried, but the we use a contiguous buffer rather than the TCP iovec so it's simpler to initialize the header in place. Thanks, Laurent