From patchwork Thu Mar 9 10:11:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 66759 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp215617wrd; Thu, 9 Mar 2023 02:41:11 -0800 (PST) X-Google-Smtp-Source: AK7set/wKtK3HLODsoHlTPnLxDnp7nBtX5lgKRa0PJkjDt7R2MPZOZdMTfOiLZZyifGEVwgsoRN3 X-Received: by 2002:a17:902:e882:b0:19d:1720:3873 with SMTP id w2-20020a170902e88200b0019d17203873mr27703040plg.57.1678358471574; Thu, 09 Mar 2023 02:41:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678358471; cv=none; d=google.com; s=arc-20160816; b=hKXjB1ecllk/k3NQVxG+klFx4rKGPNDFitO266jcPOSyUk8VbFACYTD/Bbt/uB/XBq V3XVOT+wsDBOGcQxKdkaVIUwRzcBM+vqH8dN2Aa0Z3dkT4RgDaw6JOISapZb7NI9Ldnp IzSxjk5dp4n7PprBOYsfDkaFHHL1eRjiNTvG/0csam0n9LvqBELytF+AnjGLlmHk8bhd jVlluqbNRoqicbOUErmA7FQadD93cWGpB7SXX+Z3xRBYs9a7crLhAgKokcsEhdpfJb/P sKDisO+tQ/x4Qkp+CXgvWRyi5KJUgr+cWsE2wv+xvoSufAVsZaODiRlUXWY1XBjRMv8B U2Tg== 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=j4u8esguJpS8punv0Tt8LlZsmPGSr23mg2hrkVvwQU8=; b=yilLLAc4wMH23uuIUjCL3AVFtQTbq5kvS+DCxxfVIsgtkWC6ME88JOWbyMKozrMEDk nge2F8WOG2o2RVHNeScRGTLZMj9kRyaR5oR3e8rmhatl4T02OIxJ0grBE4mY5NqNiep3 +Rxv98u8/fOdcIVnSrw9ZwxszhoQPoht2Pvl0yHGGTH/MXj9BOhjKZA3NWC1Jx6R7BUs 0CZuTps6W5H0je6HLPfdjN0q1H7eCxtOCElzrWMprmOn3okZevZCWLNULfvxt96rc/VO 1Si+e3Pu+19zLoUxaMplqv6n9BuVBNcOBTxfFmGOQ3I4KG1oxpONZt1oXKP37tUulDqs HhEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=DmMKvK5s; 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 bg9-20020a1709028e8900b0019bb474b1e6si16393585plb.190.2023.03.09.02.40.59; Thu, 09 Mar 2023 02:41:11 -0800 (PST) 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=DmMKvK5s; 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 S230523AbjCIKQJ (ORCPT + 99 others); Thu, 9 Mar 2023 05:16:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229746AbjCIKPa (ORCPT ); Thu, 9 Mar 2023 05:15:30 -0500 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B868FE63D1; Thu, 9 Mar 2023 02:15:08 -0800 (PST) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 0B6475FD3A; Thu, 9 Mar 2023 13:14:47 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678356887; bh=j4u8esguJpS8punv0Tt8LlZsmPGSr23mg2hrkVvwQU8=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=DmMKvK5s7uXi7NDaGz3QUVnV3bVOMgx8yPK02SuAcTm9GNKmzX3bouOqKKZR/1dsB Bk5I6djoo2zF9TTYITKScJElzVaG7n601KyLT8URUsIyE34JBalIZsru/06laVGtDN QULxDkQdOeGEdYMy0CPvNA/ODNUW5tWXMMZD7ewEFlmFeYKoJdp6G5d+xd1sMPpWE+ syZ7IgnIrH489u6VkymYKuvLl3BD2oMoRiOrbMiyijGCsUisNoeZWb5ZbzQMGK4in+ Dn5rJqOHAJwVAddft+G6xKIHl5YQUz+Qhys346Bng4WedEqD+e+bN6p8iBwHo5Kyop swS/Mie8SfaTA== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Thu, 9 Mar 2023 13:14:46 +0300 (MSK) Message-ID: <453d77fd-8344-26d8-bb44-7ed829b7de47@sberdevices.ru> Date: Thu, 9 Mar 2023 13:11:46 +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: <0abeec42-a11d-3a51-453b-6acf76604f2e@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [RFC PATCH v3 1/4] virtio/vsock: don't use skbuff state to account credit 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/09 05:43:00 #20927523 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 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?1759886412441202383?= X-GMAIL-MSGID: =?utf-8?q?1759886412441202383?= This replaces 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'. Signed-off-by: Arseniy Krasnov --- 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 Thu Mar 9 10:12:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 66753 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp214609wrd; Thu, 9 Mar 2023 02:38:22 -0800 (PST) X-Google-Smtp-Source: AK7set++4tMgKZW0wfz6xzSiAoSkrXB2IB+wrWW7US45+Vq3qjQw57TCmIxZUhPiEj5bD3M71Puo X-Received: by 2002:a17:90b:4f47:b0:235:82d0:3a36 with SMTP id pj7-20020a17090b4f4700b0023582d03a36mr22954309pjb.41.1678358302143; Thu, 09 Mar 2023 02:38:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678358302; cv=none; d=google.com; s=arc-20160816; b=Y0SFGMQCM5uELe54ZM1WIjyRR4dSBgg66H9JfH+9xF+M3WCGFgoxzgG7mJTnueLlJl ynN1xZ1qIVEDXogzSJYoKe7oXQOHEM/0AuZ4E7lxgNhxbT3nKT/xYD9MxEYOTeguD2ni i/CA9Qn3Z8MOeDKLGu06BhE6ckstxjGTht7EX+5MWJN0tLftQN+aHm01YbDOuhsiibHU PdbdQtLL9GhQDN88bbU0MpGqMI0HXwHj8/6GAvIJHhNpQdHvPGNTCZU3D/8/Va3UPcT5 feIJfQNCU94yGrftoblTY6AShTS7eBn9SVbxyZpILourjMR7TeoL/K32dCKZxN4i3N4j zI4g== 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=pEUT86ikon0sBC2KSBuNIGLhBhGsTeozoRveheVlr4Y=; b=HvuN++eryoX/F5L+aisSdYKfuEoeyBY02yhDFhinWyoBwR88Le5XkALhimVFFC7q3Y yK3BlIkyl51J1GGyQRXbQhzk/s0qMG/RjuIkpbRLS1KxqJ2UTKnfmggriAvynsV5mRo4 rXDDViEUcYyi8SChgukryNjNjDLHKRvCtYdSVYcwiKB5sHBHfNTb6dLvkvrqWzC6O3Ml gDm6qKlZlC707fj5eouQ7I16PO0zjvsOb79kJYSJgobndoK/q6oPlWn4Nszjlr8+m8jM OB+IZfeACb3W/8k4iCRLPJkU3CEKjp95maWODw4IT5V2onwjhUMcfcFljdNZHLegRdS2 HjrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=r7xIN1aI; 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 l6-20020a17090a598600b002192eb3532bsi1906441pji.116.2023.03.09.02.38.09; Thu, 09 Mar 2023 02:38:22 -0800 (PST) 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=r7xIN1aI; 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 S229817AbjCIKRR (ORCPT + 99 others); Thu, 9 Mar 2023 05:17:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231381AbjCIKQ5 (ORCPT ); Thu, 9 Mar 2023 05:16:57 -0500 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBA61EB89D; Thu, 9 Mar 2023 02:15:59 -0800 (PST) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id A911F5FD38; Thu, 9 Mar 2023 13:15:49 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678356949; bh=pEUT86ikon0sBC2KSBuNIGLhBhGsTeozoRveheVlr4Y=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=r7xIN1aIeFVncexr7O9vq3lT3Yp6jfhNFezQpoVfUsCnEEW67fBB6RthuzpWTAB/8 cA5KG/Ig38O6ypd7baQxpmnwu0Q0/wm4RnvzJJFS/Ile2fRBstzc/NUflyp9p1oYmC rFOoRU3rcCBb9KiuZ71MNbADrDlphpnT3lM8lq9HQJzahar7g3zdN8DH4SBrao2JRL eJtqrmYaL8trWLPcp3GQpcNBaOW6VYqb1InqGy7rLDJvmbPgIgbBi3NW002vLrscxF sn8SLtIymetqF8/rwOVIa2Fk4j6Ktpc1QIXsjH4WZ5n5K0PcU8+RReSjfqdGVn4BcE 6U/McRUC5a5gg== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Thu, 9 Mar 2023 13:15:49 +0300 (MSK) Message-ID: Date: Thu, 9 Mar 2023 13:12:42 +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: <0abeec42-a11d-3a51-453b-6acf76604f2e@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [RFC PATCH v3 2/4] virtio/vsock: remove redundant 'skb_pull()' call 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/09 05:43:00 #20927523 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 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?1759886234758605963?= X-GMAIL-MSGID: =?utf-8?q?1759886234758605963?= There is no sense to update skbuff state, because it is used only once after dequeue to copy data and then will be released. Signed-off-by: Arseniy Krasnov --- 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 Thu Mar 9 10:13:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 66758 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp215200wrd; Thu, 9 Mar 2023 02:40:04 -0800 (PST) X-Google-Smtp-Source: AK7set+eKqDLF6fQMY27qtpmLKc4z3vNTgttK5CKWEzG/1cfqT1wmpP1qSdkpWtnQvaBPPji4Yk/ X-Received: by 2002:aa7:9dce:0:b0:5a9:b7e3:2ee4 with SMTP id g14-20020aa79dce000000b005a9b7e32ee4mr21472494pfq.12.1678358404042; Thu, 09 Mar 2023 02:40:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678358404; cv=none; d=google.com; s=arc-20160816; b=qzYK2VLYW2ROdpfe/kBueyQ6Y+njirBkKorX7ZcH0DjFQRm258MZ8SdT4pJNKMyeio nqOoh7sqCk+AXS7VoEmgBtewBtZx/t3UrfQE/RiA0DQsdtZErE0/9BoExWWUuTyE7sH7 9iegt5msJKRj3oZBLiuYAoH+VXN6K1uWahV/MrdX3VoOyKxa12PMnLKGwrwavcSAn43P rZE8l/Arkyq+oFZYnbB4Lk155/qgq8Mr+r3ozKgoBJZxDrvp5W+M+04bRtwKHEa1+913 SrFFvw/JYjbr5ePlz1ut4FGDM7+I5w/kcL0jRQaoXHBDYdW5S3y2fv2o70ekHqBHwY3S M05A== 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=twQ60nnpAyulvzxPcu0ha11knd8LOrgUyOb/wJN9jCA=; b=XUgjap4t/+KHmPursdoUQMcWcVFrlhPyK2xG1wrqBEztekL2SWUWHQ3/bg/XAZSzHT la+WAZfw3/vWlW8TzgT+a26AnasbEV+tfpVXZXMZOUmM1gaPcayCG6CuqJozsUDPKqnQ +gISTFqa/hGhq/Bucuvk6QcDPk26FJpdUIM2ZT3vl9tE43IgydUmjbQb/8S3JkyL6gd1 FFtTQwQqoRpTAHxMGsKKfurbJfeE64Hun+Jo4CFST2y374UHus5//OVKsCcinsMpxUlV U3QKRMV3iMg6XtG/YcNrOuhTBwc1YW0ZGpALKzt1CE6Te5jX0rzvQ83/L3O1gVLr8vJR SWhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=g19SdJjk; 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 y72-20020a638a4b000000b00503011e4f27si16690701pgd.869.2023.03.09.02.39.51; Thu, 09 Mar 2023 02:40:04 -0800 (PST) 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=g19SdJjk; 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 S231408AbjCIKSM (ORCPT + 99 others); Thu, 9 Mar 2023 05:18:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230450AbjCIKRv (ORCPT ); Thu, 9 Mar 2023 05:17:51 -0500 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57AA5CEFB3; Thu, 9 Mar 2023 02:17:00 -0800 (PST) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id A83955FD38; Thu, 9 Mar 2023 13:16:51 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678357011; bh=twQ60nnpAyulvzxPcu0ha11knd8LOrgUyOb/wJN9jCA=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=g19SdJjkunhov7Cg/9Iavuv6kt0M12I0iYQkitkTwzR2VeGWDJqUOiH6e+8KPyb/c rV9y1c8xRGF06lVYzXnSrLyWnSuJoznJG3aSfoIbEgcyR2geDcBZk9aywi2P8YTptu ruxwcZ5hHCLkeXyU9JSbBi9phTCT1l+95rIXeZmrGTQdK2KSt2+tNyllTwnpikivc6 7vrIK9BhZIwJ06k2Su2cljEPeSux6nFoAXYJc90x3xf/dQARPCZGsKrTc6P2O8hT+n U4NHFKrp6illpvUIvbYTkhvYFv8DyGc/6HuSZMRfB9z9BW7RozyIKcKEu3wl43jnG6 dxSJzG3Vfkueg== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Thu, 9 Mar 2023 13:16:51 +0300 (MSK) Message-ID: Date: Thu, 9 Mar 2023 13:13:51 +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: <0abeec42-a11d-3a51-453b-6acf76604f2e@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [RFC PATCH v3 3/4] virtio/vsock: don't drop skbuff on copy failure 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/09 05:43:00 #20927523 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 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?1759886341839631329?= X-GMAIL-MSGID: =?utf-8?q?1759886341839631329?= 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()'. Signed-off-by: Arseniy Krasnov --- 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 Thu Mar 9 10:14: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: 66752 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp211453wrd; Thu, 9 Mar 2023 02:29:41 -0800 (PST) X-Google-Smtp-Source: AK7set8v1PQAGJGgfVO3eyd13eNVf8cyGzyRvKD+XcnlmdT39DYL/IyCs/OP6b1kdG8fRYW2e2YA X-Received: by 2002:a62:2502:0:b0:5a8:bed9:3509 with SMTP id l2-20020a622502000000b005a8bed93509mr15900806pfl.3.1678357781137; Thu, 09 Mar 2023 02:29:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678357781; cv=none; d=google.com; s=arc-20160816; b=HLRZj0BXyNbMTIWg/LjPFu1DigSYQ2ERUTzZTKj73QUC4g420Xnt1+kuoElo2A65yw VgA8l21iIKEOx/l+OdJNx8idiJmbgYitkvfYrlJgj/48h7RARTqBjc38T89wXDb5lPJO YYjMD54NFnxpsGaVvbZKG587e2AoiRC0czmvxSsuE8VyUV4wseFuKh8alh1Dc6nFBkPq iLE7z+WSozEOdYPRXBPubLgYwCjfmWyQAjwiHi2uqm0IU48ksv0P/YbS0FJv5BCz97DC FK2DgtchjBjjO0H+jj66OiNwl3Pb/ey8Phj0fCIKm8otPnQJgV+53gxHybLZt+773lmf AWAQ== 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=0WD164jUGiAEsSnNo9cWIGgl9axoJsKnBX1OlIW0ADQ=; b=d92euZ6gk9hrIsk3dYXxGNAR+rwlYrXIAHHm6TJBNqLd7prC0z78rH0zjXvwzrmXRd 5O2Rm27IGFjmzbi+RdiAyB+msBXFg0JRwYEfdcNIO2Agy6J37x+wkYDsLKpm7cWJgvzz vC8lkPUePqzaM7d/mWr4Z86gz66oZbkV9RuEPJCiRptSZqIIeC1iQkXi9Z+1ahGjOGdU EGkysiWfSvMGGKdgxptxNjWckrmFz57Lhldd6d3HY360W9fun97R6/etcMaRr21aN5Vq VEbvCay+NHOo/zmPr3A6UWWG3URrbRmQTX8SOuMzXk2npfQTdBj5yUVKkY/rA6+aAb0O CCRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=e3u5oXwj; 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 h1-20020aa796c1000000b0060555dffa2bsi17234191pfq.134.2023.03.09.02.29.25; Thu, 09 Mar 2023 02:29:41 -0800 (PST) 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=e3u5oXwj; 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 S231348AbjCIKTL (ORCPT + 99 others); Thu, 9 Mar 2023 05:19:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231339AbjCIKSe (ORCPT ); Thu, 9 Mar 2023 05:18:34 -0500 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A068EE6839; Thu, 9 Mar 2023 02:17:50 -0800 (PST) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 010045FD38; Thu, 9 Mar 2023 13:17:49 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678357069; bh=0WD164jUGiAEsSnNo9cWIGgl9axoJsKnBX1OlIW0ADQ=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=e3u5oXwjC0chJ6GQ6YYs426wPQvsiCPSCmf/r+7QV+EDWG5AU/TVv62qUwnqrRMBw DedSAa94hm9cBavoZ0JInwxjg4RJKrgGF4mTvuAt/6VerNW3oiZ6PcgWI771RisZ9J VWUE5C4JbqxyesRVG+nm6qUFw1fw77uN0SBgVqwb4qWDdsa20AHCGC7o61g/AQCoht fcTmzOso1OmymjHNhkvNzMVUD3u8+TWFghfGgc/ONgmkiM1jwqtmvTwOlYZDrkNWRH nW31HVMhUCkgiFvXqxU5PDDZNLtqJnlYlzy/+X9b+KZ2uEB/1+pTsSus/jDoN6KscZ IoKBaL0Oyk+1g== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Thu, 9 Mar 2023 13:17:48 +0300 (MSK) Message-ID: <5d726a68-8530-3e90-202c-ba21996db60f@sberdevices.ru> Date: Thu, 9 Mar 2023 13:14: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: <0abeec42-a11d-3a51-453b-6acf76604f2e@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [RFC PATCH v3 4/4] test/vsock: copy to user failure test 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/09 05:43:00 #20927523 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 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?1759885688619680101?= X-GMAIL-MSGID: =?utf-8?q?1759885688619680101?= 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, + }, {}, };