From patchwork Tue Jun 6 13:08:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 103814 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3391398vqr; Tue, 6 Jun 2023 06:23:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6aTKEe73AoGYSJ0WFrOkUgx6KcRYdPqTbMO5ujDiyq2n69o6dIExwZ+4QRLpeFH/fdJjU1 X-Received: by 2002:a05:6a21:3393:b0:10f:1e5d:83ea with SMTP id yy19-20020a056a21339300b0010f1e5d83eamr1289294pzb.25.1686057782442; Tue, 06 Jun 2023 06:23:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686057782; cv=none; d=google.com; s=arc-20160816; b=r1/MkfBdeltQCQx+kbCzjXfx+QCjcwmsYRe9C+7c30sknqf9S/Ko9a5u1ke3jRVEKt ZM91owC12fG0pBzCB7POAmn4UO+RMKfeKS+whwref3sLGVBwLvk9TXTUQ3Fmr70JG4/8 APGRJoP1dG95tDoyQg4AGNHoUkWP6otawn9H3Sb+tU7nfOGpDDnWtBs6OZ3Qo0pEj0LR nF2lf1aTSQ+DKWamRKAi3KwotZVBw93Pw8UcJCEFTFnMO2k8OvRCvWgGdX0gd8fJL57v +8q0bfdMkN73No7Erj8ibtGG8UuC7UyljlxALDMguL42rjRT+DVXAlxHhydgbx3Ww4KI YBWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fy2ggJLQIWe53H9p3VJNg7LWC+KUVOljTaVR6c617po=; b=yPdmgOs3MDUVxwg2aC38v9UIHWUTSQdZPk96NBQ0RhkW+uzDdvKxQSgPUijMgSwCXn cylROEW8Eykz3qTdd7p5VE20CECKTFFILKr4J+G1CZ6h7uNx3d15PyPzxpUdBGh+TPM/ k2V8QHHKHlaTNsfS16at0kFZUec4QYTThgAvgGBGbt8tcg3u9m6n1Ivl6IcEdMhdMVFG 0M0VNnBXF11jLdwjpVcsNmx0MWOZtlh4wJoJSxAdQEr1f9K8GHPg69GhDapMTQFTDjC6 F4h6mpt9Awm/m4l2BlWtdTCJbSYV+RTCA86qG+2WKqZvDwfNGx+zBBfckFJWP2OlGYh8 gnpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="h5/n2S3h"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n12-20020a170903110c00b001ac528e3f1bsi7490038plh.154.2023.06.06.06.22.49; Tue, 06 Jun 2023 06:23:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="h5/n2S3h"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238210AbjFFNMA (ORCPT + 99 others); Tue, 6 Jun 2023 09:12:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238079AbjFFNLR (ORCPT ); Tue, 6 Jun 2023 09:11:17 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA63F1986 for ; Tue, 6 Jun 2023 06:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686056987; 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=fy2ggJLQIWe53H9p3VJNg7LWC+KUVOljTaVR6c617po=; b=h5/n2S3hq2liIH1xIhOrLDb72q+imq0H6SjdDy5XFra9yts53p/iE2k5zzlHFf/m/MeqJd 1v8ST9OgNMaUXYVhWin4l61CeyGUhYciPI09IXyUFy7mGYzoMlQfSuc2c1Bqq7KrRpeX4g 4p6t7yF+3kJLVFFm+WTYCWnS0q9KY40= 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-630-LDioG1ZoO5yPnQdoqqJwpg-1; Tue, 06 Jun 2023 09:09:43 -0400 X-MC-Unique: LDioG1ZoO5yPnQdoqqJwpg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 302A78037AD; Tue, 6 Jun 2023 13:09:42 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id A110F492B00; Tue, 6 Jun 2023 13:09:39 +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 v3 09/10] crypto: af_alg: Convert af_alg_sendpage() to use MSG_SPLICE_PAGES Date: Tue, 6 Jun 2023 14:08:55 +0100 Message-ID: <20230606130856.1970660-10-dhowells@redhat.com> In-Reply-To: <20230606130856.1970660-1-dhowells@redhat.com> References: <20230606130856.1970660-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767959725345322871?= X-GMAIL-MSGID: =?utf-8?q?1767959725345322871?= Convert af_alg_sendpage() to use sendmsg() with MSG_SPLICE_PAGES rather than directly splicing in the pages itself. 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 Acked-by: Herbert Xu --- crypto/af_alg.c | 52 ++++++++----------------------------------------- 1 file changed, 8 insertions(+), 44 deletions(-) diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 9c12530d604a..3cf734835ccb 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -1114,53 +1114,17 @@ EXPORT_SYMBOL_GPL(af_alg_sendmsg); ssize_t af_alg_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 af_alg_ctx *ctx = ask->private; - struct af_alg_tsgl *sgl; - int err = -EINVAL; + struct bio_vec bvec; + struct msghdr msg = { + .msg_flags = flags | MSG_SPLICE_PAGES, + }; if (flags & MSG_SENDPAGE_NOTLAST) - flags |= MSG_MORE; - - lock_sock(sk); - if (!ctx->more && ctx->used) - goto unlock; - - if (!size) - goto done; - - if (!af_alg_writable(sk)) { - err = af_alg_wait_for_wmem(sk, flags); - if (err) - goto unlock; - } - - err = af_alg_alloc_tsgl(sk); - if (err) - goto unlock; - - ctx->merge = 0; - sgl = list_entry(ctx->tsgl_list.prev, struct af_alg_tsgl, list); - - if (sgl->cur) - sg_unmark_end(sgl->sg + sgl->cur - 1); - - sg_mark_end(sgl->sg + sgl->cur); - - get_page(page); - sg_set_page(sgl->sg + sgl->cur, page, size, offset); - sgl->cur++; - ctx->used += size; - -done: - ctx->more = flags & MSG_MORE; - -unlock: - af_alg_data_wakeup(sk); - release_sock(sk); + msg.msg_flags |= MSG_MORE; - return err ?: size; + bvec_set_page(&bvec, page, size, offset); + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, size); + return sock_sendmsg(sock, &msg); } EXPORT_SYMBOL_GPL(af_alg_sendpage);