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 B9C80C433ED for ; Wed, 21 Apr 2021 09:39:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 86D2B61451 for ; Wed, 21 Apr 2021 09:39:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238563AbhDUJjh (ORCPT ); Wed, 21 Apr 2021 05:39:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24645 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238561AbhDUJjg (ORCPT ); Wed, 21 Apr 2021 05:39:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618997943; 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=gSlikRZsUWJsx7Rq6CkgW2e557egJiXRO6RyE7OIcao=; b=ET5pytHjjv+eKrA4FkiXYDkY4RGrAaP/meAC/k5LIlgvbTl4gtqAbb76HZN+8Y4jnknNg+ QVfo/Wjlqe9hAzZyuTAmXRawpZ/1CBO3d+NsqPaVDDo7F0CA6f0B7r74Tzhe545cWw4/yn EP8sMUR/8iAOpzqF9LKjiSi9BgKBDV4= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-394-vFaGGfrIM4KTvZxJkl_EyQ-1; Wed, 21 Apr 2021 05:38:56 -0400 X-MC-Unique: vFaGGfrIM4KTvZxJkl_EyQ-1 Received: by mail-ej1-f69.google.com with SMTP id c18-20020a17090603d2b029037c77ad778eso5668638eja.1 for ; Wed, 21 Apr 2021 02:38:56 -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=gSlikRZsUWJsx7Rq6CkgW2e557egJiXRO6RyE7OIcao=; b=Yvo+eIPCgELEY+uPfWPeVvIVIdiejq4MsWa3Kp1VRsA8exvmPpkr8dSvxMV8+1OdeV mzoukNllOrhazqTNtC/JVGX7XQ96b85DaP5BQVDKWDJ0o6J24h1n3TLqyIkLOxBsVVUx /LTjrYrpGiGm0bAWVDU9TCYk3LS3SrbArdDEIO70EkH1NrgwUxqovAGd6MOlCDjnZLew dAoF+TRqUj0b8ExmGu2MZkPlpEa4ET+4eheoAG+wI4Yujd2D02kayk+cgtGpWrUDMuRk 0K6+O+zC0k7Bxf+lgIWKftp8sHtiKEtcUEAhjRug9/H2v81O/xNOXsrPKF3PXHUW61Ea Lz7Q== X-Gm-Message-State: AOAM533DMfGWv/39VyzzTevhdsS3EYDaAVfMJyO1cK6VxljMuSqwpM/M VkHEtSYOFW3OyCOiSoPw94+UKd+xb9rpqU6EfaDMD37PQ7DefxbsT7tCq1DNNsjyXGLra5Y60SQ Jyl7+eD8NC4IP X-Received: by 2002:a17:907:76c5:: with SMTP id kf5mr31320928ejc.526.1618997934984; Wed, 21 Apr 2021 02:38:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIwbBRm7mr85h28m7cl7ow2IIb274l/KuCduv8M7TerEq2T8gyqF0loaor8I4gqRyLdgQpMw== X-Received: by 2002:a17:907:76c5:: with SMTP id kf5mr31320915ejc.526.1618997934762; Wed, 21 Apr 2021 02:38:54 -0700 (PDT) Received: from steredhat (host-79-34-249-199.business.telecomitalia.it. [79.34.249.199]) by smtp.gmail.com with ESMTPSA id g11sm2506664edw.37.2021.04.21.02.38.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 02:38:54 -0700 (PDT) Date: Wed, 21 Apr 2021 11:38:51 +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 , Norbert Slusarek , Andra Paraschiv , Jeff Vander Stoep , Alexander Popov , "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 v8 19/19] af_vsock: serialize writes to shared socket Message-ID: <20210421093851.36yazy5vp4uwimd6@steredhat> References: <20210413123954.3396314-1-arseny.krasnov@kaspersky.com> <20210413124739.3408031-1-arseny.krasnov@kaspersky.com> <7d433ed9-8d4c-707a-9149-ff0e65d7f943@kaspersky.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <7d433ed9-8d4c-707a-9149-ff0e65d7f943@kaspersky.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Wed, Apr 14, 2021 at 01:51:17PM +0300, Arseny Krasnov wrote: > >On 13.04.2021 15:47, Arseny Krasnov wrote: >> This add logic, that serializes write access to single socket >> by multiple threads. It is implemented be adding field with TID >> of current writer. When writer tries to send something, it checks >> that field is -1(free), else it sleep in the same way as waiting >> for free space at peers' side. >> >> This implementation is PoC and not related to SEQPACKET close, so >> i've placed it after whole patchset. >> >> Signed-off-by: Arseny Krasnov >> --- >> include/net/af_vsock.h | 1 + >> net/vmw_vsock/af_vsock.c | 10 +++++++++- >> 2 files changed, 10 insertions(+), 1 deletion(-) >> >> diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h >> index 53d3f33dbdbf..786df80b9fc3 100644 >> --- a/include/net/af_vsock.h >> +++ b/include/net/af_vsock.h >> @@ -69,6 +69,7 @@ struct vsock_sock { >> u64 buffer_size; >> u64 buffer_min_size; >> u64 buffer_max_size; >> + pid_t tid_owner; >> >> /* Private to transport. */ >> void *trans; >> diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c >> index 54bee7e643f4..d00f8c07a9d3 100644 >> --- a/net/vmw_vsock/af_vsock.c >> +++ b/net/vmw_vsock/af_vsock.c >> @@ -1765,7 +1765,9 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg, >> ssize_t written; >> >> add_wait_queue(sk_sleep(sk), &wait); >> - while (vsock_stream_has_space(vsk) == 0 && >> + while ((vsock_stream_has_space(vsk) == 0 || >> + (vsk->tid_owner != current->pid && >> + vsk->tid_owner != -1)) && >> sk->sk_err == 0 && >> !(sk->sk_shutdown & SEND_SHUTDOWN) && >> !(vsk->peer_shutdown & RCV_SHUTDOWN)) { >> @@ -1796,6 +1798,8 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg, >> goto out_err; >> } >> } >> + >> + vsk->tid_owner = current->pid; >> remove_wait_queue(sk_sleep(sk), &wait); >> >> /* These checks occur both as part of and after the loop >> @@ -1852,7 +1856,10 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg, >> err = total_written; >> } >> out: >> + vsk->tid_owner = -1; >> release_sock(sk); >> + sk->sk_write_space(sk); >> + >> return err; >> } >> >> @@ -2199,6 +2206,7 @@ static int vsock_create(struct net *net, struct socket *sock, >> return -ENOMEM; >> >> vsk = vsock_sk(sk); >> + vsk->tid_owner = -1; >This must be moved to '__vsock_create()' Okay, I'll review the next version. In order to backport this fix to stable branches I think is better to move at the beginning of this series or even out as a separate patch. Thanks, Stefano >> >> if (sock->type == SOCK_DGRAM) { >> ret = vsock_assign_transport(vsk, NULL); >