From patchwork Tue Mar 14 10:45:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 69496 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1684696wrd; Tue, 14 Mar 2023 03:56:40 -0700 (PDT) X-Google-Smtp-Source: AK7set/GfViWfVhpG3uiiqrU/IOwuPlz8frswsRiQlspuFhGpqa8XhOvz/muM0gMXyd/6DG5on+G X-Received: by 2002:a05:6a21:32a8:b0:c1:1561:406 with SMTP id yt40-20020a056a2132a800b000c115610406mr14020640pzb.4.1678791399953; Tue, 14 Mar 2023 03:56:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678791399; cv=none; d=google.com; s=arc-20160816; b=nNP2D3Qu0r5kba9dJw4UbQLvRQbB4HZ3pyJXdjc0zs68GSpwxLfV2Ilg+ka5R/nf8E cfybAFPEpvDI9NerjpLdwYIPiV8F8nn153iKjJVXQb89fR0OdhkkYb0DR92cUaovZisP FK+tW2R+Xm++zItbrtTOKs31XMY6Awb8dEi9iAR4c9XUmEgDHNwUHdZvxvtH5VwDJGgK y5Ol6Ansmv5sdw+bubhQUymKIhIWkVqmNxOGMI2bzu68F/Gb+BMJlD1YVDqUL1nC2bqB JV2+40/FWaIauiH1OeWiclQrtrgVfbOxDWWrYgzpdIq62/Juge/Wc6gRwuf28zPTXQu1 zLFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:subject:from:cc:to :in-reply-to:content-language:user-agent:mime-version:date :message-id:dkim-signature; bh=O9gE/e3yodgY9/2lXhwQfpuuKkQb1WuGw0jqX7CdLPE=; b=bpY+xY2XNloRHfTAU2M32aAPSBArRk0mlKNL1ek3eI+/ZUv0m3VKIaStVkpuJThsH3 mDCjjx0ffKu9Fs6V+CaHRkSuq/vKgwkUNnsqgjPS59EKIAyYFvtP9q6JLpyiqUp6HV9p J3mRbAIok59kynC/IQhSExNUhQ8Vb2/7ERpfcQnzL2CYpP8ZgL0QGCy6sZJ4sAnRWxbK 7WsHZ9zzB3YNdImG7WVhnKyXCsbP0qCcdMdMkNiIFEmBRfTOTV17FI4sugIEnWnFA1ez 8NK8HrQ1m8d4SDpWsJyV0RScmI44R+4b1MyxRu/IHNlCinO+JdDCviyeEgrdBovMkTRo AxVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Olm0J031; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g19-20020a635213000000b0050b1a0068d3si2034168pgb.102.2023.03.14.03.56.27; Tue, 14 Mar 2023 03:56:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Olm0J031; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229674AbjCNKuU (ORCPT + 99 others); Tue, 14 Mar 2023 06:50:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230498AbjCNKt6 (ORCPT ); Tue, 14 Mar 2023 06:49:58 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A1A19CFDA; Tue, 14 Mar 2023 03:49:27 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 16DDD5FD1B; Tue, 14 Mar 2023 13:49:08 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678790948; bh=O9gE/e3yodgY9/2lXhwQfpuuKkQb1WuGw0jqX7CdLPE=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=Olm0J031XNxDpWpsClTgF5zygiodMekRLoQWGsVHm6GDSK4wEesNNXaLKosZTZIQO ibh/Gggnm9e63G+MancnN7GVOib51Jz4Yty5LGp1pEfYPIDIswAr3PWJuWHa1wUXkD YyC4tvb6UfsUi0DJgKdQviCds7q5tRG1VqTJxjIImrMLUueCJ1JC8LnFrSdWwGO+O+ BPg0LeFSmW7Nt/TJrx7jy3FD+a/9ZOdAuq90c7alBWg87vdOQ+TviO2LkJ0f2C9a7F v5RplooPIgu513nIni6MH72oLlu/ICJ3AjkKvwYjad1/Vy9C1FIlQz7yG5la1K178C N5YrKn2oraNzA== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Tue, 14 Mar 2023 13:49:07 +0300 (MSK) Message-ID: <677f4431-d678-543c-c4aa-e237f5f36a80@sberdevices.ru> Date: Tue, 14 Mar 2023 13:45:58 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Content-Language: en-US In-Reply-To: <34d65539-015e-23c8-cf5e-f34bd5795e52@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [PATCH net v4 3/4] virtio/vsock: don't drop skbuff on copy failure X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH02.sberdevices.ru (172.16.1.5) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/03/14 06:01:00 #20942017 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760340370463643369?= X-GMAIL-MSGID: =?utf-8?q?1760340370463643369?= 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 Reviewed-by: Stefano Garzarella --- net/vmw_vsock/virtio_transport_common.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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); } }