13 Aug, 2015
6 commits
-
NLM locks don't conflict with NFSv4 share reservations, so we're not
going to learn anything new by watiting for them.They do conflict with NFSv4 locks and with delegations.
Signed-off-by: J. Bruce Fields
-
export.h refers to the pnfs_layouttype enum, which is defined there.
Signed-off-by: Jeff Layton
Reviewed-by: Christoph Hellwig
Signed-off-by: J. Bruce Fields -
Switch using list_head for cache_head in cache_detail,
it is useful of remove an cache_head entry directly from cache_detail.v8, using hash list, not head list
Signed-off-by: Kinglong Mee
Reviewed-by: NeilBrown
Signed-off-by: J. Bruce Fields -
Nfsd has implement a site of seq_operations functions as sunrpc's cache.
Just exports sunrpc's codes, and remove nfsd's redundant codes.v8, same as v6
Signed-off-by: Kinglong Mee
Reviewed-by: NeilBrown
Signed-off-by: J. Bruce Fields -
Cleanup.
Just store cache_detail in seq_file's private,
an allocated handle is redundant.v8, same as v6.
Signed-off-by: Kinglong Mee
Reviewed-by: NeilBrown
Signed-off-by: J. Bruce Fields -
According to Christoph's advice, this patch introduce a new helper
nfsd4_cb_sequence_done() for processing more callback errors, following
the example of the client's nfs41_sequence_done().Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields
11 Aug, 2015
22 commits
-
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
Commit 294ac32e99 "nfsd: protect clid and verifier generation with
client_lock" moved gen_confirm() to gen_clid().After that commit, setclientid will return a bad reply with all-zero
verifier after copy_clid().Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
If using clientid_counter, it seems possible that gen_confirm could
generate the same verifier for the same client in some situations.Add a new counter for client confirm verifier to make sure gen_confirm
generates a different verifier on each call for the same clientid.Signed-off-by: Kinglong Mee
Reviewed-by: Jeff Layton
Signed-off-by: J. Bruce Fields -
v2, new helper nfs4_free_stateowner for freeing so_owner.data and sop
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
Layout is a state resource, nfsd should check it too.
v2, drop unneeded updating in nfsd4_renew()
v3, fix compile error without CONFIG_NFSD_PNFSSigned-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
In later patches, we'll want to be able to allocate and free svc_rqst
structures without monkeying with the serv->sv_nrthreads refcount.Factor those pieces out of their respective functions.
Signed-off-by: Shirley Ma
Acked-by: Jeff Layton
Tested-by: Shirley Ma
Signed-off-by: J. Bruce Fields -
In later patches, we're going to need to allow code external to svc.c
to figure out what pool_mode is in use. Move these definitions into
svc.h to prepare for that.Also, make the svc_pool_map object available and exported so that other
modules can peek in there to get insight into what pool mode is in use.
Likewise, export svc_pool_map_get/put function to make it safe to do so.Signed-off-by: Shirley Ma
Acked-by: Jeff Layton
Tested-by: Shirley Ma
Signed-off-by: J. Bruce Fields -
Add an operation that will do setup of the service. In the case of a
classic thread-based service that means starting up threads. In the case
of a workqueue-based service, the setup will do something different.Signed-off-by: Shirley Ma
Acked-by: Jeff Layton
Tested-by: Shirley Ma
Signed-off-by: J. Bruce Fields -
For now, all services use svc_xprt_do_enqueue, but once we add
workqueue-based service support, we'll need to do something different.Signed-off-by: Shirley Ma
Acked-by: Jeff Layton
Tested-by: Shirley Ma
Signed-off-by: J. Bruce Fields -
...not technically an operation, but it's more convenient and cleaner
to pass the module pointer in this struct.Signed-off-by: Shirley Ma
Acked-by: Jeff Layton
Tested-by: Shirley Ma
Signed-off-by: J. Bruce Fields -
Since we now have a container for holding svc_serv operations, move the
sv_function into it as well.Signed-off-by: Shirley Ma
Acked-by: Jeff Layton
Tested-by: Shirley Ma
Signed-off-by: J. Bruce Fields -
In later patches we'll need to abstract out more operations on a
per-service level, besides sv_shutdown and sv_function.Declare a new svc_serv_ops struct to hold these operations, and move
sv_shutdown into this struct.Signed-off-by: Shirley Ma
Acked-by: Jeff Layton
Tested-by: Shirley Ma
Signed-off-by: J. Bruce Fields -
Both commit 0380a3f375 ("svcrdma: Add a separate "max data segs"
macro for svcrdma") and commit 7e5be28827bf ("svcrdma: advertise
the correct max payload") are incorrect. This commit reverts both
changes, restoring the server's maximum payload size to 1MB.Commit 7e5be28827bf based the server's maximum payload on the
_client's_ RPCRDMA_MAX_DATA_SEGS value. That was wrong.Commit 0380a3f375 tried to fix this so that the client maximum
payload size could be raised without affecting the server, but
managed to confuse matters more on the server side.More importantly, limiting the advertised maximum payload size was
meant to be a workaround, not the actual fix. We need to revisithttps://bugzilla.linux-nfs.org/show_bug.cgi?id=270
A Linux client on a platform with 64KB pages can overrun and crash
an x86_64 NFS/RDMA server when the r/wsize is 1MB. An x86/64 Linux
client seems to work fine using 1MB reads and writes when the Linux
server's maximum payload size is restored to 1MB.BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=270
Fixes: 0380a3f375 ("svcrdma: Add a separate "max data segs" macro")
Signed-off-by: Chuck Lever
Signed-off-by: J. Bruce Fields
01 Aug, 2015
1 commit
-
Currently, preprocess_stateid_op calls nfs4_check_olstateid which
verifies that the open stateid corresponds to the current filehandle in the
call by calling nfs4_check_fh.If the stateid is a NFS4_DELEG_STID however, then no such check is done.
This could cause incorrect enforcement of permissions, because the
nfsd_permission() call in nfs4_check_file uses current the current
filehandle, but any subsequent IO operation will use the file descriptor
in the stateid.Move the call to nfs4_check_fh into nfs4_check_file instead so that it
can be done for all stateid types.Signed-off-by: Jeff Layton
Cc: stable@vger.kernel.org
[bfields: moved fh check to avoid NULL deref in special stateid case]
Signed-off-by: J. Bruce Fields
21 Jul, 2015
11 commits
-
Commit 0bf4828983df ("svcrdma: refactor marshalling logic") removed
the last call site for svc_rdma_fastreg().Signed-off-by: Chuck Lever
Signed-off-by: J. Bruce Fields -
Kernel coding conventions frown upon having large nontrivial
functions in header files, and the preference these days is to
allow the compiler to make inlining decisions if possible.As these functions are re-homed into a .c file, be sure that
comparisons with fields in struct rpcrdma_msg are with be32
constants.This is a refactoring change; no behavior change is intended.
Signed-off-by: Chuck Lever
Signed-off-by: J. Bruce Fields -
The Linux NFS server returns garbage in the data payload of inline
NFS/RDMA READ replies. These are READs of under 1000 bytes or so
where the client has not provided either a reply chunk or a write
list.The NFS server delivers the data payload for an NFS READ reply to
the transport in an xdr_buf page list. If the NFS client did not
provide a reply chunk or a write list, send_reply() is supposed to
set up a separate sge for the page containing the READ data, and
another sge for XDR padding if needed, then post all of the sges via
a single SEND Work Request.The problem is send_reply() does not advance through the xdr_buf
when setting up scatter/gather entries for SEND WR. It always calls
dma_map_xdr with xdr_off set to zero. When there's more than one
sge, dma_map_xdr() sets up the SEND sge's so they all point to the
xdr_buf's head.The current Linux NFS/RDMA client always provides a reply chunk or
a write list when performing an NFS READ over RDMA. Therefore, it
does not exercise this particular case. The Linux server has never
had to use more than one extra sge for building RPC/RDMA replies
with a Linux client.However, an NFS/RDMA client _is_ allowed to send small NFS READs
without setting up a write list or reply chunk. The NFS READ reply
fits entirely within the inline reply buffer in this case. This is
perhaps a more efficient way of performing NFS READs that the Linux
NFS/RDMA client may some day adopt.Fixes: b432e6b3d9c1 ('svcrdma: Change DMA mapping logic to . . .')
BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=285
Signed-off-by: Chuck Lever
Signed-off-by: J. Bruce Fields -
When removing underlying RDMA device, the rmmod will hang forever if there
are any outstanding NFS/RDMA client mounts. The outstanding NFS/RDMA counts
could also prevent the server from shutting down. Further debugging shows
that the existing connections are not teared down and resource are not
released when receiving RDMA_CM_EVENT_DEVICE_REMOVAL event. It seems the
original code missing svc_xprt_put() in RDMA_CM_EVENT_REMOVAL event handler
thus svc_xprt_free is never invoked to release the existing connection
resources.The patch has been passed removing, adding device back and forth without
stopping NFS/RDMA service. This will also allow a device to be unplugged
and swapped out without shutting down NFS service.BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=252
Signed-off-by: Shirley Ma
Reviewed-by: Chuck Lever
Signed-off-by: J. Bruce Fields -
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
Just using the macro defined in nfs_idmap.h.
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
nfs_fs.h is a client's header file.
# ll fs/nfsd/nfs4acl.o fs/nfsd/nfsd.ko
-rw-r--r--. 1 root root 328248 Jul 3 19:26 fs/nfsd/nfs4acl.o
-rw-r--r--. 1 root root 7452016 Jul 3 19:26 fs/nfsd/nfsd.koAfter this patch,
# ll fs/nfsd/nfs4acl.o fs/nfsd/nfsd.ko
-rw-r--r--. 1 root root 150872 Jul 3 19:15 fs/nfsd/nfs4acl.o
-rw-r--r--. 1 root root 7273792 Jul 3 19:23 fs/nfsd/nfsd.koSigned-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
After proc_layoutcommit success, i_size_read(inode) always >= new_size.
Just set lc_size_chg before proc_layoutcommit, if proc_layoutcommit
failed, nfsd will skip the lc_size_chg, so it's no harm.Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
This reverts commit 731d5cca82729c85ca3296902a64836619f4ba2d.
Commit ffe1f0df5862 ("rpcrdma: Merge svcrdma and xprtrdma modules into
one") forgot to update the corresponding documentation.Reported-by: Valentin Rothberg
Signed-off-by: J. Bruce Fields -
If lookup_one_len() failed, nfsd should free those memory allocated for fname.
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields -
If nfsd4_layout_setlease fails, nfsd will not put ls->ls_file.
Fix commit c5c707f96f "nfsd: implement pNFS layout recalls".
Signed-off-by: Kinglong Mee
Signed-off-by: J. Bruce Fields
