summaryrefslogtreecommitdiff
path: root/0004-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch
diff options
context:
space:
mode:
Diffstat (limited to '0004-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch')
-rw-r--r--0004-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch118
1 files changed, 0 insertions, 118 deletions
diff --git a/0004-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch b/0004-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch
deleted file mode 100644
index ea9af03..0000000
--- a/0004-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 78a29b77d3643814a19ce55937309b89010a763c Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Sun, 31 Jan 2021 16:38:13 -0500
-Subject: [PATCH] Revert "SUNRPC: Handle TCP socket sends with
- kernel_sendpage() again"
-
-This reverts commit 00ee972739fb2526d3936f1e7ccfc8c91d250c60.
----
- net/sunrpc/svcsock.c | 86 +-------------------------------------------
- 1 file changed, 1 insertion(+), 85 deletions(-)
-
-diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
-index c9766d07eb81..b248f2349437 100644
---- a/net/sunrpc/svcsock.c
-+++ b/net/sunrpc/svcsock.c
-@@ -1062,90 +1062,6 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
- return 0; /* record not complete */
- }
-
--static int svc_tcp_send_kvec(struct socket *sock, const struct kvec *vec,
-- int flags)
--{
-- return kernel_sendpage(sock, virt_to_page(vec->iov_base),
-- offset_in_page(vec->iov_base),
-- vec->iov_len, flags);
--}
--
--/*
-- * kernel_sendpage() is used exclusively to reduce the number of
-- * copy operations in this path. Therefore the caller must ensure
-- * that the pages backing @xdr are unchanging.
-- *
-- * In addition, the logic assumes that * .bv_len is never larger
-- * than PAGE_SIZE.
-- */
--static int svc_tcp_sendmsg(struct socket *sock, struct msghdr *msg,
-- struct xdr_buf *xdr, rpc_fraghdr marker,
-- unsigned int *sentp)
--{
-- const struct kvec *head = xdr->head;
-- const struct kvec *tail = xdr->tail;
-- struct kvec rm = {
-- .iov_base = &marker,
-- .iov_len = sizeof(marker),
-- };
-- int flags, ret;
--
-- *sentp = 0;
-- xdr_alloc_bvec(xdr, GFP_KERNEL);
--
-- msg->msg_flags = MSG_MORE;
-- ret = kernel_sendmsg(sock, msg, &rm, 1, rm.iov_len);
-- if (ret < 0)
-- return ret;
-- *sentp += ret;
-- if (ret != rm.iov_len)
-- return -EAGAIN;
--
-- flags = head->iov_len < xdr->len ? MSG_MORE | MSG_SENDPAGE_NOTLAST : 0;
-- ret = svc_tcp_send_kvec(sock, head, flags);
-- if (ret < 0)
-- return ret;
-- *sentp += ret;
-- if (ret != head->iov_len)
-- goto out;
--
-- if (xdr->page_len) {
-- unsigned int offset, len, remaining;
-- struct bio_vec *bvec;
--
-- bvec = xdr->bvec;
-- offset = xdr->page_base;
-- remaining = xdr->page_len;
-- flags = MSG_MORE | MSG_SENDPAGE_NOTLAST;
-- while (remaining > 0) {
-- if (remaining <= PAGE_SIZE && tail->iov_len == 0)
-- flags = 0;
-- len = min(remaining, bvec->bv_len);
-- ret = kernel_sendpage(sock, bvec->bv_page,
-- bvec->bv_offset + offset,
-- len, flags);
-- if (ret < 0)
-- return ret;
-- *sentp += ret;
-- if (ret != len)
-- goto out;
-- remaining -= len;
-- offset = 0;
-- bvec++;
-- }
-- }
--
-- if (tail->iov_len) {
-- ret = svc_tcp_send_kvec(sock, tail, 0);
-- if (ret < 0)
-- return ret;
-- *sentp += ret;
-- }
--
--out:
-- return 0;
--}
--
- /**
- * svc_tcp_sendto - Send out a reply on a TCP socket
- * @rqstp: completed svc_rqst
-@@ -1173,7 +1089,7 @@ static int svc_tcp_sendto(struct svc_rqst *rqstp)
- mutex_lock(&xprt->xpt_mutex);
- if (svc_xprt_is_dead(xprt))
- goto out_notconn;
-- err = svc_tcp_sendmsg(svsk->sk_sock, &msg, xdr, marker, &sent);
-+ err = xprt_sock_sendmsg(svsk->sk_sock, &msg, xdr, 0, marker, &sent);
- xdr_free_bvec(xdr);
- trace_svcsock_tcp_send(xprt, err < 0 ? err : sent);
- if (err < 0 || sent != (xdr->len + sizeof(marker)))
---
-2.30.0
-