From 1d850794062d8cf2562299be70b8d734cdc3bdfd Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 13 Feb 2021 19:21:20 +0000 Subject: [PATCH] core/linux-espressobin to 5.10.16-1 --- ...EADs-that-start-at-non-page-aligned-.patch | 51 ------------------- core/linux-espressobin/PKGBUILD | 9 +--- 2 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 core/linux-espressobin/0001-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch diff --git a/core/linux-espressobin/0001-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch b/core/linux-espressobin/0001-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch deleted file mode 100644 index 643978f7e..000000000 --- a/core/linux-espressobin/0001-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 7dc7170b1314236f54ccef07b1a0f356ad594d04 Mon Sep 17 00:00:00 2001 -From: Chuck Lever -Date: Sun, 31 Jan 2021 16:16:23 -0500 -Subject: [PATCH] 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-espressobin/PKGBUILD b/core/linux-espressobin/PKGBUILD index f6ff033c4..ba3653b73 100644 --- a/core/linux-espressobin/PKGBUILD +++ b/core/linux-espressobin/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=linux-espressobin _srcname=linux-5.10 _kernelname=${pkgbase#linux} _desc="Globalscale ESPRESSOBin" -pkgver=5.10.14 +pkgver=5.10.16 pkgrel=1 arch=('aarch64') url="http://www.kernel.org/" @@ -16,15 +16,13 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git') options=('!strip') source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" "http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz" - '0001-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch' 'config' 'linux.preset' '60-linux.hook' '90-linux.hook' '91-linux.hook') md5sums=('753adc474bf799d569dec4f165ed92c3' - 'd928049c6149ed507afbb72c90cb2dc2' - 'ed5be3aaf3c6e2af2a74807ee73bd7b5' + '6eb3cfa9872f7c0cbc59e5c17eca854c' '91db2c2612382a535c851169c5873612' '86d4a35722b5410e3b29fc92dae15d4b' 'ce6c81ad1ad1f8b333fd6077d47abdaf' @@ -37,9 +35,6 @@ prepare() { # add upstream patch git apply --whitespace=nowarn ../patch-${pkgver} - # ALARM patches - git apply ../0001-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch - cat "${srcdir}/config" > ./.config # add pkgrel to extraversion