From patchwork Tue Mar 14 10:42:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 69508 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1695467wrd; Tue, 14 Mar 2023 04:20:33 -0700 (PDT) X-Google-Smtp-Source: AK7set9pvjSzelnQ+cdfjlYcBbc87OW/MyxDWMGi/waNbMYwiQGK956hv45CVC2z+bkoEalhbyn/ X-Received: by 2002:a17:90b:688:b0:23d:4229:f7d7 with SMTP id m8-20020a17090b068800b0023d4229f7d7mr743452pjz.38.1678792832757; Tue, 14 Mar 2023 04:20:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678792832; cv=none; d=google.com; s=arc-20160816; b=HQtTyqAJGuge8t7PKzgs0v/73o7kCCY0p3gk6UUzB5V5EwgpvpWhWrse5J1TQ0NEjB 66okyAUhlxaltv9Jcdf9u0c5WuUqvAQoocV3lxKZB/S4zdibIVeMc6l4RVoDZUzDWXZS L0rK5imcCjNo3QqF5pFoLQqgCCN3FYB1I1FBQcYHUuH+jfnklTOOHz4ZsH7zYLxgxYr7 C9ZsNCX2mLn3uWkEpYjZXuqUqOOyr92GOZXv1jHDT95yw4vgpF3ZlwSIr9VWHlxk5D7i ZpZKgbBf9lFyNfCbFgJo0T5bkHlVz/JNGpFqPSUP764kyAj59iaHC+srWEvctRR64kwd IPjQ== 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=kaY7w8eWw8Xd2dFGwZWG/yR7l40+XzMb6T0+9TcyaYmCxo4TO1mgoCpTLS2l5hOzx3 RrUzsxI1dwjRL78IH3DakGQRnK86/CuZrPgAlTFBKa6sbUVunAQSQd6NWZ9TI8qQxqXR ZPgY+MsrrCGMMy0xubNzFl0TVM8NbN2rEEtBKwcZcZ2aP4UPOSWpYqCy7r+PkvXf4YCU xzNnQmZoYm2hmfxOd6MXdbnAqdLT67nhNUCxYOvTudaVeYe4cGgTuvdTHB/xEFq5RG2P EG46pwzLyPUct7j2NVSbisrmG9/gRqNEC7tXG5J/u5U06+Us5/KTxhZaHEqC6QexiIb6 sv8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Mh6CXTWq; 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 l4-20020a17090a4d4400b0023d1bd70913si2151766pjh.42.2023.03.14.04.20.20; Tue, 14 Mar 2023 04:20:32 -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=Mh6CXTWq; 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 S229664AbjCNKqw (ORCPT + 99 others); Tue, 14 Mar 2023 06:46:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229535AbjCNKqu (ORCPT ); Tue, 14 Mar 2023 06:46:50 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5C6DAD02; Tue, 14 Mar 2023 03:46:24 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id EB5EC5FD1B; Tue, 14 Mar 2023 13:45:45 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678790746; bh=3iLPJaGeMrLb7xNjIHjUqhJAp4hqvLxn8oJMxDMG6R0=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=Mh6CXTWqdb0MRZ4PqlZvkcVKvjPOONs26mLmnVxfv4NhrTfsY9r1wqzykxD4aPit4 /wtXJt1ZzvJey0C3GLgYxtbokw55ehCZCjkBQsUkc+v26LuMj1tWStZd3GFRjphDPB LdVBdK8xq2Y7E29rkNPuZZFt9crQfMbiC3gd76iIR6fncm+tCAdjHcp6kPs+1Osh3G mTSTD0wDLAuv1xAJq4ooyGUrlcwbYxBcE3qHYQq4hCiaJpSKc5KipD28eHsde2stVT o6gs6TGG7JcBqW6gUSEc+w9+CiyKD1N9a6XO+r30l2T4sD43iersYND5Q5XEcSebfY 5FKMZW6w0XnUA== 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:45:45 +0300 (MSK) Message-ID: <77841baa-47de-63e9-240a-76c76d2c0764@sberdevices.ru> Date: Tue, 14 Mar 2023 13:42:36 +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 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?1760341873545730655?= X-GMAIL-MSGID: =?utf-8?q?1760341873545730655?= '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 --- 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 10:43:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 69513 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1697767wrd; Tue, 14 Mar 2023 04:26:25 -0700 (PDT) X-Google-Smtp-Source: AK7set/UmWTXKWGvQUIGiya/GOy5Up4Oa7M4sbpUA/8vIyzO7h2CF5MRZCEA6HZwN2CYQyHLQf35 X-Received: by 2002:a05:6a20:748b:b0:cc:8266:994e with SMTP id p11-20020a056a20748b00b000cc8266994emr39609276pzd.4.1678793185211; Tue, 14 Mar 2023 04:26:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678793185; cv=none; d=google.com; s=arc-20160816; b=bvEplWDN1QNigFy4fD2gM0TRiwO8Mw4LD4ZM6E73hjHQSCuMt0Mz7aJX3N0iOWa7gM jUhsCnC1PFPxxOxZtpwRkaTkySmYqPjFWT2no9LNG6bJ5emibPzSkbzGq0Q8/OVpfCbB s7je9LnYRQKz1BpMsvcNGQurEBw8HTJtRVj1D4yHk9VD56ko7beFBrBFhKTDtAk9bSKC ZOlaPGG4+T1g3qBJf4m6h+q5cZtPbAPJtVsTSCDnaR3bhreZYXp2buTKSiVJF74G7k4R 66Rb444Ck7fbT/6sfgUZSoooIciLwD4z0hePuVKMTyLZx+hwFWA41ijaAN88niGWZbzv 6HvA== 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=S866dWe6awgBXahvb3qr72EBhl7drL5qpZg8rw9lTbC8lVv9EgGyWGH1A1MICpv6tz 5KHsIayFg3SeBFJG/cNlHon9eDsyLyd8JFn8lko3NfN8RZ+/fUOFJX9avnbL2E9ZwjXW xuXGHtgd3oXzK0AReudui7eYPIMs1MUetRtbBsCFwv5jFQUb0teD7LX4I+jfG76s1Xki IDyYR6sf3a9u34sdmt6/WEnQRO63AsqcC/rD7r1tXkv+DrmooWdnXG/qpQzHbbvpQ24/ MKnp+jxcATwtA9Jq6GtlHttpYa4dBJxm01VLBkuUKgplxMHkgOpQXie/Kb9tK83zHuDH H/OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b="d/gv0iqF"; 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 196-20020a6304cd000000b004fcfa513fc9si2042693pge.184.2023.03.14.04.26.10; Tue, 14 Mar 2023 04:26:25 -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="d/gv0iqF"; 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 S229687AbjCNKr7 (ORCPT + 99 others); Tue, 14 Mar 2023 06:47:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229946AbjCNKr5 (ORCPT ); Tue, 14 Mar 2023 06:47:57 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4836294F49; Tue, 14 Mar 2023 03:47:21 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 07F555FD1C; Tue, 14 Mar 2023 13:46:49 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678790809; bh=BqQPywzkRmwCTA57RbQWMUd1CdLRbsre5I6PgGn4zLc=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=d/gv0iqFdNx8hyDj09G71NixVjKXiGGcKyFX0axRd3OPLZmm6ZvN6aGOL04HANm4w 6W6n8FmETtTptezG35ZZHAM2QizR7e1OqdBaNpvVBS2o3CJdk0/jAnu4w4LGAPHsDz HPEgH6KQP/sHK6iP2RotTva7G6q5XoulvqBfQWyTX4c+iGUpMb0jgIzeHXpqgE8fpO xFjKK+YmDMWQ9MYPiFa4xAXm9nwCjnGR32unF9kyzU2cU0nTn8bnMFkvLxyRM/YRv8 3kaOLXPmtmNHc0k4ilzD5nB0JkYMxO9qowrTQ8T2uqGqe+E1dx4n8YFFmJyD3cCQZ3 XVPs5Z3TCT3wA== 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:46:48 +0300 (MSK) Message-ID: <76f8ff7b-cf6f-8a6f-993c-416506686742@sberdevices.ru> Date: Tue, 14 Mar 2023 13:43:39 +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 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?1760342242528075786?= X-GMAIL-MSGID: =?utf-8?q?1760342242528075786?= 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 --- 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 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); } } From patchwork Tue Mar 14 10:47:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 69509 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1695476wrd; Tue, 14 Mar 2023 04:20:34 -0700 (PDT) X-Google-Smtp-Source: AK7set+YMcPvdgNy1J30bpNz3Eb3lhsVkJq2qDSWfIjTXQ73szVmffRL3ztWH4uv5tD41M03kn1r X-Received: by 2002:a17:90b:3c49:b0:233:e1e6:33d4 with SMTP id pm9-20020a17090b3c4900b00233e1e633d4mr38544017pjb.47.1678792834514; Tue, 14 Mar 2023 04:20:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678792834; cv=none; d=google.com; s=arc-20160816; b=DVE6iP6g8vfdluye051APIMn6mXljXtZN6MNqwNUAV+R0jTY/0LXnUCnkJhZl8JLKr Fj4oxVs6V3G/uKWEnwk70T2862xX24W+01FBVUsXT0po0hIq/eHYacQT+f0xfrl3k5Tk ZVOBAK0vvenoJCG9i/rtC+NA55eyJSSPF8CO4KQQf+RFGJPIxOhzrcCdCV4uJ5FV3Tds r9CKRkSCTJUzUenhY629TAZYnivydfPlraLkmS7SmKXxc585feF970nzrNn9xCSRSjqB o+Yxk12jPzfiAErU/tRwXeFiPUkRVbLv9tfI7u8HnbOHoPCGJ+C+Z9E5uIYn1HytKQmg E+UQ== 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=srgVyfB12Y1R0rcVj1kyiHNfXA5ohsA2xC/3BIiYQ5zkexmuJ4pUSEQOBAE2PIjPls g5GSw9qlrRG+RZl/92SBFSSnthTge09iikcutLWDWT9InHVLOEjalVsICNTvuzqggN9+ y546vTxTjRNMn+BAISHEfxhlm7Qvi4lQhT2otdyp9n9NDafZzTZuHvQF5b1N2vhDzI2B 5e3tz0kV1573ZbUzBdUDoT9weztA8g0+bfOJNGDiMSttPlIn2/eIbDAnMBNBASC3Gv9D nP7QBxpe5h8xzjjL4qOJ8GB/gauvuUWt2LcDoZMNh4abeijkIVa4qYApK958elKSRyM5 gzSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=FBXLcVMz; 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 p20-20020a17090a931400b0023a30502979si2137855pjo.155.2023.03.14.04.20.21; Tue, 14 Mar 2023 04:20:34 -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=FBXLcVMz; 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 S230129AbjCNKvG (ORCPT + 99 others); Tue, 14 Mar 2023 06:51:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230242AbjCNKur (ORCPT ); Tue, 14 Mar 2023 06:50:47 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71F3F99C17; Tue, 14 Mar 2023 03:50:22 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id D5BAF5FD5D; Tue, 14 Mar 2023 13:50:10 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678791010; bh=PF6KHzan4mSy2kGESR6B1xvrFo2PxPLxBlkqc63AEv0=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=FBXLcVMzO5ObhSajVTiWCdadt8ErDm9Ksh+JuT51Ug7NgKKD5FrrDbyNeIV970kgP 0KWkDf4oYupOTyc2ELK916qVjsDSMZB+ONIFxZ3oFvN8ifEZLdmgPg50JHxmWRN5Rq IPiHvpIfq9LMrsZ2hfMmABMCr5rtM1Fn1G9ZF8VvN4yub79ybXGGvYbH8kxC0wM8MK 1EYIv3dZYO4TKV8ubyb/RnjMjfJjLg9IIEjW1inyYNsOUR/r6F0XYE32zvrYo3bLbC IG6OyPQ+gJAhn8aDhyZ5cmlRg10Aa/KU9z10mjaZ5wXY2Y1rwnJuy25j53BOgvmGiy H87vHwlttFnag== 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:50:10 +0300 (MSK) Message-ID: <95dae024-a3f0-32e6-97a8-afde6bea9740@sberdevices.ru> Date: Tue, 14 Mar 2023 13:47:01 +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 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?1760340795504619301?= X-GMAIL-MSGID: =?utf-8?q?1760341874804923318?= 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, + }, {}, };