Commit fb800fa4 authored by David Howells's avatar David Howells Committed by Paolo Abeni
Browse files

crypto: af_alg: Convert af_alg_sendpage() to use MSG_SPLICE_PAGES 



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: default avatarDavid Howells <dhowells@redhat.com>
cc: Herbert Xu <herbert@gondor.apana.org.au>
cc: "David S. Miller" <davem@davemloft.net>
cc: Eric Dumazet <edumazet@google.com>
cc: Jakub Kicinski <kuba@kernel.org>
cc: Paolo Abeni <pabeni@redhat.com>
cc: Jens Axboe <axboe@kernel.dk>
cc: Matthew Wilcox <willy@infradead.org>
cc: linux-crypto@vger.kernel.org
cc: netdev@vger.kernel.org
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent bf63e250

crypto/af_alg.c

+8 −44
Original line number Diff line number Diff line
@@ -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);