From patchwork Wed Mar 22 18:35:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 73616 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2504088wrt; Wed, 22 Mar 2023 11:44:16 -0700 (PDT) X-Google-Smtp-Source: AK7set+yUoPAvxovBWvue1Gd5W3Q0S6vgJdPArxbDiDnAJ0JxIwgJqK5xXeNvLGQYqhobumFnUIw X-Received: by 2002:a17:903:1109:b0:1a1:d5fd:1e71 with SMTP id n9-20020a170903110900b001a1d5fd1e71mr4487331plh.20.1679510656719; Wed, 22 Mar 2023 11:44:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679510656; cv=none; d=google.com; s=arc-20160816; b=fywb7GWkNlXMCvivJ9owhjBYYEO5BM7dunnw98uJDfopYCdowtINpXQago6PR+bWbq 54h4IbU5Ak9QWF8gOpGaSsNVj0NJJyko6VubyAkGwjT3ycWX4coVw4bwGF8qwh6Ak6gH jLdKuEPG/KQD0fySrik+mKKTU54TNUvkSpNYM0CYPyp/LhogHUy171Zc7GHGfAq6B2S+ 7cqnoFFVX6MPZf8b23mD/ok+R12b2RkEO19PpXElY63KQMtOKkK00XDmm5H7cCZ5ITFH 8uO5xn3m5poxPIl1wF8sQKjNbUp5YhHFutl/U91aFm5Jre1HKxHTG2048TKcLSZpzTBQ tetw== 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=ezacvqrTrZ1zK6rRKTaH36dKk0Vzi7emuPTjIZNzoFM=; b=aCTdcbTA6tsu0lkvG80cWg3DKf879RqFOSsPR9MHAKLScYqz5DbKaLp5r/ix0RxaN2 gZLMyDee6qpHCcfn2ZwtQqfOySj7CjnbwP206TCam+M46aWjLt6qaPpEtxnKreuMzCjU gYtqbYKj2PjHgqhTkfOCvAoFaLUxhxfi1yFNc28QafGfsdmqEB0bNGeBmdozleWARxk/ K8BIicyFhkwo9c42eoN3BL+SnDgHqLvWvv58Km83lMHhjmBRtfrwLgu3kGHtysZKuXod P5qpMsc1XSLbpkln/SvkvOtQPp8Ky1LHFdDddacPbhEwL6pVplN9pOtNDDLcLAFY9Bfm YX+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=WMn0apBN; 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 o3-20020a634103000000b004fbc54ad3b6si16618455pga.470.2023.03.22.11.44.02; Wed, 22 Mar 2023 11:44:16 -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=WMn0apBN; 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 S229823AbjCVSik (ORCPT + 99 others); Wed, 22 Mar 2023 14:38:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230120AbjCVSii (ORCPT ); Wed, 22 Mar 2023 14:38:38 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B015149F1; Wed, 22 Mar 2023 11:38:33 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 1CEC65FD3E; Wed, 22 Mar 2023 21:38:32 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1679510312; bh=ezacvqrTrZ1zK6rRKTaH36dKk0Vzi7emuPTjIZNzoFM=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=WMn0apBNntddj5QS3cJ74Eik7NqqXMh/xKx2hSY77V36ykEshr81eUwq3FP7zD//f bUM7jol15D7eUNYWXDHSBhNLg6M7Dbi0Lnftgs6aExqnKfIlJIcjp6YbqcgAJXOCr0 8tGJdrcXjBqwoDWaUQ5ANgMbvW/6LK7a+D2ePLbu9YSEEVpJaLZAojj2KxIwoLvPLf yHgJHyz3XgZ+DulyGMQIF93WikIocu7ooAAMugVJbQMFMKDB18jWggWWWGE4vjfVvo euk7c9A4NVG0pyaFDMLp4RmqdztSLUg81D4m7WOfTO2rXO5spBL3vhx2c1EH8Atgkj xt11pQFK4jADA== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Wed, 22 Mar 2023 21:38:32 +0300 (MSK) Message-ID: <0b841161-1fd2-584e-4920-40644b4b4a7e@sberdevices.ru> Date: Wed, 22 Mar 2023 21:35:22 +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: [RFC PATCH v5 1/2] virtio/vsock: allocate multiple skbuffs on tx 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/22 14:20:00 #20991698 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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?1761094566238606054?= X-GMAIL-MSGID: =?utf-8?q?1761094566238606054?= 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 = 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,49 @@ 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; - } + 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); + virtio_transport_inc_tx_pkt(vvs, skb); - return t_ops->send_pkt(skb); + ret = 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' != 'skb_len') + * somehow, we break this loop, but account such returned + * value in 'virtio_transport_put_credit()'. + */ + rest_len -= ret; + + if (WARN_ONCE(ret != 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 != pkt_len) + ret = pkt_len - rest_len; + + return ret; } static bool virtio_transport_inc_rx_pkt(struct virtio_vsock_sock *vvs,