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=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 58139C433B4 for ; Wed, 21 Apr 2021 09:12:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 157DC61444 for ; Wed, 21 Apr 2021 09:12:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237732AbhDUJNL (ORCPT ); Wed, 21 Apr 2021 05:13:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23580 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232140AbhDUJNI (ORCPT ); Wed, 21 Apr 2021 05:13:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618996355; 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=JFQIJ+5CqCy4do+wsQBitgOFibPbQLAGAyXiYakCXZc=; b=Yi3FDya800Kr0D+qM5N2IClPNAxr7YUEr5WK8ISX87kYWIfHo9qsjVESQ8Fp1wd7DMflH4 bjjSipnYBlaMAZ6v+9b3dJH5a0Hp/ZKDDaoVAtz8ETuORh/zoBu4giNtBprffm9vnyea0k JZdlLvam1mNVjCMTJ7tJrOMjyjfamHc= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-226-f3GolgC0OpSW3SaiOdsahQ-1; Wed, 21 Apr 2021 05:12:34 -0400 X-MC-Unique: f3GolgC0OpSW3SaiOdsahQ-1 Received: by mail-ej1-f70.google.com with SMTP id z6-20020a17090665c6b02903700252d1ccso5637719ejn.10 for ; Wed, 21 Apr 2021 02:12:33 -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=JFQIJ+5CqCy4do+wsQBitgOFibPbQLAGAyXiYakCXZc=; b=lSqotoJAmHtk0KpLmrGK8SWLZgKlz8nNh/qmvkEXPt3GxxxciGuF8KiysHE6T67/UF ZyOyZtS7UONYaYdVLaIwOnUuU1wo7NyFce0NWkXBIfL93WbQlH5bT9S/xYXzKfUgzf0M HFJnRAOScDq3Il9+IulkkrwG7XIqOirBckoZ51DiFFA3VlxG4j7yVSdhjv7o5TorDHvY eiauztcQJaxB6OQVWfJ760vkStTK3q7qjPyXNk8uoL9ZtMPiFGDRdaPPGC9T43bkpbIl pzjHy0wDloq1gJDeeuZqIRtrF+Qw1ml30tRWQ5MNYyzaHt+BnZMxnoT3ena9YEV4qHoo dCSQ== X-Gm-Message-State: AOAM530N4WGgLUhE9hqwLejVHUKVi+NdQMsLMb3mS0g7Ehs1HSNxm2kf lNtSmaeDGVNeQCsn+szFjkiyjZ5jtYH1oapDpvn0+DZiycRJ7xbtC/bPpiF2vPlw7eTjdII3Y6v qpm1kHvYm7VXc X-Received: by 2002:a50:fb0a:: with SMTP id d10mr24562929edq.146.1618996352006; Wed, 21 Apr 2021 02:12:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4h+POcUCHwJn3anUWZxgfuhqxTTTMI2BlWbtYQhJqOg9+yrbcbRX7689t2hRaE5mbU+0swg== X-Received: by 2002:a50:fb0a:: with SMTP id d10mr24562907edq.146.1618996351808; Wed, 21 Apr 2021 02:12:31 -0700 (PDT) Received: from steredhat (host-79-34-249-199.business.telecomitalia.it. [79.34.249.199]) by smtp.gmail.com with ESMTPSA id dc24sm1725846ejb.123.2021.04.21.02.12.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 02:12:31 -0700 (PDT) Date: Wed, 21 Apr 2021 11:12:28 +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 , Alexander Popov , kvm , Linux Virtualization , netdev , kernel list , stsp , Krasnov Arseniy Subject: Re: [RFC PATCH v8 13/19] virtio/vsock: rest of SOCK_SEQPACKET support Message-ID: References: <20210413123954.3396314-1-arseny.krasnov@kaspersky.com> <20210413124528.3404287-1-arseny.krasnov@kaspersky.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210413124528.3404287-1-arseny.krasnov@kaspersky.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Tue, Apr 13, 2021 at 03:45:25PM +0300, Arseny Krasnov wrote: >This adds rest of logic for SEQPACKET: >1) Send SHUTDOWN on socket close for SEQPACKET type. >2) Set SEQPACKET packet type during send. >3) 'seqpacket_allow' flag to virtio transport. >4) Set 'VIRTIO_VSOCK_SEQ_EOR' bit in flags for last > packet of message. > >Signed-off-by: Arseny Krasnov >--- >v7 -> v8: > - MSG_EOR handling is removed, i didn't found exact description about > how it works in POSIX. > - SEQ_BEGIN, SEQ_END, etc. now removed. > > include/linux/virtio_vsock.h | 6 ++++++ > net/vmw_vsock/virtio_transport_common.c | 16 ++++++++++++++-- > 2 files changed, 20 insertions(+), 2 deletions(-) > >diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h >index 02acf6e9ae04..f00a01bfdd7e 100644 >--- a/include/linux/virtio_vsock.h >+++ b/include/linux/virtio_vsock.h >@@ -68,6 +68,8 @@ struct virtio_transport { > > /* Takes ownership of the packet */ > int (*send_pkt)(struct virtio_vsock_pkt *pkt); >+ >+ bool seqpacket_allow; > }; > > ssize_t >@@ -80,6 +82,10 @@ virtio_transport_dgram_dequeue(struct vsock_sock *vsk, > struct msghdr *msg, > size_t len, int flags); > >+int >+virtio_transport_seqpacket_enqueue(struct vsock_sock *vsk, >+ struct msghdr *msg, >+ size_t len); > ssize_t > virtio_transport_seqpacket_dequeue(struct vsock_sock *vsk, > struct msghdr *msg, >diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c >index 572869fef832..4c5b63601308 100644 >--- a/net/vmw_vsock/virtio_transport_common.c >+++ b/net/vmw_vsock/virtio_transport_common.c >@@ -74,6 +74,9 @@ virtio_transport_alloc_pkt(struct virtio_vsock_pkt_info *info, > err = memcpy_from_msg(pkt->buf, info->msg, len); > if (err) > goto out; >+ >+ if (info->msg->msg_iter.count == 0) >+ pkt->hdr.flags |= VIRTIO_VSOCK_SEQ_EOR; We should set the flag in info->flags and assign it using cpu_to_le32() or just the following: pkt->hdr.flags = cpu_to_le32(info->flags | VIRTIO_VSOCK_SEQ_EOR); > } > > trace_virtio_transport_alloc_pkt(src_cid, src_port, >@@ -187,7 +190,7 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk, > struct virtio_vsock_pkt *pkt; > u32 pkt_len = info->pkt_len; > >- info->type = VIRTIO_VSOCK_TYPE_STREAM; >+ info->type = virtio_transport_get_type(sk_vsock(vsk)); > > t_ops = virtio_transport_get_ops(vsk); > if (unlikely(!t_ops)) >@@ -486,6 +489,15 @@ virtio_transport_seqpacket_dequeue(struct >vsock_sock *vsk, > } > EXPORT_SYMBOL_GPL(virtio_transport_seqpacket_dequeue); > >+int >+virtio_transport_seqpacket_enqueue(struct vsock_sock *vsk, >+ struct msghdr *msg, >+ size_t len) >+{ >+ return virtio_transport_stream_enqueue(vsk, msg, len); >+} >+EXPORT_SYMBOL_GPL(virtio_transport_seqpacket_enqueue); >+ > int > virtio_transport_dgram_dequeue(struct vsock_sock *vsk, > struct msghdr *msg, >@@ -905,7 +917,7 @@ void virtio_transport_release(struct vsock_sock *vsk) > struct sock *sk = &vsk->sk; > bool remove_sock = true; > >- if (sk->sk_type == SOCK_STREAM) >+ if (sk->sk_type == SOCK_STREAM || sk->sk_type == SOCK_SEQPACKET) > remove_sock = virtio_transport_close(vsk); > > list_for_each_entry_safe(pkt, tmp, &vvs->rx_queue, list) { >-- >2.25.1 >