summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch118
-rw-r--r--PKGBUILD7
2 files changed, 2 insertions, 123 deletions
diff --git a/0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch b/0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch
deleted file mode 100644
index ea9af03..0000000
--- a/0003-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
-
diff --git a/PKGBUILD b/PKGBUILD
index b4cedb6..5aac32a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _custom=1
pkgbase=linux-ck
_supver=5
_majver=10
-_minver=13
+_minver=15
_gccpatchver='20201113'
_gccpatchger='10.1'
_gccpatchker='5.8'
@@ -50,7 +50,6 @@ source=(
config # the main kernel config file
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch
- 0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch
linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}.xz::http://ck.kolivas.org/patches/${_supver}.0/${_supver}.${_majver}/${_supver}.${_majver}-${_ckpatchversion}/patch-${_supver}.${_majver}-${_ckpatchversion}.xz
kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
ath9k-regdom-hack.patch
@@ -61,12 +60,11 @@ validpgpkeys=(
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-b2sums=('f2d6f5512c10ced0990d0d0cbc1aa29e5b54b90bff01f16d16093e9c192de9eb0f31e60c9dd51c686ce88c2a1d89a49bedb503af61c91a6a186794fbe71eedde'
+b2sums=('7cf58513bf2266697843f6d91fbb214268ad511e110a4e2b66bc0db84ecb4df724a7d65f641eee5837f4d88c1371ec8b313ee8aaa1d1f0260709eae2e3af32b3'
'SKIP'
'206d96c96efc11bd228e7c636ce3b0c5c3a8f76f44114d6c83136b41553ecfff9af6353cb8e908d9fcf714683424e6d629958da98b3e074d295aa1b0ca593f4e'
'2f9195675270d79d735a3aaec25887c2f80b76eae98be8fcc5fd59ab71d925c5ee20ec5e2a015deb68b61bc2cc7f56f546a22cb96ee038e2e24c2c9dd5c3f79f'
'd8297e09f552a2d6bb24c2ba10481fd2b407057f3b24278e72a89233473460d339c83838791989773623178b5af80588fb4c484da2931f1040e313cce7ceca00'
- '4a40db184421fdda2b01efe22adee7a4e1ce82cbc877bfaea5aaaae7215d1fe9aeb307a5241af6b7b9e539ae3d1a26f35adaedce82c61d3edb60f6e0d1673743'
'067f3389124fdd937ca69e9e9568b1b3194791960a093e81037051eb6d25e80b40bf7f60c61373ac9e92bff9db760766009b1e6f9ee8429a883bb7fce2d60f8a'
'7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127'
'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a'
@@ -90,7 +88,6 @@ prepare() {
echo "Applying hotfixes"
patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
patch -p1 -i ../0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch
- patch -p1 -i ../0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch
# ck patch