From nobody Sun Apr 28 18:52:48 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07C2FC7619A for ; Sat, 25 Mar 2023 22:07:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231477AbjCYWHN (ORCPT ); Sat, 25 Mar 2023 18:07:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229488AbjCYWHL (ORCPT ); Sat, 25 Mar 2023 18:07:11 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A117DCA35; Sat, 25 Mar 2023 15:07:09 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 05C275FD02; Sun, 26 Mar 2023 01:07:08 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1679782028; bh=ezacvqrTrZ1zK6rRKTaH36dKk0Vzi7emuPTjIZNzoFM=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=DuQeudt3MAvpW1M2lRtTjKry7HZRz5L1nmTss8/klZTl9HhzkyuO8MJIqHCUvF534 wBKRj5Gyjdcip/UGSrCKIG5X3i5b1NtLYZ6g66rRbVqQpRBkd7qGx03fJEQRNigRqF xbAAZfiCZn3VXIbg7k3fWUtKBzMQZyIvuaBiEh3sZepGKodqxXGZmX101w1/VVPGUb +LrOE9n5lpmrQ60ag22A8GQdGdtlZleiYS88M/u9bgofqka7/FUx92Z+XXi/jEeMIG UlygVlZ3y+igvRmyD/RghDde9PCM4dKLOkSCSO5z1lR5q1CO6f+ZryM9elg2p9unW4 4sm+5AejDM/nQ== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Sun, 26 Mar 2023 01:07:07 +0300 (MSK) Message-ID: <7d3e4515-a520-1ac3-f768-303566868a77@sberdevices.ru> Date: Sun, 26 Mar 2023 01:03:52 +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: To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [PATCH net-next v5 1/2] virtio/vsock: allocate multiple skbuffs on tx Content-Transfer-Encoding: quoted-printable 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/25 18:14:00 #21009230 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds small optimization for tx path: instead of allocating single skbuff on every call to transport, allocate multiple skbuff's until credit space allows, thus trying to send as much as possible data without return to af_vsock.c. Signed-off-by: Arseniy Krasnov Reviewed-by: Stefano Garzarella --- net/vmw_vsock/virtio_transport_common.c | 57 +++++++++++++++++++------ 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio= _transport_common.c index 6564192e7f20..9e87c7d4d7cf 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -196,7 +196,8 @@ static int virtio_transport_send_pkt_info(struct vsock_= sock *vsk, const struct virtio_transport *t_ops; struct virtio_vsock_sock *vvs; u32 pkt_len =3D info->pkt_len; - struct sk_buff *skb; + u32 rest_len; + int ret; =20 info->type =3D virtio_transport_get_type(sk_vsock(vsk)); =20 @@ -216,10 +217,6 @@ static int virtio_transport_send_pkt_info(struct vsock= _sock *vsk, =20 vvs =3D vsk->trans; =20 - /* we can send less than pkt_len bytes */ - if (pkt_len > VIRTIO_VSOCK_MAX_PKT_BUF_SIZE) - pkt_len =3D VIRTIO_VSOCK_MAX_PKT_BUF_SIZE; - /* virtio_transport_get_credit might return less than pkt_len credit */ pkt_len =3D virtio_transport_get_credit(vvs, pkt_len); =20 @@ -227,17 +224,49 @@ static int virtio_transport_send_pkt_info(struct vsoc= k_sock *vsk, if (pkt_len =3D=3D 0 && info->op =3D=3D VIRTIO_VSOCK_OP_RW) return pkt_len; =20 - skb =3D virtio_transport_alloc_skb(info, pkt_len, - src_cid, src_port, - dst_cid, dst_port); - if (!skb) { - virtio_transport_put_credit(vvs, pkt_len); - return -ENOMEM; - } + rest_len =3D pkt_len; + + do { + struct sk_buff *skb; + size_t skb_len; + + skb_len =3D min_t(u32, VIRTIO_VSOCK_MAX_PKT_BUF_SIZE, rest_len); + + skb =3D virtio_transport_alloc_skb(info, skb_len, + src_cid, src_port, + dst_cid, dst_port); + if (!skb) { + ret =3D -ENOMEM; + break; + } =20 - virtio_transport_inc_tx_pkt(vvs, skb); + virtio_transport_inc_tx_pkt(vvs, skb); =20 - return t_ops->send_pkt(skb); + ret =3D t_ops->send_pkt(skb); + if (ret < 0) + break; + + /* Both virtio and vhost 'send_pkt()' returns 'skb_len', + * but for reliability use 'ret' instead of 'skb_len'. + * Also if partial send happens (e.g. 'ret' !=3D 'skb_len') + * somehow, we break this loop, but account such returned + * value in 'virtio_transport_put_credit()'. + */ + rest_len -=3D ret; + + if (WARN_ONCE(ret !=3D skb_len, + "'send_pkt()' returns %i, but %zu expected\n", + ret, skb_len)) + break; + } while (rest_len); + + virtio_transport_put_credit(vvs, rest_len); + + /* Return number of bytes, if any data has been sent. */ + if (rest_len !=3D pkt_len) + ret =3D pkt_len - rest_len; + + return ret; } =20 static bool virtio_transport_inc_rx_pkt(struct virtio_vsock_sock *vvs, --=20 2.25.1 From nobody Sun Apr 28 18:52:48 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91D31C7619A for ; Sat, 25 Mar 2023 22:08:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231706AbjCYWIL (ORCPT ); Sat, 25 Mar 2023 18:08:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229488AbjCYWII (ORCPT ); Sat, 25 Mar 2023 18:08:08 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 670122D41; Sat, 25 Mar 2023 15:08:07 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id C3AAE5FD02; Sun, 26 Mar 2023 01:08:05 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1679782085; bh=qj2eKpHg24lBwg8Ceng11FmHD2L6ZT5DPMiSeVXYd5I=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=Ycs9Ovje0B4OKkIJ/clxG6LEDH4VwyLuA93Gz+OTctkXltwnvYo2Q2uVRttVOm+9C HDugKuMhCSpaOUXlwcRksXnHep9dGd5bwA1JmgJUR884hfeiRYSNjTvjjEwtb8zDKE zMNlR5KdIgu0MLluBcpoBcO2jyPCyXxvzJoozSTVQGJ+d3/LBXPoM8eysq/Z59KDnf 4/KqvCV+XcFFnVsWW7GJv2GjgyUAA8o0DAjNdYe7hv9Xazgmy8zzou24aYJSyaI6Tc om1v483NxzYV56k53Fr6ISmAqYsNBXgTUdTL4X7m7JaLg/RRk4k0zViw5AtX7mzOYt Ipz8sBJjAduXg== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Sun, 26 Mar 2023 01:08:05 +0300 (MSK) Message-ID: <1ea0c407-814f-38a0-1fb7-4f146e5643ba@sberdevices.ru> Date: Sun, 26 Mar 2023 01:04:50 +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: To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [PATCH net-next v5 2/2] virtio/vsock: check argument to avoid no effect call Content-Transfer-Encoding: quoted-printable 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/25 18:14:00 #21009230 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Both of these functions have no effect when input argument is 0, so to avoid useless spinlock access, check argument before it. Signed-off-by: Arseniy Krasnov Reviewed-by: Stefano Garzarella --- net/vmw_vsock/virtio_transport_common.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio= _transport_common.c index 9e87c7d4d7cf..312658c176bd 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -302,6 +302,9 @@ u32 virtio_transport_get_credit(struct virtio_vsock_soc= k *vvs, u32 credit) { u32 ret; =20 + if (!credit) + return 0; + spin_lock_bh(&vvs->tx_lock); ret =3D vvs->peer_buf_alloc - (vvs->tx_cnt - vvs->peer_fwd_cnt); if (ret > credit) @@ -315,6 +318,9 @@ EXPORT_SYMBOL_GPL(virtio_transport_get_credit); =20 void virtio_transport_put_credit(struct virtio_vsock_sock *vvs, u32 credit) { + if (!credit) + return; + spin_lock_bh(&vvs->tx_lock); vvs->tx_cnt -=3D credit; spin_unlock_bh(&vvs->tx_lock); --=20 2.25.1