From patchwork Wed May 31 11:04:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13261974 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 B7C48C77B7A for ; Wed, 31 May 2023 11:04:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 288A28E0006; Wed, 31 May 2023 07:04:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 238BA8E0001; Wed, 31 May 2023 07:04:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1024B8E0006; Wed, 31 May 2023 07:04:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0205F8E0001 for ; Wed, 31 May 2023 07:04:40 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C8DABADDD8 for ; Wed, 31 May 2023 11:04:39 +0000 (UTC) X-FDA: 80850267078.23.B4F636B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 23127180013 for ; Wed, 31 May 2023 11:04:37 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YfMSWwiw; spf=pass (imf16.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685531078; a=rsa-sha256; cv=none; b=EQTQqXffLa5oVRSE0x/spb0VdLk/iq+4mBTt8XYBluhx9/jnD3GpxPs460VkcvghfRY9D5 01wlGxneMBda4Cp6fTPQ6CQo/n02Z7WvHyZRif9Fzysz+obbtB5LVS2jx+9G0nCDYOc1f4 se+wNtT3gLsfO3GAGF1MSQROZZUVeT8= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YfMSWwiw; spf=pass (imf16.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=1685531078; 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=oo2uxP/MzmHd10a5KbN5Oq58DgcC9fhPDz9XsE6LWiI=; b=z/d5Iimw1aPnotdrrjA3S6YImJkXjy9T4cUzhp0rPmMfNTfzM2CeZbVwhYmiYKiyugL6SA yQaTFfBoEN9uynEk47sDQFqu2V4TT7NJbepJ/jqT0UXFyJAfX9p9ZS1vDYknwpFNN0s5OJ GD36nup44U0DGTdkT5rzlFLybeegjI4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685531077; 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=oo2uxP/MzmHd10a5KbN5Oq58DgcC9fhPDz9XsE6LWiI=; b=YfMSWwiwQxidFtx4JlBej38Xwjc4BZ+2VRpNT+rsxzEhgrUMNBZvgWCBVgt/ACt3iB0as8 Q7rITR1UvvbxPoMCHGwYbO7JmwHA39UlNidaFdszU6dsWnHHhgIFWEMW6x0LLTUwW1i4JP txpv2UBL/G0V3qIDdf6PyCFCPzAa01o= 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-210-5MnFPOU1Pei6bNTHzvR1rw-1; Wed, 31 May 2023 07:04:32 -0400 X-MC-Unique: 5MnFPOU1Pei6bNTHzvR1rw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 015F4185A78B; Wed, 31 May 2023 11:04:32 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48C7A112132D; Wed, 31 May 2023 11:04:29 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Tom Herbert , Tom Herbert , Cong Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Jens Axboe , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 1/2] kcm: Support MSG_SPLICE_PAGES Date: Wed, 31 May 2023 12:04:21 +0100 Message-ID: <20230531110423.643196-2-dhowells@redhat.com> In-Reply-To: <20230531110423.643196-1-dhowells@redhat.com> References: <20230531110423.643196-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 23127180013 X-Stat-Signature: gq3scne3h4qknoqtma755rix6cs5a8jr X-Rspam-User: X-HE-Tag: 1685531077-46262 X-HE-Meta: U2FsdGVkX18p5f/QVIo3tDvc7MahcfohL3hUy/PMOg6IABxJyKJS0g3QVWcKLkGzOq/xG8fAR0FS0MRk/zBLLuyHUTFm5/7oeRse9S892H3KSpU4+0stA2wHlF+djIbSorxV+gK1rQ6xWDFX1+gDqKdszAHLusft4S1lBWXzGAgYJDWLc6Uvn6UlmTidFETrJmWEQsRdItKxMOHCuT9HYQeAoyyqjeCsxp592X27ZcqOfmCWb0YOTeoNb/tNs6m0r09Qx7dv+6Ah+deEbgXVvCV7ynDiuUhXnFhTrZwl04qs1YBEYijNGl6cYNqRYMz63G+zDn/Majb3wEGh1r3It3UGDH9sEXEbiMs8G4dKtsc3AjgaYIEks03ZU3kV84X4p/rYLoYv14YAM9x9bL+9Dks1xXCmyKFre7mfnJmL1HHb+y618J6SwICR1wDIxrye0afr3Z3qb24wW0LM8AcX8u499rfBXEBPkdOsKRg+qt03fD59BkPRI7nMQMSlFwonQVZJqpUaozy4YLPvSHk+mEBikUGjL5mbJmIGJfc6W/rpw3cbyU8CbahU50615/UbGE14SFxf6d1qFwtMLqvKZYC6mTvoyeWWdVlbeSeZBiDzi8B+nw/51dWNcLuMjdrzRbE9vpi/ghKUkMQT372MqZqoL+dOv4/ASkAdzUCkM5qr4sA6UAwZOf985M88XY3GwXzNR/xpcLKIvNMVgvlpyC86dbJ5EMrvKzB0gkFGf+0F6+Th7ae7aVJlTQ38xF+JH0gNR9xB7uY2ANliw/UkXDZpt79/8fsvCh3aaFCsLQ7Y3nBRqTqSlu1YkY2untVrkxd8qQ9N33r2aePFLnVfZDchMGZAUrhnyqLOMs37/YqXVdp/ywVdUG9C+Rsd8xQ7AIlK19RcVXU80s/FhMX2HYk/L7gjpocrvBFe5fqoQEqX3Gyr5nMjhsmiBazk+nCxhy8q3Z+lfDzXPk5/q71 qlQmWWLi tvTmbgXRrddXQxUezt4RmY+KwzB6QDtK3HJLDTZvYwRFPABvtVqeGK1HpwvylMRERVobN+VLu0L/K8a6pLC1iBMOqbkGTG4tE4jEa/RqUAH1zZXp78b0AiROS8oJyEDOyWZtWr4jINk01o3EKmNOSRFiZB8kOkPcBNAMsH/9/Xmb3BDdO2xX5I3boAI+9XbwucatDpOrIGXJRi3EugW0h93vaZ0fsHgwSq+2mbaZcq5dTYAiFBqhJtaFWTbTe5YGFWUVkKey3+ZgYGRJSTcvs+N3QtNZBkpVFZrJk4o37V/UjgEkNhc8j0XmuRaOJ7u82BDct4GhISqkphqbGVQKw9J1NDw/c0OrCHE5RRMU5qytRaLbecBJNQy4mHbcBlMqI26oxmQGNpVyZEm0xaxCfY4a3GELkAFY3kLmWuFwamJsWmO4hv4QO1JFG35jDRRuvXHPgmdVU5NVJw3jXiZb/E07jIKvllXrMDk+mKy6WDTbRdY2or+rUPUdZuKVYjfJnW/A2pbZSkJdxXul3poosuC6aYVEqbdBjNugeMmqkRwc1aQNCOkgfzAUO9Wmnz1OqlOaNvCL1YfEHwj/RObeGUnbE8XYu7PrnQj8YtbHLAJqASqcgwLycdZLVJ19Imfe5hud4K9QXQfGeKQR3ev3yTGbOtKMCmSl4CCn0 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: Make AF_KCM sendmsg() support MSG_SPLICE_PAGES. This causes pages to be spliced from the source iterator if possible. This allows ->sendpage() to be replaced by something that can handle multiple multipage folios in a single transaction. Signed-off-by: David Howells cc: Tom Herbert cc: Tom Herbert cc: Cong Wang cc: Jakub Kicinski cc: Eric Dumazet cc: "David S. Miller" cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org --- Notes: ver #2) - Only account the amount actually copied. - Wrap at 80 chars. net/kcm/kcmsock.c | 57 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index cfe828bd7fc6..8555ede66333 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -989,29 +989,52 @@ static int kcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) merge = false; } - copy = min_t(int, msg_data_left(msg), - pfrag->size - pfrag->offset); + if (msg->msg_flags & MSG_SPLICE_PAGES) { + copy = msg_data_left(msg); + if (!sk_wmem_schedule(sk, copy)) + goto wait_for_memory; - if (!sk_wmem_schedule(sk, copy)) - goto wait_for_memory; + err = skb_splice_from_iter(skb, &msg->msg_iter, copy, + sk->sk_allocation); + if (err < 0) { + if (err == -EMSGSIZE) + goto wait_for_memory; + goto out_error; + } - err = skb_copy_to_page_nocache(sk, &msg->msg_iter, skb, - pfrag->page, - pfrag->offset, - copy); - if (err) - goto out_error; + copy = err; + skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG; + sk_wmem_queued_add(sk, copy); + sk_mem_charge(sk, copy); - /* Update the skb. */ - if (merge) { - skb_frag_size_add(&skb_shinfo(skb)->frags[i - 1], copy); + if (head != skb) + head->truesize += copy; } else { - skb_fill_page_desc(skb, i, pfrag->page, - pfrag->offset, copy); - get_page(pfrag->page); + copy = min_t(int, msg_data_left(msg), + pfrag->size - pfrag->offset); + if (!sk_wmem_schedule(sk, copy)) + goto wait_for_memory; + + err = skb_copy_to_page_nocache(sk, &msg->msg_iter, skb, + pfrag->page, + pfrag->offset, + copy); + if (err) + goto out_error; + + /* Update the skb. */ + if (merge) { + skb_frag_size_add( + &skb_shinfo(skb)->frags[i - 1], copy); + } else { + skb_fill_page_desc(skb, i, pfrag->page, + pfrag->offset, copy); + get_page(pfrag->page); + } + + pfrag->offset += copy; } - pfrag->offset += copy; copied += copy; if (head != skb) { head->len += copy;