mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
core/linux-raspberrypi to 5.10.13-3
This commit is contained in:
graysky
parent
413e122cf5
commit
2563cad895
2 changed files with 7 additions and 124 deletions
|
|
@ -1,118 +0,0 @@
|
|||
From 78a29b77d3643814a19ce55937309b89010a763c Mon Sep 17 00:00:00 2001
|
||||
From: graysky <graysky AT archlinux DOT 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
|
||||
|
||||
|
|
@ -6,12 +6,12 @@
|
|||
buildarch=20
|
||||
|
||||
pkgbase=linux-raspberrypi
|
||||
_commit=431ac1d21b5e842c5a564bc0bab31d7dc11611f5
|
||||
_commit=34263dc81a12862c66e2593bb26c09d5fd20f46d
|
||||
_srcname=linux-${_commit}
|
||||
_kernelname=${pkgbase#linux}
|
||||
_desc="Raspberry Pi"
|
||||
pkgver=5.10.13
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
arch=('armv6h' 'armv7h')
|
||||
url="http://www.kernel.org/"
|
||||
license=('GPL2')
|
||||
|
|
@ -24,15 +24,16 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
|
|||
'linux.preset'
|
||||
'60-linux.hook'
|
||||
'90-linux.hook'
|
||||
0001-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch)
|
||||
md5sums=('ea8da06baf0ea9a08c33fff4c5aebaa3'
|
||||
0001-SUNRPC-Fix-NFS-READs-the-start-at-non-page-aligned-o.patch::https://github.com/torvalds/linux/commit/bad4c6eb5eaa8300e065bd4426727db5141d687d.patch
|
||||
)
|
||||
md5sums=('9ee8f7bd44d27a1c31e36a5e6d72ee04'
|
||||
'9669d916a5929a2eedbd64477f83d99e'
|
||||
'ae9fa2a98aca88cb8d38e76110aa77e1'
|
||||
'ed8041f962681b9ba95493db900e2224'
|
||||
'86d4a35722b5410e3b29fc92dae15d4b'
|
||||
'ce6c81ad1ad1f8b333fd6077d47abdaf'
|
||||
'69e1db90d78f691dc446fe2ab94727eb'
|
||||
'9496b8e6f3f3bfde0d6854ae5b106bfb')
|
||||
'a14efc4c769e573dff6605a1d80eb984')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${_srcname}"
|
||||
|
|
@ -46,7 +47,7 @@ prepare() {
|
|||
sed -i '2iexit 0' scripts/depmod.sh
|
||||
|
||||
# https://github.com/xbmc/xbmc/issues/19147
|
||||
patch -Np1 -i ../0001-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch
|
||||
patch -Np1 -i ../0001-SUNRPC-Fix-NFS-READs-the-start-at-non-page-aligned-o.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue