From patchwork Wed Mar 29 14:13:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13192535 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 85A55C6FD18 for ; Wed, 29 Mar 2023 14:15:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C77F6B009F; Wed, 29 Mar 2023 10:15:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 178CA6B00A0; Wed, 29 Mar 2023 10:15:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F0D1A6B00A1; Wed, 29 Mar 2023 10:15:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E0C786B009F for ; Wed, 29 Mar 2023 10:15:18 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9939140CD4 for ; Wed, 29 Mar 2023 14:15:18 +0000 (UTC) X-FDA: 80622133116.02.088F1EE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 7A765180021 for ; Wed, 29 Mar 2023 14:15:16 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Dk//I4lx"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1680099316; 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=M2oP5Z8d/ozTZw8iAkug1jFMjHxpMchS5ih/ENv5oqDwIcsYc9iowd2lSHk6yUmpnDeRR3 okZmczSyY6yCDxGE0iJNkJFvXegz1O3boWtY6jfoE2pxzm81iStYn2azDtoXajj8qzHrNp S88IuLAMpb0gBUHErfgjDvtau4GxBf4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Dk//I4lx"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680099316; a=rsa-sha256; cv=none; b=QfwugTElvxd9sOo5OU++44shuNGUGWbtSBKbI6EhMkVryrt8VpJ9DuGLP024iekjTHagE1 vYEQYALpo5/fVZuZdmqNd1RiZTvjG2b8GrYij3wvLf4NXd5P8xHHggpJDjxvdLFyzaksA3 l9VQnye7FeX2L654vvvNMdNq73qyhWE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680099315; 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=Dk//I4lx7BOnYxkfIz9av1ekycqK22HPXeNxO1cvCjF8u68qCSuXVWi021S1bxx9ueIwEZ Kv55SWUKxhqolj0IODlih/ilHJqUdr8G7gqd+wnEe8ObkCiRPl1Dh76AL+LY1pK0xaIWGa 1XcSQIcbrOceMyZqQ55U01F8cDhiYWQ= 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-612-sHDpKiIEOqiGBf3DQmh3WA-1; Wed, 29 Mar 2023 10:15:11 -0400 X-MC-Unique: sHDpKiIEOqiGBf3DQmh3WA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6673388562B; Wed, 29 Mar 2023 14:15:10 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 548E32027041; Wed, 29 Mar 2023 14:15:08 +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: [RFC PATCH v2 26/48] crypto: af_alg/hash: Support MSG_SPLICE_PAGES Date: Wed, 29 Mar 2023 15:13:32 +0100 Message-Id: <20230329141354.516864-27-dhowells@redhat.com> In-Reply-To: <20230329141354.516864-1-dhowells@redhat.com> References: <20230329141354.516864-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 7A765180021 X-Stat-Signature: n4xtxws6a35nctgmbxh53nxia69qhwn8 X-HE-Tag: 1680099316-923156 X-HE-Meta: U2FsdGVkX19Nh6vcEQUnSW9QHX0ZedsmEUuFxmJJE+q3uuA2hYN7v49aVYTQz6aNmlw6TBBoj74Qcymn4LL0DC9y290GtoW+vKwq1dFMPb2pNvAeHuNOEcDT76h4pCnOvS3MotXF7/OdKrvergGtINHJH0d1G6MMBHcOBbUphkHkx5kQLzEQMWl6j/XgzqWXwkb5Cwx54Ao58spxlqtHPbrKwRjSFR8TEJSknq0RpjVjrjL/VmacawJuPoZjP/fqFRYaJKXCQVKu54PjG5guKM9yxJk/qJmukccdM69zZnav8dqmSAazfQIfE4BJ1D1OON9d8Rtov3Jo/EmrEctdmam3cuwvDFoNYnq0PBrIkIvPYx4JxZisnpmKcg1+yRsez6zPG223HqXIGtLf/WDA8PrSNBC26AoBVMzgMbTUoSjhHVg4Ds50DSvAQzgPyCON003IvOZ7RXkLG5R38SAgDx/kK5ztd5weAWlzx6RpiDFRChYXwKmuBAi3Od0a+rG07UrkDLpohf3A1Da9lDEVyGfW7307pEVDDzi2xp+LllhxM05/XLJE4IDHPkxZ9g/6kXSrBX6Apjyit6xh8lq3ufqd7URP6bQjKpJkwpN8jiBb9MKb/vYKIe7B7/BKmFwfP7LxOj1upKZWlCrn0wn3vZ1KqezrDsp3uHRs+TMoGn03UIfnY5Zx/sQ91FO1F1ArnVjGfWHW86Ui4XRPThMXJlLaMVA+Imo+9ahR8LG7QqDQIWOZ9imaUtUeDT4k9/bW0Cn5+HHV5bv7b6DD55AgM1zBNr4x2kSRS1tAbTvOPm8qdziBsM55InG3kgyKGwp0DaJx/Pv4p4a1qxpZmGxntC8xXI+dEsYnWtu2IfoNftvOjBBVv9SyYxi4BPaAKSYczRwopc6wUvlndvH+W5yYzmX5Bv9rwS6F5x2NgyhTg/gcG8ac2SO+LzyYU7BCmz7p4CcwN6gHZUjqoXGfYCT X09Q4yyM sypFlniaLwjKVqZ82ZhJLo6ulZF3RVPWKdBkNhGSpLI6LdPWxvG6+XSN7cnHqFsIiaAZhVrPtE4E4tZZu+3tEhKwp6aGWvjPfkrh/LK/PNXpqHoEEiCHyZIWNBJi7f8jdh3tY5H1OcRMS+cAi5nmoEoaKF/M02Ci52oLB7hR6gQh3sAPFt6smfFNubFVXVsthXhbqDAqYE3um7/pC0SFl4Nr5yXuF+pEzDkaAGD4pZCbS4O0CkSGHe+1RV9xjvbBGdABMv1JOXZEHIf5atk1gS1l+SEBLzJAx6KBFPe1NlxCwaY24lTUObfQHwMQhCIfFShAZm0i6qREG67T2MauXu25eoZdLRkAvMDlPqzUDZyD1GyWLCbOHVNdlkx2Pf570aJXFmJ7j6fE1wZ3wfhNZhiIqVVF0zgXW8xGrbrQwzLCsdlFhwxXYOYln99HJd/jqf+lvUzrLra53AG5taJSKE4cIri9Haucc32gEFuoL6CeXoT77fihi+ZhZmA== 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,