From patchwork Tue Mar 14 11:08:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 69521 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1706322wrd; Tue, 14 Mar 2023 04:46:44 -0700 (PDT) X-Google-Smtp-Source: AK7set8xHfQytREKnurFY0qKT/cNnV1tpP/Or0LaWsL6yc4P4w9LW+SunqV6hvN0DwTGnCSANOuc X-Received: by 2002:a17:90b:3e8c:b0:237:85e5:3294 with SMTP id rj12-20020a17090b3e8c00b0023785e53294mr39425927pjb.20.1678794404379; Tue, 14 Mar 2023 04:46:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678794404; cv=none; d=google.com; s=arc-20160816; b=u7KFnBv5+CAlP1UmjTxyVMcYTsxSKgQMb2hx0rwZnCmMXfmFVKAms5Dv2y7QJwsgeh +qirpG7YZmWiTdQNBPdgYHZ9Y34F/rV/HWlzUltfkSEKvOCVtfpRND/gRyNmdeYobsz9 3FkGcIEMVA09Txftqi+90mQlNo6Hm2aDqkmFxlzd8wgC6SMBvHD8ysaCYClA+ks7leJF INo02m2q4pvIcsWvHg5zsHhHhbU2lRoJWSwqN+XzBJzaxrtWE16PeHx31xcYsx7FDkoX 0d6L27x8vQ8BWBoBLw7qRG5f5uN/MCMpkOBz6LENWEDssFxON18bO2ZBQiyH/jGt3T7Q nA4g== 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=BO1M8DNWcK0wZNaTSUeVMn+aqOj32fWh1Zk1Yh9cnTqQ0UgzTTGuh+KHk6KAmZOREa GTt/UhcHCzhU+yu6sogTpFzJhz5Yt3uKXLUyRdlEcwiAumqMjrYquqDGcgRcl3e8LJRx kj86hRD0ghyJPN0nTSyMSSQc+P5TepfwkhFpbtIjh8MdQnEpqvapMoE9lsv+0ukqoFet HnBxwmDyZckKOCzPqX2PHr7wOHrgds7q2KxXvDG3xPAe36sNhiEM8filMBIQLnuDz7z9 OZIyA9Oq6SovuxCNzkIcbwUAL+atw6FXBhpt3l3IyDUF9QiRM0kcZDhyVHMz8ODmtGNs zEfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=rs9aJKEU; 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 c11-20020a17090a8d0b00b0023b3b1be891si2176232pjo.131.2023.03.14.04.46.20; Tue, 14 Mar 2023 04:46:44 -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=rs9aJKEU; 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 S230176AbjCNLMu (ORCPT + 99 others); Tue, 14 Mar 2023 07:12:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229692AbjCNLMs (ORCPT ); Tue, 14 Mar 2023 07:12:48 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD99581CC9; Tue, 14 Mar 2023 04:12:11 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id DB44A5FD1A; Tue, 14 Mar 2023 14:11:29 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678792289; bh=O9gE/e3yodgY9/2lXhwQfpuuKkQb1WuGw0jqX7CdLPE=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=rs9aJKEUB94LWJ6gM88+e0+Foo1slZ3l9Xyt1LIHuAlwih6EAq2Tkssm2STXl411C V+EWkuO51SsBk7CfKtKxnfNp+ruKcm1oQzOTLSCKgutTfNi9g1kpCW+hZjClV3mw2A pcOzemdiU90rfiNgSBu3ag9OmJuWLLDbTUkUir16nkWGOEeOD3DSnQOogpWcZKLajG bZnnoBRj+LX1OeU9CQXiV0bEOy1iOP9ocIoIuO7rLeWhjIlBsF4KfkE9JtIt9bLY3j FKa3yx8L00cg58vUa8pshHl2isnDD21LkS9anWlC2aAKIa8Ot/t4tS87m42zaPsNvf h55qF/Hw+SB3A== 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 14:11:29 +0300 (MSK) Message-ID: <3f8fcfb1-6d5e-93db-f2d6-651e22dba9ce@sberdevices.ru> Date: Tue, 14 Mar 2023 14:08:20 +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: <1bfcb7fd-bce3-30cf-8a58-8baa57b7345c@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [PATCH RESEND 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?1760343521845671571?= X-GMAIL-MSGID: =?utf-8?q?1760343521845671571?= 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 Acked-by: Bobby Eshleman --- 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); } }