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=-16.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 A9E34C433B4 for ; Thu, 13 May 2021 11:58:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8455861183 for ; Thu, 13 May 2021 11:58:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233059AbhEML7e (ORCPT ); Thu, 13 May 2021 07:59:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51599 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232152AbhEML7c (ORCPT ); Thu, 13 May 2021 07:59:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620907101; 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=mHdwZTL+pvK8Zg99tTdQKEFKw4APO+UMqyfXLBZ12cw=; b=TPMz123/QZJ05xlKbDrNfcIqcQSPuXup8htC57gdVMxtB+bJxTmnHIJH5qeLpUB7/AF8bX Eog3D78Ujqnoetz2REFl9u1Z9jOCtvlU9sn8u18sU6+UFBGUXOcNstIe5Gf36pRZHqEUxF jMpdfhnRaWgtU+drUa2LeIgDy0ztPIA= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-323-tCCA5paaPQGyui0I2o_DLA-1; Thu, 13 May 2021 07:58:20 -0400 X-MC-Unique: tCCA5paaPQGyui0I2o_DLA-1 Received: by mail-ej1-f71.google.com with SMTP id qk30-20020a170906d9deb02903916754e1b6so8249608ejb.2 for ; Thu, 13 May 2021 04:58:20 -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=mHdwZTL+pvK8Zg99tTdQKEFKw4APO+UMqyfXLBZ12cw=; b=t2J9M4Fi3OAf2AIvv0E6GZzjDtD2u9DxzGITER5mL6G3lPKJJt+2yFTRsIDyll1NoR 2sMx/r6frXFH+eOal58T0cOG1o2/0zjPZF+1XHttouOsTFBFCopVXtfiZPtyBDx5vzNj SxvJmX6C3I8FO3qROUArNh7Xr3+Fot8P6gj8LdlIwvOwJgFLKqVCS0hBaoQE3hKjJFe+ 6g+hQeziJZstndx5PJGvhynXb6JGRxxqnBdJSS1gVcVAf6vm/ntZBgTrZ3qz5tkkq0w1 CruPTqB6hvjZcKm0oXf3Irqny64dGGvRhUPOhyqt0Y6O0nBNOc1Fwf85iXYxZSGF4joz KNDg== X-Gm-Message-State: AOAM532GNgRJMzYAr+7iR/rajfLEktJwHLh09v+u9xtcHJRrqk+ECv0o FBy1Iuj4PYglEPAoZLRnW/0FFqPzKy1hNI0K4arsipeVL/ib7tiNW5rbBEInGvAt/BuDieW4eE8 m0zucpHIg2fEh X-Received: by 2002:a17:906:3952:: with SMTP id g18mr8710572eje.138.1620907099240; Thu, 13 May 2021 04:58:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytzhY86+D4jQaq9WMVx+063wiEyhp56IsRtO0CBtMRCrX7Xse2B2ObmWARquFYRp5Ry0+5mg== X-Received: by 2002:a17:906:3952:: with SMTP id g18mr8710552eje.138.1620907099070; Thu, 13 May 2021 04:58:19 -0700 (PDT) Received: from steredhat (host-79-18-148-79.retail.telecomitalia.it. [79.18.148.79]) by smtp.gmail.com with ESMTPSA id b25sm2288552edv.9.2021.05.13.04.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 May 2021 04:58:18 -0700 (PDT) Date: Thu, 13 May 2021 13:58:16 +0200 From: Stefano Garzarella To: Arseny Krasnov Cc: Stefan Hajnoczi , "Michael S. Tsirkin" , Jason Wang , "David S. Miller" , Jakub Kicinski , Jorgen Hansen , Andra Paraschiv , Colin Ian King , Norbert Slusarek , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stsp2@yandex.ru, oxffffaa@gmail.com Subject: Re: [RFC PATCH v9 11/19] virtio/vsock: dequeue callback for SOCK_SEQPACKET Message-ID: <20210513115816.332nfej4jyra7vrh@steredhat> References: <20210508163027.3430238-1-arseny.krasnov@kaspersky.com> <20210508163523.3431999-1-arseny.krasnov@kaspersky.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20210508163523.3431999-1-arseny.krasnov@kaspersky.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Sat, May 08, 2021 at 07:35:20PM +0300, Arseny Krasnov wrote: >This adds transport callback and it's logic for SEQPACKET dequeue. >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 >--- > v8 -> v9: > 1) Check for RW packet type is removed from loop(all packet now > considered RW). > 2) Locking in loop is fixed. > 3) cpu_to_le32()/le32_to_cpu() now used. > 4) MSG_TRUNC handling removed from transport. > > include/linux/virtio_vsock.h | 5 ++ > net/vmw_vsock/virtio_transport_common.c | 64 +++++++++++++++++++++++++ > 2 files changed, 69 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..f649a21dd23b 100644 >--- a/net/vmw_vsock/virtio_transport_common.c >+++ b/net/vmw_vsock/virtio_transport_common.c >@@ -393,6 +393,58 @@ 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 err = 0; >+ size_t user_buf_len = msg->msg_iter.count; >+ >+ *msg_ready = false; >+ spin_lock_bh(&vvs->rx_lock); >+ >+ while (!*msg_ready && !list_empty(&vvs->rx_queue) && err >= 0) { >+ 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)) >{ >+ err = -EINVAL; >+ } else { >+ err += pkt_len; If `bytes_to_copy == 0` we are not increasing the real length. Anyway is a bit confusing increase a variable called `err`, I think is better to have another variable to store this information that we return if there aren't errors.