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=-15.8 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 D1040C433E0 for ; Mon, 22 Feb 2021 11:45:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C53264DE5 for ; Mon, 22 Feb 2021 11:45:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230087AbhBVLpn (ORCPT ); Mon, 22 Feb 2021 06:45:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:48688 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229907AbhBVLp0 (ORCPT ); Mon, 22 Feb 2021 06:45:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613994240; 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=jMggRyrmt7rUz3sFUZulBpW7f6YfWViL3qR4aD0gP18=; b=PQ9B2HqnT0wuiU/2uNnn7qsCYuKNX/hIltE5Qf+GmMdH8kAMOoIPP5Ccvh/tVsBqdU7gMw 4mLCfkr9lCyIEXcnDh6K3hWQ94EPUwT/8PJP1X/VZ4GYd/Fo1VrHp7zWF06hg0YIPnuPep BHLYmqhEX8tamAhK1AG/Frjj9xkTxOE= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-490-eOC5pSFIMp23OfeICsSUKQ-1; Mon, 22 Feb 2021 06:43:57 -0500 X-MC-Unique: eOC5pSFIMp23OfeICsSUKQ-1 Received: by mail-wm1-f69.google.com with SMTP id r21so2512336wmq.7 for ; Mon, 22 Feb 2021 03:43:56 -0800 (PST) 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=jMggRyrmt7rUz3sFUZulBpW7f6YfWViL3qR4aD0gP18=; b=D2n/JT2TX0PQIESSUZpkZwzKKyoYqR7pqYijhVs3cye5qVItJ9HO08SR84K2Xa1w0P vENlQ3JrOPMFMyQftW0kWNRFoAkPessNYfW3Lk8uOUxdCL0O37vnOfyjuVEnClqtGlRj Tf5ieLhX2cFtfsIL9CuuSZUIPA0HKBOrjYZXOqvFbiXKKIjA6IGhp/8gbq0Gy71H2BT6 n5gnJKrNsHE2oMCT9nxBnNYAf8pMSgjq+NO7xhYhi3C5m/9FmY5MdYM/v4jw6SUTe5pU O6FSS/D7xjrmOKtadYmysn3noK/nFTb3mOetYYxuG8yodzcNJGb9guB9NDkU+4ZM1N9u NVhA== X-Gm-Message-State: AOAM532TAdZdub0/yy/KrsqeeYHJpqmtvRzJd5qyoIEzNTngQubBiFIM lW/Cnc2WKs5NlwXgdmhAaOQhqqhjJxpGBAFFUDA24fsY0fnPLC9/KYCc9cY5/DKTbJTzNgDwiyX 4nuDi6kHQQ53Tdisu X-Received: by 2002:adf:a2c7:: with SMTP id t7mr21223393wra.42.1613994235724; Mon, 22 Feb 2021 03:43:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJxh4bkeSBk/Aof8/0ud063mP9B8es8pjQc7OR5fltHgLTpr3ahl7wR4tuzSs4XfoCBOiy7e3A== X-Received: by 2002:adf:a2c7:: with SMTP id t7mr21223379wra.42.1613994235557; Mon, 22 Feb 2021 03:43:55 -0800 (PST) Received: from steredhat (host-79-34-249-199.business.telecomitalia.it. [79.34.249.199]) by smtp.gmail.com with ESMTPSA id h17sm20352349wrw.74.2021.02.22.03.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 03:43:55 -0800 (PST) Date: Mon, 22 Feb 2021 12:43:52 +0100 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, stsp2@yandex.ru, oxffffaa@gmail.com Subject: Re: [RFC PATCH v5 03/19] af_vsock: separate receive data loop Message-ID: <20210222114352.u5byc3lbndwtorjo@steredhat> References: <20210218053347.1066159-1-arseny.krasnov@kaspersky.com> <20210218053653.1067086-1-arseny.krasnov@kaspersky.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20210218053653.1067086-1-arseny.krasnov@kaspersky.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, Feb 18, 2021 at 08:36:50AM +0300, Arseny Krasnov wrote: >This moves STREAM specific data receive logic to dedicated function: >'__vsock_stream_recvmsg()', while checks that will be same for both >types of socket are in shared function: 'vsock_connectible_recvmsg()'. I'm not a native speaker, but I would rewrite this message like this: Move STREAM specific data receive logic to '__vsock_stream_recvmsg()' dedicated function, while checks, that will be same for both STREAM and SEQPACKET sockets, stays in 'vsock_connectible_recvmsg()' shared functions. Anyway the patch LGTM: Reviewed-by: Stefano Garzarella > >Signed-off-by: Arseny Krasnov >--- > net/vmw_vsock/af_vsock.c | 116 ++++++++++++++++++++++----------------- > 1 file changed, 67 insertions(+), 49 deletions(-) > >diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c >index 6cf7bb977aa1..d277dc1cdbdf 100644 >--- a/net/vmw_vsock/af_vsock.c >+++ b/net/vmw_vsock/af_vsock.c >@@ -1894,65 +1894,22 @@ static int vsock_wait_data(struct sock *sk, struct wait_queue_entry *wait, > return data; > } > >-static int >-vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, >- int flags) >+static int __vsock_stream_recvmsg(struct sock *sk, struct msghdr *msg, >+ size_t len, int flags) > { >- struct sock *sk; >- struct vsock_sock *vsk; >+ struct vsock_transport_recv_notify_data recv_data; > const struct vsock_transport *transport; >- int err; >- size_t target; >+ struct vsock_sock *vsk; > ssize_t copied; >+ size_t target; > long timeout; >- struct vsock_transport_recv_notify_data recv_data; >+ int err; > > DEFINE_WAIT(wait); > >- sk = sock->sk; > vsk = vsock_sk(sk); >- err = 0; >- >- lock_sock(sk); >- > transport = vsk->transport; > >- if (!transport || sk->sk_state != TCP_ESTABLISHED) { >- /* Recvmsg is supposed to return 0 if a peer performs an >- * orderly shutdown. Differentiate between that case and when a >- * peer has not connected or a local shutdown occured >with the >- * SOCK_DONE flag. >- */ >- if (sock_flag(sk, SOCK_DONE)) >- err = 0; >- else >- err = -ENOTCONN; >- >- goto out; >- } >- >- if (flags & MSG_OOB) { >- err = -EOPNOTSUPP; >- goto out; >- } >- >- /* We don't check peer_shutdown flag here since peer may actually shut >- * down, but there can be data in the queue that a local socket can >- * receive. >- */ >- if (sk->sk_shutdown & RCV_SHUTDOWN) { >- err = 0; >- goto out; >- } >- >- /* It is valid on Linux to pass in a zero-length receive buffer. This >- * is not an error. We may as well bail out now. >- */ >- if (!len) { >- err = 0; >- goto out; >- } >- > /* We must not copy less than target bytes into the user's buffer > * before returning successfully, so we wait for the consume queue to > * have that much data to consume before dequeueing. Note that this >@@ -2011,6 +1968,67 @@ vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, > if (copied > 0) > err = copied; > >+out: >+ return err; >+} >+ >+static int >+vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, >+ int flags) >+{ >+ struct sock *sk; >+ struct vsock_sock *vsk; >+ const struct vsock_transport *transport; >+ int err; >+ >+ DEFINE_WAIT(wait); >+ >+ sk = sock->sk; >+ vsk = vsock_sk(sk); >+ err = 0; >+ >+ lock_sock(sk); >+ >+ transport = vsk->transport; >+ >+ if (!transport || sk->sk_state != TCP_ESTABLISHED) { >+ /* Recvmsg is supposed to return 0 if a peer performs an >+ * orderly shutdown. Differentiate between that case and >when a >+ * peer has not connected or a local shutdown occurred with the >+ * SOCK_DONE flag. >+ */ >+ if (sock_flag(sk, SOCK_DONE)) >+ err = 0; >+ else >+ err = -ENOTCONN; >+ >+ goto out; >+ } >+ >+ if (flags & MSG_OOB) { >+ err = -EOPNOTSUPP; >+ goto out; >+ } >+ >+ /* We don't check peer_shutdown flag here since peer may actually shut >+ * down, but there can be data in the queue that a local socket can >+ * receive. >+ */ >+ if (sk->sk_shutdown & RCV_SHUTDOWN) { >+ err = 0; >+ goto out; >+ } >+ >+ /* It is valid on Linux to pass in a zero-length receive buffer. This >+ * is not an error. We may as well bail out now. >+ */ >+ if (!len) { >+ err = 0; >+ goto out; >+ } >+ >+ err = __vsock_stream_recvmsg(sk, msg, len, flags); >+ > out: > release_sock(sk); > return err; >-- >2.25.1 >