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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70B8CC6FD1E for ; Fri, 10 Mar 2023 09:12:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231478AbjCJJMQ (ORCPT ); Fri, 10 Mar 2023 04:12:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230301AbjCJJLw (ORCPT ); Fri, 10 Mar 2023 04:11:52 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40F32116C1A for ; Fri, 10 Mar 2023 01:06:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678439160; 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=wz8nUvi2fGgDgewNMYegfHqQ2FX4wiXlwJl5P4TAg0M=; b=A+HozW0d5E9QDn7Ij5QK7Y2wJb+9Z6M6hdHrO4cQ4jl5MMx/bD6loXhOpuqvJar9OQq/8c eO6SFN6hKHQbO8gGoNExIW1NsKKPsOLbPajreehKoorx2YpyRqHpUW0AuqcDdppO7V7XLE bohiig2ihPribhf4eChbMWXQPYmuUc8= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-462-aN2l0z6hPSOi6IExy78mpA-1; Fri, 10 Mar 2023 04:05:59 -0500 X-MC-Unique: aN2l0z6hPSOi6IExy78mpA-1 Received: by mail-wr1-f72.google.com with SMTP id bh3-20020a05600005c300b002c70d6e2014so925699wrb.10 for ; Fri, 10 Mar 2023 01:05:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678439157; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wz8nUvi2fGgDgewNMYegfHqQ2FX4wiXlwJl5P4TAg0M=; b=CynEYBzkLb84O1qt4VVEi5Umhqy8cHPOg3rHjANwMRiyhraY+bOHiFiyAcxySMU2pf WfE+7SgWNjOSG/Z8NGcImI+rOAaLXrQqmyfif2x4pfd5eyE9B++y+xAvYRojISvUGiWR a38vqrIkhYFjQpJj/RvfookTXSido5lIQIzWysN8N8C+3AL8dUClGOcQSQGxVWdmfjqv 0DOg3VQWhqIZ1kFii8eFim/Ivm59sb9JpDXzlLKII1J0ILvRCJJ63JFFcILDr4E6e7Eo siwtDPhy3dmTQa2JFKxUZVoMeVanBcMBX1EQGaDred4kgWMk+k6cgYUR1faQNRTHHjpp QH3w== X-Gm-Message-State: AO0yUKXtcRuB8UGrws4O+V8TIFPGPmdh73JL7T8/eNa/1HeRdZuPcGs7 DTaJtkwAhhHDqoYjB54vGsU9d0ye226LbWH8gIpdp4jHp4JaH0caEStaeysLK+59W4+peihZET8 VyFfpXkGspJUnBbiy X-Received: by 2002:adf:e343:0:b0:2c7:f56:285b with SMTP id n3-20020adfe343000000b002c70f56285bmr16988086wrj.63.1678439157274; Fri, 10 Mar 2023 01:05:57 -0800 (PST) X-Google-Smtp-Source: AK7set/kMCf2/pJ8VDpyvGWvl95/R1kauUwT62ehT8eA6aqrdwrsYUpmjAVFex11URKqVX/AodZhVQ== X-Received: by 2002:adf:e343:0:b0:2c7:f56:285b with SMTP id n3-20020adfe343000000b002c70f56285bmr16988072wrj.63.1678439157105; Fri, 10 Mar 2023 01:05:57 -0800 (PST) Received: from sgarzare-redhat (host-82-57-51-170.retail.telecomitalia.it. [82.57.51.170]) by smtp.gmail.com with ESMTPSA id a4-20020adffb84000000b002c592535839sm1624988wrr.17.2023.03.10.01.05.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 01:05:56 -0800 (PST) Date: Fri, 10 Mar 2023 10:05:53 +0100 From: Stefano Garzarella To: Arseniy Krasnov Cc: Stefan Hajnoczi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@sberdevices.ru, oxffffaa@gmail.com Subject: Re: [RFC PATCH v4 3/4] virtio/vsock: don't drop skbuff on copy failure Message-ID: <20230310090553.mlvthrdpmehi5op5@sgarzare-redhat> References: <1804d100-1652-d463-8627-da93cb61144e@sberdevices.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, Mar 09, 2023 at 11:28:01PM +0300, Arseniy Krasnov wrote: >This returns behaviour of SOCK_STREAM read as before skbuff usage. When >copying to user fails current skbuff won't be dropped, but returned to >sockets's queue. Technically instead of 'skb_dequeue()', 'skb_peek()' is >called and when skbuff becomes empty, it is removed from queue by >'__skb_unlink()'. > >Fixes: 71dc9ec9ac7d ("virtio/vsock: replace virtio_vsock_pkt with sk_buff") >Signed-off-by: Arseniy Krasnov >--- > net/vmw_vsock/virtio_transport_common.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) Reviewed-by: Stefano Garzarella > >diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c >index 9a411475e201..6564192e7f20 100644 >--- a/net/vmw_vsock/virtio_transport_common.c >+++ b/net/vmw_vsock/virtio_transport_common.c >@@ -364,7 +364,7 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk, > > spin_lock_bh(&vvs->rx_lock); > while (total < len && !skb_queue_empty(&vvs->rx_queue)) { >- skb = __skb_dequeue(&vvs->rx_queue); >+ skb = skb_peek(&vvs->rx_queue); > > bytes = len - total; > if (bytes > skb->len) >@@ -388,9 +388,8 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk, > u32 pkt_len = le32_to_cpu(virtio_vsock_hdr(skb)->len); > > virtio_transport_dec_rx_pkt(vvs, pkt_len); >+ __skb_unlink(skb, &vvs->rx_queue); > consume_skb(skb); >- } else { >- __skb_queue_head(&vvs->rx_queue, skb); > } > } > >-- >2.25.1 >