diff --git a/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index abade4c0c..57db693f9 100644 --- a/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,4 +1,4 @@ -From 3dd39d5ab6b9c8e7bae488d7e9402838ade0d0dd Mon Sep 17 00:00:00 2001 +From 719f6957c15bc157f5f9c9008f65dd2e1c1c4a4c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 Subject: [PATCH 1/5] net/smsc95xx: Allow mac address to be set as a parameter diff --git a/core/linux-aarch64/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch b/core/linux-aarch64/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch index 6e2438d84..4960449bc 100644 --- a/core/linux-aarch64/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch +++ b/core/linux-aarch64/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch @@ -1,4 +1,4 @@ -From 080b8eca291350090c8a3e6f0d18ec42288606f0 Mon Sep 17 00:00:00 2001 +From 3bb4e6195174c95571be71628a0d1933186c1939 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 7 Aug 2017 19:34:57 -0600 Subject: [PATCH 2/5] arm64: dts: rockchip: disable pwm0 on rk3399-firefly diff --git a/core/linux-aarch64/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch b/core/linux-aarch64/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch index abc784cef..5a258bfa4 100644 --- a/core/linux-aarch64/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch +++ b/core/linux-aarch64/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch @@ -1,4 +1,4 @@ -From 3841c87af9043c6cacb22f571492b264124adc70 Mon Sep 17 00:00:00 2001 +From e081295d2c1920bf5a358e54eeeb7a64106298c2 Mon Sep 17 00:00:00 2001 From: William Wu Date: Mon, 4 Dec 2017 10:40:39 +0100 Subject: [PATCH 3/5] arm64: dts: rockchip: add usb3 controller node for RK3328 diff --git a/core/linux-aarch64/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch b/core/linux-aarch64/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch index 10bcbcf8e..987e4adbe 100644 --- a/core/linux-aarch64/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch +++ b/core/linux-aarch64/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch @@ -1,4 +1,4 @@ -From eef9bbbcf5751718b6b310b7dfe742015a66ea03 Mon Sep 17 00:00:00 2001 +From 6db831f5625aa64fd451ec55722d057b9e3b4592 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Mon, 4 Dec 2017 10:40:41 +0100 Subject: [PATCH 4/5] arm64: dts: rockchip: enable usb3 nodes on rk3328-rock64 diff --git a/core/linux-aarch64/0005-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch b/core/linux-aarch64/0005-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch deleted file mode 100644 index a527d3adc..000000000 --- a/core/linux-aarch64/0005-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 4e7ac3b7bd1155f8c4b753706a8f65b673d87ef8 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Mon, 1 Feb 2021 17:10:32 -0700 -Subject: [PATCH 5/5] 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 4404c491eb38..c2752e2b9ce3 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/core/linux-aarch64/0005-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch b/core/linux-aarch64/0005-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch new file mode 100644 index 000000000..bc023583d --- /dev/null +++ b/core/linux-aarch64/0005-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch @@ -0,0 +1,52 @@ +From b9b847f63866bd1243e39ba3c91188a78e8eb29b Mon Sep 17 00:00:00 2001 +From: Chuck Lever +Date: Sun, 31 Jan 2021 16:16:23 -0500 +Subject: [PATCH 5/5] SUNRPC: Fix NFS READs that start at non-page-aligned + offsets + +Anj Duvnjak reports that the Kodi.tv NFS client is not able to read +video files from a v5.10.11 Linux NFS server. + +The new sendpage-based TCP sendto logic was not attentive to non- +zero page_base values. nfsd_splice_read() sets that field when a +READ payload starts in the middle of a page. + +The Linux NFS client rarely emits an NFS READ that is not page- +aligned. All of my testing so far has been with Linux clients, so I +missed this one. + +Reported-by: A. Duvnjak +BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=211471 +Fixes: 4a85a6a3320b ("SUNRPC: Handle TCP socket sends with kernel_sendpage() again") +Signed-off-by: Chuck Lever +Tested-by: A. Duvnjak +--- + net/sunrpc/svcsock.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c +index 4404c491eb38..fa7b7ae2c2c5 100644 +--- a/net/sunrpc/svcsock.c ++++ b/net/sunrpc/svcsock.c +@@ -1113,14 +1113,15 @@ static int svc_tcp_sendmsg(struct socket *sock, struct msghdr *msg, + unsigned int offset, len, remaining; + struct bio_vec *bvec; + +- bvec = xdr->bvec; +- offset = xdr->page_base; ++ bvec = xdr->bvec + (xdr->page_base >> PAGE_SHIFT); ++ offset = offset_in_page(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); ++ ++ len = min(remaining, bvec->bv_len - offset); + ret = kernel_sendpage(sock, bvec->bv_page, + bvec->bv_offset + offset, + len, flags); +-- +2.30.0 + diff --git a/core/linux-aarch64/PKGBUILD b/core/linux-aarch64/PKGBUILD index f8ee2ad99..c9b299c12 100644 --- a/core/linux-aarch64/PKGBUILD +++ b/core/linux-aarch64/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=linux-aarch64 _srcname=linux-5.10 _kernelname=${pkgbase#linux} _desc="AArch64 multi-platform" -pkgver=5.10.13 +pkgver=5.10.14 pkgrel=1 arch=('aarch64') url="http://www.kernel.org/" @@ -20,7 +20,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" '0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch' '0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch' '0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch' - '0005-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch' + '0005-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch' 'config' 'kernel.its' 'kernel.keyblock' @@ -29,12 +29,12 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" '60-linux.hook' '90-linux.hook') md5sums=('753adc474bf799d569dec4f165ed92c3' - '4a34221501c7ee90ba275743bc552488' - '998a9695fc1f087bdf36235be76c2a00' - 'e59ef0ca63069a6b225ba3657ad17dfb' - '9515506fd25e5497cf9164058d4766b1' - '0cf880d04f4e28cc34721681088b7842' - 'e7f18ff5afd6bf512154f725eac99021' + 'd928049c6149ed507afbb72c90cb2dc2' + 'fbfba70a9530fe94fa2e4054c239e9b5' + '80c74384ff32418453ebe2afe545217c' + '0fd5ae1152c26f10843ba1dfcb940adc' + '046c2cb1c6c6e9e09d1428f3cabe6c79' + 'dfc8b7a3bd94c4ab8560944b76e4130f' 'e27a16b8cb7d1abfb9921baa1451ec72' '7f1a96e24f5150f790df94398e9525a3' '61c5ff73c136ed07a7aadbf58db3d96a' @@ -54,7 +54,7 @@ prepare() { git apply ../0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch git apply ../0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch git apply ../0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch - git apply ../0005-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch + git apply ../0005-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch cat "${srcdir}/config" > ./.config