On Thu, 2020-12-03 at 17:04 +0100, Mkrtchyan, Tigran wrote:
>
>
> Hi Trond,
>
> unfortunately the same result. Here the output of gdb, if it helps.
>
> (gdb) list *0x00000000000252be
> 0x252be is in _shift_data_right_pages (net/sunrpc/xdr.c:344).
> 339 if (*pgto != *pgfrom) {
> 340 vfrom = kmap_atomic(*pgfrom);
> 341 memcpy(vto + pgto_base, vfrom +
> pgfrom_base, copy);
> 342 kunmap_atomic(vfrom);
> 343 } else
> 344 memmove(vto + pgto_base, vto +
> pgfrom_base, copy);
> 345 flush_dcache_page(*pgto);
> 346 kunmap_atomic(vto);
> 347
> 348 } while ((len -= copy) != 0);
> (gdb)
>
You probably need this one in addition to the first patch.
8<----------------------------------------------------
>From fec77469f373fbccb292c2d522f2ebee3b9011a8 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
Date: Thu, 3 Dec 2020 12:04:51 -0500
Subject: [PATCH] NFSv4.2: Fix up the get/listxattr calls to
rpc_prepare_reply_pages()
Ensure that both getxattr and listxattr page array are correctly
aligned, and that getxattr correctly accounts for the page padding
word.
Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
---
fs/nfs/nfs42xdr.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/fs/nfs/nfs42xdr.c b/fs/nfs/nfs42xdr.c
index 8432bd6b95f0..103978ff76c9 100644
--- a/fs/nfs/nfs42xdr.c
+++ b/fs/nfs/nfs42xdr.c
@@ -191,7 +191,7 @@
#define encode_getxattr_maxsz (op_encode_hdr_maxsz + 1 + \
nfs4_xattr_name_maxsz)
-#define decode_getxattr_maxsz (op_decode_hdr_maxsz + 1 + 1)
+#define decode_getxattr_maxsz (op_decode_hdr_maxsz + 1 +
pagepad_maxsz)
#define encode_setxattr_maxsz (op_encode_hdr_maxsz + \
1 + nfs4_xattr_name_maxsz + 1)
#define decode_setxattr_maxsz (op_decode_hdr_maxsz +
decode_change_info_maxsz)
@@ -1476,17 +1476,18 @@ static void nfs4_xdr_enc_getxattr(struct
rpc_rqst *req, struct xdr_stream *xdr,
struct compound_hdr hdr = {
.minorversion = nfs4_xdr_minorversion(&args-
>seq_args),
};
+ uint32_t replen;
size_t plen;
encode_compound_hdr(xdr, req, &hdr);
encode_sequence(xdr, &args->seq_args, &hdr);
encode_putfh(xdr, args->fh, &hdr);
+ replen = hdr.replen + op_decode_hdr_maxsz + 1;
encode_getxattr(xdr, args->xattr_name, &hdr);
plen = args->xattr_len ? args->xattr_len : XATTR_SIZE_MAX;
- rpc_prepare_reply_pages(req, args->xattr_pages, 0, plen,
- hdr.replen);
+ rpc_prepare_reply_pages(req, args->xattr_pages, 0, plen,
replen);
req->rq_rcv_buf.flags |= XDRBUF_SPARSE_PAGES;
encode_nops(&hdr);
@@ -1520,14 +1521,15 @@ static void nfs4_xdr_enc_listxattrs(struct
rpc_rqst *req,
struct compound_hdr hdr = {
.minorversion = nfs4_xdr_minorversion(&args-
>seq_args),
};
+ uint32_t replen;
encode_compound_hdr(xdr, req, &hdr);
encode_sequence(xdr, &args->seq_args, &hdr);
encode_putfh(xdr, args->fh, &hdr);
+ replen = hdr.replen + op_decode_hdr_maxsz + 2 + 1;
encode_listxattrs(xdr, args, &hdr);
- rpc_prepare_reply_pages(req, args->xattr_pages, 0, args-
>count,
- hdr.replen);
+ rpc_prepare_reply_pages(req, args->xattr_pages, 0, args-
>count, replen);
encode_nops(&hdr);
}
--
2.28.0
--
Trond Myklebust
Linux NFS client maintainer, Hammerspace
trond.myklebust@xxxxxxxxxxxxxxx
