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.5 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=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 9716AC433DB for ; Mon, 22 Feb 2021 12:06:51 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 1877A64E24 for ; Mon, 22 Feb 2021 12:06:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1877A64E24 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 smtp1.osuosl.org (Postfix) with ESMTP id B41A2839E0; Mon, 22 Feb 2021 12:06:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 88fxkUQJ0YwY; Mon, 22 Feb 2021 12:06:49 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTP id DA6B9839A4; Mon, 22 Feb 2021 12:06:48 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id BB90EC000A; Mon, 22 Feb 2021 12:06:48 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5D9C8C0001 for ; Mon, 22 Feb 2021 12:06:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5A09387070 for ; Mon, 22 Feb 2021 12:06:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B7s0kyk15tiz for ; Mon, 22 Feb 2021 12:06:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by hemlock.osuosl.org (Postfix) with ESMTPS id 95D7D87046 for ; Mon, 22 Feb 2021 12:06:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613995605; 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=zfN32sQUDLnzJ032yBR935SiIXgmWnEZ4V626Ip1AbU=; b=gMQHEClXxIUN1RUSUWh+aI7Ts/3zVSdKcH0VVykGmeQi8rVyiElS8nKizTZvo0OLJCr7Oc EMJPaqoOgMtwSyWaDCa03IdmHQd2aQuCnWrJlfB7Euk4XtPsFc+jaSIsngkLgQVl4JmOj6 8cbU6pdMEBvPaZD8bTv0i1n3Bu+mZsc= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-523-Wp4hzvFLMGC9yqQjae7kow-1; Mon, 22 Feb 2021 07:06:44 -0500 X-MC-Unique: Wp4hzvFLMGC9yqQjae7kow-1 Received: by mail-wr1-f69.google.com with SMTP id g5so1754309wrd.22 for ; Mon, 22 Feb 2021 04:06:43 -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=zfN32sQUDLnzJ032yBR935SiIXgmWnEZ4V626Ip1AbU=; b=m8p93sIRq5sV8se/ews3zlKzmZjGl9k9FTgD5WC24vmhysjWG9wES4CIyisCgShxXk p3mOQBheTr8kF20/1rXEUzjBTa43aF/zBJtBKCjDSqYgW5sFVIwwA3whQ76Aq5Qy5QRd 8cwQkdyAJ5fSvcSU/VTjIYY7ogd/aBTaefd4WXzwlZ/KDf38Hf5XgpUbNfHtEs6EGxDO YrdqeCfNXyQrY9kHL+1erzpByAETIc8YK6qbhiT8s+JZQjUXqfLppuCy78I/AxSynbIP PRngbPK/6c9P1yiNvYewtzmJooddxIWR6MjLjsIibRcrqzmo6Mcl+EkInh2Qww2JEcTM +90Q== X-Gm-Message-State: AOAM530I5ek6hH1uNlpzfHGdOWgXzj3IOjdY6CFFRa5U92Rvjwq6+jRx vPC/mBNIG7JBcjRX6F3N67sIO/Gk8nHuFarVR8nJ4udef+Zoi6d2i6NX/gHXmj5jbMI11LkG818 NozFuDCg/Q5S6FbdsGTtaAvREZN7OLq05E2nvu5T/FA== X-Received: by 2002:a05:6000:89:: with SMTP id m9mr12916252wrx.3.1613995601962; Mon, 22 Feb 2021 04:06:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJzBgxVG1+KQe5ktBwrmeS45BwEguQMp9b4SH8ACBZnLC8/aSNiV9xm9pOzkDA3ilfNa94ePDA== X-Received: by 2002:a05:6000:89:: with SMTP id m9mr12916229wrx.3.1613995601788; Mon, 22 Feb 2021 04:06:41 -0800 (PST) Received: from steredhat (host-79-34-249-199.business.telecomitalia.it. [79.34.249.199]) by smtp.gmail.com with ESMTPSA id h20sm9909617wmb.1.2021.02.22.04.06.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 04:06:41 -0800 (PST) Date: Mon, 22 Feb 2021 13:06:38 +0100 From: Stefano Garzarella To: Arseny Krasnov Subject: Re: [RFC PATCH v5 05/19] af_vsock: separate wait space loop Message-ID: <20210222120638.ybltjuubfabgk3uz@steredhat> References: <20210218053347.1066159-1-arseny.krasnov@kaspersky.com> <20210218053758.1067436-1-arseny.krasnov@kaspersky.com> MIME-Version: 1.0 In-Reply-To: <20210218053758.1067436-1-arseny.krasnov@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, stsp2@yandex.ru, 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 Thu, Feb 18, 2021 at 08:37:54AM +0300, Arseny Krasnov wrote: >This moves loop that waits for space on send to separate function, >because it will be used for SEQ_BEGIN/SEQ_END sending before and >after data transmission. Waiting for SEQ_BEGIN/SEQ_END is needed >because such packets carries SEQPACKET header that couldn't be >fragmented by credit mechanism, so to avoid it, sender waits until >enough space will be ready. > >Signed-off-by: Arseny Krasnov >--- > include/net/af_vsock.h | 2 + > net/vmw_vsock/af_vsock.c | 99 +++++++++++++++++++++++++--------------- > 2 files changed, 63 insertions(+), 38 deletions(-) > >diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h >index 01563338cc03..6fbe88306403 100644 >--- a/include/net/af_vsock.h >+++ b/include/net/af_vsock.h >@@ -205,6 +205,8 @@ void vsock_remove_sock(struct vsock_sock *vsk); > void vsock_for_each_connected_socket(void (*fn)(struct sock *sk)); > int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk); > bool vsock_find_cid(unsigned int cid); >+int vsock_wait_space(struct sock *sk, size_t space, int flags, >+ struct vsock_transport_send_notify_data *send_data); > > /**** TAP ****/ > >diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c >index b754927a556a..09b377422b1e 100644 >--- a/net/vmw_vsock/af_vsock.c >+++ b/net/vmw_vsock/af_vsock.c >@@ -1692,6 +1692,65 @@ static int vsock_connectible_getsockopt(struct socket *sock, > return 0; > } > >+int vsock_wait_space(struct sock *sk, size_t space, int flags, >+ struct vsock_transport_send_notify_data *send_data) >+{ >+ const struct vsock_transport *transport; >+ struct vsock_sock *vsk; >+ long timeout; >+ int err; >+ >+ DEFINE_WAIT_FUNC(wait, woken_wake_function); >+ >+ vsk = vsock_sk(sk); >+ transport = vsk->transport; >+ timeout = sock_sndtimeo(sk, flags & MSG_DONTWAIT); >+ err = 0; >+ >+ add_wait_queue(sk_sleep(sk), &wait); >+ >+ while (vsock_stream_has_space(vsk) < space && >+ sk->sk_err == 0 && >+ !(sk->sk_shutdown & SEND_SHUTDOWN) && >+ !(vsk->peer_shutdown & RCV_SHUTDOWN)) { >+ >+ /* Don't wait for non-blocking sockets. */ >+ if (timeout == 0) { >+ err = -EAGAIN; >+ goto out_err; >+ } >+ >+ if (send_data) { >+ err = transport->notify_send_pre_block(vsk, send_data); >+ if (err < 0) >+ goto out_err; >+ } >+ >+ release_sock(sk); >+ timeout = wait_woken(&wait, TASK_INTERRUPTIBLE, timeout); >+ lock_sock(sk); >+ if (signal_pending(current)) { >+ err = sock_intr_errno(timeout); >+ goto out_err; >+ } else if (timeout == 0) { >+ err = -EAGAIN; >+ goto out_err; >+ } >+ } >+ >+ if (sk->sk_err) { >+ err = -sk->sk_err; >+ } else if ((sk->sk_shutdown & SEND_SHUTDOWN) || >+ (vsk->peer_shutdown & RCV_SHUTDOWN)) { >+ err = -EPIPE; >+ } >+ >+out_err: >+ remove_wait_queue(sk_sleep(sk), &wait); >+ return err; >+} >+EXPORT_SYMBOL_GPL(vsock_wait_space); >+ > static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg, > size_t len) > { >@@ -1699,10 +1758,8 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg, > struct vsock_sock *vsk; > const struct vsock_transport *transport; > ssize_t total_written; >- long timeout; > int err; > struct vsock_transport_send_notify_data send_data; >- DEFINE_WAIT_FUNC(wait, woken_wake_function); > > sk = sock->sk; > vsk = vsock_sk(sk); >@@ -1740,9 +1797,6 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg, > goto out; > } > >- /* Wait for room in the produce queue to enqueue our user's data. */ >- timeout = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT); >- > err = transport->notify_send_init(vsk, &send_data); > if (err < 0) > goto out; >@@ -1750,39 +1804,8 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg, > while (total_written < len) { > ssize_t written; > >- add_wait_queue(sk_sleep(sk), &wait); >- while (vsock_stream_has_space(vsk) == 0 && >- sk->sk_err == 0 && >- !(sk->sk_shutdown & SEND_SHUTDOWN) && >- !(vsk->peer_shutdown & RCV_SHUTDOWN)) { >- >- /* Don't wait for non-blocking sockets. */ >- if (timeout == 0) { >- err = -EAGAIN; >- remove_wait_queue(sk_sleep(sk), &wait); >- goto out_err; >- } >- >- err = transport->notify_send_pre_block(vsk, &send_data); >- if (err < 0) { >- remove_wait_queue(sk_sleep(sk), &wait); >- goto out_err; >- } >- >- release_sock(sk); >- timeout = wait_woken(&wait, TASK_INTERRUPTIBLE, timeout); >- lock_sock(sk); >- if (signal_pending(current)) { >- err = sock_intr_errno(timeout); >- remove_wait_queue(sk_sleep(sk), &wait); >- goto out_err; >- } else if (timeout == 0) { >- err = -EAGAIN; >- remove_wait_queue(sk_sleep(sk), &wait); >- goto out_err; >- } >- } >- remove_wait_queue(sk_sleep(sk), &wait); >+ if (vsock_wait_space(sk, 1, msg->msg_flags, &send_data)) >+ goto out_err; > > /* These checks occur both as part of and after the loop > * conditional since we need to check before and after >-- >2.25.1 > The patch LGTM: Reviewed-by: Stefano Garzarella _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization