From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=none 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=dDc8E7EK; 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 ESMTP id 716BD5A0275 for ; Wed, 14 Aug 2024 16:44:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723646671; 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=HOcT5RdtZHvzAAl+rOECueMXy7M/3FDTzrXIPLbQnXw=; b=dDc8E7EKIFXXgMS7sMuHf3ja6hsQWucJN3TOrtUdylJ4U/gENGl70tOZMV83amPbGemqTm nBXsMvdr0na0NCn1zNksRizCMwWejKC2+mvi6NhSiv5VreyUeMuDyZ2Vo5luM7LuFxXwrM SpIhlkdAsK3NIHSKZPdNdzH754iG5Tw= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-370-0X-I7NpLMK-MeaG-GSqihA-1; Wed, 14 Aug 2024 10:44:30 -0400 X-MC-Unique: 0X-I7NpLMK-MeaG-GSqihA-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7a1dad7654dso820417185a.3 for ; Wed, 14 Aug 2024 07:44:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723646669; x=1724251469; 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=HOcT5RdtZHvzAAl+rOECueMXy7M/3FDTzrXIPLbQnXw=; b=mEaJRoP91Mgzy7WEQz7tKs4TdHVsUQop2OUW1m3stBjC7cdgdHx3WRg3wcNyr3LSiK DAqW8Tm7QRyogrlMQeJOynbblR/nBMkbVffKXgN5saL69NLaAJg7Sl6ZQFr2J4C98V94 ZiP/4UJb86rBpfSgAASSPHpiykKRdVxjUPQR8TDJFgFc7ioQvERUiOH7bMIYlqI2lUEe VlvluyHqL0FCa4lFkWORjKTwSW5+B5/nxs3PDo7/zJ+RJn6De+yofSSzyOlLk2kE03Xa TOr4MJ68GiAAx3aFyREx1JhHeqfEbjpc6oaqhDtFkwrLBXLuzahvwS970WxXGTs3lSAK 3L6w== X-Gm-Message-State: AOJu0YzNB2iM1jIAUEsaJ6mHIZJpr5UMBak1Dzv6f3P+XeC+ylJFRUD+ WEwQgqlAqyiBaT6KOacnNKNRSICAMwbDuM2TAFJ0mA//bErwJOrOW8/XDl74laJqQl8sRLg2D0L m5qId0beWWKPL9mnT7A6ZIID0VFGVSMZZcA7lci5vC7fY5+jWmw== X-Received: by 2002:a05:6214:3c9e:b0:6b5:d73d:918f with SMTP id 6a1803df08f44-6bf5d062cd3mr36373406d6.0.1723646669641; Wed, 14 Aug 2024 07:44:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFpippmCDuDZSuSITYgYX8ISlbvYHeL2iJAjda8Wxa4oiPZewJ1ukg1zL9oGd9suhjn4S956g== X-Received: by 2002:a05:6214:3c9e:b0:6b5:d73d:918f with SMTP id 6a1803df08f44-6bf5d062cd3mr36373136d6.0.1723646669279; Wed, 14 Aug 2024 07:44:29 -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 6a1803df08f44-6bd82c5f99csm44558256d6.3.2024.08.14.07.44.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 14 Aug 2024 07:44:28 -0700 (PDT) Message-ID: Date: Wed, 14 Aug 2024 16:44:26 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 3/4] vhost-user: introduce vhost-user API To: Stefano Brivio References: <20240712153244.831436-1-lvivier@redhat.com> <20240712153244.831436-4-lvivier@redhat.com> <20240719232953.07bacbfb@elisabeth> From: Laurent Vivier Autocrypt: addr=lvivier@redhat.com; keydata= xsFNBFYFJhkBEAC2me7w2+RizYOKZM+vZCx69GTewOwqzHrrHSG07MUAxJ6AY29/+HYf6EY2 WoeuLWDmXE7A3oJoIsRecD6BXHTb0OYS20lS608anr3B0xn5g0BX7es9Mw+hV/pL+63EOCVm SUVTEQwbGQN62guOKnJJJfphbbv82glIC/Ei4Ky8BwZkUuXd7d5NFJKC9/GDrbWdj75cDNQx UZ9XXbXEKY9MHX83Uy7JFoiFDMOVHn55HnncflUncO0zDzY7CxFeQFwYRbsCXOUL9yBtqLer Ky8/yjBskIlNrp0uQSt9LMoMsdSjYLYhvk1StsNPg74+s4u0Q6z45+l8RAsgLw5OLtTa+ePM JyS7OIGNYxAX6eZk1+91a6tnqfyPcMbduxyBaYXn94HUG162BeuyBkbNoIDkB7pCByed1A7q q9/FbuTDwgVGVLYthYSfTtN0Y60OgNkWCMtFwKxRaXt1WFA5ceqinN/XkgA+vf2Ch72zBkJL RBIhfOPFv5f2Hkkj0MvsUXpOWaOjatiu0fpPo6Hw14UEpywke1zN4NKubApQOlNKZZC4hu6/ 8pv2t4HRi7s0K88jQYBRPObjrN5+owtI51xMaYzvPitHQ2053LmgsOdN9EKOqZeHAYG2SmRW LOxYWKX14YkZI5j/TXfKlTpwSMvXho+efN4kgFvFmP6WT+tPnwARAQABzSNMYXVyZW50IFZp dmllciA8bHZpdmllckByZWRoYXQuY29tPsLBeAQTAQIAIgUCVgVQgAIbAwYLCQgHAwIGFQgC CQoLBBYCAwECHgECF4AACgkQ8ww4vT8vvjwpgg//fSGy0Rs/t8cPFuzoY1cex4limJQfReLr SJXCANg9NOWy/bFK5wunj+h/RCFxIFhZcyXveurkBwYikDPUrBoBRoOJY/BHK0iZo7/WQkur 6H5losVZtrotmKOGnP/lJYZ3H6OWvXzdz8LL5hb3TvGOP68K8Bn8UsIaZJoeiKhaNR0sOJyI YYbgFQPWMHfVwHD/U+/gqRhD7apVysxv5by/pKDln1I5v0cRRH6hd8M8oXgKhF2+rAOL7gvh jEHSSWKUlMjC7YwwjSZmUkL+TQyE18e2XBk85X8Da3FznrLiHZFHQ/NzETYxRjnOzD7/kOVy gKD/o7asyWQVU65mh/ECrtjfhtCBSYmIIVkopoLaVJ/kEbVJQegT2P6NgERC/31kmTF69vn8 uQyW11Hk8tyubicByL3/XVBrq4jZdJW3cePNJbTNaT0d/bjMg5zCWHbMErUib2Nellnbg6bc 2HLDe0NLVPuRZhHUHM9hO/JNnHfvgiRQDh6loNOUnm9Iw2YiVgZNnT4soUehMZ7au8PwSl4I KYE4ulJ8RRiydN7fES3IZWmOPlyskp1QMQBD/w16o+lEtY6HSFEzsK3o0vuBRBVp2WKnssVH qeeV01ZHw0bvWKjxVNOksP98eJfWLfV9l9e7s6TaAeySKRRubtJ+21PRuYAxKsaueBfUE7ZT 7zfOwU0EVgUmGQEQALxSQRbl/QOnmssVDxWhHM5TGxl7oLNJms2zmBpcmlrIsn8nNz0rRyxT 460k2niaTwowSRK8KWVDeAW6ZAaWiYjLlTunoKwvF8vP3JyWpBz0diTxL5o+xpvy/Q6YU3BN efdq8Vy3rFsxgW7mMSrI/CxJ667y8ot5DVugeS2NyHfmZlPGE0Nsy7hlebS4liisXOrN3jFz asKyUws3VXek4V65lHwB23BVzsnFMn/bw/rPliqXGcwl8CoJu8dSyrCcd1Ibs0/Inq9S9+t0 VmWiQWfQkz4rvEeTQkp/VfgZ6z98JRW7S6l6eophoWs0/ZyRfOm+QVSqRfFZdxdP2PlGeIFM C3fXJgygXJkFPyWkVElr76JTbtSHsGWbt6xUlYHKXWo+xf9WgtLeby3cfSkEchACrxDrQpj+ Jt/JFP+q997dybkyZ5IoHWuPkn7uZGBrKIHmBunTco1+cKSuRiSCYpBIXZMHCzPgVDjk4viP brV9NwRkmaOxVvye0vctJeWvJ6KA7NoAURplIGCqkCRwg0MmLrfoZnK/gRqVJ/f6adhU1oo6 z4p2/z3PemA0C0ANatgHgBb90cd16AUxpdEQmOCmdNnNJF/3Zt3inzF+NFzHoM5Vwq6rc1JP jfC3oqRLJzqAEHBDjQFlqNR3IFCIAo4SYQRBdAHBCzkM4rWyRhuVABEBAAHCwV8EGAECAAkF AlYFJhkCGwwACgkQ8ww4vT8vvjwg9w//VQrcnVg3TsjEybxDEUBm8dBmnKqcnTBFmxN5FFtI WlEuY8+YMiWRykd8Ln9RJ/98/ghABHz9TN8TRo2b6WimV64FmlVn17Ri6FgFU3xNt9TTEChq AcNg88eYryKsYpFwegGpwUlaUaaGh1m9OrTzcQy+klVfZWaVJ9Nw0keoGRGb8j4XjVpL8+2x OhXKrM1fzzb8JtAuSbuzZSQPDwQEI5CKKxp7zf76J21YeRrEW4WDznPyVcDTa+tz++q2S/Bp P4W98bXCBIuQgs2m+OflERv5c3Ojldp04/S4NEjXEYRWdiCxN7ca5iPml5gLtuvhJMSy36gl U6IW9kn30IWuSoBpTkgV7rLUEhh9Ms82VWW/h2TxL8enfx40PrfbDtWwqRID3WY8jLrjKfTd R3LW8BnUDNkG+c4FzvvGUs8AvuqxxyHbXAfDx9o/jXfPHVRmJVhSmd+hC3mcQ+4iX5bBPBPM oDqSoLt5w9GoQQ6gDVP2ZjTWqwSRMLzNr37rJjZ1pt0DCMMTbiYIUcrhX8eveCJtY7NGWNyx FCRkhxRuGcpwPmRVDwOl39MB3iTsRighiMnijkbLXiKoJ5CDVvX5yicNqYJPKh5MFXN1bvsB kmYiStMRbrD0HoY1kx5/VozBtc70OU0EB8Wrv9hZD+Ofp0T3KOr1RUHvCZoLURfFhSQ= In-Reply-To: <20240719232953.07bacbfb@elisabeth> 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: HRTN3UD43T3JNISVNKY374G44X6LTG7W X-Message-ID-Hash: HRTN3UD43T3JNISVNKY374G44X6LTG7W 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 19/07/2024 23:29, Stefano Brivio wrote: > On Fri, 12 Jul 2024 17:32:43 +0200 > Laurent Vivier wrote: > >> Add vhost_user.c and vhost_user.h that define the functions needed >> to implement vhost-user backend. >> >> Signed-off-by: Laurent Vivier >> --- >> Makefile | 4 +- >> iov.c | 1 - >> vhost_user.c | 1267 ++++++++++++++++++++++++++++++++++++++++++++++++++ >> vhost_user.h | 197 ++++++++ >> virtio.c | 5 - >> virtio.h | 2 +- >> 6 files changed, 1467 insertions(+), 9 deletions(-) >> create mode 100644 vhost_user.c >> create mode 100644 vhost_user.h >> ... >> +/** >> + * vu_send() - Send a buffer to the front-end using the RX virtqueue >> + * @vdev: vhost-user device >> + * @buf: address of the buffer >> + * @size: size of the buffer >> + * >> + * Return: number of bytes sent, -1 if there is an error >> + */ >> +/* cppcheck-suppress unusedFunction */ >> +int vu_send(struct vu_dev *vdev, const void *buf, size_t size) >> +{ >> + size_t hdrlen = vdev->hdrlen; >> + struct vu_virtq *vq = &vdev->vq[VHOST_USER_RX_QUEUE]; >> + struct vu_virtq_element elem[VIRTQUEUE_MAX_SIZE]; >> + struct iovec in_sg[VIRTQUEUE_MAX_SIZE]; >> + size_t lens[VIRTQUEUE_MAX_SIZE]; >> + size_t offset; >> + int i, j; >> + __virtio16 *num_buffers_ptr; >> + int in_sg_count; > > Can those be aligned in the usual way (from longest to shortest)? > >> + >> + debug("vu_send size %zu hdrlen %zu", size, hdrlen); >> + >> + if (!vu_queue_enabled(vq) || !vu_queue_started(vq)) { >> + err("Got packet, but no available descriptors on RX virtq."); >> + return 0; >> + } >> + >> + offset = 0; >> + i = 0; >> + num_buffers_ptr = NULL; >> + in_sg_count = 0; > > Could those be initialised when you declare them? > >> + while (offset < size) { >> + size_t len; >> + int total; >> + int ret; >> + >> + total = 0; >> + >> + if (i == ARRAY_SIZE(elem) || >> + in_sg_count == ARRAY_SIZE(in_sg)) { >> + err("virtio-net unexpected long buffer chain"); >> + goto err; >> + } >> + >> + elem[i].out_num = 0; >> + elem[i].out_sg = NULL; >> + elem[i].in_num = ARRAY_SIZE(in_sg) - in_sg_count; >> + elem[i].in_sg = &in_sg[in_sg_count]; >> + >> + ret = vu_queue_pop(vdev, vq, &elem[i]); >> + if (ret < 0) { >> + if (vu_wait_queue(vq) != -1) >> + continue; >> + if (i) { >> + err("virtio-net unexpected empty queue: " >> + "i %d mergeable %d offset %zd, size %zd, " >> + "features 0x%" PRIx64, >> + i, vu_has_feature(vdev, >> + VIRTIO_NET_F_MRG_RXBUF), >> + offset, size, vdev->features); >> + } >> + offset = -1; >> + goto err; >> + } >> + in_sg_count += elem[i].in_num; >> + >> + if (elem[i].in_num < 1) { >> + err("virtio-net receive queue contains no in buffers"); >> + vu_queue_detach_element(vdev, vq, elem[i].index, 0); >> + offset = -1; >> + goto err; >> + } >> + >> + if (i == 0) { >> + struct virtio_net_hdr hdr = { >> + .flags = VIRTIO_NET_HDR_F_DATA_VALID, >> + .gso_type = VIRTIO_NET_HDR_GSO_NONE, >> + }; >> + >> + ASSERT(offset == 0); >> + ASSERT(elem[i].in_sg[0].iov_len >= hdrlen); >> + >> + len = iov_from_buf(elem[i].in_sg, elem[i].in_num, 0, >> + &hdr, sizeof(hdr)); >> + >> + num_buffers_ptr = (__virtio16 *)((char *)elem[i].in_sg[0].iov_base + >> + len); >> + >> + total += hdrlen; > > Shouldn't this be 'total += len' or, alternatively, shouldn't there be > a check that len == hdrlen? len is sizeof(virtio_net_hdr) but hdrlen can be either sizeof(struct virtio_net_hdr) or sizeof(struct virtio_net_hdr_mrg_rxbuf). It depends on VIRTIO_NET_F_MRG_RXBUF. We actually want to add hdrlen to total. struct virtio_net_hdr_mrg_rxbuf { struct virtio_net_hdr hdr; __virtio16 num_buffers; /* Number of merged rx buffers */ }; At this point we initialize hdr, num_buffers will be set later only if hdrlen is sizeof(struct virtio_net_hdr_mrg_rxbuf). Thanks, Laurent