From patchwork Tue Mar 14 11:05:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 69519 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1705865wrd; Tue, 14 Mar 2023 04:45:37 -0700 (PDT) X-Google-Smtp-Source: AK7set+nJ6B70Q+KXDGj9ZlhLu7aHZvpoPLj6PY5yAbGAZnXtiEILvUiKFxir/bO6RoNUD5kcLCN X-Received: by 2002:a17:90b:4a4a:b0:23d:44c6:745a with SMTP id lb10-20020a17090b4a4a00b0023d44c6745amr615670pjb.2.1678794337100; Tue, 14 Mar 2023 04:45:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678794337; cv=none; d=google.com; s=arc-20160816; b=H+SJRX4bzcpawTmOvqCOgFwwxqm60xL7ETfpTIxJDW8l/RVYqu01I+bv6qNnF1Sv4n zLvT7NYPyc8uXn1r6wISeIzWz2veNahzxoCniIY6bII5mjAyQ1nIYEISlmZZjlcutPWa rWKlfdR/dTlQw7t1SmC4La3xXsTHC+UZihJWZ0E7ZMjKqX7Wc73+Ov+h/K7bHfxrh5sD 3O69LZwC9gy+huvlYVmEfSmbcceN9Vb10cKlgR5weneGPV/6l4PuUkmA5pEa+EXSPn62 ABycQPVGmr94YY/yvIq79zPV5f3ZGLO0t80E4N6B2cnsqqIeNGiVcrOrZ/LmYUo1kGjN 8+xQ== 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=3iLPJaGeMrLb7xNjIHjUqhJAp4hqvLxn8oJMxDMG6R0=; b=x3FlLpdW3O1yVmGckyVBcxNg96KJULrhiHFjccPa+J3k9ufSuAfjq1l8b4gAbOyNJx 1tny90d/De+27rrF1X9tMqSDsv3Zy7n/szAZTc/ivyzVNdwsWjUJikdM4iFeQcbmBq4d Lhei7+Qg3Vcs4DD6dvPkvbcdOo5Fu3sT6Sjjde0M/fCPCY0rByxRe0a94GRs/j1ocT0P c+kNpiZBGSOus82RVmg2wjpduDelV6eyebrpS8NIZ2HOBAOeYgZY2nexteCR6ljgPuZc Oup0QmXR7XQJ6ROqOGuHgXATXDF1JQB4B27VAfRdkkIwHO6hTYKzg11VzO39I3ONezV/ zDow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=ZgOUElos; 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 x4-20020a17090aca0400b0023b4d01f319si2286561pjt.75.2023.03.14.04.45.24; Tue, 14 Mar 2023 04:45:37 -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=ZgOUElos; 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 S231157AbjCNLKU (ORCPT + 99 others); Tue, 14 Mar 2023 07:10:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231343AbjCNLKH (ORCPT ); Tue, 14 Mar 2023 07:10:07 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E98B787374; Tue, 14 Mar 2023 04:09:39 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 756585FD61; Tue, 14 Mar 2023 14:08:58 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678792138; bh=3iLPJaGeMrLb7xNjIHjUqhJAp4hqvLxn8oJMxDMG6R0=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=ZgOUElosaYO1LiE/XLPSTYPW8MI+wAI/CjoI8nuhTTrvUFAXhYE/6VEqPFAv4g5PE 7KXqzQn4ydLgwWZwY9xdupYJ7BQ6eU5ia8bnc0IxBjxHm4QNOgsu7HgGx6Qo85UfBi WbJgm85f86qF9vXcnQXPr8QU3y/3yGGlbEW5GeEN/U+BUhSm9KVGvsIopqUgYAC6+q +wDZRQEeTShF3yU3lg9X19etZlN014G85/7yI991rUUj46AzRF8wGlVFWldYCv/nLG IAzrZVjLahNj0IhXxRZOX12fKImKqNJ7RM6fThhe5hX8tEfUgsrCXX3WHWkyL1HI8n Q/PuaLB1CledQ== 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:08:57 +0300 (MSK) Message-ID: <92bc3587-6994-e003-5ec5-252c1961d8ec@sberdevices.ru> Date: Tue, 14 Mar 2023 14:05:48 +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 1/4] virtio/vsock: don't use skbuff state to account credit X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) 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?1760343450788892775?= X-GMAIL-MSGID: =?utf-8?q?1760343450788892775?= 'skb->len' can vary when we partially read the data, this complicates the calculation of credit to be updated in 'virtio_transport_inc_rx_pkt()/ virtio_transport_dec_rx_pkt()'. Also in 'virtio_transport_dec_rx_pkt()' we were miscalculating the credit since 'skb->len' was redundant. For these reasons, let's replace the use of skbuff state to calculate new 'rx_bytes'/'fwd_cnt' values with explicit value as input argument. This makes code more simple, because it is not needed to change skbuff state before each call to update 'rx_bytes'/'fwd_cnt'. 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 | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index a1581c77cf84..618680fd9906 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -241,21 +241,18 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk, } static bool virtio_transport_inc_rx_pkt(struct virtio_vsock_sock *vvs, - struct sk_buff *skb) + u32 len) { - if (vvs->rx_bytes + skb->len > vvs->buf_alloc) + if (vvs->rx_bytes + len > vvs->buf_alloc) return false; - vvs->rx_bytes += skb->len; + vvs->rx_bytes += len; return true; } static void virtio_transport_dec_rx_pkt(struct virtio_vsock_sock *vvs, - struct sk_buff *skb) + u32 len) { - int len; - - len = skb_headroom(skb) - sizeof(struct virtio_vsock_hdr) - skb->len; vvs->rx_bytes -= len; vvs->fwd_cnt += len; } @@ -388,7 +385,9 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk, skb_pull(skb, bytes); if (skb->len == 0) { - virtio_transport_dec_rx_pkt(vvs, skb); + u32 pkt_len = le32_to_cpu(virtio_vsock_hdr(skb)->len); + + virtio_transport_dec_rx_pkt(vvs, pkt_len); consume_skb(skb); } else { __skb_queue_head(&vvs->rx_queue, skb); @@ -437,17 +436,17 @@ static int virtio_transport_seqpacket_do_dequeue(struct vsock_sock *vsk, while (!msg_ready) { struct virtio_vsock_hdr *hdr; + size_t pkt_len; skb = __skb_dequeue(&vvs->rx_queue); if (!skb) break; hdr = virtio_vsock_hdr(skb); + pkt_len = (size_t)le32_to_cpu(hdr->len); if (dequeued_len >= 0) { - size_t pkt_len; size_t bytes_to_copy; - pkt_len = (size_t)le32_to_cpu(hdr->len); bytes_to_copy = min(user_buf_len, pkt_len); if (bytes_to_copy) { @@ -484,7 +483,7 @@ static int virtio_transport_seqpacket_do_dequeue(struct vsock_sock *vsk, msg->msg_flags |= MSG_EOR; } - virtio_transport_dec_rx_pkt(vvs, skb); + virtio_transport_dec_rx_pkt(vvs, pkt_len); kfree_skb(skb); } @@ -1040,7 +1039,7 @@ virtio_transport_recv_enqueue(struct vsock_sock *vsk, spin_lock_bh(&vvs->rx_lock); - can_enqueue = virtio_transport_inc_rx_pkt(vvs, skb); + can_enqueue = virtio_transport_inc_rx_pkt(vvs, len); if (!can_enqueue) { free_pkt = true; goto out; From patchwork Tue Mar 14 11:06:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 69503 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1693155wrd; Tue, 14 Mar 2023 04:15:15 -0700 (PDT) X-Google-Smtp-Source: AK7set/+5R5JAAzJ8S4HJozLk+VNmlqE+errSohFq0yqvJuErUUoF9VvwVmJrkv+JfOAoqZBLvkH X-Received: by 2002:a62:1756:0:b0:625:13f3:9409 with SMTP id 83-20020a621756000000b0062513f39409mr3753289pfx.26.1678792514813; Tue, 14 Mar 2023 04:15:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678792514; cv=none; d=google.com; s=arc-20160816; b=MdmtK/Qtzu2aE6bkUc+DYPnaSXa+pf9ReTOYqm4vOUdJR3VEOg0jJhMF7M1h8z3dzB LxV6qks2FYfzQzQhRBwG8SkmPs4JN81DxhJDT4gMf+NvsfERgPOqRS0bnkqNQgdaHNvT h9pjZPjzdUOklLw1V5oD6oU0moox5CuZpxOr6v0rOxe1NKijLs8ShOEU2u+yV+h3yyUl nhud8YGqpQpCAKw77qlF+zwZ2jGX19iCGjvVboBs64IPKP8cjAFZoeD1+i7KTEpSeazf vhR6O6wgmvb10aeuaXa4BrWds6QZgyctEa83BppZtEEPQSIfC/6/nP07me0KVEf5bB/C 5SzA== 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=BqQPywzkRmwCTA57RbQWMUd1CdLRbsre5I6PgGn4zLc=; b=f0d9sXUOH31eK077JZNHoTfmNtPUG0LsrK+OT8k1z5m7xaDgp3xT1OZ75cqmTTDW89 I+iuZC60V2N8qV9+/WeURRSGIv3upuuM90nZHMAaPPeREcV/HiIhzvB+dbwMxVVGfPi6 9bywPc+jkw9USHkprA4x0NrMuHla/t13SveNlfNuT2UcIsWBoJ6YfRPRlhoq2eaKGCt5 ZgjM1Y9B8Q4jRM+TUqAydU7kVY9jkPa/oDf6yudLrLUnwcEfrCgo4PLcSrXUTPIs+/Fk UqfbXNt3TqS2MNp1X9601CjCP0STiKHR9fwRjDFo1wqeOt6CAVQSlyOudPIqkxdFAzPF YDig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b="BN0l2/Tf"; 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 p68-20020a622947000000b005a8dcaeba57si1872114pfp.371.2023.03.14.04.14.59; Tue, 14 Mar 2023 04:15:14 -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="BN0l2/Tf"; 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 S230374AbjCNLKr (ORCPT + 99 others); Tue, 14 Mar 2023 07:10:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231247AbjCNLK3 (ORCPT ); Tue, 14 Mar 2023 07:10:29 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B94D1E9F5; Tue, 14 Mar 2023 04:10:04 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 5D9F75FD62; Tue, 14 Mar 2023 14:10:02 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678792202; bh=BqQPywzkRmwCTA57RbQWMUd1CdLRbsre5I6PgGn4zLc=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=BN0l2/TfDTCvsziVYfNoVC4mjBCurnqS4VS8aYpiO7hTx4sXavjRCJufKIfRHMicT 6tjzPREFYda1wSXPLrwMk5P7xKn8vpLK31bzoeskcJgABxg4X2cbO+XUH1SMf5Y9CK HKO9Y3nSM54exR5FnTDFOU4Ki+bGcoaVzZMvI4icl6VkkxW2rQap1an+amcsGZl7yc bIbxm4LOWYJHIVj7uXnSfO+L3tPMPqzAts75TdgfRW0SjJX5UyXqeMFmwk2hf7JSMq bVLmJtNMaI0+w89QTAs5xP7zzTht7TcisGNS7vA+UFuQC2E6KRBvwCoxyxqZ4dLn8I 0TgNt+dZ9h1EA== 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:10:02 +0300 (MSK) Message-ID: <75e3f51b-2848-d3ce-a995-4ac8320663f6@sberdevices.ru> Date: Tue, 14 Mar 2023 14:06:53 +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 2/4] virtio/vsock: remove redundant 'skb_pull()' call 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?1760341540222715649?= X-GMAIL-MSGID: =?utf-8?q?1760341540222715649?= Since we now no longer use 'skb->len' to update credit, there is no sense to update skbuff state, because it is used only once after dequeue to copy data and then will be released. 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 | 1 - 1 file changed, 1 deletion(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 618680fd9906..9a411475e201 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -465,7 +465,6 @@ static int virtio_transport_seqpacket_do_dequeue(struct vsock_sock *vsk, dequeued_len = err; } else { user_buf_len -= bytes_to_copy; - skb_pull(skb, bytes_to_copy); } spin_lock_bh(&vvs->rx_lock); 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); } } From patchwork Tue Mar 14 11:09:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 69515 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1698266wrd; Tue, 14 Mar 2023 04:27:40 -0700 (PDT) X-Google-Smtp-Source: AK7set+ONCZHPoSA/1Mw2vvyzjp7HelY+6/SfbctYUCnHTA3fHKxHbiDxTqIq9TfLviMXlYTAyWk X-Received: by 2002:a05:6a20:cb54:b0:cc:289f:9c37 with SMTP id hd20-20020a056a20cb5400b000cc289f9c37mr33954092pzb.7.1678793259780; Tue, 14 Mar 2023 04:27:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678793259; cv=none; d=google.com; s=arc-20160816; b=JZNdq9gmKLI6CgqajoZkO7dcCXNFkgWaTaf70UszbnnTvBw+u174/A+WMX+mK5B82u AXmkDiKcNiXGnOudz+mMr1Y4RopMH+3adsDQtbH1pxOyeNzlzFRMRvyOJL5GsvkjjKFx RFfaOfLW2HqqzhQgzKLxcJt36PXMOoa6gb4/7D+bNj7ERLCOsWeWGgT2IgNXECQ1QEal rRL5abudJXi6n7p2e2vwU/1DDpCkJA3IXwmXQ+ehJ1t5m8zpr9Cabb/10Cza/dYDSdkw BrIov3Rd08sY2fXweqjhstKpDdes9SI8LXc7vNlfM6TVlnyUd0irxHKwta/ZwKhIiB7r UVuw== 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=PF6KHzan4mSy2kGESR6B1xvrFo2PxPLxBlkqc63AEv0=; b=zzIUnety+OEWLgDXGfUIePPPvBeD+Gp9/IbSbhpD2ncOMHYMCn08tORpBVChFkyJEm t3ncQqvRLpiBx3O8yIpCdMRkE9WsONe3XsLOhFz/jSr7JkC1M7001FiC58AYjUGupgnK USj0BoQoyligNOikcypW6uFi3IpDJGZzdM33YRaRvjNzKZrukWFJ1sjsR43f8HKtX5fC iZuJ6MkCYQkYvPvk56xesocHtsrkQm0BICVtljwmN99FHpaE1AgkFeJ4OUiE8yrdMwop dzG5la7f6yoUiauqFz1XyF5QLRWiuvrwLPSEYDqiTqfoJ9Gjh9eT6Z0vO1qiXAXQuWoi nBuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=V97g7Z1P; 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 e9-20020aa798c9000000b00594252e8a11si1974451pfm.170.2023.03.14.04.27.24; Tue, 14 Mar 2023 04:27: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=V97g7Z1P; 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 S230489AbjCNLNv (ORCPT + 99 others); Tue, 14 Mar 2023 07:13:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229692AbjCNLNq (ORCPT ); Tue, 14 Mar 2023 07:13:46 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4D0523871; Tue, 14 Mar 2023 04:13:09 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id D4B005FD61; Tue, 14 Mar 2023 14:12:36 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678792356; bh=PF6KHzan4mSy2kGESR6B1xvrFo2PxPLxBlkqc63AEv0=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=V97g7Z1PcFuaP3jAELaZ84GVI5pDoM8EOmkpq8+lOcs+OMb0qD7kDdVlR+7AxGHXH tjk+J+D7PLCtAQ31welKzgyI6um2mq65G4aIWqpM61x0cLdd3sxJrA5ndauyCs0wRm Wktr7R+/rGBfyt1qiSV1t0iA5X012pkc0ZBeI1htiRXUFwK2na4VFACipsiCBHYPb8 9P5zQ0sskM5xkPjaJEK/dylaX+HQF/nZ1Lllk6qCu14tWkToJJIE1hCKXQmL7qcsRV 798VsI0I628PC074hPtzYbxdcUurtj1Pgq2THTWJw3CwobyPRsrbbTM7VtIg2aRpaI 6tphEyEywXFqg== 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:12:36 +0300 (MSK) Message-ID: <984e04b8-3f61-f59f-1683-414a53e7eca4@sberdevices.ru> Date: Tue, 14 Mar 2023 14:09:27 +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 4/4] test/vsock: copy to user failure test X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) 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?1760342321065698145?= X-GMAIL-MSGID: =?utf-8?q?1760342321065698145?= This adds SOCK_STREAM and SOCK_SEQPACKET tests for invalid buffer case. It tries to read data to NULL buffer (data already presents in socket's queue), then uses valid buffer. For SOCK_STREAM second read must return data, because skbuff is not dropped, but for SOCK_SEQPACKET skbuff will be dropped by kernel, and 'recv()' will return EAGAIN. Signed-off-by: Arseniy Krasnov Reviewed-by: Stefano Garzarella --- tools/testing/vsock/vsock_test.c | 118 +++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c index 67e9f9df3a8c..3de10dbb50f5 100644 --- a/tools/testing/vsock/vsock_test.c +++ b/tools/testing/vsock/vsock_test.c @@ -860,6 +860,114 @@ static void test_stream_poll_rcvlowat_client(const struct test_opts *opts) close(fd); } +#define INV_BUF_TEST_DATA_LEN 512 + +static void test_inv_buf_client(const struct test_opts *opts, bool stream) +{ + unsigned char data[INV_BUF_TEST_DATA_LEN] = {0}; + ssize_t ret; + int fd; + + if (stream) + fd = vsock_stream_connect(opts->peer_cid, 1234); + else + fd = vsock_seqpacket_connect(opts->peer_cid, 1234); + + if (fd < 0) { + perror("connect"); + exit(EXIT_FAILURE); + } + + control_expectln("SENDDONE"); + + /* Use invalid buffer here. */ + ret = recv(fd, NULL, sizeof(data), 0); + if (ret != -1) { + fprintf(stderr, "expected recv(2) failure, got %zi\n", ret); + exit(EXIT_FAILURE); + } + + if (errno != ENOMEM) { + fprintf(stderr, "unexpected recv(2) errno %d\n", errno); + exit(EXIT_FAILURE); + } + + ret = recv(fd, data, sizeof(data), MSG_DONTWAIT); + + if (stream) { + /* For SOCK_STREAM we must continue reading. */ + if (ret != sizeof(data)) { + fprintf(stderr, "expected recv(2) success, got %zi\n", ret); + exit(EXIT_FAILURE); + } + /* Don't check errno in case of success. */ + } else { + /* For SOCK_SEQPACKET socket's queue must be empty. */ + if (ret != -1) { + fprintf(stderr, "expected recv(2) failure, got %zi\n", ret); + exit(EXIT_FAILURE); + } + + if (errno != EAGAIN) { + fprintf(stderr, "unexpected recv(2) errno %d\n", errno); + exit(EXIT_FAILURE); + } + } + + control_writeln("DONE"); + + close(fd); +} + +static void test_inv_buf_server(const struct test_opts *opts, bool stream) +{ + unsigned char data[INV_BUF_TEST_DATA_LEN] = {0}; + ssize_t res; + int fd; + + if (stream) + fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); + else + fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL); + + if (fd < 0) { + perror("accept"); + exit(EXIT_FAILURE); + } + + res = send(fd, data, sizeof(data), 0); + if (res != sizeof(data)) { + fprintf(stderr, "unexpected send(2) result %zi\n", res); + exit(EXIT_FAILURE); + } + + control_writeln("SENDDONE"); + + control_expectln("DONE"); + + close(fd); +} + +static void test_stream_inv_buf_client(const struct test_opts *opts) +{ + test_inv_buf_client(opts, true); +} + +static void test_stream_inv_buf_server(const struct test_opts *opts) +{ + test_inv_buf_server(opts, true); +} + +static void test_seqpacket_inv_buf_client(const struct test_opts *opts) +{ + test_inv_buf_client(opts, false); +} + +static void test_seqpacket_inv_buf_server(const struct test_opts *opts) +{ + test_inv_buf_server(opts, false); +} + static struct test_case test_cases[] = { { .name = "SOCK_STREAM connection reset", @@ -920,6 +1028,16 @@ static struct test_case test_cases[] = { .run_client = test_seqpacket_bigmsg_client, .run_server = test_seqpacket_bigmsg_server, }, + { + .name = "SOCK_STREAM test invalid buffer", + .run_client = test_stream_inv_buf_client, + .run_server = test_stream_inv_buf_server, + }, + { + .name = "SOCK_SEQPACKET test invalid buffer", + .run_client = test_seqpacket_inv_buf_client, + .run_server = test_seqpacket_inv_buf_server, + }, {}, };