From patchwork Tue May 30 14:16:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13260174 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 1B9BEC7EE33 for ; Tue, 30 May 2023 14:18:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AED45280004; Tue, 30 May 2023 10:17:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A75CF900002; Tue, 30 May 2023 10:17:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8EF98280004; Tue, 30 May 2023 10:17:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 7B1E6900002 for ; Tue, 30 May 2023 10:17:59 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2D147160276 for ; Tue, 30 May 2023 14:17:59 +0000 (UTC) X-FDA: 80847125478.28.C7352D4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id F09B04000A for ; Tue, 30 May 2023 14:17:55 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JAHUKqZx; spf=pass (imf04.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=1685456277; 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=NBXOPllhnShhjBRylpaDepFHduJQFj0kF52MtSgNo3M=; b=1j3QmSIk7a7yXHIWjRnkwOxoyc4f/JRD+FMtURFVWIiWKPM5vUfCaxKHRjQI8z+M6XMTqE l/Ce2y8TWDU+9by5ikhQqeK/ra7UpBloSxm6m8Z71JdsUA112gwYaXn6OD44EMgDY86FQS c0pfHVInHitOdo847kESq/mj9CAbboM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685456277; a=rsa-sha256; cv=none; b=sh4jGxPLnzVFLJ8VukMN0X0p9folPK4FzKVNuB44A59CzFoolCZKePCJsnj49tczPgRSTA tdFyTkC0l/CtvdXtZ9psiDT5sN4MxK8tDuD/mozdR1bw1VE9B6LaQa4eRRJJwuKQsotX/n ZYnaixwi0usClpqdcr3wqh3CkK4k9Y8= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JAHUKqZx; spf=pass (imf04.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685456275; 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=NBXOPllhnShhjBRylpaDepFHduJQFj0kF52MtSgNo3M=; b=JAHUKqZxMU8QaseBE2858xlGKKwovvDC1jWfByjj4SxgsTFrMxP0PmwhKzCMBb/8QaN6Vk sNN8QLDowo37DxS/ISML16BSUkhvcFfTXhPMLxOtiofFAFkkDtP0SLAc6eyFyph2lLzcmS Z6hE2m1tU+uffwEQ93bR0NUnXTH1nRQ= 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-454-lYgHP-yeNMaEfEacsos-nA-1; Tue, 30 May 2023 10:17:52 -0400 X-MC-Unique: lYgHP-yeNMaEfEacsos-nA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D6652185A797; Tue, 30 May 2023 14:17:49 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6DB6E140E956; Tue, 30 May 2023 14:17:47 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Herbert Xu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Jens Axboe , linux-crypto@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 10/10] crypto: af_alg/hash: Support MSG_SPLICE_PAGES Date: Tue, 30 May 2023 15:16:34 +0100 Message-ID: <20230530141635.136968-11-dhowells@redhat.com> In-Reply-To: <20230530141635.136968-1-dhowells@redhat.com> References: <20230530141635.136968-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Rspamd-Queue-Id: F09B04000A X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: es1ic5r1gfbpfmt5rykk7gx8cmpwh53u X-HE-Tag: 1685456275-240246 X-HE-Meta: U2FsdGVkX1/wtd9gy+n8zljVNE76HEmneMuHFNS1uJO6WbIph6c4OP/oorZ5rLJ1+i1em4O5mTGOz2eqp7aErv7XokQNETYtm/YpoNEVYbgyg+MlDkhQFC25uq5hHOQIIbzlDA+Xeec+ucC+PGsCvK8gH6MKaJSdsYV4YEKE98JoRdBbf5MKy8BybgYu7J6NbbskjOQxjehhb96HBveHetHzZNViQ5PKaorrYxK38l8M03AiB6PxzfIOUby7S1Mfxg+3DRc/atLZo+m4IV4EPlCWWivZq0obimho0daLuM+788YDow72YFZVva7iFq3J2Q+kM8dsJ3xHFkmegWYy2c255ZniLkLjWlH4oWhpg243FBNX6jjn9df04CfAXhZOMWyNTV1I6nCtXOL758rAwfybA1iBh22xYH09ztXp0zCWtWS0JAszNKLOO+dsA49J5onD3/JM5LwAmCtyqDxa3CFikBcPOYfEgT73PViso77rUEbnPDTeqVJDS6+6pYynD1L8zQEPqVb+fO8oFppjHNPySrJT6AUHZ9TtCSvt3COVBC+L11+ExCk9On+3bvacp2iZ4EXSVwYZlshHe/nqd1LrvdLuQYz1RmX4OEx2qH6QrcNLCa7XmUtHhiMsC+3LxYUBpvsuq0gIqZr0E2bnP22ooOYHmzPNOPRkJyTkX2rknvPyLSiJ445lb84OypBFCiHyTVCZ+X5yvxBPy7VbuTSXuASuLyWRXwZ9xdBKh4uYhShlYTaAnXl8fpoj+Zsg3xMrC1NwLfO3JERg+kBgmmYSLCySYk2OOgKO6MbY5FrUzS0C+mL+8cGGHbWxDb+89oxN8PrOl65HSqjJEiXiAiyZHNNJIeXP9ZNPDhpPQIFTef1wV7rjdeOeHsMghRgGZJdYGrElid0K3L3ADQT0QbLkbVR9oQEpH19ddrj73o/JqxMd74JX2yMvkLEY8B9JgWBUpNREfwN8FsJRBqE zOjACqWZ +ZldsY8ljSyF/WcgtvOXXcZiIuNEj1gaIIPdjsgwPaiQq8F4lWF85bGiBKrfqJ3mPe6ZmzQ973b2bkU84lY0Ptx7y+TbT2ktEZ3F12cHLNHqzTzt3rCczxLNrOfCvttxdmyKE9gmPwAb2QEBt1YKXzW37DgKAtlSJUDDfvf6yAfLZVJrIXOinabprJ3y3rt0q7Qfb4luk3k1QxwBQ58DwQfFYrzanXvo0Vi2dvgUFFPuWjx+5NdM8MXRsD1T5vYPdVPtlIA+VtaUuqdsbpP+YYg5GdMw8X3u2HLXbhEOfLOdyz+Co2HXbEoEciCZCDP6G71ibjN5tcPvRozQ1/++/JqSchgikTYbjY7125oaP3rncQnqmqc9K9m2zOPbIcocrKxx+XAtsj/y01XJkAz8rAGMlFHKJ1i+Yi4mOS8EsoUE9p1zCY/uxNut74dKbqFrNFVNhWi6ztiVzyRoN8OM5oeh9y6tUcLGyFuRhnucEqy0u3G7JPkhGkaCLBG5OuEroToYwSUFHLMUtBMVfcc7/WPhfjITC+T8jmS7uzy9y7SN+jS0= 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. 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 --- Notes: ver #2) - Fixed some checkpatch warnings. crypto/af_alg.c | 11 +++-- crypto/algif_hash.c | 104 ++++++++++++++++++++++++++++---------------- 2 files changed, 74 insertions(+), 41 deletions(-) diff --git a/crypto/af_alg.c b/crypto/af_alg.c index e2fc9051ba39..b78a399d0e19 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -542,9 +542,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 16c69c4b9c62..2f7a98b0eae3 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -63,78 +63,106 @@ 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 = 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_mark_end(ctx->sgl.sgt.sgl + ctx->sgl.sgt.nents); + 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 = 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,