From patchwork Sun Mar 19 18:46:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 71843 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp842747wrt; Sun, 19 Mar 2023 12:19:27 -0700 (PDT) X-Google-Smtp-Source: AK7set/hqf7Y8etqzUgEOCsxucF89SGDMPtzHWazTU9eDjbL7otlSshiYgJ5uSpVmEwrUH3y3K5r X-Received: by 2002:a05:6a20:4a29:b0:d9:a544:e4a1 with SMTP id fr41-20020a056a204a2900b000d9a544e4a1mr670558pzb.9.1679253566987; Sun, 19 Mar 2023 12:19:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679253566; cv=none; d=google.com; s=arc-20160816; b=uc5uakXMjF+SSyF0WxXMSY80qGXxpN24s66b1aL+TssEuGqewR9ZRy5Ae61WcT9KRR 0hMk8IZvK1roADB2RMBV1zeCBq4kfTPFLozXBtz5kJbaotdkphMEP70vj4SR36ZI1Txo dGqssx7m1IviP9FtJeVqurMQ21DRBZSD5voR5BkIS4mzc2jgzw1dg594/ZgrnFfcY1lT p+p7Mu5l5zS2R9HJx8vMO0nn7pWtwICqU5RlUvLEeJHMSw4Z2FxavAfq8gePbKRSTkLa DMzk3hjb5fhl7nOqwAjYnBTdc22xrmL8N5od/ERFnMKFAANEmPZhWx7V1vKwpGw9QLzo Rv/A== 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 :content-language:user-agent:mime-version:date:message-id :dkim-signature; bh=g3ARJtrmBWONb2FJm1F1Bs7nZK9URSKi6RexbFHQdI8=; b=xMlijj1tbF4lzw2xoxDNHc9xOo/ob/aJYoTlN74pXKz6lDKFzj5xa3uugAcD6bfAKU ofjyRODwzxzL4fU/+17Uhu25IEaBZ9x9jfrCSG4IEwquxNWS6yChUWoWdTxrv21kmWmW rEndy+qdJxM94ttDT3cLHbV/u4DodIIZWoOQE09D9C9m2MayIFj/dNghOOWKGSyColmb vnxgWB95SjkwaLEMDfI+65/s3oBX+HViEgZeHjWstOmUYrcEY3AZvdToOSqRB9QIgVNr koZBqicyh5smjR33EgHg2qM/OLD/E+3WNUZV/i1x0STAs1tT/iELGPPMGoYDU5T3rDWG GKYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Ik48EtjB; 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 b9-20020a63d809000000b0050aac96e55fsi8606319pgh.6.2023.03.19.12.19.14; Sun, 19 Mar 2023 12:19:26 -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=Ik48EtjB; 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 S229866AbjCSStq (ORCPT + 99 others); Sun, 19 Mar 2023 14:49:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229639AbjCSSto (ORCPT ); Sun, 19 Mar 2023 14:49:44 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF4D81025B; Sun, 19 Mar 2023 11:49:40 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id D3C565FD08; Sun, 19 Mar 2023 21:49:38 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1679251778; bh=g3ARJtrmBWONb2FJm1F1Bs7nZK9URSKi6RexbFHQdI8=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=Ik48EtjBkcg/ushrwSQlDs35ZT64ySBHD1qFJogAnXLRbNkt8ZTFNmq/tmNSY22UY tsRMVC8PcJrOEC8ziTYXnc6SmeMth1qow7KbJryBm84cbuVlNKU9wspv4iVYxHEqVP oFnZyg1Jx8KN2eC0ClfU0JxwAAj2QcHsOUTWYRnwaVD8F6Qq54OXYsmJRo7MoYHUuK hLy+4nVX46Y+zkFMXIpT74r2MbzYrou8KFgHhEhejHedKbKSCFWWAq0ixtS+4MkYGj ghroOtH4yhQP6bTL5i0IPqx5L/c0uzXWnIFd5aeWrwiWCVIvh4IxWrohlWKflQ0cdb iutxGl2RrzgRg== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Sun, 19 Mar 2023 21:49:34 +0300 (MSK) Message-ID: Date: Sun, 19 Mar 2023 21:46:10 +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 To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [RFC PATCH v2] virtio/vsock: allocate multiple skbuffs on tx 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/19 16:43:00 #20974059 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?1760824987983945451?= X-GMAIL-MSGID: =?utf-8?q?1760824987983945451?= 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 --- Link to v1: https://lore.kernel.org/netdev/2c52aa26-8181-d37a-bccd-a86bd3cbc6e1@sberdevices.ru/ Changelog: v1 -> v2: - If sent something, return number of bytes sent (even in case of error). Return error only if failed to sent first skbuff. net/vmw_vsock/virtio_transport_common.c | 53 ++++++++++++++++++------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 6564192e7f20..3fdf1433ec28 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 = info->pkt_len; - struct sk_buff *skb; + u32 rest_len; + int ret; info->type = virtio_transport_get_type(sk_vsock(vsk)); @@ -216,10 +217,6 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk, vvs = vsk->trans; - /* we can send less than pkt_len bytes */ - if (pkt_len > VIRTIO_VSOCK_MAX_PKT_BUF_SIZE) - pkt_len = VIRTIO_VSOCK_MAX_PKT_BUF_SIZE; - /* virtio_transport_get_credit might return less than pkt_len credit */ pkt_len = virtio_transport_get_credit(vvs, pkt_len); @@ -227,17 +224,45 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk, if (pkt_len == 0 && info->op == VIRTIO_VSOCK_OP_RW) return pkt_len; - skb = 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; - } + ret = 0; + rest_len = pkt_len; + + do { + struct sk_buff *skb; + size_t skb_len; + + skb_len = min_t(u32, VIRTIO_VSOCK_MAX_PKT_BUF_SIZE, rest_len); + + skb = virtio_transport_alloc_skb(info, skb_len, + src_cid, src_port, + dst_cid, dst_port); + if (!skb) { + ret = -ENOMEM; + break; + } + + virtio_transport_inc_tx_pkt(vvs, skb); + + ret = t_ops->send_pkt(skb); + + if (ret < 0) + break; - virtio_transport_inc_tx_pkt(vvs, skb); + rest_len -= skb_len; + } while (rest_len); - return t_ops->send_pkt(skb); + /* Don't call this function with zero as argument: + * it tries to acquire spinlock and such argument + * makes this call useless. + */ + if (rest_len) + virtio_transport_put_credit(vvs, rest_len); + + /* Return number of bytes, if any data has been sent. */ + if (rest_len != pkt_len) + ret = pkt_len - rest_len; + + return ret; } static bool virtio_transport_inc_rx_pkt(struct virtio_vsock_sock *vvs,