From patchwork Wed Mar 29 14:13:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13192532 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 3AECFC6FD18 for ; Wed, 29 Mar 2023 14:15:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC51D6B009B; Wed, 29 Mar 2023 10:15:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C73B76B009C; Wed, 29 Mar 2023 10:15:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AEDC56B009D; Wed, 29 Mar 2023 10:15:10 -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 9F1116B009B for ; Wed, 29 Mar 2023 10:15:10 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 68D38160D38 for ; Wed, 29 Mar 2023 14:15:10 +0000 (UTC) X-FDA: 80622132780.09.8EEB2D6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 96CEF100025 for ; Wed, 29 Mar 2023 14:15:08 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IiJWyflK; spf=pass (imf14.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=1680099308; a=rsa-sha256; cv=none; b=Sftad5ppjXYG1GJLzGbV05mlMti4IDSyBPedJF2tG8Qqldt/VKWlmoD1sYl1ggkIk8lY9O +7JJGV+B6JIlOGV6MJ3+xUjLd6z7UiqtCijG6645rU1Q+xnydICIiLv155C2z4i9KycbYM y+yDyE13BQ7v86ncVvz54zfrWb7tgmQ= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IiJWyflK; spf=pass (imf14.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=1680099308; 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=Cnsl2PBKcn/WeJcDUlvQg+kDRV/xI85q/f39rakA9vk=; b=lRinxnfR2CrkanCdZBdlyBAMTbljzDPokd5rDAxWqs5S+VZE2Dk+X67ujXrfByBpFRHVP6 tuYliQujz+08AG14xJHVSi+oigYi5W7l8LwLpjwY9qxzhqcEFD2jVaSUDXV1bPaxgB94Ba YvNnnF+1I6RAnHcMlyxCXW6q3YuYfK0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680099307; 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=Cnsl2PBKcn/WeJcDUlvQg+kDRV/xI85q/f39rakA9vk=; b=IiJWyflK47eMCUoMXyaGoXeIODB06BJ3L+Rx7P0pJWqXyNOfcXthtDaFtUeb3XosIanZgz BKGfNaZ1RNcG0iml8UOsUzhBc/Ta9GeUl1W7SyaCZka/V06twyFg2hFijsdoIAOMGdYvSl aan++Dh7yMAT/9sokCDnNJEyXR9g0Do= 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-354-ZXES39PtP7W3LCkby0Z-qw-1; Wed, 29 Mar 2023 10:15:03 -0400 X-MC-Unique: ZXES39PtP7W3LCkby0Z-qw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 19257858F09; Wed, 29 Mar 2023 14:15:02 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 062E318EC2; Wed, 29 Mar 2023 14:14:59 +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 23/48] crypto: af_alg: Indent the loop in af_alg_sendmsg() Date: Wed, 29 Mar 2023 15:13:29 +0100 Message-Id: <20230329141354.516864-24-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.5 X-Rspam-User: X-Rspamd-Queue-Id: 96CEF100025 X-Rspamd-Server: rspam01 X-Stat-Signature: 775b5kwdj959sbbt3y7ykipq1i3gjwr4 X-HE-Tag: 1680099308-617724 X-HE-Meta: U2FsdGVkX18++2Gt1bfTnw3Ayh4Y7cWw/jtYCNYicfo0b/Mu0o9yGH9dKXrjNbOzfpCv9wh+AznmFmWCHycjMkVcNhPXTpZDlXFrHl8RyU5XxKZzmBmnnPJt9xJ7w1lBHkcgy2ELGwakUzVCsVs1Pk+5tDeRTWoZzTafLiELMY9iUkUcq1EZ84rsuQ0NV2OZdE0evp3W9xMeo+szMSnjXSIH4Vwi4wIXGRzdzE7I8PRKVu+RFB3dhzNCB1bXTsxodIeKnpblsqGMBWXmIzQFlip8AQj8SQjudJVsRHbG27wRDXn85Vx6B2EIQMjzB0hrIgzxrn0UiHPUSS8IP7ZYZqj8V7RHT3SgjyLEiGEAjkm/T8Fhnp5hNtOxvvdVjgT6ilQQvaCBwW1PaOtbNKt3mHfN5+igMhVWI8Fxv89gZsgUMnGZORoBDOHcKCYhyPKkz3BZgZeFFdgWs8WITVBtUBqjibdNnNbWaOW781q4AdKVmDU+u8AFbAL+U5rtDYs2siS6MYQa9qWew31D1HXt/eCT9RTyEasQ5X4gpER+IkPqDLdAW+RqKyES1jOBG/ealYXtxt0HZwQEqzrOLhhLX4hika08x/t9qRyIpCT/pr6gNBQHBozSi8jCDK6HGt/U3CYsBNwSw79GrE9pcTkYfp+GOaaOs+KRl3RJd+S92zltNwhmId7t436tPnTYLNM9RNXE6mHRnQpI+ido3DbsHnpJ4TV0bq90/jZqz14IEB+R/jufR5hb2xQe1KDrVVHIB9d9nCziBbi9vNomD6Ao3AgR9Q7ER1OHO7R0PALK2RmMo9j2BgW2oOmMBbECxXDMWMhkwycH9gdCElKv7s/LyiBsU7YOJZiFU0S/sj/wA6dXBQuf18kaAwmr1sZptW0JYooCHZCt1XrP2NHSewNZ9maniXvOrNWduNWRoFxMuduwsZ/6FGOgohko9ra/gz26nz5gGEjiNhXDdkG+3nz mMqNMBKE OrWcif02g+O+Vwr35Bmh7LWGyZrlR7f5OqAN1Dl/PCGnmB7DLQJ9eWDj3dJA+OuDx9+bFiQJIIznyTIgogQnRNgP0HM9RFNlB1NI9H0XSMD9iIWUkC6oETSz2OgnNrkM2Ks/r0+cC463QVSOM6QABRQIGCKJ9BvD8eW415ycLAb0DxjB/f1VXKWMIHHQgnaIndPU7qRi5Xz/nqe8ClIvBuW9YUF9/3Xd1jgmVOn15YCnaMT/ry8pvjHSlcQmM+c2bvuGTJnRZ7uaIKDf5rMOkYYa1Tl8D2LVqF4wWi253WTCYfAxKH+j9S6FbE0Xpk+X77AgubJFgVyx/6rE8gQTj42zKy5zuKfOcCQ/0wzLq/9aU2h6/eSF97WzU1I2M2a1fh4CANztNE654mN9JwsOc6mooUQ9s2eWRK57q5sKZfHpdIyCb5EeNV9y2A9bwZQUYfRwD88OqH4eBaIlgewiMPLpyFrLdhKKJQ9p6DbODUpNNccDegCKEjiXUaA== 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: Put the loop in af_alg_sendmsg() into an if-statement to indent it to make the next patch easier to review as that will add another branch to handle MSG_SPLICE_PAGES to the if-statement. 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 | 50 +++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 1dafd088ad45..483821e310e9 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -1031,35 +1031,37 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, if (sgl->cur) sg_unmark_end(sg + sgl->cur - 1); - do { - struct page *pg; - unsigned int i = sgl->cur; + if (1 /* TODO check MSG_SPLICE_PAGES */) { + do { + struct page *pg; + unsigned int i = sgl->cur; - plen = min_t(size_t, len, PAGE_SIZE); + plen = min_t(size_t, len, PAGE_SIZE); - pg = alloc_page(GFP_KERNEL); - if (!pg) { - err = -ENOMEM; - goto unlock; - } + pg = alloc_page(GFP_KERNEL); + if (!pg) { + err = -ENOMEM; + goto unlock; + } - sg_assign_page(sg + i, pg); + sg_assign_page(sg + i, pg); - err = memcpy_from_msg(page_address(sg_page(sg + i)), - msg, plen); - if (err) { - __free_page(sg_page(sg + i)); - sg_assign_page(sg + i, NULL); - goto unlock; - } + err = memcpy_from_msg(page_address(sg_page(sg + i)), + msg, plen); + if (err) { + __free_page(sg_page(sg + i)); + sg_assign_page(sg + i, NULL); + goto unlock; + } - sg[i].length = plen; - len -= plen; - ctx->used += plen; - copied += plen; - size -= plen; - sgl->cur++; - } while (len && sgl->cur < MAX_SGL_ENTS); + sg[i].length = plen; + len -= plen; + ctx->used += plen; + copied += plen; + size -= plen; + sgl->cur++; + } while (len && sgl->cur < MAX_SGL_ENTS); + } if (!size) sg_mark_end(sg + sgl->cur - 1);