pNFS: Don't keep retrying if the server replied NFS4ERR_LAYOUTUNAVAILABLE
Subsystems (2)
[email protected]
maintainerPATCH 1/2 pNFS: Don't keep retrying if the server replied NFS4ERR_LAYOUTUNAVAILABLE
From: Trond Myklebust <[email protected]>
If the server tells us that a pNFS layout is not available for a specific file, then we should not keep pounding it with further layoutget requests.
--- fs/nfs/pnfs.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/nfs/pnfs.c +6 -0
@@ -2152,6 +2152,12 @@ pnfs_update_layout(struct inode *ino,case -ERECALLCONFLICT :case -EAGAIN :break ; +case -ENODATA : +/* The server returned NFS4ERR_LAYOUTUNAVAILABLE */ +pnfs_layout_set_fail_bit ( + lo,pnfs_iomode_to_fail_bit (iomode)); + lseg =NULL ; + goto out_put_layout_hdr;default :if (!nfs_error_is_fatal (PTR_ERR (lseg))) {pnfs_layout_clear_fail_bit (lo,pnfs_iomode_to_fail_bit (iomode));
Signature · 1 line
2.36.1
[email protected]
maintainerPATCH 2/2 pNFS: Avoid a live lock condition in pnfs_update_layout()
From: Trond Myklebust <[email protected]>
If we're about to send the first layoutget for an empty layout, we want to make sure that we drain out the existing pending layoutget calls first. The reason is that these layouts may have been already implicitly returned to the server by a recall to which the client gave a NFS4ERR_NOMATCHING_LAYOUT response.
The problem is that wait_var_event_killable() could in principle see the plh_outstanding count go back to '1' when the first process to wake up starts sending a new layoutget. If it fails to get a layout, then this loop can continue ad infinitum...
--- fs/nfs/callback_proc.c | 1 + fs/nfs/pnfs.c | 15 +++++++++------ fs/nfs/pnfs.h | 1 + 3 files changed, 11 insertions(+), 6 deletions(-)
fs/nfs/callback_proc.c +1 -0
@@ -288,6 +288,7 @@ static u32 initiate_file_draining(struct nfs_client *clp, rv =NFS4_OK ;break ;case -ENOENT : +set_bit (NFS_LAYOUT_DRAIN , &lo->plh_flags);/* Embrace your forgetfulness! */ rv =NFS4ERR_NOMATCHING_LAYOUT ;
fs/nfs/pnfs.c +9 -6
@@ -469,6 +469,7 @@ pnfs_mark_layout_stateid_invalid(struct pnfs_layout_hdr *lo,pnfs_clear_lseg_state (lseg, lseg_list);pnfs_clear_layoutreturn_info (lo);pnfs_free_returned_lsegs (lo, lseg_list, &range,0 ); +set_bit (NFS_LAYOUT_DRAIN , &lo->plh_flags);if (test_bit (NFS_LAYOUT_RETURN , &lo->plh_flags) && !test_and_set_bit (NFS_LAYOUT_RETURN_LOCK , &lo->plh_flags))pnfs_clear_layoutreturn_waitbit (lo);
@@ -1917,8 +1918,9 @@ static void nfs_layoutget_begin(struct pnfs_layout_hdr *lo)static void nfs_layoutget_end (struct pnfs_layout_hdr *lo) { -if (atomic_dec_and_test (&lo->plh_outstanding)) -wake_up_var (&lo->plh_outstanding); +if (atomic_dec_and_test (&lo->plh_outstanding) && +test_and_clear_bit (NFS_LAYOUT_DRAIN , &lo->plh_flags)) +wake_up_bit (&lo->plh_flags,NFS_LAYOUT_DRAIN ); }static bool pnfs_is_first_layoutget (struct pnfs_layout_hdr *lo)
@@ -2025,11 +2027,11 @@ pnfs_update_layout(struct inode *ino,* If the layout segment list is empty, but there are outstanding * layoutget calls, then they might be subject to a layoutrecall. */ -if ((list_empty (&lo->plh_segs) || !pnfs_layout_is_valid (lo)) && +if (test_bit (NFS_LAYOUT_DRAIN , &lo->plh_flags) &&atomic_read (&lo->plh_outstanding) !=0 ) {spin_unlock (&ino->i_lock); - lseg =ERR_PTR (wait_var_event_killable (&lo->plh_outstanding, - !atomic_read (&lo->plh_outstanding))); + lseg =ERR_PTR (wait_on_bit (&lo->plh_flags,NFS_LAYOUT_DRAIN , +TASK_KILLABLE ));if (IS_ERR (lseg)) goto out_put_layout_hdr;pnfs_put_layout_hdr (lo);
@@ -2413,7 +2415,8 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) goto out_forget; } -if (!pnfs_layout_is_valid (lo) && !pnfs_is_first_layoutget (lo)) +if (test_bit (NFS_LAYOUT_DRAIN , &lo->plh_flags) && + !pnfs_is_first_layoutget (lo)) goto out_forget;if (nfs4_stateid_match_other (&lo->plh_stateid, &res->stateid)) {
fs/nfs/pnfs.h +1 -0
@@ -105,6 +105,7 @@ enum {NFS_LAYOUT_FIRST_LAYOUTGET ,/* Serialize first layoutget */ NFS_LAYOUT_INODE_FREEING ,/* The inode is being freed */ NFS_LAYOUT_HASHED ,/* The layout visible */ + NFS_LAYOUT_DRAIN, }; enum layoutdriver_policy_flags {
Signature · 1 line
2.36.1