Message ID | 20230331160914.1608208-28-dhowells@redhat.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp692391vqo; Fri, 31 Mar 2023 09:36:29 -0700 (PDT) X-Google-Smtp-Source: AKy350b0tceowbC0PgoNB+qo0Xzknz36iw9Cwh2cCr6uWF9TzxgaV9PmcjI8JboUvpVe52rSjD6+ X-Received: by 2002:a05:6402:cc:b0:500:5627:a20b with SMTP id i12-20020a05640200cc00b005005627a20bmr25554994edu.1.1680280589124; Fri, 31 Mar 2023 09:36:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680280589; cv=none; d=google.com; s=arc-20160816; b=gBpaXZtycsBi3iwX2C8BEJ+ADcgxczv6WRR2vGw5GRKOydmntm2iId0vPXtTuMovPZ zCoet3ot9M83HwWna3nUc1bEmzSJQjLieP3w5XSopmj4CAoGkmgYiNw0xOAPDnUjYGOu 2WAyZCUGiRNGBL1y4NmenUHs7g9L+hOG7Ifzs1bKY5KcTk50i3gh7nV4/jrxcwrJHjk/ mELqP2pxGMPHR6B+LA8DqOw/JPVd8Q4Hp+JCpjYpYMeAObFax2de3epgulGmnJlzdF+s yOZLzdEtSu4waM92O+Tiqj3TYjhep8HyYFb90Fc/79fgS7qgrNVUJ4bTpy0yYWUmI6Cp AX8Q== 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=zbMUDKrdVAVwS+N9r9mW+fACtMcx+N9uUpcmjLnA2dk=; b=wK6oHDgjl9AUnbzPHqAA6wj0RZkPoTLmtvkLkz0iYDm5FPMyuDdznh1nhHWzWWqtaq oXNLG6KwGRja6gAXAtnHEhp+zsubES8wj61VukV/SFbSFMMX1S9Be4rz4av0Ckk/TkcQ 5GsQ2C+oqzlgFfimDT3Gy/eu25wqWu6xoqNhRmfM+GuY8hl1uT/xWZPKiG6vHhCbrDkw PFoNnaE8p75Y1PMoBv7YEnvMvc4l07Vfe7OH8F29RzcfxFQATECVJs3zrNKCxgX6zy8W ISB7u1PnA8mFPPfwKUZDbOPd54F7zPep1mtV9jKxgpswORtoOcOPEdzvmhVc/InAbYeN ynWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="b/WdsDLY"; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h5-20020a50ed85000000b004fe1b624748si80008edr.354.2023.03.31.09.36.03; Fri, 31 Mar 2023 09:36:29 -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="b/WdsDLY"; 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 S233092AbjCaQPY (ORCPT <rfc822;dexuan.linux@gmail.com> + 99 others); Fri, 31 Mar 2023 12:15:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232891AbjCaQNt (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 31 Mar 2023 12:13:49 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 207BE24AD1 for <linux-kernel@vger.kernel.org>; Fri, 31 Mar 2023 09:10:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680279042; 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=zbMUDKrdVAVwS+N9r9mW+fACtMcx+N9uUpcmjLnA2dk=; b=b/WdsDLYORxq24qusI2xnKsKvbS+E3NWC6906+g01CJuco0LJowsRZQwzXmK7A2HwlnYvn eSL94QCWzav4oT1XC3dSP0+4GrmZYIx6bfvnH9lUpLZ7lNocm/Xcef/HTV9gId24cRBbrp kev/sxTiVZe0U0UTXmxchBD39bNwa+E= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-398-2LwuMPeSO5ywsd8zwlaphQ-1; Fri, 31 Mar 2023 12:10:38 -0400 X-MC-Unique: 2LwuMPeSO5ywsd8zwlaphQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 48CE73802B94; Fri, 31 Mar 2023 16:10:36 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35BAC492C3E; Fri, 31 Mar 2023 16:10:34 +0000 (UTC) From: David Howells <dhowells@redhat.com> To: Matthew Wilcox <willy@infradead.org>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com> Cc: David Howells <dhowells@redhat.com>, Al Viro <viro@zeniv.linux.org.uk>, Christoph Hellwig <hch@infradead.org>, Jens Axboe <axboe@kernel.dk>, Jeff Layton <jlayton@kernel.org>, Christian Brauner <brauner@kernel.org>, Chuck Lever III <chuck.lever@oracle.com>, Linus Torvalds <torvalds@linux-foundation.org>, netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Boris Pismenny <borisp@nvidia.com>, John Fastabend <john.fastabend@gmail.com> Subject: [PATCH v3 27/55] tls/device: Support MSG_SPLICE_PAGES Date: Fri, 31 Mar 2023 17:08:46 +0100 Message-Id: <20230331160914.1608208-28-dhowells@redhat.com> In-Reply-To: <20230331160914.1608208-1-dhowells@redhat.com> References: <20230331160914.1608208-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761901899166920782?= X-GMAIL-MSGID: =?utf-8?q?1761901899166920782?= |
Series |
splice, net: Replace sendpage with sendmsg(MSG_SPLICE_PAGES)
|
|
Commit Message
David Howells
March 31, 2023, 4:08 p.m. UTC
Make TLS's device sendmsg() support MSG_SPLICE_PAGES. This causes pages to
be spliced from the source iterator if possible and copied the data if not.
This allows ->sendpage() to be replaced by something that can handle
multiple multipage folios in a single transaction.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Chuck Lever <chuck.lever@oracle.com>
cc: Boris Pismenny <borisp@nvidia.com>
cc: John Fastabend <john.fastabend@gmail.com>
cc: Jakub Kicinski <kuba@kernel.org>
cc: Eric Dumazet <edumazet@google.com>
cc: "David S. Miller" <davem@davemloft.net>
cc: Paolo Abeni <pabeni@redhat.com>
cc: Jens Axboe <axboe@kernel.dk>
cc: Matthew Wilcox <willy@infradead.org>
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 6c593788dc25..f5c3b56ac1ce 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -508,7 +508,30 @@ static int tls_push_data(struct sock *sk, zc_pfrag.offset = iter_offset.offset; zc_pfrag.size = copy; tls_append_frag(record, &zc_pfrag, 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 (!sendpage_ok(zc_pfrag.page)) { + iov_iter_revert(iter_offset.msg_iter, copy); + goto no_zcopy_this_page; + } + + zc_pfrag.offset = off; + zc_pfrag.size = copy; + tls_append_frag(record, &zc_pfrag, copy); } else if (copy) { +no_zcopy_this_page: copy = min_t(size_t, copy, pfrag->size - pfrag->offset); rc = tls_device_copy_data(page_address(pfrag->page) + @@ -571,6 +594,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);