Commits · 6019ce0742ca55d3e45279a19b07d1542747a098 · Kirill Smelkov / linux

22 Mar, 2021 40 commits

NFSD: Add a tracepoint to record directory entry encoding · 6019ce07

Chuck Lever authored Mar 05, 2021

Enable watching the progress of directory encoding to capture the
timing of any issues with reading or encoding a directory. The
new tracepoint captures dirent encoding for all NFS versions.

For example, here's what a few NFSv4 directory entries might look
like:

nfsd-989 [002] 468.596265: nfsd_dirent: fh_hash=0x5d162594 ino=2 name=.
nfsd-989 [002] 468.596267: nfsd_dirent: fh_hash=0x5d162594 ino=1 name=..
nfsd-989 [002] 468.596299: nfsd_dirent: fh_hash=0x5d162594 ino=3827 name=zlib.c
nfsd-989 [002] 468.596325: nfsd_dirent: fh_hash=0x5d162594 ino=3811 name=xdiff
nfsd-989 [002] 468.596351: nfsd_dirent: fh_hash=0x5d162594 ino=3810 name=xdiff-interface.h
nfsd-989 [002] 468.596377: nfsd_dirent: fh_hash=0x5d162594 ino=3809 name=xdiff-interface.c
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

6019ce07

NFSD: Clean up after updating NFSv3 ACL encoders · 1416f435
Chuck Lever authored Nov 15, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
1416f435
NFSD: Update the NFSv3 SETACL result encoder to use struct xdr_stream · 15e432bf
Chuck Lever authored Nov 18, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
15e432bf
NFSD: Update the NFSv3 GETACL result encoder to use struct xdr_stream · 20798dfe
Chuck Lever authored Nov 18, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
20798dfe
NFSD: Clean up after updating NFSv2 ACL encoders · 83d0b845
Chuck Lever authored Nov 15, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
83d0b845
NFSD: Update the NFSv2 ACL ACCESS result encoder to use struct xdr_stream · 07f5c296
Chuck Lever authored Nov 18, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
07f5c296
NFSD: Update the NFSv2 ACL GETATTR result encoder to use struct xdr_stream · 8d2009a1
Chuck Lever authored Nov 18, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
8d2009a1

NFSD: Update the NFSv2 SETACL result encoder to use struct xdr_stream · 778f068f

Chuck Lever authored Nov 18, 2020

The SETACL result encoder is exactly the same as the NFSv2
attrstatres decoder.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

778f068f

NFSD: Update the NFSv2 GETACL result encoder to use struct xdr_stream · f8cba473
Chuck Lever authored Nov 18, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
f8cba473
NFSD: Add an xdr_stream-based encoder for NFSv2/3 ACLs · 8edc0648
Chuck Lever authored Nov 18, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
8edc0648
NFSD: Remove unused NFSv2 directory entry encoders · 8a2cf9f5
Chuck Lever authored Nov 15, 2020
```
Clean up.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
8a2cf9f5
NFSD: Update the NFSv2 READDIR entry encoder to use struct xdr_stream · f5dcccd6
Chuck Lever authored Nov 14, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
f5dcccd6
NFSD: Update the NFSv2 READDIR result encoder to use struct xdr_stream · 94c8f8c6
Chuck Lever authored Oct 23, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
94c8f8c6

NFSD: Count bytes instead of pages in the NFSv2 READDIR encoder · 8141d6a2

Chuck Lever authored Nov 13, 2020

Clean up: Counting the bytes used by each returned directory entry
seems less brittle to me than trying to measure consumed pages after
the fact.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

8141d6a2

NFSD: Add a helper that encodes NFSv3 directory offset cookies · d5253200

Chuck Lever authored Nov 13, 2020

Refactor: Add helper function similar to nfs3svc_encode_cookie3().
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

d5253200

NFSD: Update the NFSv2 STATFS result encoder to use struct xdr_stream · bf15229f
Chuck Lever authored Oct 23, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
bf15229f
NFSD: Update the NFSv2 READ result encoder to use struct xdr_stream · a6f8d9dc
Chuck Lever authored Oct 23, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
a6f8d9dc
NFSD: Update the NFSv2 READLINK result encoder to use struct xdr_stream · d9014b0f
Chuck Lever authored Oct 23, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
d9014b0f
NFSD: Update the NFSv2 diropres encoder to use struct xdr_stream · e3b4ef22
Chuck Lever authored Oct 23, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
e3b4ef22
NFSD: Update the NFSv2 attrstat encoder to use struct xdr_stream · 92b54a4f
Chuck Lever authored Oct 23, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
92b54a4f
NFSD: Update the NFSv2 stat encoder to use struct xdr_stream · a887eaed
Chuck Lever authored Oct 23, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
a887eaed

NFSD: Reduce svc_rqst::rq_pages churn during READDIR operations · 76ed0dd9

Chuck Lever authored Jan 15, 2021

During NFSv2 and NFSv3 READDIR/PLUS operations, NFSD advances
rq_next_page to the full size of the client-requested buffer, then
releases all those pages at the end of the request. The next request
to use that nfsd thread has to refill the pages.

NFSD does this even when the dirlist in the reply is small. With
NFSv3 clients that send READDIR operations with large buffer sizes,
that can be 256 put_page/alloc_page pairs per READDIR request, even
though those pages often remain unused.

We can save some work by not releasing dirlist buffer pages that
were not used to form the READDIR Reply. I've left the NFSv2 code
alone since there are never more than three pages involved in an
NFSv2 READDIR Reply.

Eventually we should nail down why these pages need to be released
at all in order to avoid allocating and releasing pages
unnecessarily.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

76ed0dd9

NFSD: Remove unused NFSv3 directory entry encoders · 14119346
Chuck Lever authored Nov 13, 2020
```
Clean up.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
14119346

NFSD: Update NFSv3 READDIR entry encoders to use struct xdr_stream · 7f87fc2d

Chuck Lever authored Oct 22, 2020

The benefit of the xdr_stream helpers is that they transparently
handle encoding an XDR data item that crosses page boundaries.
Most of the open-coded logic to do that here can be eliminated.

A sub-buffer and sub-stream are set up as a sink buffer for the
directory entry encoder. As an entry is encoded, it is added to
the end of the content in this buffer/stream. The total length of
the directory list is tracked in the buffer's @len field.

When it comes time to encode the Reply, the sub-buffer is merged
into rq_res's page array at the correct place using
xdr_write_pages().
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

7f87fc2d

NFSD: Update the NFSv3 READDIR3res encoder to use struct xdr_stream · e4ccfe30
Chuck Lever authored Oct 22, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
e4ccfe30

NFSD: Count bytes instead of pages in the NFSv3 READDIR encoder · a1409e2d

Chuck Lever authored Nov 09, 2020

Clean up: Counting the bytes used by each returned directory entry
seems less brittle to me than trying to measure consumed pages after
the fact.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

a1409e2d

NFSD: Add a helper that encodes NFSv3 directory offset cookies · a161e6c7

Chuck Lever authored Nov 10, 2020

Refactor: De-duplicate identical code that handles encoding of
directory offset cookies across page boundaries.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

a161e6c7

NFSD: Update the NFSv3 COMMIT3res encoder to use struct xdr_stream · 5ef2826c

Chuck Lever authored Oct 22, 2020

As an additional clean up, encode_wcc_data() is removed because it
is now no longer used.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

5ef2826c

NFSD: Update the NFSv3 PATHCONF3res encoder to use struct xdr_stream · ded04a58
Chuck Lever authored Nov 06, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
ded04a58
NFSD: Update the NFSv3 FSINFO3res encoder to use struct xdr_stream · 0a139d1b
Chuck Lever authored Oct 22, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
0a139d1b
NFSD: Update the NFSv3 FSSTAT3res encoder to use struct xdr_stream · 8b704498
Chuck Lever authored Nov 06, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
8b704498
NFSD: Update the NFSv3 LINK3res encoder to use struct xdr_stream · 4d74380a
Chuck Lever authored Oct 22, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
4d74380a
NFSD: Update the NFSv3 RENAMEv3res encoder to use struct xdr_stream · 89d79e96
Chuck Lever authored Oct 22, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
89d79e96
NFSD: Update the NFSv3 CREATE family of encoders to use struct xdr_stream · 78315b36
Chuck Lever authored Oct 22, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
78315b36
NFSD: Update the NFSv3 WRITE3res encoder to use struct xdr_stream · ecb7a085
Chuck Lever authored Oct 22, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
ecb7a085
NFSD: Update the NFSv3 READ3res encode to use struct xdr_stream · cc9bcdad
Chuck Lever authored Oct 22, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
cc9bcdad
NFSD: Update the NFSv3 READLINK3res encoder to use struct xdr_stream · 9a9c8923
Chuck Lever authored Oct 22, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
9a9c8923
NFSD: Update the NFSv3 wccstat result encoder to use struct xdr_stream · 70f8e839
Chuck Lever authored Oct 22, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
70f8e839

NFSD: Update the NFSv3 LOOKUP3res encoder to use struct xdr_stream · 5cf35335

Chuck Lever authored Oct 22, 2020

Also, clean up: Rename the encoder function to match the name of
the result structure in RFC 1813, consistent with other encoder
function names in nfs3xdr.c. "diropres" is an NFSv2 thingie.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

5cf35335

NFSD: Update the NFSv3 ACCESS3res encoder to use struct xdr_stream · 907c3822
Chuck Lever authored Oct 22, 2020
```
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
```
907c3822