From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7944AC47082 for ; Tue, 8 Jun 2021 08:23:35 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 141FA6127A for ; Tue, 8 Jun 2021 08:23:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 141FA6127A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=virtualization-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id BEAAE40223; Tue, 8 Jun 2021 08:23:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ipurnfPmQpHs; Tue, 8 Jun 2021 08:23:33 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTP id ED2B640295; Tue, 8 Jun 2021 08:23:32 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B8393C000D; Tue, 8 Jun 2021 08:23:32 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 499E4C0001 for ; Tue, 8 Jun 2021 08:23:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 383BD834C7 for ; Tue, 8 Jun 2021 08:23:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1EOsaCt_1fIE for ; Tue, 8 Jun 2021 08:23:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 346CF82C18 for ; Tue, 8 Jun 2021 08:23:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623140608; 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: in-reply-to:in-reply-to:references:references; bh=aInU0vkdmOr9exwK4wjdgUKbEXeDUXZCTLF/tA2okIY=; b=UBvfHc3/5sVpf+k7zuzgUy/2HUe9Vz+K2ESJgxbsxDLEn26IIJM4i0WbK1o0dpRyT25OND CR4yQKHfIGXgH73VXPtMu+xn4qIjpI4cqtGYaEWePZhqkaqiAWEz0RLO6xKRkcx/+aK4Hv imto+ewoXYioTmSeiLJ7F9o7bm/ltUw= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-267-lkCK4nimNsCaP356gPZ7Pw-1; Tue, 08 Jun 2021 04:23:24 -0400 X-MC-Unique: lkCK4nimNsCaP356gPZ7Pw-1 Received: by mail-ed1-f72.google.com with SMTP id c12-20020aa7d60c0000b029038fccdf4390so10476272edr.9 for ; Tue, 08 Jun 2021 01:23:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=aInU0vkdmOr9exwK4wjdgUKbEXeDUXZCTLF/tA2okIY=; b=huDDH2OGej0GMezJHcPCf9OxLNZ7P4iTKtxg7Nx2rKWY04LcPh3QUcaWL4pbLrkDyt hAo7W2Zb+vCcvtX82I1rutNHUfgDnmbUtSw54V4ffeq1vm+rIHL7oqOlNjhnpNwuvkL2 5sefzZ9m7ZJQeU43MCXTk1dF/q7Zvqq2ux7BP+ddo1HA0BWzdcVovTSHxEVw08lwgLoo ddKvKAHwUWOKnrg8Y3i/ATbig7oOqvnKI6wy+oiesri+ynEXmW+PIcFy4zH04Mxz0L4H cZtARTOCKL2rt7won2eRfdmc95qIzqVxet6Fw7XmQ6KljUHKgndT7pfqP98myuEcz6iB kMoA== X-Gm-Message-State: AOAM532XGEYHovsIZTDsqIWFjYiyA6wdPFNUBm8ZHdEWxrxq/cpPFNon x8eknMdRwh+OSI1Ye0lgqMpPjuy/wGS7vrccmyrbPjUdZxSHS3yebUW3LOZ0dxwT9cPgX5tsRJ7 li5WWuB95s92+nRUicdI1kpdGYM+qmDPQMr7oOit1JQ== X-Received: by 2002:a05:6402:214:: with SMTP id t20mr20502340edv.20.1623140603118; Tue, 08 Jun 2021 01:23:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwAjvPZk/sUPc8opkloFDtWfeIxWq0x/McIlLRmPabQP9/5yQzTcXJ1jLdQMpZOSEYxKVWx2A== X-Received: by 2002:a05:6402:214:: with SMTP id t20mr20502323edv.20.1623140602875; Tue, 08 Jun 2021 01:23:22 -0700 (PDT) Received: from steredhat (host-79-18-148-79.retail.telecomitalia.it. [79.18.148.79]) by smtp.gmail.com with ESMTPSA id m15sm7394259eji.39.2021.06.08.01.23.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 01:23:22 -0700 (PDT) Date: Tue, 8 Jun 2021 10:23:20 +0200 From: Stefano Garzarella To: Arseny Krasnov Subject: Re: [PATCH v10 11/18] virtio/vsock: dequeue callback for SOCK_SEQPACKET Message-ID: <20210608082320.vs2tzgpxgr2dhxye@steredhat> References: <20210520191357.1270473-1-arseny.krasnov@kaspersky.com> <20210520191801.1272027-1-arseny.krasnov@kaspersky.com> <20210603144513.ryjzauq7abnjogu3@steredhat> <6b833ccf-ea93-db6a-4743-463ac1cfe817@kaspersky.com> <20210604150324.winiikx5h3p6gsyy@steredhat> <20210607110421.wkx4dj7wipwsqztj@steredhat> <8e2eb802-7c5d-70b0-82b5-ec8de4fdc046@kaspersky.com> MIME-Version: 1.0 In-Reply-To: <8e2eb802-7c5d-70b0-82b5-ec8de4fdc046@kaspersky.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=sgarzare@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Cc: Andra Paraschiv , "kvm@vger.kernel.org" , "Michael S. Tsirkin" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "virtualization@lists.linux-foundation.org" , "oxffffaa@gmail.com" , Norbert Slusarek , Stefan Hajnoczi , Colin Ian King , Jakub Kicinski , "David S. Miller" , Jorgen Hansen X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" On Mon, Jun 07, 2021 at 04:18:38PM +0300, Arseny Krasnov wrote: > >On 07.06.2021 14:04, Stefano Garzarella wrote: >> On Fri, Jun 04, 2021 at 09:03:26PM +0300, Arseny Krasnov wrote: >>> On 04.06.2021 18:03, Stefano Garzarella wrote: >>>> On Fri, Jun 04, 2021 at 04:12:23PM +0300, Arseny Krasnov wrote: >>>>> On 03.06.2021 17:45, Stefano Garzarella wrote: >>>>>> On Thu, May 20, 2021 at 10:17:58PM +0300, Arseny Krasnov wrote: >>>>>>> Callback fetches RW packets from rx queue of socket until whole record >>>>>>> is copied(if user's buffer is full, user is not woken up). This is done >>>>>>> to not stall sender, because if we wake up user and it leaves syscall, >>>>>>> nobody will send credit update for rest of record, and sender will wait >>>>>>> for next enter of read syscall at receiver's side. So if user buffer is >>>>>>> full, we just send credit update and drop data. >>>>>>> >>>>>>> Signed-off-by: Arseny Krasnov >>>>>>> --- >>>>>>> v9 -> v10: >>>>>>> 1) Number of dequeued bytes incremented even in case when >>>>>>> user's buffer is full. >>>>>>> 2) Use 'msg_data_left()' instead of direct access to 'msg_hdr'. >>>>>>> 3) Rename variable 'err' to 'dequeued_len', in case of error >>>>>>> it has negative value. >>>>>>> >>>>>>> include/linux/virtio_vsock.h | 5 ++ >>>>>>> net/vmw_vsock/virtio_transport_common.c | 65 +++++++++++++++++++++++++ >>>>>>> 2 files changed, 70 insertions(+) >>>>>>> >>>>>>> diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h >>>>>>> index dc636b727179..02acf6e9ae04 100644 >>>>>>> --- a/include/linux/virtio_vsock.h >>>>>>> +++ b/include/linux/virtio_vsock.h >>>>>>> @@ -80,6 +80,11 @@ virtio_transport_dgram_dequeue(struct vsock_sock *vsk, >>>>>>> struct msghdr *msg, >>>>>>> size_t len, int flags); >>>>>>> >>>>>>> +ssize_t >>>>>>> +virtio_transport_seqpacket_dequeue(struct vsock_sock *vsk, >>>>>>> + struct msghdr *msg, >>>>>>> + int flags, >>>>>>> + bool *msg_ready); >>>>>>> s64 virtio_transport_stream_has_data(struct vsock_sock *vsk); >>>>>>> s64 virtio_transport_stream_has_space(struct vsock_sock *vsk); >>>>>>> >>>>>>> diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c >>>>>>> index ad0d34d41444..61349b2ea7fe 100644 >>>>>>> --- a/net/vmw_vsock/virtio_transport_common.c >>>>>>> +++ b/net/vmw_vsock/virtio_transport_common.c >>>>>>> @@ -393,6 +393,59 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk, >>>>>>> return err; >>>>>>> } >>>>>>> >>>>>>> +static int virtio_transport_seqpacket_do_dequeue(struct vsock_sock *vsk, >>>>>>> + struct msghdr *msg, >>>>>>> + int flags, >>>>>>> + bool *msg_ready) >>>>>>> +{ >>>>>>> + struct virtio_vsock_sock *vvs = vsk->trans; >>>>>>> + struct virtio_vsock_pkt *pkt; >>>>>>> + int dequeued_len = 0; >>>>>>> + size_t user_buf_len = msg_data_left(msg); >>>>>>> + >>>>>>> + *msg_ready = false; >>>>>>> + spin_lock_bh(&vvs->rx_lock); >>>>>>> + >>>>>>> + while (!*msg_ready && !list_empty(&vvs->rx_queue) && dequeued_len >= 0) { >>>>>> I' >>>>>> >>>>>>> + size_t bytes_to_copy; >>>>>>> + size_t pkt_len; >>>>>>> + >>>>>>> + pkt = list_first_entry(&vvs->rx_queue, struct virtio_vsock_pkt, list); >>>>>>> + pkt_len = (size_t)le32_to_cpu(pkt->hdr.len); >>>>>>> + bytes_to_copy = min(user_buf_len, pkt_len); >>>>>>> + >>>>>>> + if (bytes_to_copy) { >>>>>>> + /* sk_lock is held by caller so no one else can dequeue. >>>>>>> + * Unlock rx_lock since memcpy_to_msg() may sleep. >>>>>>> + */ >>>>>>> + spin_unlock_bh(&vvs->rx_lock); >>>>>>> + >>>>>>> + if (memcpy_to_msg(msg, pkt->buf, bytes_to_copy)) >>>>>>> + dequeued_len = -EINVAL; >>>>>> I think here is better to return the error returned by memcpy_to_msg(), >>>>>> as we do in the other place where we use memcpy_to_msg(). >>>>>> >>>>>> I mean something like this: >>>>>> err = memcpy_to_msgmsg, pkt->buf, bytes_to_copy); >>>>>> if (err) >>>>>> dequeued_len = err; >>>>> Ack >>>>>>> + else >>>>>>> + user_buf_len -= bytes_to_copy; >>>>>>> + >>>>>>> + spin_lock_bh(&vvs->rx_lock); >>>>>>> + } >>>>>>> + >>>>>> Maybe here we can simply break the cycle if we have an error: >>>>>> if (dequeued_len < 0) >>>>>> break; >>>>>> >>>>>> Or we can refactor a bit, simplifying the while() condition and also the >>>>>> code in this way (not tested): >>>>>> >>>>>> while (!*msg_ready && !list_empty(&vvs->rx_queue)) { >>>>>> ... >>>>>> >>>>>> if (bytes_to_copy) { >>>>>> int err; >>>>>> >>>>>> /* ... >>>>>> */ >>>>>> spin_unlock_bh(&vvs->rx_lock); >>>>>> err = memcpy_to_msgmsg, pkt->buf, bytes_to_copy); >>>>>> if (err) { >>>>>> dequeued_len = err; >>>>>> goto out; >>>>>> } >>>>>> spin_lock_bh(&vvs->rx_lock); >>>>>> >>>>>> user_buf_len -= bytes_to_copy; >>>>>> } >>>>>> >>>>>> dequeued_len += pkt_len; >>>>>> >>>>>> if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOR) >>>>>> *msg_ready = true; >>>>>> >>>>>> virtio_transport_dec_rx_pkt(vvs, pkt); >>>>>> list_del(&pkt->list); >>>>>> virtio_transport_free_pkt(pkt); >>>>>> } >>>>>> >>>>>> out: >>>>>> spin_unlock_bh(&vvs->rx_lock); >>>>>> >>>>>> virtio_transport_send_credit_update(vsk); >>>>>> >>>>>> return dequeued_len; >>>>>> } >>>>> I think we can't do 'goto out' or break, because in case of error, >>>>> we still need >>>>> to free packet. >>>> Didn't we have code that remove packets from a previous message? >>>> I don't see it anymore. >>>> >>>> For example if we have 10 packets queued for a message (the 10th >>>> packet >>>> has the EOR flag) and the memcpy_to_msg() fails on the 2nd packet, with >>>> you proposal we are freeing only the first 2 packets, the rest is there >>>> and should be freed when reading the next message, but I don't see that >>>> code. >>>> >>>> The same can happen if the recvmsg syscall is interrupted. In that case >>>> we report that nothing was copied, but we freed the first N packets, so >>>> they are lost but the other packets are still in the queue. >>>> >>>> Please check also the patch where we implemented >>>> __vsock_seqpacket_recvmsg(). >>>> >>>> I thinks we should free packets only when we are sure we copied them to >>>> the user space. >>> Hm, yes, this is problem. To solve it i can restore previous approach >>> with seqbegin/seqend. In that case i can detect unfinished record and >>> drop it's packets. Seems seqbegin will be a bit like >>> VIRTIO_VSOCK_SEQ_EOR in flags >>> field of header(e.g. VIRTIO_VSOCK_SEQ_BEGIN). Message id and length are >>> unneeded, >>> as channel considedered lossless. What do You think? >>> >> I think VIRTIO_VSOCK_SEQ_BEGIN is redundant, using only EOR should be >> fine. >> >> When we receive EOR we know that this is the last packet on this message >> and the next packet will be the first of a new message. >> >> What we should do is check that we have all the fragments of a packet >> and return them all together, otherwise we have to say we have nothing. >> >> For example as we process packets from the vitqueue and queue them in >> the rx_queue we could use a counter of how many EORs are in the >> rx_queue, which we decrease in virtio_transport_seqpacket_do_dequeue() >> when we copied all the fragments. >> >> If the counter is 0, we don't remove anything from the queue and >> virtio_transport_seqpacket_do_dequeue() returns 0. >> >> So .seqpacket_dequeue should return 0 if there is not at least one >> complete message, or return the entire message. A partial message should >> never return. >> >> What do you think? > >I like it, i've implemented this approach in some early pre v1 versions. > >But in this case, credit update logic will be changed - in current implementation > >(both seqpacket and stream) credit update reply is sent when data is copied > >to user's buffer(e.g. we copy data somewhere, free packet and ready to process > >new packet). But if we don't touch user's buffer and keeping incoming packet in rx queue > >until whole record is ready, when to send credit update? I think the best approach could be to send credit updates when we remove them from the rx_queue. Stefano _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization