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.4 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 773B4C433ED for ; Thu, 13 May 2021 13:44:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3F9EA613BF for ; Thu, 13 May 2021 13:44:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234135AbhEMNpy (ORCPT ); Thu, 13 May 2021 09:45:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53949 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230508AbhEMNpx (ORCPT ); Thu, 13 May 2021 09:45:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620913483; 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=oWoRXdPQG5Lp8dZ+UX0wcCkUvkRtLC4RqeaSswn2gS0=; b=ZQ2lg/wjV2nHBxdRoxUaHcCdWVLSJURuR3m9YxYK5kf0uRvZReb8E6DRr480EJZ0fIhsh9 qbys8VE0qNbToalTA5dmM2Kk77P/BkQVYgjVhPSVZHeyeBuOTFfTf/5TjSCrGkrY9o/7jI +syiCavOVomupzYjObtDSEyabnTDrR8= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-518-08XMkN0dPFyplL5gy_bJPg-1; Thu, 13 May 2021 09:44:41 -0400 X-MC-Unique: 08XMkN0dPFyplL5gy_bJPg-1 Received: by mail-ed1-f69.google.com with SMTP id z12-20020aa7d40c0000b0290388179cc8bfso14599535edq.21 for ; Thu, 13 May 2021 06:44:41 -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=oWoRXdPQG5Lp8dZ+UX0wcCkUvkRtLC4RqeaSswn2gS0=; b=lkXctG/MyCAHI2//9+NH8o8ft6d0Asj5i96zOvTO2QiZi2f4emdOo6ix8Biv5HesFc hxij1xIT6jxdvnXCZUiTeaADXUQTUisdvQg1CqyiOCLk+RrIIwnxo93fk8ptMcsMo+C9 mHr4+H+MyAoaznTfsh1nqWNo6vknSOo6OnmTVDgHZFK7Vu41aRmHqM77VFyY1lJSfMeZ LYnEsRKFKilNIxc2VAFLE1GrIMCVhBhJ7KhMjCNkOWYfNFlIs6wtM0jUyiwQJ9bjLH37 xWIJg0EvEP7XDnJCECI7+aQ4chxOvRtubzNmJcgu/V+znv+RRUasVXlMZHXQB9fZRlBk mv3Q== X-Gm-Message-State: AOAM533cyWeQRQGPZbHV+VXwjGQ7RxZUmt2B/Y1xFbY0eTD0wxtTswPO 8uF+nXxQPeBuCNbbMbZrolBgwNN2P2AIowPwGrkC9Kf/fIsihkToqXqJxVodVI0h0Z+iB0YqCgq lxFpaXZbKpZPI X-Received: by 2002:a17:906:f28a:: with SMTP id gu10mr9366309ejb.135.1620913480735; Thu, 13 May 2021 06:44:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRgeZlJQmydhRmOxSudfdDEFokEqUOqWxM5HwrKX/tQlm/Hr03jIduTjjqf7mT/0OjHrCwUQ== X-Received: by 2002:a17:906:f28a:: with SMTP id gu10mr9366276ejb.135.1620913480499; Thu, 13 May 2021 06:44:40 -0700 (PDT) Received: from steredhat (host-79-18-148-79.retail.telecomitalia.it. [79.18.148.79]) by smtp.gmail.com with ESMTPSA id q25sm1863114ejd.9.2021.05.13.06.44.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 May 2021 06:44:40 -0700 (PDT) Date: Thu, 13 May 2021 15:44:37 +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 , 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 v9 15/19] vhost/vsock: enable SEQPACKET for transport Message-ID: <20210513134437.xwz5gaulse4jqcmm@steredhat> References: <20210508163027.3430238-1-arseny.krasnov@kaspersky.com> <20210508163634.3432505-1-arseny.krasnov@kaspersky.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20210508163634.3432505-1-arseny.krasnov@kaspersky.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Sat, May 08, 2021 at 07:36:31PM +0300, Arseny Krasnov wrote: >This removes: >1) Ignore of non-stream type of packets. >This adds: >1) Handling of SEQPACKET bit: if guest sets features with this bit cleared, > then SOCK_SEQPACKET support will be disabled. >2) 'seqpacket_allow()' callback. >3) Handling of SEQ_EOR bit: when vhost places data in buffers of guest's > rx queue, keep this bit set only when last piece of data is copied. > >Signed-off-by: Arseny Krasnov >--- > v8 -> v9: > 1) Move 'seqpacket_allow' to 'struct vhost_vsock'. > 2) Use cpu_to_le32()/le32_to_cpu() to work with 'flags' of packet. > > drivers/vhost/vsock.c | 42 +++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 39 insertions(+), 3 deletions(-) > >diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c >index 5e78fb719602..3395b25d4a35 100644 >--- a/drivers/vhost/vsock.c >+++ b/drivers/vhost/vsock.c >@@ -31,7 +31,8 @@ > > enum { > VHOST_VSOCK_FEATURES = VHOST_FEATURES | >- (1ULL << VIRTIO_F_ACCESS_PLATFORM) >+ (1ULL << VIRTIO_F_ACCESS_PLATFORM) | >+ (1ULL << VIRTIO_VSOCK_F_SEQPACKET) > }; > > enum { >@@ -56,6 +57,7 @@ struct vhost_vsock { > atomic_t queued_replies; > > u32 guest_cid; >+ bool seqpacket_allow; > }; > > static u32 vhost_transport_get_local_cid(void) >@@ -112,6 +114,7 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, > size_t nbytes; > size_t iov_len, payload_len; > int head; >+ bool restore_flag = false; > > spin_lock_bh(&vsock->send_pkt_list_lock); > if (list_empty(&vsock->send_pkt_list)) { >@@ -174,6 +177,12 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, > /* Set the correct length in the header */ > pkt->hdr.len = cpu_to_le32(payload_len); > >+ if (pkt->off + payload_len < pkt->len && >+ le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOR) { >+ pkt->hdr.flags &= ~cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR); >+ restore_flag = true; >+ } I think is better to move this code in the same block when we limit payload_len, something like this (not tested): /* If the packet is greater than the space available in the * buffer, we split it using multiple buffers. */ if (payload_len > iov_len - sizeof(pkt->hdr)) { payload_len = iov_len - sizeof(pkt->hdr); if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOR) { pkt->hdr.flags &= ~cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR); restore_flag = true; } } The rest LGTM.