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.0 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 3D790C433E6 for ; Fri, 12 Mar 2021 15:11:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F39A664FD9 for ; Fri, 12 Mar 2021 15:11:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230256AbhCLPLB (ORCPT ); Fri, 12 Mar 2021 10:11:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:42243 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231843AbhCLPKf (ORCPT ); Fri, 12 Mar 2021 10:10:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615561834; 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=At+gLYpOVuwtYiPKDJPSOAsFyXGyFQ/Ei1/8xDCko3E=; b=UsoiAJB0qzl2h+jsYu2T2ijyIwcIsvJS0urhcpOHjkrgZhogAwAM6zCv+pfXXQCCoN+IYm V5kPJ1mk4WOq1vHPb+fnIopVXW3adG4xPJUvbCNrnlmENwRyjD5LiQFUcVZKEuVKksWdCb hVdHtHy4zOePN54w4BXJZ2Yecyj2HXg= 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-206-Tx-Cg1UmPx-iIzwaJNrAJg-1; Fri, 12 Mar 2021 10:10:33 -0500 X-MC-Unique: Tx-Cg1UmPx-iIzwaJNrAJg-1 Received: by mail-wr1-f69.google.com with SMTP id 75so11199161wrl.3 for ; Fri, 12 Mar 2021 07:10:33 -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=At+gLYpOVuwtYiPKDJPSOAsFyXGyFQ/Ei1/8xDCko3E=; b=L1JVMfMH/kNQ/gUmxRFhNHySjIMd5E+QUSovjpArnuDUlPptIhgRU7FBoSJP3ELnm+ ODuwev0ZVTQXnyHOQhGG+t32b7y8yDc1mw8Ko8JtSjxF0qWPDRWF4IyFss9Br+qZZn/M PaJfEyEA34vGXqrMe+LwWassh61Zo0+dXDD2kbGKEHbDQkevlMdmlaemsX9TWfjq/QdI yE/Dl4TVZ8cwiDrR9+4Bx/mNVj9ndYbSXh2jKRqresSe/wb7By/3hyRcPvxEFsKop4zi TlofPUywNO8HMasrlBB+8RPqu03+urH2JU82+5xfNAX5ZGdcu7/yRqUo4en5OuJfgN2E 2d5Q== X-Gm-Message-State: AOAM530BxKbyXcV/0MwLn96t4Jy+wK0p2qNSywuecHhtvIeQKKVfMB9Q u3GKPqmNVYfERZmfwICn66b5kODNFBJv2rwM+aRXuwpyhj+mnrCRKXAfARoZRAjdWgUB8rugutN A+UzYKeW7Wb53 X-Received: by 2002:adf:90c2:: with SMTP id i60mr14448538wri.75.1615561832250; Fri, 12 Mar 2021 07:10:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJwBUQ6H37FhlxEuc6bIG9e30/3DvMV1YlOPohF80Djr/3IK1mCCHCFlpAvMtmDgq0mHUGX6jQ== X-Received: by 2002:adf:90c2:: with SMTP id i60mr14448382wri.75.1615561830569; Fri, 12 Mar 2021 07:10:30 -0800 (PST) Received: from steredhat (host-79-34-249-199.business.telecomitalia.it. [79.34.249.199]) by smtp.gmail.com with ESMTPSA id t8sm8072008wrr.10.2021.03.12.07.10.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 07:10:30 -0800 (PST) Date: Fri, 12 Mar 2021 16:10:27 +0100 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 v6 06/22] af_vsock: implement send logic for SEQPACKET Message-ID: <20210312151027.kamodty37ftspkmc@steredhat> References: <20210307175722.3464068-1-arseny.krasnov@kaspersky.com> <20210307180030.3465161-1-arseny.krasnov@kaspersky.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20210307180030.3465161-1-arseny.krasnov@kaspersky.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Sun, Mar 07, 2021 at 09:00:26PM +0300, Arseny Krasnov wrote: >This adds some logic to current stream enqueue function for SEQPACKET >support: >1) Use transport's seqpacket enqueue callback. >2) Return value from enqueue function is whole record length or error > for SOCK_SEQPACKET. > >Signed-off-by: Arseny Krasnov >--- > include/net/af_vsock.h | 2 ++ > net/vmw_vsock/af_vsock.c | 22 ++++++++++++++++------ > 2 files changed, 18 insertions(+), 6 deletions(-) > >diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h >index a8c4039e40cf..aed306292ab3 100644 >--- a/include/net/af_vsock.h >+++ b/include/net/af_vsock.h >@@ -139,6 +139,8 @@ struct vsock_transport { > size_t (*seqpacket_seq_get_len)(struct vsock_sock *vsk); > int (*seqpacket_dequeue)(struct vsock_sock *vsk, struct msghdr *msg, > int flags, bool *msg_ready); >+ int (*seqpacket_enqueue)(struct vsock_sock *vsk, struct msghdr *msg, >+ int flags, size_t len); > > /* Notification. */ > int (*notify_poll_in)(struct vsock_sock *, size_t, bool *); >diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c >index 5bf64a3e678a..a031f165494d 100644 >--- a/net/vmw_vsock/af_vsock.c >+++ b/net/vmw_vsock/af_vsock.c >@@ -1830,9 +1830,14 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg, > * responsibility to check how many bytes we were able to send. > */ > >- written = transport->stream_enqueue( >- vsk, msg, >- len - total_written); >+ if (sk->sk_type == SOCK_SEQPACKET) { >+ written = transport->seqpacket_enqueue(vsk, >+ msg, msg->msg_flags, I think we can avoid to pass 'msg->msg_flags', since the transport can access it through the 'msg' pointer, right? >+ len - total_written); >+ } else { >+ written = transport->stream_enqueue(vsk, >+ msg, len - total_written); >+ } > if (written < 0) { > err = -ENOMEM; > goto out_err; >@@ -1844,12 +1849,17 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg, > vsk, written, &send_data); > if (err < 0) > goto out_err; >- > } > > out_err: >- if (total_written > 0) >- err = total_written; >+ if (total_written > 0) { >+ /* Return number of written bytes only if: >+ * 1) SOCK_STREAM socket. >+ * 2) SOCK_SEQPACKET socket when whole buffer is sent. >+ */ >+ if (sk->sk_type == SOCK_STREAM || total_written == len) >+ err = total_written; >+ } > out: > release_sock(sk); > return err; >-- >2.25.1 >