- 10 Feb, 2017 6 commits
-
-
Chuck Lever authored
Sriharsha (sriharsha.basavapatna@broadcom.com) reports an occasional double DMA unmap of an FRWR MR when a connection is lost. I see one way this can happen. When a request requires more than one segment or chunk, rpcrdma_marshal_req loops, invoking ->frwr_op_map for each segment (MR) in each chunk. Each call posts a FASTREG Work Request to register one MR. Now suppose that the transport connection is lost part-way through marshaling this request. As part of recovering and resetting that req, rpcrdma_marshal_req invokes ->frwr_op_unmap_safe, which hands all the req's registered FRWRs to the MR recovery thread. But note: FRWR registration is asynchronous. So it's possible that some of these "already registered" FRWRs are fully registered, and some are still waiting for their FASTREG WR to complete. When the connection is lost, the "already registered" frmrs are marked FRMR_IS_VALID, and the "still waiting" WRs flush. Then frwr_wc_fastreg marks these frmrs FRMR_FLUSHED_FR. But thanks to ->frwr_op_unmap_safe, the MR recovery thread is doing an unreg / alloc_mr, a DMA unmap, and marking each of these frwrs FRMR_IS_INVALID, at the same time frwr_wc_fastreg might be running. - If the recovery thread runs last, then the frmr is marked FRMR_IS_INVALID, and life continues. - If frwr_wc_fastreg runs last, the frmr is marked FRMR_FLUSHED_FR, but the recovery thread has already DMA unmapped that MR. When ->frwr_op_map later re-uses this frmr, it sees it is not marked FRMR_IS_INVALID, and tries to recover it before using it, resulting in a second DMA unmap of the same MR. The fix is to guarantee in-flight FASTREG WRs have flushed before MR recovery runs on those FRWRs. Thus we depend on ro_unmap_safe (called from xprt_rdma_send_request on retransmit, or from xprt_rdma_free) to clean up old registrations as needed. Reported-by:
Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com> Signed-off-by:
Chuck Lever <chuck.lever@oracle.com> Tested-by:
Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Chuck Lever authored
We no longer need to accommodate an xdr_buf whose pages start at an offset and cross extra page boundaries. If there are more partial or whole pages to send than there are available SGEs, the marshaling logic is now smart enough to use a Read chunk instead of failing. Signed-off-by:
Chuck Lever <chuck.lever@oracle.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Chuck Lever authored
The MAX_SEND_SGES check introduced in commit 655fec69 ("xprtrdma: Use gathered Send for large inline messages") fails for devices that have a small max_sge. Instead of checking for a large fixed maximum number of SGEs, check for a minimum small number. RPC-over-RDMA will switch to using a Read chunk if an xdr_buf has more pages than can fit in the device's max_sge limit. This is considerably better than failing all together to mount the server. This fix supports devices that have as few as three send SGEs available. Reported-by:
Selvin Xavier <selvin.xavier@broadcom.com> Reported-by:
Devesh Sharma <devesh.sharma@broadcom.com> Reported-by:
Honggang Li <honli@redhat.com> Reported-by:
Ram Amrani <Ram.Amrani@cavium.com> Fixes: 655fec69 ("xprtrdma: Use gathered Send for large ...") Cc: stable@vger.kernel.org # v4.9+ Tested-by:
Honggang Li <honli@redhat.com> Tested-by:
Ram Amrani <Ram.Amrani@cavium.com> Tested-by:
Steve Wise <swise@opengridcomputing.com> Reviewed-by:
Parav Pandit <parav@mellanox.com> Signed-off-by:
Chuck Lever <chuck.lever@oracle.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Chuck Lever authored
Commit d5440e27 ("xprtrdma: Enable pad optimization") made the Linux client omit XDR round-up padding in normal Read and Write chunks so that the client doesn't have to register and invalidate 3-byte memory regions that contain no real data. Unfortunately, my cheery 2014 assessment that this optimization "is supported now by both Linux and Solaris servers" was premature. We've found bugs in Solaris in this area since commit d5440e27 ("xprtrdma: Enable pad optimization") was merged (SYMLINK is the main offender). So for maximum interoperability, I'm disabling this optimization again. If a CM private message is exchanged when connecting, the client recognizes that the server is Linux, and enables the optimization for that connection. Until now the Solaris server bugs did not impact common operations, and were thus largely benign. Soon, less capable devices on Linux NFS/RDMA clients will make use of Read chunks more often, and these Solaris bugs will prevent interoperation in more cases. Fixes: 677eb17e ("xprtrdma: Fix XDR tail buffer marshalling") Cc: stable@vger.kernel.org # v4.9+ Signed-off-by:
Chuck Lever <chuck.lever@oracle.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Chuck Lever authored
Pad optimization is changed by echoing into /proc/sys/sunrpc/rdma_pad_optimize. This is a global setting, affecting all RPC-over-RDMA connections to all servers. The marshaling code picks up that value and uses it for decisions about how to construct each RPC-over-RDMA frame. Having it change suddenly in mid-operation can result in unexpected failures. And some servers a client mounts might need chunk round-up, while others don't. So instead, copy the pad_optimize setting into each connection's rpcrdma_ia when the transport is created, and use the copy, which can't change during the life of the connection, instead. This also removes a hack: rpcrdma_convert_iovs was using the remote-invalidation-expected flag to predict when it could leave out Write chunk padding. This is because the Linux server handles implicit XDR padding on Write chunks correctly, and only Linux servers can set the connection's remote-invalidation-expected flag. It's more sensible to use the pad optimization setting instead. Fixes: 677eb17e ("xprtrdma: Fix XDR tail buffer marshalling") Cc: stable@vger.kernel.org # v4.9+ Signed-off-by:
Chuck Lever <chuck.lever@oracle.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Chuck Lever authored
When pad optimization is disabled, rpcrdma_convert_iovs still does not add explicit XDR round-up padding to a Read chunk. Commit 677eb17e ("xprtrdma: Fix XDR tail buffer marshalling") incorrectly short-circuited the test for whether round-up padding is needed that appears later in rpcrdma_convert_iovs. However, if this is indeed a regular Read chunk (and not a Position-Zero Read chunk), the tail iovec _always_ contains the chunk's padding, and never anything else. So, it's easy to just skip the tail when padding optimization is enabled, and add the tail in a subsequent Read chunk segment, if disabled. Fixes: 677eb17e ("xprtrdma: Fix XDR tail buffer marshalling") Cc: stable@vger.kernel.org # v4.9+ Signed-off-by:
Chuck Lever <chuck.lever@oracle.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
- 09 Feb, 2017 4 commits
-
-
Trond Myklebust authored
Set the timeout for TCP connections to be 1 lease period to ensure that we don't lose our lease due to a faulty TCP connection. Signed-off-by:
Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Trond Myklebust authored
When the NFSv4 server tells us the lease period, we usually want to adjust down the timeout parameters on the TCP connection to ensure that we don't miss lease renewals due to a faulty connection. Signed-off-by:
Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Trond Myklebust authored
Signed-off-by:
Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Trond Myklebust authored
Signed-off-by:
Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
- 08 Feb, 2017 10 commits
-
-
Trond Myklebust authored
If we exit because the file access check failed, we currently leak the struct nfs4_state. We need to attach it to the open context before returning. Fixes: 3efb9722 ("NFSv4: Refactor _nfs4_open_and_get_state..") Cc: stable@vger.kernel.org # 3.10+ Signed-off-by:
Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Kinglong Mee authored
Signed-off-by:
Kinglong Mee <kinglongmee@gmail.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Kinglong Mee authored
pos in rpc_clnt_iter is useless, drop it and record clnt in seq_private. Signed-off-by:
Kinglong Mee <kinglongmee@gmail.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Kinglong Mee authored
Signed-off-by:
Kinglong Mee <kinglongmee@gmail.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Kinglong Mee authored
Don't found any place using the cr_magic. Signed-off-by:
Kinglong Mee <kinglongmee@gmail.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Kinglong Mee authored
NFS_NGROUPS has been move to sunrpc, rename to UNX_NGROUPS. Signed-off-by:
Kinglong Mee <kinglongmee@gmail.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Kinglong Mee authored
Record flush/channel/content entries is useless, remove them. Signed-off-by:
Kinglong Mee <kinglongmee@gmail.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Kinglong Mee authored
register_shrinker may return error when register fail, error out. Signed-off-by:
Kinglong Mee <kinglongmee@gmail.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Nicholas Piggin authored
Since commit 4f52b6bb ("NFS: Don't call COMMIT in ->releasepage()"), no tasks wait on PagePrivate, so the wake introduced in commit 95905446 ("NFS: avoid deadlocks with loop-back mounted NFS filesystems.") can be removed. Signed-off-by:
Nicholas Piggin <npiggin@gmail.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Benjamin Coddington authored
An interrupted rename will leave the old dentry behind if the rename succeeds. Fix this by moving the final local work of the rename to rpc_call_done so that the results of the RENAME can always be handled, even if the original process has already returned with -ERESTARTSYS. Signed-off-by:
Benjamin Coddington <bcodding@redhat.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
- 30 Jan, 2017 20 commits
-
-
Wei Yongjun authored
Fixes the following sparse warning: fs/nfs/nfs4state.c:862:60: warning: Using plain integer as NULL pointer Signed-off-by:
Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Wei Yongjun authored
Fixes the following sparse warning: fs/nfs/flexfilelayout/flexfilelayout.c:2114:34: warning: symbol 'layoutreturn_ops' was not declared. Should it be static? Signed-off-by:
Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
The function is cleaner this way, since we can use the result of memcmp() directly Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
Once again, it's easier and cleaner just to return the error directly. Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
This function doesn't add much, since all it does is access the server's nfs_client variable. Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
It's simpler just to return the status unconditionally Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
There is no need for a goto just to return an error code without any cleanup. Returning the error directly helps to clean up the code. Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
We can cut out the if statement and return the results of the comparison directly. Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
This tracepoint displays information about the slot that was chosen for the RPC, in addition to session information. This could be useful information for debugging, and we can set the session id hash to 0 to indicate that there is no session. Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
This creates a single place for all the work to happen, using the presence of a session to determine if extra values need to be set. Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
Rather than implementing this twice for NFS v4.0 and v4.1 Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
This puts the check in a single place, rather than needing to implement it twice for v4.0 and v4.1. Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
The inline ifdef lets us put everything in a single place, rather than having two (very similar) versions of this function. Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-
Anna Schumaker authored
This does the right thing depending on if we have a session, rather than needing to handle this manually in multiple places. Signed-off-by:
Anna Schumaker <Anna.Schumaker@Netapp.com>
-