From patchwork Fri Mar 31 16:08:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13196187 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 96B9FC761AF for ; Fri, 31 Mar 2023 16:10:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 309536B00A3; Fri, 31 Mar 2023 12:10:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 291EB6B0075; Fri, 31 Mar 2023 12:10:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 159D86B00A3; Fri, 31 Mar 2023 12:10:43 -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 0686E6B0074 for ; Fri, 31 Mar 2023 12:10:43 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id BA021120DC7 for ; Fri, 31 Mar 2023 16:10:42 +0000 (UTC) X-FDA: 80629681524.28.5F3FC0B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf10.hostedemail.com (Postfix) with ESMTP id D9509C0016 for ; Fri, 31 Mar 2023 16:10:40 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hvuJVlhU; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680279040; 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=M5DaLi1tovZrH11oTI95mtlHRv/XZcPSFvwL/aUxUh4=; b=zJfZo4GcXhaHfXxcYdzuJuCHdFe6C9nu83UbfjTIE3WzJ3A7ZpO7JN7DvYs8zxgOt6C+vF 3B3Np/LFjmZeSdP5n9AJ0FwUPW88bV2eEyiOrJU4crmBZLMo9jCTlQIhSVFNTmIUfWw4Ka dsrmqcY+OeKlf10NhjlrkznU0WyJ0xs= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hvuJVlhU; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680279040; a=rsa-sha256; cv=none; b=lEexSgYtUKVEYVEKtP0CUgB1mdO3eLbiFO2nAVHkXYMoB4XDUC0M6Jhm9Mf+y9TNFYoVjQ 5j5fQU5oQ6dCChr03JQ83PdGeypc77UnPAxgkqTs4ug/Gc+Aekfn4Qr8ja6dhRmIWFGf95 5PAy7TUBqjDgqzVJ6PM7a+BKO3LJ1oE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680279040; 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=M5DaLi1tovZrH11oTI95mtlHRv/XZcPSFvwL/aUxUh4=; b=hvuJVlhUbWk56eDcODE5dwNiIYjJlheVSuisaPadN0mshUCuer2jQJLJatzv0cy+pDtDYM 2Vh2o5aVnqXZNZCp4s0y2MtNUA4o/HGR4uOjzikqgsqbQtISkJKDNIxX+Xgb4RRS2iuas9 Qm6FpzNUjMX3LjOgqWzvYmS67yzI0dE= 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-185-bYCsTSCqNby-9SBEzU5ngA-1; Fri, 31 Mar 2023 12:10:36 -0400 X-MC-Unique: bYCsTSCqNby-9SBEzU5ngA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 986783803502; Fri, 31 Mar 2023 16:10:33 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 816BF4020C82; Fri, 31 Mar 2023 16:10:31 +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, Herbert Xu , linux-crypto@vger.kernel.org Subject: [PATCH v3 26/55] crypto: af_alg/hash: Support MSG_SPLICE_PAGES Date: Fri, 31 Mar 2023 17:08:45 +0100 Message-Id: <20230331160914.1608208-27-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.2 X-Rspamd-Queue-Id: D9509C0016 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 9qozw5imb1xu65p6pfjyw985uursyjgi X-HE-Tag: 1680279040-989243 X-HE-Meta: U2FsdGVkX1+90t0Bo/+reGBVrJktKGSFSqAcEqN7SxbHxtTXmunS4ZSp9QPn5LQXfUhYzDnTLHDcAKBbrS2nP166he+5Dcm6wjJVd9bwgTRV4mQXS17lQOwT9ak5YgxRbRM3KX3xjHgrhMmHJ1Ldr6pXeyadfrHtoffy0KebCArFWv9p1fgHcLI8bzjl3pkClFcpjWtjNUBtgTvgA7j+pjomyQrZSMeBiALOughk0Ks3XrmgdMT/O+0NoRTqIpOZ3ea0LCCBM+g2mE+s/d7FTpUgZe6irzIygIrb2UsJfL3DMDB0/1C+sklLBF2tODeAk+/JZTCidXqW2mdWErI+61Rj+bi2v0Im/5C6syG15unN16ha3Q3tKn7t6VxSugoZkqKwPBkYqoNLJ/5sgsLwuPnzX812DSy4N+/XZrVd55E1hhv+dvA9GUWaXurA3yt4I3FAZP3ox/X5d5DvmPTIWqBtLpEwkHVZzFUSKu3zMAP5fRkeMls3mQymK0rUSbfF3GZuEuJfQdwmucTxCBxseI/Lk4+GPhYhxqHJXRjqNbvUjpPYKFMKvPLgz95wm1p+Ma4KVuGqJgeoRLwcJdsPKBXKnpUqejo5+KrJuehW0TEYyASOdurJC9pIX7h4l67VssvENKqASWSplONycUmk2agploYZN4vGG/eFwNg7Uco1CPGYGs/6ieWQNq4TukvFDiYluwd+ORbxDgOk3g4uMblK56rgaSSA2BD3x20Ok3jNXHFVt0ehW3gqlesTnvOBt13TtBPf9VcHOEGXekGNxkjuhL39fIK+AN1jarrlA/70MbfEIlFe2bdk3zt5jhJofQjOnIyqpK+T7TK26IGqUN5ahf2Pc2XAbsoPHNna8IkHXVtV6bOOFUy4hbC1q/krlnmIAkPEsQWYyemqLHzpknXeWR4OisX+IC5sd+CNDobpqUizYLmANqtZifBAbkQyQPrbZVykzhbe5X87evV XufLnj3Y Tk7Ezc7MDxwh3vGwioXErcsf3jdbVK/4m7HY500Qoqq1jbykqPbv2DZCH1L+gNHSr8FQVLkhJmnYGDZeAUMfKkDh1k+vjlZDLCDVkWqRUVPHFSGGT+8b/ht8rg8ZvKaCZnUi1wFNY8JxYuvyxwcVdFtxNiwdqvnecofoxYTXSBGxiIlQdoxh75sa67I0y0dxtNEIxAKE93B55fqmwZ84uJRogc6tP3JKX08UlHLTPToTOa+BFeyPs2R+5NXdfDz5VOBR33bYKdjCaZjOrTfN21obqWf6PQvvWP40oOtW1akTXcfHGStxLRTxKoSsPRfRu+i07n3QTvJ5oW22Yft5C8VyaUquMyMdFsinvzeJxuzKyAmpQqVVtj4gxkvR9rv+2ZSn3t+E6KWOTFTOCHzvyRcvNKiDuYH+0W6bJ/vFZTNySXeWunpqnd97mPS0jzIb+3JJGqDJvkpORbm69WBfVn5dlbSHUe2YRCIPsTUJ8krHdIVREIsWiackYnQ== 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_ALG sendmsg() support MSG_SPLICE_PAGES in the hashing code. 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. [!] Note that this makes use of netfs_extract_iter_to_sg() from netfslib. This probably needs moving to core code somewhere. Signed-off-by: David Howells cc: Herbert Xu cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: linux-crypto@vger.kernel.org cc: netdev@vger.kernel.org --- crypto/af_alg.c | 11 +++-- crypto/algif_hash.c | 99 ++++++++++++++++++++++++++++----------------- 2 files changed, 70 insertions(+), 40 deletions(-) diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 7fe8c8db6bb5..686610a4986f 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -543,9 +543,14 @@ void af_alg_free_sg(struct af_alg_sgl *sgl) { int i; - if (sgl->need_unpin) - for (i = 0; i < sgl->sgt.nents; i++) - unpin_user_page(sg_page(&sgl->sgt.sgl[i])); + if (sgl->sgt.sgl) { + if (sgl->need_unpin) + for (i = 0; i < sgl->sgt.nents; i++) + unpin_user_page(sg_page(&sgl->sgt.sgl[i])); + if (sgl->sgt.sgl != sgl->sgl) + kvfree(sgl->sgt.sgl); + sgl->sgt.sgl = NULL; + } } EXPORT_SYMBOL_GPL(af_alg_free_sg); diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index f051fa624bd7..b89c2c50cecc 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -64,77 +64,102 @@ static void hash_free_result(struct sock *sk, struct hash_ctx *ctx) static int hash_sendmsg(struct socket *sock, struct msghdr *msg, size_t ignored) { - int limit = ALG_MAX_PAGES * PAGE_SIZE; struct sock *sk = sock->sk; struct alg_sock *ask = alg_sk(sk); struct hash_ctx *ctx = ask->private; - long copied = 0; + ssize_t copied = 0; + size_t len, max_pages = ALG_MAX_PAGES, npages; + bool continuing = ctx->more, need_init = false; int err; - if (limit > sk->sk_sndbuf) - limit = sk->sk_sndbuf; + /* Don't limit to ALG_MAX_PAGES if the pages are all already pinned. */ + if (!user_backed_iter(&msg->msg_iter)) + max_pages = INT_MAX; + else + max_pages = min_t(size_t, max_pages, + DIV_ROUND_UP(sk->sk_sndbuf, PAGE_SIZE)); lock_sock(sk); - if (!ctx->more) { + if (!continuing) { if ((msg->msg_flags & MSG_MORE)) hash_free_result(sk, ctx); - - err = crypto_wait_req(crypto_ahash_init(&ctx->req), &ctx->wait); - if (err) - goto unlock; + need_init = true; } ctx->more = false; while (msg_data_left(msg)) { - int len = msg_data_left(msg); - - if (len > limit) - len = limit; - ctx->sgl.sgt.sgl = ctx->sgl.sgl; ctx->sgl.sgt.nents = 0; ctx->sgl.sgt.orig_nents = 0; - len = netfs_extract_iter_to_sg(&msg->msg_iter, len, - &ctx->sgl.sgt, ALG_MAX_PAGES, 0); - if (len < 0) { - err = copied ? 0 : len; - goto unlock; + err = -EIO; + npages = iov_iter_npages(&msg->msg_iter, max_pages); + if (npages == 0) + goto unlock_free; + + if (npages > ARRAY_SIZE(ctx->sgl.sgl)) { + err = -ENOMEM; + ctx->sgl.sgt.sgl = + kvmalloc(array_size(npages, sizeof(*ctx->sgl.sgt.sgl)), + GFP_KERNEL); + if (!ctx->sgl.sgt.sgl) + goto unlock_free; } + sg_init_table(ctx->sgl.sgl, npages); ctx->sgl.need_unpin = iov_iter_extract_will_pin(&msg->msg_iter); - ahash_request_set_crypt(&ctx->req, ctx->sgl.sgt.sgl, NULL, len); + err = netfs_extract_iter_to_sg(&msg->msg_iter, LONG_MAX, + &ctx->sgl.sgt, npages, 0); + if (err < 0) + goto unlock_free; + len = err; + sg_mark_end(ctx->sgl.sgt.sgl + ctx->sgl.sgt.nents - 1); - err = crypto_wait_req(crypto_ahash_update(&ctx->req), - &ctx->wait); - af_alg_free_sg(&ctx->sgl); - if (err) { - iov_iter_revert(&msg->msg_iter, len); - goto unlock; + if (!msg_data_left(msg)) { + err = hash_alloc_result(sk, ctx); + if (err) + goto unlock_free; } - copied += len; - } + ahash_request_set_crypt(&ctx->req, ctx->sgl.sgt.sgl, ctx->result, len); - err = 0; + if (!msg_data_left(msg) && !continuing && !(msg->msg_flags & MSG_MORE)) { + err = crypto_ahash_digest(&ctx->req); + } else { + if (need_init) { + err = crypto_wait_req(crypto_ahash_init(&ctx->req), + &ctx->wait); + if (err) + goto unlock_free; + need_init = false; + } + + if (msg_data_left(msg) || (msg->msg_flags & MSG_MORE)) + err = crypto_ahash_update(&ctx->req); + else + err = crypto_ahash_finup(&ctx->req); + continuing = true; + } - ctx->more = msg->msg_flags & MSG_MORE; - if (!ctx->more) { - err = hash_alloc_result(sk, ctx); + err = crypto_wait_req(err, &ctx->wait); if (err) - goto unlock; + goto unlock_free; - ahash_request_set_crypt(&ctx->req, NULL, ctx->result, 0); - err = crypto_wait_req(crypto_ahash_final(&ctx->req), - &ctx->wait); + copied += len; + af_alg_free_sg(&ctx->sgl); } + ctx->more = msg->msg_flags & MSG_MORE; + err = 0; unlock: release_sock(sk); + return copied ?: err; - return err ?: copied; +unlock_free: + af_alg_free_sg(&ctx->sgl); + goto unlock; } static ssize_t hash_sendpage(struct socket *sock, struct page *page,