From patchwork Fri Mar 31 16:08:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13196188 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 CA62EC761A6 for ; Fri, 31 Mar 2023 16:10:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 68B366B0075; Fri, 31 Mar 2023 12:10:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 63CDF6B0078; Fri, 31 Mar 2023 12:10:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 503286B009D; Fri, 31 Mar 2023 12:10:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 3CF4C6B0075 for ; Fri, 31 Mar 2023 12:10:46 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 02B9E8046F for ; Fri, 31 Mar 2023 16:10:46 +0000 (UTC) X-FDA: 80629681692.06.9A0D761 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf28.hostedemail.com (Postfix) with ESMTP id 33852C002C for ; Fri, 31 Mar 2023 16:10:44 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SI28YrOD; spf=pass (imf28.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=1680279044; 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=zbMUDKrdVAVwS+N9r9mW+fACtMcx+N9uUpcmjLnA2dk=; b=LBDqFcaHQoJv2uWovU/tLU5P+HjvxlW6h/8kBxiIL7MIWEWdKzUBrNTZX0L2X0hgeJSL8o bfbfFgMFOyVGaYwX+9a/I0JVzWmP0aMfwvlT6Ej/q+f3PshPxM45UHAr5uhm3lzuBDeaVs cYJEql8tuNB/jOUZB2KrhHhnO5OHt2M= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SI28YrOD; spf=pass (imf28.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=1680279044; a=rsa-sha256; cv=none; b=CORVQ0n/8443ik4EORcQWAoOmAG6arhPsJ+WsYv6XoJL3Vvtkf/pV8z+7qEJboddjwF23K CHwkP7LOIvFUlf/diW1FQbLMjDjUdx2n4ULZdKEmA/zRkrverDQLPJ7FLgl5m0QxHyQ6Yf RZ4BghhxuM2YC+N/cCqFya3kgAAsy8Y= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680279043; 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=SI28YrODEiCWIcM4TaSEbIiCVwEvYeCLTDu2GVeVlGgAtSViPPl32b9jWD+1/p+TlggcfK hhMPyQXP2OvYUacuqeaW473crux4aftEUpWeYKUy92VQBhX/ZSk4cCYldHbqexBTX1Ztdt KbIvEvgW4zQRdIln6Clrn5FAGXRD8Eo= 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 To: Matthew Wilcox , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: David Howells , Al Viro , Christoph Hellwig , Jens Axboe , Jeff Layton , Christian Brauner , Chuck Lever III , Linus Torvalds , netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Boris Pismenny , John Fastabend 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 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 33852C002C X-Rspam-User: X-Stat-Signature: tkxu76iarh71htrzn76ykk5a9g1r1mbn X-HE-Tag: 1680279044-450106 X-HE-Meta: U2FsdGVkX198tUdtEjQsDJQ0/6qhhKG0lIP/ud6N5rrRnRowJnzOraIMKnl4J9osGAFEJBAn9UqQpB4wjFCMikWTzM76pRMwmoJkj4qeqCzHNVd/jQXNqCvz7xOZf0kbraflGQW/UhrRdTlxq1do0dxbX4VMlilHW/zYrPrywvZ1rTkrIxdiFEyA3lpd4gyJIEXZFZ7vxKlSJjdYMjbqFU3LPQFvwzyxcGxByUEGjBuTXYk+2kTqciFxeFCdzogfDld5PGJ25rHD82N1wu0EcP597010VfbFfsCbbZsVWz1pN9CFoIkvZkXo9cG7WVs9TiY6GhjtZ+PmBpMn2IUQWzB5YED90CIw8KnD8eUR3qA6hztJMYY0HDRakThjr7NQmOnorLyLuBpm8AQC473Iqo2bOlw9zZ0sn5WDQg5IY52qt8uuR8bfqtocBLSQbOMVqe/Z4SV40mTeLJBywYmrE4hFPJOckWpmZ1jzm+Y5FLs1ktiB8T+DL48+IGrZ1mfbGNcnKlyo1Ttft62yDqwZGXb40MIDq6xRn/dJ3B+D3OvV6GM04ukehleEVVI44ceEhXGIS3So5tuWTKPwTPiYBRS85c2WB3vTE+XIZ2y5lmCcz9WJhNnzpNTQsn8AR52NZFm5fcHKZMS4U0a1ROCZhla0THGaSXEt2Wzjv/PVHoOWaSC7LGmoCvekiu5a2eR7aOkc618evN3P8tGpsrG447DM9nb8P1/du+7Tdp8NhFJxbSZ70EbVVYGeMDy8duhgE9HQ6HDbCg+fsWbAB5Js8oyeXVzXMExbXlTQrOpU4vtaqgQNFDy0HQKwRuGv5y5bBLS0eTnR22B0TmtAqG6CcSr6QlAEhtUPWydEGpIpEaycU/P8iObihIqbFRINnl4UD/TDHpc0dgrSHNqstMHE5uH7rgAruWZPGdIYFpqvija1PhsFUI+LdvSM7tCQT14RutPlUd3oPJtL1jN2ckL /Eu0SvcQ +I+mCPdDY6COP0NnQAK3bIFkqdFrlrnF1hKdws/AbUSUfr037Z3E4tNgXryF7zmGX8GSAbQBhtiGhW5fBUJXCZUoo7gq9EQ/aKZjjq7z9nom6y8nF+FXatrJm4zUAnWgwzghBklmrMWPfl3AjJHpNICqnDv1RaA+dNQIP3YgHuJUdTM+/UuxqQWVoycZKj8UYssituVqzeuXorPY+yslIAPK9SaWIbmO1120Ze+cIoX5pyUyvBnhsnTcAWsAPQmQYo21XeWbtGWjN9jhpEk4m3EshhyXS+L29/uT5u+7Bh9Kso1ZVV+2GJLjli9m4mcSvJVeCVQTiEZxN6NQPr99/RdnH9P5r4Jp8q2Lwgl9PVoSkl+arSFPsuMQ/IQvCchrLFsdnpdzPPwFYAW9+lzYNyDasElFIsz6mavvasyZws4ugzLqOfIiQOPvzB8pMpvkQibfJNz5Pju2/Dmm/bx+nCmWp8BZXC9374/3XcAy87bOFilWa5eo46JpW00I5gmrEy/c787cYrYJEs623BS0qlB6dQ8jhG1EL7vPdjfNfWiBbwfkG5Go6e3E5pUXzaYxu3VfAX/bXR3WhqSM= 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 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 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 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);