From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 933DAC7EE37 for ; Fri, 9 Jun 2023 10:02:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 130FC8E000A; Fri, 9 Jun 2023 06:02:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DE9D8E0001; Fri, 9 Jun 2023 06:02:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9AAA8E000A; Fri, 9 Jun 2023 06:02:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D94118E0001 for ; Fri, 9 Jun 2023 06:02:50 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id AB370C01BB for ; Fri, 9 Jun 2023 10:02:50 +0000 (UTC) X-FDA: 80882770500.21.AAA64EF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 4A56A14001A for ; Fri, 9 Jun 2023 10:02:47 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S3bHhqFA; spf=pass (imf26.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686304967; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3LFa2xxbJsqyZ30qpsSqRMBPDTmtcps3tB0X7zJ4/t0=; b=eL01VyvuLvArmYY0HlKCeh93kP7omZBZXk/0R9MIwqcG97VFupgh/8QxYhxmmpt3RsG8tj ail08c2ZtdERev+jd+N0A5uZYbLOiS+xbFArRCn5iPMTQFUrI5DCVdHSW0qKUg3n6iSzT/ bfVtz15RIFJISI2HcJwX61rfKdsuurE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686304967; a=rsa-sha256; cv=none; b=uZBHfqmHu+YzpGa122LFVE0iY+t/idFUgjcP5QNSDBBNCp/lsf1j8KoppOZa/Go4IGwRHv 5n3xWry7nMkJDmRDNghAShW2ZCUnUt0C7hiSMvskGCjAxTtJEw2jKQFhwLuE+9lsGxhXmx M7yGznR8+gnTvp7FzI/8iOqRYZancq8= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S3bHhqFA; spf=pass (imf26.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686304966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3LFa2xxbJsqyZ30qpsSqRMBPDTmtcps3tB0X7zJ4/t0=; b=S3bHhqFAh+MbFZcWjQgpZeYknxxAGJEZUW6ArviscDoNFGwo3sanoDTJoWzPpFgsH2+lpY XXfs0OHnCcci6YuOIVdWSdtNPzn1k0YVCrlkjsnYd57mh562x3LXp0CcgIMyL5gQ1IHydm En9ix9K9Jz1vA+rSbQJQpNWbGj/+1LU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-104-0rQ0XTexPKWqfrAzgZR2CA-1; Fri, 09 Jun 2023 06:02:45 -0400 X-MC-Unique: 0rQ0XTexPKWqfrAzgZR2CA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7C0C485A5BE; Fri, 9 Jun 2023 10:02:44 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 22EF3145B965; Fri, 9 Jun 2023 10:02:42 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Jens Axboe , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tom Herbert , Tom Herbert Subject: [PATCH net-next 6/6] kcm: Send multiple frags in one sendmsg() Date: Fri, 9 Jun 2023 11:02:21 +0100 Message-ID: <20230609100221.2620633-7-dhowells@redhat.com> In-Reply-To: <20230609100221.2620633-1-dhowells@redhat.com> References: <20230609100221.2620633-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Rspamd-Queue-Id: 4A56A14001A X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: or867xxgkk9746kcqg5ax1pui3gqbiug X-HE-Tag: 1686304967-552354 X-HE-Meta: U2FsdGVkX19oLikfyDjCaB2OOEop9bouaGF9aqNdVf8TZPRV11psbYgdKzWsfffx2IA1Ahe8es0XWSD3NU+ECP+y4rotYHA9QvELiyW3eA3gCFUgRGmQPY1a1J980FxQXRxntt+TtmoDc3hav6P0RO7pMz70F7rY7kTUbNhntseS+Mw7DQAQ6NeylMDvi/7OLzx414XdisScmIgf9xSEEvnc12d/YqF+XX9kAtWaulWpw23ytTt0t7l4KLkeenNV/+HOmvNR4Y6rQD8NVfbIIIV0ZUuLFGqSgedoJObJRrGdO1uYcw+Dbomp1azO9TE0KRY2BaOJOw7FliSdBgemwJDux1Vwa9WbiSeBuZ5NNlTjQkaWM1k0ioRrb9rWLBniw3Tha4y1y2LUzoHHkK3oPT47DbucUBAIob9JrycHW52W2jvR46E5t7ZuejwbPcF5Rceiw6bvebyILjudflIRetJcmjVfsX3kb0OHMf7v47Hjl6bzirjIQU79t4fjmuxiMjc4RbLNHl2QFtypr5OBBARdAYcA8KTglF0aXGstlanljE48hX7ZxWurvQaLTI1hL9iW6BYM1x/7PS4z6kCE2W8BbHu1NfjI/8eMwVXLp0T3CNOFS1pyjYvtcM6eigk0MKn+5WM3DSe/XDNOzVw0blSriA4eYOuG1ytE/K1mX94wFMXnjfnBafHIYLT68jcdFVFSaBO71YoCBuzOh+zUqx9DagBCoyV6BT6WRXoRwpS3/utmEijBq3nznm9cuSTpcCKdljVICrLDoSEHBPuTPAwb5VmQENJiGAtY5G16teTPn7+zpvwkrX2/ZN6OoAj9dd98EsqV027zkf3AHfI4qhtNDZmiS72GeYPTbQ4zkSeiTw8YTuAdp//FFicoBNTkCC6zihHzxzC+vN9/WRytfak1yDgao4HuV+EE2/5Bd1aBFQWTiRy9g+89AkNGFBZMnpY1zbZSW42orOlEp8G tXmKCObD FwAB8wFsP5pXPhOhQg49BOeITqpNDK65zx8oG5BXb+g7avkF26HEGhuT2OQSwQzDWS6SibhCRaKkU3C5/VO9TF1Iosmp+F8IVI9PdOn+F7qYGYDrWoMrjeXKtBBi8e1fUi5oWGZmj/q/oVr0IxlpQNKKSxpIDmfrGpDsJy7H8nUguTP4FMJbcTT2/L7+aKKY3Cxx0gNxTE8prWFRTPrQ7Zc2jVachoh+2EQp6sEuxtwyCbHoo8SeeuTwywD6k6X3HuGo1GBNHl+TASPDvHgcZtmywQSxZPJNMJ2boD/0BPz39mQdyE65B6ZYApgCijK4EBgX8e3P2TBrIdQunS4KQBEahr5SrHjCsCatVkpO/tw1JOrgRZXcRT9A0HtJXHYvVRbFZ8Ca+a3IHlR3Xl/vGQhlSjFx8KkQlYiaFXvSy9uH3rJH4I/YLZ1H7KRUAAZTs63U/NbX+etLDerSjErxn6aJvLsTc8bLOEs7HpGdpSlcS0rQpvSsYT0n390B4LoSNHdL0vBaF5iX8d+6rgzdPz6OdVOJErR07qKTxRvs7b2tCOwxy7d7IgQE0IA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Rewrite the AF_KCM transmission loop to send all the fragments in a single skb or frag_list-skb in one sendmsg() with MSG_SPLICE_PAGES set. The list of fragments in each skb is conveniently a bio_vec[] that can just be attached to a BVEC iter. Note: I'm working out the size of each fragment-skb by adding up bv_len for all the bio_vecs in skb->frags[] - but surely this information is recorded somewhere? For the skbs in head->frag_list, this is equal to skb->data_len, but not for the head. head->data_len includes all the tail frags too. Signed-off-by: David Howells cc: Tom Herbert cc: Tom Herbert cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org --- include/net/kcm.h | 2 +- net/kcm/kcmsock.c | 126 ++++++++++++++++++---------------------------- 2 files changed, 51 insertions(+), 77 deletions(-) diff --git a/include/net/kcm.h b/include/net/kcm.h index 2d704f8f4905..90279e5e09a5 100644 --- a/include/net/kcm.h +++ b/include/net/kcm.h @@ -47,9 +47,9 @@ struct kcm_stats { struct kcm_tx_msg { unsigned int sent; - unsigned int fragidx; unsigned int frag_offset; unsigned int msg_flags; + bool started_tx; struct sk_buff *frag_skb; struct sk_buff *last_skb; }; diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 3bcac1453f10..d75d775e9462 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -581,12 +581,10 @@ static void kcm_report_tx_retry(struct kcm_sock *kcm) */ static int kcm_write_msgs(struct kcm_sock *kcm) { + unsigned int total_sent = 0; struct sock *sk = &kcm->sk; struct kcm_psock *psock; - struct sk_buff *skb, *head; - struct kcm_tx_msg *txm; - unsigned short fragidx, frag_offset; - unsigned int sent, total_sent = 0; + struct sk_buff *head; int ret = 0; kcm->tx_wait_more = false; @@ -600,78 +598,57 @@ static int kcm_write_msgs(struct kcm_sock *kcm) if (skb_queue_empty(&sk->sk_write_queue)) return 0; - kcm_tx_msg(skb_peek(&sk->sk_write_queue))->sent = 0; - - } else if (skb_queue_empty(&sk->sk_write_queue)) { - return 0; + kcm_tx_msg(skb_peek(&sk->sk_write_queue))->started_tx = false; } - head = skb_peek(&sk->sk_write_queue); - txm = kcm_tx_msg(head); - - if (txm->sent) { - /* Send of first skbuff in queue already in progress */ - if (WARN_ON(!psock)) { - ret = -EINVAL; - goto out; +retry: + while ((head = skb_peek(&sk->sk_write_queue))) { + struct msghdr msg = { + .msg_flags = MSG_DONTWAIT | MSG_SPLICE_PAGES, + }; + struct kcm_tx_msg *txm = kcm_tx_msg(head); + struct sk_buff *skb; + unsigned int msize; + int i; + + if (!txm->started_tx) { + psock = reserve_psock(kcm); + if (!psock) + goto out; + skb = head; + txm->frag_offset = 0; + txm->sent = 0; + txm->started_tx = true; + } else { + if (WARN_ON(!psock)) { + ret = -EINVAL; + goto out; + } + skb = txm->frag_skb; } - sent = txm->sent; - frag_offset = txm->frag_offset; - fragidx = txm->fragidx; - skb = txm->frag_skb; - - goto do_frag; - } - -try_again: - psock = reserve_psock(kcm); - if (!psock) - goto out; - - do { - skb = head; - txm = kcm_tx_msg(head); - sent = 0; -do_frag_list: if (WARN_ON(!skb_shinfo(skb)->nr_frags)) { ret = -EINVAL; goto out; } - for (fragidx = 0; fragidx < skb_shinfo(skb)->nr_frags; - fragidx++) { - struct bio_vec bvec; - struct msghdr msg = { - .msg_flags = MSG_DONTWAIT | MSG_SPLICE_PAGES, - }; - skb_frag_t *frag; - - frag_offset = 0; -do_frag: - frag = &skb_shinfo(skb)->frags[fragidx]; - if (WARN_ON(!skb_frag_size(frag))) { - ret = -EINVAL; - goto out; - } + msize = 0; + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) + msize += skb_shinfo(skb)->frags[i].bv_len; + + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, + skb_shinfo(skb)->frags, skb_shinfo(skb)->nr_frags, + msize); + iov_iter_advance(&msg.msg_iter, txm->frag_offset); - bvec_set_page(&bvec, - skb_frag_page(frag), - skb_frag_size(frag) - frag_offset, - skb_frag_off(frag) + frag_offset); - iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, - bvec.bv_len); + do { ret = sock_sendmsg(psock->sk->sk_socket, &msg); if (ret <= 0) { if (ret == -EAGAIN) { /* Save state to try again when there's * write space on the socket */ - txm->sent = sent; - txm->frag_offset = frag_offset; - txm->fragidx = fragidx; txm->frag_skb = skb; - ret = 0; goto out; } @@ -685,39 +662,36 @@ static int kcm_write_msgs(struct kcm_sock *kcm) true); unreserve_psock(kcm); - txm->sent = 0; + txm->started_tx = false; kcm_report_tx_retry(kcm); ret = 0; - - goto try_again; + goto retry; } - sent += ret; - frag_offset += ret; + txm->sent += ret; + txm->frag_offset += ret; KCM_STATS_ADD(psock->stats.tx_bytes, ret); - if (frag_offset < skb_frag_size(frag)) { - /* Not finished with this frag */ - goto do_frag; - } - } + } while (msg.msg_iter.count > 0); if (skb == head) { if (skb_has_frag_list(skb)) { - skb = skb_shinfo(skb)->frag_list; - goto do_frag_list; + txm->frag_skb = skb_shinfo(skb)->frag_list; + txm->frag_offset = 0; + continue; } } else if (skb->next) { - skb = skb->next; - goto do_frag_list; + txm->frag_skb = skb->next; + txm->frag_offset = 0; + continue; } /* Successfully sent the whole packet, account for it. */ + sk->sk_wmem_queued -= txm->sent; + total_sent += txm->sent; skb_dequeue(&sk->sk_write_queue); kfree_skb(head); - sk->sk_wmem_queued -= sent; - total_sent += sent; KCM_STATS_INCR(psock->stats.tx_msgs); - } while ((head = skb_peek(&sk->sk_write_queue))); + } out: if (!head) { /* Done with all queued messages. */