Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp1021858rwd; Wed, 7 Jun 2023 09:53:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4NkTVIXMtGVWS2j1/b0K55OqEYF5d0UOcHdvcPge9YducK6Xui8hYv/uArYUmNJh8QURIn X-Received: by 2002:a92:c802:0:b0:334:7796:f90c with SMTP id v2-20020a92c802000000b003347796f90cmr5884899iln.18.1686156802774; Wed, 07 Jun 2023 09:53:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686156802; cv=none; d=google.com; s=arc-20160816; b=Dxn1Pns8mCk3AwKP1wVmT0Dq039l2G4RfTnGzW4KjEjz1yAe/ypLQly98oKTKegdkt H8mS5oit7NKJJFwKMRLAsX+qfPsCL0UweO4qhwgzIAkx4lgzavnc8mPtDNCN69SxnmMI k04hq8/Y3Lzt/TS1cI6ZiiSmP6sbcvCsslv9wMv338Lj0aYc7hxz3CXVWp9K/NwpWdk6 1nz9qL0lwAQteXw9ixSXubqzxG7MpxoFovROJAghJXuR4x7ngURZNs5DIAIMcLa4XZoO KesamQTbimaZLZ+zrK8Z/uENG8TTpJUQWc5y8sGjsq1vx4Xh7GGhXu0c9sZDwaHeeLRJ paXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/RO1yxPz5vv1zCyaq/Wi9xLZBTYHqYC8FIFy+4PrNrg=; b=e47eY4mJ0PsYgoUg/CJ5kXzHzeuy0wEG0TvBQnRMv5jZuI4tANVfm7jV3L+wnN7AAt 9s+/aAh+ImnOPfLGyBzDVieFXkbsQQEQzYj8IuETPjkRBmzPQPYl8NKjYqKHe3q6HaXm 3TaP+9ynd3AZRC2BdbxmfRVAU/tHXsmnuTUwD8J2JL1PP9vthc5s3Bh1YR2SSQyKdabR oiCybCY4EVZL8SxfTpf8HcSiUwNtn0vmkC1nS4GU+0qQVXBFnyr2nlYYd69mRj/A1v/B BWzZLJwMUKyeW92pW7jO92wVmtiZLOcsN7+CKlFRtTKdOH0s9NcvjgW7ZrFisco1pnA9 qNpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="iqHNRc/7"; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d18-20020a170902aa9200b001ab1ba2572csi8915867plr.240.2023.06.07.09.53.10; Wed, 07 Jun 2023 09:53:22 -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=@redhat.com header.s=mimecast20190719 header.b="iqHNRc/7"; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229792AbjFGQ0d (ORCPT + 99 others); Wed, 7 Jun 2023 12:26:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbjFGQ0b (ORCPT ); Wed, 7 Jun 2023 12:26:31 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 674651FE2 for ; Wed, 7 Jun 2023 09:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686155145; 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=/RO1yxPz5vv1zCyaq/Wi9xLZBTYHqYC8FIFy+4PrNrg=; b=iqHNRc/7qP3ILklr1GJ7pBJ6zvBL84zY520XKc5k928NP63aIno5CaZ6UG4IDfkXHJSg9M 3WOXesCVguQBtNQZsr9kMDAjAHZfQ8PWFsT7o9uCyn5aO4mFGb/wgG8seyn+1aq9J4/FA9 uDl9P00qXAKrOJ9FmBjx3R7FHAVeq28= 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-646-2UqzVZS9PQ2uhUjL3YSU2g-1; Wed, 07 Jun 2023 10:06:59 -0400 X-MC-Unique: 2UqzVZS9PQ2uhUjL3YSU2g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C3ABF811E7C; Wed, 7 Jun 2023 14:06:58 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C5992166B25; Wed, 7 Jun 2023 14:06:55 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org, Linus Torvalds Cc: David Howells , Chuck Lever , Boris Pismenny , John Fastabend , 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 Subject: [PATCH net-next v5 13/14] tls/device: Support MSG_SPLICE_PAGES Date: Wed, 7 Jun 2023 15:05:58 +0100 Message-ID: <20230607140559.2263470-14-dhowells@redhat.com> In-Reply-To: <20230607140559.2263470-1-dhowells@redhat.com> References: <20230607140559.2263470-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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 Make TLS's device 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: Chuck Lever cc: Boris Pismenny cc: John Fastabend cc: Jakub Kicinski cc: Eric Dumazet cc: "David S. Miller" cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org --- net/tls/tls_device.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index 439be833dcf9..bb3bb523544e 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -509,6 +509,29 @@ static int tls_push_data(struct sock *sk, tls_append_frag(record, &zc_pfrag, copy); iter_offset.offset += copy; + } else if (copy && (flags & MSG_SPLICE_PAGES)) { + struct page_frag zc_pfrag; + struct page **pages = &zc_pfrag.page; + size_t off; + + rc = iov_iter_extract_pages(iter_offset.msg_iter, + &pages, copy, 1, 0, &off); + if (rc <= 0) { + if (rc == 0) + rc = -EIO; + goto handle_error; + } + copy = rc; + + if (WARN_ON_ONCE(!sendpage_ok(zc_pfrag.page))) { + iov_iter_revert(iter_offset.msg_iter, copy); + rc = -EIO; + goto handle_error; + } + + zc_pfrag.offset = off; + zc_pfrag.size = copy; + tls_append_frag(record, &zc_pfrag, copy); } else if (copy) { copy = min_t(size_t, copy, pfrag->size - pfrag->offset); @@ -572,6 +595,9 @@ int tls_device_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) union tls_iter_offset iter; int rc; + if (!tls_ctx->zerocopy_sendfile) + msg->msg_flags &= ~MSG_SPLICE_PAGES; + mutex_lock(&tls_ctx->tx_lock); lock_sock(sk);