aboutsummaryrefslogtreecommitdiff
path: root/fs/nfsd/nfs4callback.c
AgeCommit message (Collapse)AuthorFilesLines
2014-11-19nfsd: Fix slot wake up race in the nfsv4.1 callback codeTrond Myklebust1-2/+6
The currect code for nfsd41_cb_get_slot() and nfsd4_cb_done() has no locking in order to guarantee atomicity, and so allows for races of the form. Task 1 Task 2 ====== ====== if (test_and_set_bit(0) != 0) { clear_bit(0) rpc_wake_up_next(queue) rpc_sleep_on(queue) return false; } This patch breaks the race condition by adding a retest of the bit after the call to rpc_sleep_on(). Signed-off-by: Trond Myklebust <[email protected]> Cc: [email protected] Signed-off-by: J. Bruce Fields <[email protected]>
2014-10-01nfsd: eliminate "to_delegation" defineJeff Layton1-4/+1
We now have cb_to_delegation and to_delegation, which do the same thing and are defined separately in different .c files. Move the cb_to_delegation definition into a header file and eliminate the redundant to_delegation definition. Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Jeff Layton <[email protected]>
2014-09-26nfsd: introduce nfsd4_callback_opsChristoph Hellwig1-62/+29
Add a higher level abstraction than the rpc_ops for callback operations. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-09-26nfsd: split nfsd4_callback initialization and useChristoph Hellwig1-8/+6
Split out initializing the nfs4_callback structure from using it. For the NULL callback this gets rid of tons of pointless re-initializations. Note that I don't quite understand what protects us from running multiple NULL callbacks at the same time, but at least this chance doesn't make it worse.. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-09-26nfsd: introduce a generic nfsd4_cbChristoph Hellwig1-33/+10
Add a helper to queue up a callback. CB_NULL has a bit of special casing because it is special in the specification, but all other new callback operations will be able to share code with this and a few more changes to refactor the callback code. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-09-26nfsd: remove nfsd4_callback.cb_opChristoph Hellwig1-8/+9
We can always get at the private data by using container_of, no need for a void pointer. Also introduce a little to_delegation helper to avoid opencoding the container_of everywhere. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-09-26nfsd: do not clear rpc_resp in nfsd4_cb_done_sequenceBenny Halevy1-3/+0
This is incorrect when a callback is has to be restarted, in which case the XDR decoding of the second iteration will see a NULL cb argument. [hch: updated description] Signed-off-by: Benny Halevy <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-09-26nfsd: fix nfsd4_cb_recall_done error handlingChristoph Hellwig1-10/+7
For any error that is not EBADHANDLE or NFS4ERR_BAD_STATEID, nfsd4_cb_recall_done first marks the connection down, then retries until dl_retries hits zero, then marks the connection down again and sets cb_done. This changes the code to only retry for EBADHANDLE or NFS4ERR_BAD_STATEID, and factors setting cb_done into a single point in the function. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-07-31nfsd: Add a struct nfs4_file field to struct nfs4_stidTrond Myklebust1-1/+1
All stateids are associated with a nfs4_file. Let's consolidate. Replace delegation->dl_file with the dl_stid.sc_file, and nfs4_ol_stateid->st_file with st_stid.sc_file. Signed-off-by: Trond Myklebust <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-07-31nfsd: Add reference counting to the lock and open stateidsTrond Myklebust1-1/+1
When we remove the client_mutex, we'll need to be able to ensure that these objects aren't destroyed while we're not holding locks. Add a ->free() callback to the struct nfs4_stid, so that we can release a reference to the stid without caring about the contents. Signed-off-by: Trond Myklebust <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-07-29nfsd: remove dl_fh field from struct nfs4_delegationJeff Layton1-1/+1
Now that the nfs4_file has a filehandle in it, we no longer need to keep a per-delegation copy of it. Switch to using the one in the nfs4_file instead. Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-07-23nfsd4: convert comma to semicolonHimangi Saraogi1-1/+1
Replace a comma between expression statements by a semicolon. This changes the semantics of the code, but given the current indentation appears to be what is intended. A simplified version of the Coccinelle semantic patch that performs this transformation is as follows: // <smpl> @r@ expression e1,e2; @@ e1 -, +; e2; // </smpl> Signed-off-by: Himangi Saraogi <[email protected]> Acked-by: Julia Lawall <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-07-18svcrdma: Select NFSv4.1 backchannel transport based on forward channelChuck Lever1-1/+2
The current code always selects XPRT_TRANSPORT_BC_TCP for the back channel, even when the forward channel was not TCP (eg, RDMA). When a 4.1 mount is attempted with RDMA, the server panics in the TCP BC code when trying to send CB_NULL. Instead, construct the transport protocol number from the forward channel transport or'd with XPRT_TRANSPORT_BC. Transports that do not support bi-directional RPC will not have registered a "BC" transport, causing create_backchannel_client() to fail immediately. Fixes: https://bugzilla.linux-nfs.org/show_bug.cgi?id=265 Signed-off-by: Chuck Lever <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-07-16nfsd: Avoid taking state_lock while holding inode lock in nfsd_break_one_delegJeff Layton1-4/+21
state_lock is a heavily contended global lock. We don't want to grab that while simultaneously holding the inode->i_lock. Add a new per-nfs4_file lock that we can use to protect the per-nfs4_file delegation list. Hold that while walking the list in the break_deleg callback and queue the workqueue job for each one. The workqueue job can then take the state_lock and do the list manipulations without the i_lock being held prior to starting the rpc call. Signed-off-by: Trond Myklebust <[email protected]> Signed-off-by: Jeff Layton <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-07-16nfsd: eliminate nfsd4_init_callbackJeff Layton1-6/+2
It's just an obfuscated INIT_WORK call. Just make the work_func_t a non-static symbol and use a normal INIT_WORK call. Signed-off-by: Jeff Layton <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-04-18nfsd: set timeparms.to_maxval in setup_callback_clientJeff Layton1-1/+3
...otherwise the logic in the timeout handling doesn't work correctly. Spotted-by: Trond Myklebust <[email protected]> Cc: [email protected] Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2014-03-30NFSD/SUNRPC: Check rpc_xprt out of xs_setup_bc_tcpKinglong Mee1-1/+18
Besides checking rpc_xprt out of xs_setup_bc_tcp, increase it's reference (it's important). Signed-off-by: Kinglong Mee <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2013-04-09nfsd4: check backchannel attributes on create_sessionJ. Bruce Fields1-24/+1
Make sure the client gives us an adequate backchannel. Signed-off-by: J. Bruce Fields <[email protected]>
2013-04-04nfsd4: minor cb_recall simplificationJ. Bruce Fields1-5/+3
Signed-off-by: J. Bruce Fields <[email protected]>
2012-11-28nfsd: make NFSv4 lease time per netStanislav Kinsbursky1-3/+5
Lease time is a part of NFSv4 state engine, which is constructed per network namespace. Signed-off-by: Stanislav Kinsbursky <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2012-11-15nfsd: make nfs4_client network namespace dependentStanislav Kinsbursky1-1/+1
And use it's net where possible. Signed-off-by: Stanislav Kinsbursky <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2012-11-14nfsd4: get_backchannel_cred should be staticFengguang Wu1-1/+1
Signed-off-by: J. Bruce Fields <[email protected]>
2012-11-07nfsd4: backchannel should use client-provided security flavorJ. Bruce Fields1-2/+1
For now this only adds support for AUTH_NULL. (Previously we assumed AUTH_UNIX.) We'll also need AUTH_GSS, which is trickier. Signed-off-by: J. Bruce Fields <[email protected]>
2012-11-07nfsd4: common helper to initialize callback workJ. Bruce Fields1-1/+6
I've found it confusing having the only references to nfsd4_do_callback_rpc() in a different file. Signed-off-by: J. Bruce Fields <[email protected]>
2012-11-07nfsd4: use callback security parameters in create_sessionJ. Bruce Fields1-14/+35
We're currently ignoring the callback security parameters specified in create_session, and just assuming the client wants auth_sys, because that's all the current linux client happens to care about. But this could cause us callbacks to fail to a client that wanted something different. For now, all we're doing is no longer ignoring the uid and gid passed in the auth_sys case. Further patches will add support for auth_null and gss (and possibly use more of the auth_sys information; the spec wants us to use exactly the credential we're passed, though it's hard to imagine why a client would care). Signed-off-by: J. Bruce Fields <[email protected]>
2012-09-10nfsd: remove duplicate init in nfsd4_cb_recallNamjae Jeon1-1/+0
remove duplicate init in nfsd4_cb_recall Signed-off-by: Namjae Jeon <[email protected]> Signed-off-by: Vivek Trivedi <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2012-08-20nfsd4: fix security flavor of NFSv4.0 callbackJ. Bruce Fields1-2/+2
Commit d5497fc693a446ce9100fcf4117c3f795ddfd0d2 "nfsd4: move rq_flavor into svc_cred" forgot to remove cl_flavor from the client, leaving two places (cl_flavor and cl_cred.cr_flavor) for the flavor to be stored. After that patch, the latter was the one that was updated, but the former was the one that the callback used. Symptoms were a long delay on utime(). This is because the utime() generated a setattr which recalled a delegation, but the cb_recall was ignored by the client because it had the wrong security flavor. Cc: [email protected] Tested-by: Jamie Heilman <[email protected]> Reported-by: Jamie Heilman <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2012-06-20nfsd4: remove unnecessary commentJ. Bruce Fields1-1/+0
For the most part readers of cl_cb_state only need a value that is "eventually" right. And the value is set only either 1) in response to some change of state, in which case it's set to UNKNOWN and then a callback rpc is sent to probe the real state, or b) in the handling of a response to such a callback. UNKNOWN is therefore always a "temporary" state, and for the other states we're happy to accept last writer wins. So I think we're OK here. Signed-off-by: J. Bruce Fields <[email protected]>
2012-05-31nfsd4: move principal name into svc_credJ. Bruce Fields1-2/+3
Instead of keeping the principal name associated with a request in a structure that's private to auth_gss and using an accessor function, move it to svc_cred. Signed-off-by: J. Bruce Fields <[email protected]>
2012-03-28nfsd4: use auth_unix unconditionally on backchannelJ. Bruce Fields1-1/+2
This isn't actually correct, but it works with the Linux client, and agrees with the behavior we used to have before commit 80fc015bdfe. Later patches will implement the spec-mandated behavior (which is to use the security parameters explicitly given by the client in create_session or backchannel_ctl). Signed-off-by: J. Bruce Fields <[email protected]>
2012-03-26nfsd: convert nfs4_client->cl_cb_flags to a generic flags fieldJeff Layton1-7/+7
We'll need a way to flag the nfs4_client as already being recorded on stable storage so that we don't continually upcall. Currently, that's recorded in the cl_firststate field of the client struct. Using an entire u32 to store a flag is rather wasteful though. The cl_cb_flags field is only using 2 bits right now, so repurpose that to a generic flags field. Rename NFSD4_CLIENT_KILL to NFSD4_CLIENT_CB_KILL to make it evident that it's part of the callback flags. Add a mask that we can use for existing checks that look to see whether any flags are set, so that the new flags don't interfere. Convert all references to cl_firstate to the NFSD4_CLIENT_STABLE flag, and add a new NFSD4_CLIENT_RECLAIM_COMPLETE flag. Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2012-03-26Merge nfs containerization work from Trond's treeJ. Bruce Fields1-4/+4
The nfs containerization work is a prerequisite for Jeff Layton's reboot recovery rework.
2012-03-09nfsd4: make sure set CB_PATH_DOWN sequence flag setJ. Bruce Fields1-1/+1
Make sure this is set whenever there is no callback channel. If a client does not set up a callback channel at all, then it will get this flag set from the very start. That's OK, it can just ignore the flag if it doesn't care. If a client does care, I think it's better to inform it of the problem as early as possible. Reported-by: Rick Macklem <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2012-01-31SUNRPC: constify the rpc_programTrond Myklebust1-3/+3
Signed-off-by: Trond Myklebust <[email protected]>
2012-01-31SUNRPC: handle RPC client pipefs dentries by network namespace aware routinesStanislav Kinsbursky1-1/+1
v2: 1) "Over-put" of PipeFS mount point fixed. Fix is ugly, but allows to bisect the patch set. And it will be removed later in the series. This patch makes RPC clients PipeFs dentries allocations in it's owner network namespace context. RPC client pipefs dentries creation logic has been changed: 1) Pipefs dentries creation by sb was moved to separated function, which will be used for handling PipeFS mount notification. 2) Initial value of RPC client PipeFS dir dentry is set no NULL now. RPC client pipefs dentries cleanup logic has been changed: 1) Cleanup is done now in separated rpc_remove_pipedir() function, which takes care about pipefs superblock locking. Also this patch removes slashes from cb_program.pipe_dir_name and from NFS_PIPE_DIRNAME to make rpc_d_lookup_sb() work. This doesn't affect vfs_path_lookup() results in nfs4blocklayout_init() since this slash is cutted off anyway in link_path_walk(). Signed-off-by: Stanislav Kinsbursky <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2012-01-05SUNRPC: Clean up the RPCSEC_GSS service ticket requestsTrond Myklebust1-1/+1
Instead of hacking specific service names into gss_encode_v1_msg, we should just allow the caller to specify the service name explicitly. Signed-off-by: Trond Myklebust <[email protected]> Acked-by: J. Bruce Fields <[email protected]>
2011-10-24nfsd41: use SEQ4_STATUS_BACKCHANNEL_FAULT when cb_sequence is invalidBenny Halevy1-0/+10
Signed-off-by: Benny Halevy <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2011-09-26nfsd4: move client * to nfs4_stateid, add init_stid helperJ. Bruce Fields1-4/+4
This will be convenient. Signed-off-by: J. Bruce Fields <[email protected]>
2011-09-13nfsd4: add common dl_stid field to delegationJ. Bruce Fields1-1/+1
Signed-off-by: J. Bruce Fields <[email protected]>
2011-02-22NFSD: fix decode_cb_sequence4resokBenny Halevy1-1/+1
Fix bug introduced in patch 85a56480 NFSD: Update XDR decoders in NFSv4 callback client Although decode_cb_sequence4resok ignores highest slotid and target highest slotid it must account for their space in their xdr stream when calling xdr_inline_decode Cc: Chuck Lever <[email protected]> Signed-off-by: Benny Halevy <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2011-02-14NFSD: use nfserr for status after decode_cb_op_statusBenny Halevy1-4/+2
Bugs introduced in 85a56480191ca9f08fc775c129b9eb5c8c1f2c05 "NFSD: Update XDR decoders in NFSv4 callback client" Cc: Chuck Lever <[email protected]> Signed-off-by: Benny Halevy <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2011-01-14Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linuxLinus Torvalds1-52/+99
* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux: (62 commits) nfsd4: fix callback restarting nfsd: break lease on unlink, link, and rename nfsd4: break lease on nfsd setattr nfsd: don't support msnfs export option nfsd4: initialize cb_per_client nfsd4: allow restarting callbacks nfsd4: simplify nfsd4_cb_prepare nfsd4: give out delegations more quickly in 4.1 case nfsd4: add helper function to run callbacks nfsd4: make sure sequence flags are set after destroy_session nfsd4: re-probe callback on connection loss nfsd4: set sequence flag when backchannel is down nfsd4: keep finer-grained callback status rpc: allow xprt_class->setup to return a preexisting xprt rpc: keep backchannel xprt as long as server connection rpc: move sk_bc_xprt to svc_xprt nfsd4: allow backchannel recovery nfsd4: support BIND_CONN_TO_SESSION nfsd4: modify session list under cl_lock Documentation: fl_mylease no longer exists ... Fix up conflicts in fs/nfsd/vfs.c with the vfs-scale work. The vfs-scale work touched some msnfs cases, and this merge removes support for that entirely, so the conflict was trivial to resolve.
2011-01-14nfsd4: fix callback restartingJ. Bruce Fields1-12/+9
Ensure a new callback is added to the client's list of callbacks at most once. Signed-off-by: J. Bruce Fields <[email protected]>
2011-01-13nfsd4: initialize cb_per_clientJ. Bruce Fields1-0/+1
Otherwise a callback that is aborted before it runs will result in a list_del on an uninitialized list head. Signed-off-by: J. Bruce Fields <[email protected]>
2011-01-11nfsd4: allow restarting callbacksJ. Bruce Fields1-6/+28
If we lose the backchannel and then the client repairs the problem, resend any callbacks. We use a new cb_done flag to track whether there is still work to be done for the callback or whether it can be destroyed with the rpc. Signed-off-by: J. Bruce Fields <[email protected]>
2011-01-11nfsd4: simplify nfsd4_cb_prepareJ. Bruce Fields1-22/+4
Remove handling for a nonexistant case (status && !-EAGAIN). Signed-off-by: J. Bruce Fields <[email protected]>
2011-01-11nfsd4: add helper function to run callbacksJ. Bruce Fields1-2/+7
Signed-off-by: J. Bruce Fields <[email protected]>
2011-01-11nfsd4: make sure sequence flags are set after destroy_sessionJ. Bruce Fields1-0/+6
If this loses any backchannel, make sure we have a chance to notice that and set the sequence flags. Signed-off-by: J. Bruce Fields <[email protected]>
2011-01-11nfsd4: keep finer-grained callback statusJ. Bruce Fields1-12/+14
Distinguish between when the callback channel is known to be down, and when it is not yet confirmed. This will be useful in the 4.1 case. Also, we don't seem to be using the fact that this field is atomic. Signed-off-by: J. Bruce Fields <[email protected]>
2011-01-11nfsd4: allow backchannel recoveryJ. Bruce Fields1-3/+33
Now that we have a list of connections to choose from, we can teach the callback code to just pick a suitable connection and use that, instead of insisting on forever using the connection that the first create_session was sent with. Signed-off-by: J. Bruce Fields <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.