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.1 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=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 2F6B7C4708F for ; Fri, 4 Jun 2021 15:06:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1316361400 for ; Fri, 4 Jun 2021 15:06:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230083AbhFDPIf (ORCPT ); Fri, 4 Jun 2021 11:08:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37751 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229864AbhFDPIe (ORCPT ); Fri, 4 Jun 2021 11:08:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622819207; 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=R4lH0ENSCRPWcR6tjmSMqiJJcwn1xqWLtNNasWP/7BY=; b=gaUWEbFSO88tLQpjZwTHnnNYVZK9gjwQHl7mcDcP5qoeNY4w1MHZQB7s54s4aXR7aRjtzL QQ+cuH+xAzsz0/YBhTfXybHXwcI+djjg3y0svcwyoE5QWMvouWdfTBFU9RKVfMsWpM9sEV 2UtHiBlb5jD3kcioqZKc8hvVi6wqmyg= 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-41-Fqzv9iNAPZKTsjjhE_h2Cw-1; Fri, 04 Jun 2021 11:06:45 -0400 X-MC-Unique: Fqzv9iNAPZKTsjjhE_h2Cw-1 Received: by mail-ed1-f72.google.com with SMTP id x8-20020aa7d3880000b029038fe468f5f4so5101158edq.10 for ; Fri, 04 Jun 2021 08:06:44 -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=R4lH0ENSCRPWcR6tjmSMqiJJcwn1xqWLtNNasWP/7BY=; b=oLMvfhqozTUYhtfIYMivEiJgjLvmgE13lfxTLCfeNwhvHdK73X1DpDvSZz8NKxXi9c OwUz3Mus10N3y4BSb0Apj1barD5jiOpbHSx0yJ/WrWxE3LTAmg43UcJtHURtgnuVxOqt MRqTPF9cqgkupSh+yJHjV/Ct7QWYhvmNTeBbDY9vioSLUlzbyW3k6+PVSrVI4wkG0SCE Ey1EZdR5ORijGCw9LFu6cgEsbsri0LOndLfGR07vr/q76JKlwQXpJ5LpSDE3kGN8XTw4 IUgCFJDWTW5I9lDlhK/VtL5FBstWFxAjgQowVH3eqgU/o+3z5xqfQu9jaFePJEsX9uT+ vi9w== X-Gm-Message-State: AOAM533PBClDSvNhYmebnk64yCbTR1iYClHm8j9dIp2Nc2G7bc1/hPL5 PkK/SB488XWRRfIE7/nlcdUMqGP4eSCyDTKv2PU0sn4fHG/smn+Z8oB9nIoGZGrGlXcNYulrk1O 4aE5M5qMI98nZ X-Received: by 2002:a17:906:b307:: with SMTP id n7mr4531780ejz.261.1622819203843; Fri, 04 Jun 2021 08:06:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFKUEl+a6SCxy6FtoRWYARC6BFE/SxvneKPM+vbJAKJH5rGGVaDehSBEGg8bb1AIBMBTVsMA== X-Received: by 2002:a17:906:b307:: with SMTP id n7mr4531750ejz.261.1622819203625; Fri, 04 Jun 2021 08:06:43 -0700 (PDT) Received: from steredhat ([5.170.129.161]) by smtp.gmail.com with ESMTPSA id w11sm3677629ede.54.2021.06.04.08.06.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jun 2021 08:06:43 -0700 (PDT) Date: Fri, 4 Jun 2021 17:06:38 +0200 From: Stefano Garzarella To: Arseny Krasnov Cc: Stefan Hajnoczi , "Michael S. Tsirkin" , Jason Wang , "David S. Miller" , Jakub Kicinski , Jorgen Hansen , Colin Ian King , Andra Paraschiv , Norbert Slusarek , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oxffffaa@gmail.com Subject: Re: [PATCH v10 04/18] af_vsock: implement SEQPACKET receive loop Message-ID: <20210604150638.rmx262k4wjmp2zob@steredhat> References: <20210520191357.1270473-1-arseny.krasnov@kaspersky.com> <20210520191611.1271204-1-arseny.krasnov@kaspersky.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20210520191611.1271204-1-arseny.krasnov@kaspersky.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Thu, May 20, 2021 at 10:16:08PM +0300, Arseny Krasnov wrote: >Add receive loop for SEQPACKET. It looks like receive loop for >STREAM, but there are differences: >1) It doesn't call notify callbacks. >2) It doesn't care about 'SO_SNDLOWAT' and 'SO_RCVLOWAT' values, because > there is no sense for these values in SEQPACKET case. >3) It waits until whole record is received or error is found during > receiving. >4) It processes and sets 'MSG_TRUNC' flag. > >So to avoid extra conditions for two types of socket inside one loop, two >independent functions were created. > >Signed-off-by: Arseny Krasnov >--- > v9 -> v10: > 1) Use 'msg_data_left()' instead of direct access to 'msg_hdr'. > > include/net/af_vsock.h | 4 +++ > net/vmw_vsock/af_vsock.c | 72 +++++++++++++++++++++++++++++++++++++++- > 2 files changed, 75 insertions(+), 1 deletion(-) > >diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h >index b1c717286993..5175f5a52ce1 100644 >--- a/include/net/af_vsock.h >+++ b/include/net/af_vsock.h >@@ -135,6 +135,10 @@ struct vsock_transport { > bool (*stream_is_active)(struct vsock_sock *); > bool (*stream_allow)(u32 cid, u32 port); > >+ /* SEQ_PACKET. */ >+ ssize_t (*seqpacket_dequeue)(struct vsock_sock *vsk, struct msghdr *msg, >+ int flags, bool *msg_ready); >+ > /* Notification. */ > int (*notify_poll_in)(struct vsock_sock *, size_t, bool *); > int (*notify_poll_out)(struct vsock_sock *, size_t, bool *); >diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c >index c4f6bfa1e381..aede474343d1 100644 >--- a/net/vmw_vsock/af_vsock.c >+++ b/net/vmw_vsock/af_vsock.c >@@ -1974,6 +1974,73 @@ static int __vsock_stream_recvmsg(struct sock *sk, struct msghdr *msg, > return err; > } > >+static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg, >+ size_t len, int flags) >+{ >+ const struct vsock_transport *transport; >+ bool msg_ready; >+ struct vsock_sock *vsk; >+ ssize_t record_len; >+ long timeout; >+ int err = 0; >+ DEFINE_WAIT(wait); >+ >+ vsk = vsock_sk(sk); >+ transport = vsk->transport; >+ >+ timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT); >+ msg_ready = false; >+ record_len = 0; >+ >+ while (1) { >+ ssize_t fragment_len; >+ >+ if (vsock_wait_data(sk, &wait, timeout, NULL, 0) <= 0) { >+ /* In case of any loop break(timeout, signal >+ * interrupt or shutdown), we report user that >+ * nothing was copied. >+ */ >+ err = 0; Why we report that nothing was copied? What happen to the bytes already copied in `msg`? >+ break; >+ } >+ >+ fragment_len = transport->seqpacket_dequeue(vsk, msg, flags, &msg_ready); >+ >+ if (fragment_len < 0) { >+ err = -ENOMEM; >+ break; >+ } >+ >+ record_len += fragment_len; >+ >+ if (msg_ready) >+ break; >+ } >+ >+ if (sk->sk_err) >+ err = -sk->sk_err; >+ else if (sk->sk_shutdown & RCV_SHUTDOWN) >+ err = 0; >+ >+ if (msg_ready && err == 0) { >+ /* User sets MSG_TRUNC, so return real length of >+ * packet. >+ */ >+ if (flags & MSG_TRUNC) >+ err = record_len; >+ else >+ err = len - msg_data_left(msg); >+ >+ /* Always set MSG_TRUNC if real length of packet is >+ * bigger than user's buffer. >+ */ >+ if (record_len > len) >+ msg->msg_flags |= MSG_TRUNC; >+ } >+ >+ return err; >+} >+ > static int > vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, > int flags) >@@ -2029,7 +2096,10 @@ vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, > goto out; > } > >- err = __vsock_stream_recvmsg(sk, msg, len, flags); >+ if (sk->sk_type == SOCK_STREAM) >+ err = __vsock_stream_recvmsg(sk, msg, len, flags); >+ else >+ err = __vsock_seqpacket_recvmsg(sk, msg, len, flags); > > out: > release_sock(sk); >-- >2.25.1 >