From mboxrd@z Thu Jan 1 00:00:00 1970 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 AE2FBC77B6C for ; Fri, 31 Mar 2023 16:11:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D6B576B00B1; Fri, 31 Mar 2023 12:11:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CCBCB6B00B2; Fri, 31 Mar 2023 12:11:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B1DC26B00B3; Fri, 31 Mar 2023 12:11:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A05F66B00B1 for ; Fri, 31 Mar 2023 12:11:30 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 7D78A1A0D0B for ; Fri, 31 Mar 2023 16:11:30 +0000 (UTC) X-FDA: 80629683540.20.5606C91 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf11.hostedemail.com (Postfix) with ESMTP id B038040018 for ; Fri, 31 Mar 2023 16:11:28 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UNrdfrp6; spf=pass (imf11.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1680279088; 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=taClZ7tV+6NGiC2MYzyqiyjdYhpNZJPUqY1OQ7XAIPM=; b=aOzgzNGRCVlxoE/ciPRjMmbuak+1Kijxj1QXDEYBWzsknpKH5yIHOxNbR//choT5C1XbXA 7ZHbEDcZbrM+iKZn1eXJ4rzEZrOWfZ+4yWtrlf6khHdGV9ioy91PQiW9MbBbYr41GvuK/+ CAy+H5fgIWBtrA/MvqDX54bQxyydLqs= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UNrdfrp6; spf=pass (imf11.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1680279088; a=rsa-sha256; cv=none; b=PWHCyc2jEw2hQkxALG7+tJprXr0GsTMsFdlffoqFJz8HX6Wsyzt71VPqQakLJofAn5fXts XWJdOAQSRCO/iR65jdWPblgUawyQ38T0jWA4jaHw3MkgpGKjKMpgdXspIlJRAR0BZuH7Mi HTKrWPWOVacDKg7FQ4kpxObKLoO3cfg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680279088; 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=taClZ7tV+6NGiC2MYzyqiyjdYhpNZJPUqY1OQ7XAIPM=; b=UNrdfrp6Yj/iiWYW8FfJx2Ym+h0wYHDzZm4TZJcMduY/JBIR/Ut7y13M2jxm7MwtwmGP+h Qx0YaUzrzw/3FinQlk1+nR5oqb7/p+UHq+fjz3WA5djJFFv/kCMPEAoGjwlBT8oHaBDO9e Nll8nnxJOp8wqfBpkZrrkXukF6NHgBo= 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-321-c9EO5cpKMmGD23YMrtD9Yg-1; Fri, 31 Mar 2023 12:11:23 -0400 X-MC-Unique: c9EO5cpKMmGD23YMrtD9Yg-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 73F4B811E7C; Fri, 31 Mar 2023 16:11:22 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 628494020C82; Fri, 31 Mar 2023 16:11:20 +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 44/55] algif: Remove hash_sendpage*() Date: Fri, 31 Mar 2023 17:09:03 +0100 Message-Id: <20230331160914.1608208-45-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.2 X-Rspamd-Queue-Id: B038040018 X-Stat-Signature: uhn4knnock4unrxriufjb8neen7xypj1 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1680279088-208624 X-HE-Meta: U2FsdGVkX18ZUxAhAKS7MEMqXyR1lK1DfyybtpixQNAxCAEBQUDINXjTPckXIbZI9a2tY6enujUaWZ3tYgiJli5BUXVctpxPAaLpps6YbRq0JMM4AIoseqPJnwoRROZW7Oo70QdNDLDtAH6E9iONWUiMWrwM9deKOXxOEXV8cBSLbrrfVIQrYXklKI7oqH8vYUdi+vh+0g57P/BLnz5OUJAM9OK0XZ9NTGP1y7pFwYRtBbiMsHBdJ/k90GEc/0eDJal4xzfl1iPQ3p6iqsbSGGCFWY9jXzyhmF5tz/5rXdwtUO+fdqEOB0FewLYbg3Ys2DdCIOZK/dwbEKGRGEpUu7W2ecvedUQo0tCkST07Cm6lEpbkn4KpH36GrKc04ZRlB3HYckIZUPlH6VhoLua3hSKAr9nF6OSEskXDwdh9Km0eHH3JDGLUk80DteFDUfl2QANrys09KsrOalQYuLCsJ+wFksb9ItP/PGcqy2ubRTnVwqU5wzptxOf7SLbUjZ1YgMPL9w8yKwpNKTUrrf5xeyQnrVLXXgs74cig9kyveLD6/pJZPavsPtoJ7fYn/LrlG1Q+vmkHvL57sYGFGLVrl8Tkp1KdR8A5coiWNkGACadMcMHg71vPmN7+LyfOuDApYyG9GW3mg1CAhU8wAKlNBTcbC2vCGmlyYVR7vbDFBC65pFQcNmYXsqvGkw3TqQ0n1mChh9mlLVe9NsQq/VNeZSAEXj9P495JwRW8o+fvhBP7vVuR5Gn4bBxfcMORUpG5dUnlccsRwAHbqe6q/9eBwbqCWLgmiBT6IFMMcJHTNyCAcbgy2xPc725GYHAHs5HtakS54uy5A5yt0lp0sOQM0cZByNYHVIfuBBYyFwyYirzbVBIwAqeW2JQmfVHjkFauaP8u3dsKR3Or2OhLLQghO6HNFNt4ARrBzUvQydRXsx4ZZ4kk4eNWeSvmGl6fGHennMh8LrvTWVhHbk4a6t3 ScM/8GP1 gJVp07QxFAPK1aMKCThqhKOEIvFHhw7cGTwzwYqYun3Nz8Z9m0FAT8BX68N0TiRrwXfybpQKdO8O6KiGMyBHhtvYxOn7HMP86tzR0vBKEm6p+Y9P4JVqg+KbXwihjPPSLt8E4Nly08CKkabxLlplx7MG7lu0xebL+Z8XfUN3bwbThfWbJUxSp79coMcsh/pz23LHMiplD9b0/LusOWhtMgq8QQwVBD9/saCAyJPLhrTWO4s73UyC09/qAEqqeYwzkCVFw+p56kLmetPo4jr5FkvQVoxn5ssC2kDdPB2Bn0MGvwKpOyXaGEoiGpC2/qJbSuz67tRTbmmpFt/GQzyP3bW7mXGpERLdEVJJI8n4U6uCdl8Oy0qCqS0m752NSciACdqxd2NtnfOsXrPAQWNP/Kx5BR5q+BkBNt0f8akYmPVCjBCPRNW8i33SBUSyVuMmGEy0E5fH7FONfxi4gDUl4X8YCzXc3ejv2qYA0XsiXrSwJDLLyBsTavql7LA== 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: Remove hash_sendpage*().. 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/algif_hash.c | 66 --------------------------------------------- 1 file changed, 66 deletions(-) diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index b89c2c50cecc..dc6c45637b2d 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -162,58 +162,6 @@ static int hash_sendmsg(struct socket *sock, struct msghdr *msg, goto unlock; } -static ssize_t hash_sendpage(struct socket *sock, struct page *page, - int offset, size_t size, int flags) -{ - struct sock *sk = sock->sk; - struct alg_sock *ask = alg_sk(sk); - struct hash_ctx *ctx = ask->private; - int err; - - if (flags & MSG_SENDPAGE_NOTLAST) - flags |= MSG_MORE; - - lock_sock(sk); - sg_init_table(ctx->sgl.sgl, 1); - sg_set_page(ctx->sgl.sgl, page, size, offset); - - if (!(flags & MSG_MORE)) { - err = hash_alloc_result(sk, ctx); - if (err) - goto unlock; - } else if (!ctx->more) - hash_free_result(sk, ctx); - - ahash_request_set_crypt(&ctx->req, ctx->sgl.sgl, ctx->result, size); - - if (!(flags & MSG_MORE)) { - if (ctx->more) - err = crypto_ahash_finup(&ctx->req); - else - err = crypto_ahash_digest(&ctx->req); - } else { - if (!ctx->more) { - err = crypto_ahash_init(&ctx->req); - err = crypto_wait_req(err, &ctx->wait); - if (err) - goto unlock; - } - - err = crypto_ahash_update(&ctx->req); - } - - err = crypto_wait_req(err, &ctx->wait); - if (err) - goto unlock; - - ctx->more = flags & MSG_MORE; - -unlock: - release_sock(sk); - - return err ?: size; -} - static int hash_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags) { @@ -318,7 +266,6 @@ static struct proto_ops algif_hash_ops = { .release = af_alg_release, .sendmsg = hash_sendmsg, - .sendpage = hash_sendpage, .recvmsg = hash_recvmsg, .accept = hash_accept, }; @@ -370,18 +317,6 @@ static int hash_sendmsg_nokey(struct socket *sock, struct msghdr *msg, return hash_sendmsg(sock, msg, size); } -static ssize_t hash_sendpage_nokey(struct socket *sock, struct page *page, - int offset, size_t size, int flags) -{ - int err; - - err = hash_check_key(sock); - if (err) - return err; - - return hash_sendpage(sock, page, offset, size, flags); -} - static int hash_recvmsg_nokey(struct socket *sock, struct msghdr *msg, size_t ignored, int flags) { @@ -420,7 +355,6 @@ static struct proto_ops algif_hash_ops_nokey = { .release = af_alg_release, .sendmsg = hash_sendmsg_nokey, - .sendpage = hash_sendpage_nokey, .recvmsg = hash_recvmsg_nokey, .accept = hash_accept_nokey, };