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 7F664C4320A for ; Fri, 6 Aug 2021 07:28:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6404C611CC for ; Fri, 6 Aug 2021 07:28:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243613AbhHFH3L (ORCPT ); Fri, 6 Aug 2021 03:29:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45203 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243029AbhHFH3K (ORCPT ); Fri, 6 Aug 2021 03:29:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628234934; 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=YI2lpjNjLO4bbJ7dq0evOTMBQAQSvAtnohvXHPYKA6U=; b=Pi65d7bLQW4iZhslq9LdcUVYHkvCNIo9uMv61fSFFrchNPKsiFy0zAFoJbaD1BhT4AkD8c chmqzMdphc8bTNZTqEVcNijtFACFINRB+yvD93rtm96k8s98GpUrgFMHu8Lx5VewdcSs9F cbpdVW9B6AJWajkb1IZ4wFp28e4wFlA= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-171-HA0BZJ0NPfCJYv_Y6WOUwA-1; Fri, 06 Aug 2021 03:28:53 -0400 X-MC-Unique: HA0BZJ0NPfCJYv_Y6WOUwA-1 Received: by mail-ej1-f71.google.com with SMTP id q19-20020a1709064cd3b02904c5f93c0124so2851686ejt.14 for ; Fri, 06 Aug 2021 00:28:53 -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=YI2lpjNjLO4bbJ7dq0evOTMBQAQSvAtnohvXHPYKA6U=; b=m3f0rpCbER5PBWLtN8RLnHLK1uOOokrZQKne9IvDtdqH4PnYa2orm60n3WTCZLXhhp UpfGII640F2S4MdLEqeJZ+9eaXMLbDoGpBG44mJJnUeWL0E+oLq6IZ8qGY2qkIE9D8DV 56fkOosSSgSQpwfH9ervnINuh0U8zk/H6DNKeh+E3PnpgxRHY6kLWuMDQRz8YEhYy3bv HK5u407IRK6udqxv3ZKOhX2gjSIVkA8AKQz9zWJSft2Ek6khrOAkTgcsRlVOTPgQjLd5 9L8P55KZ5R9Be9B0MgNOHKZ4yWwEWmBy78VqzWFTLEecvQl111rkDAHXgHJNwwikoEqI DYjA== X-Gm-Message-State: AOAM53095M0Fzt2wz1ibkqEI76JgNmhPPboXXms2FFQNkc8Teu7BDiFR eaa/FNcmyXuk6JD3KUOTGcqj7gXeH8k3F/QTGAlLQStzQJmtMsToNMl8Fzb7KQrGAUMHdkukC7q niNUKBsYctPp3 X-Received: by 2002:aa7:c794:: with SMTP id n20mr546492eds.244.1628234932579; Fri, 06 Aug 2021 00:28:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKisyk358bceGT2heyJE0PRcG1aZN0zSV/ZG+Jy0+uAynRlV6ioYSXV4qTARzSycSTWVsKSA== X-Received: by 2002:aa7:c794:: with SMTP id n20mr546475eds.244.1628234932453; Fri, 06 Aug 2021 00:28:52 -0700 (PDT) Received: from steredhat (host-79-18-148-79.retail.telecomitalia.it. [79.18.148.79]) by smtp.gmail.com with ESMTPSA id i16sm3423692edr.38.2021.08.06.00.28.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Aug 2021 00:28:52 -0700 (PDT) Date: Fri, 6 Aug 2021 09:28:49 +0200 From: Stefano Garzarella To: Arseny Krasnov Cc: Stefan Hajnoczi , "Michael S. Tsirkin" , Jason Wang , "David S. Miller" , Jakub Kicinski , Norbert Slusarek , Andra Paraschiv , Colin Ian King , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oxffffaa@gmail.com Subject: Re: [RFC PATCH v1 3/7] vhost/vsock: support MSG_EOR bit processing Message-ID: <20210806072849.4by3wbdkg2bsierm@steredhat> References: <20210726163137.2589102-1-arseny.krasnov@kaspersky.com> <20210726163341.2589759-1-arseny.krasnov@kaspersky.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20210726163341.2589759-1-arseny.krasnov@kaspersky.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Mon, Jul 26, 2021 at 07:33:38PM +0300, Arseny Krasnov wrote: >It works in the same way as 'end-of-message' bit: if packet has >'EOM' bit, also check for 'EOR' bit. > >Signed-off-by: Arseny Krasnov >--- > drivers/vhost/vsock.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > >diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c >index 3b55de70ac77..3e2b150f9c6f 100644 >--- a/drivers/vhost/vsock.c >+++ b/drivers/vhost/vsock.c >@@ -115,6 +115,7 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, > size_t iov_len, payload_len; > int head; > bool restore_msg_eom_flag = false; >+ bool restore_msg_eor_flag = false; Since we now have 2 flags to potentially restore, we could use a single variable (e.g. uint32_t flags_to_restore), initialized to 0. We can set all the flags we need to restore and then simply put it in or with the `pkt->hdr.flags` field. > spin_lock_bh(&vsock->send_pkt_list_lock); > if (list_empty(&vsock->send_pkt_list)) { >@@ -188,6 +189,11 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, > if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOM) { > pkt->hdr.flags &= ~cpu_to_le32(VIRTIO_VSOCK_SEQ_EOM); > restore_msg_eom_flag = true; >+ >+ if (le32_to_cpu(pkt->hdr.flags & VIRTIO_VSOCK_SEQ_EOR)) { ^ Here it should be `le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOR` >+ pkt->hdr.flags &= ~cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR); >+ restore_msg_eor_flag = true; >+ } > } > } > >@@ -224,9 +230,13 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, > * to send it with the next available buffer. > */ > if (pkt->off < pkt->len) { >- if (restore_msg_eom_flag) >+ if (restore_msg_eom_flag) { > pkt->hdr.flags |= cpu_to_le32(VIRTIO_VSOCK_SEQ_EOM); > >+ if (restore_msg_eor_flag) >+ pkt->hdr.flags |= cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR); >+ } >+ If we use a single variable, here we can simply do: pkt->hdr.flags |= cpu_to_le32(flags_to_restore); Stefano