Commit 0cf21c66 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-4.8-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfixes from Trond Myklebust:
 "Highlights include:

  Stable patches:
   - Fix a refcount leak in nfs_callback_up_net
   - Fix an Oopsable condition when the flexfile pNFS driver connection
     to the DS fails
   - Fix an Oopsable condition in NFSv4.1 server callback races
   - Ensure pNFS clients stop doing I/O to the DS if their lease has
     expired, as required by the NFSv4.1 protocol

  Bugfixes:
   - Fix potential looping in the NFSv4.x migration code
   - Patch series to close callback races for OPEN, LAYOUTGET and
     LAYOUTRETURN
   - Silence WARN_ON when NFSv4.1 over RDMA is in use
   - Fix a LAYOUTCOMMIT race in the pNFS/blocks client
   - Fix pNFS timeout issues when the DS fails"

* tag 'nfs-for-4.8-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4.x: Fix a refcount leak in nfs_callback_up_net
  NFS4: Avoid migration loops
  pNFS/flexfiles: Fix an Oopsable condition when connection to the DS fails
  NFSv4.1: Remove obsolete and incorrrect assignment in nfs4_callback_sequence
  NFSv4.1: Close callback races for OPEN, LAYOUTGET and LAYOUTRETURN
  NFSv4.1: Defer bumping the slot sequence number until we free the slot
  NFSv4.1: Delay callback processing when there are referring triples
  NFSv4.1: Fix Oopsable condition in server callback races
  SUNRPC: Silence WARN_ON when NFSv4.1 over RDMA is in use
  pnfs/blocklayout: update last_write_offset atomically with extents
  pNFS: The client must not do I/O to the DS if it's lease has expired
  pNFS: Handle NFS4ERR_OLD_STATEID correctly in LAYOUTSTAT calls
  pNFS/flexfiles: Set reasonable default retrans values for the data channel
  NFS: Allow the mount option retrans=0
  pNFS/flexfiles: Fix layoutstat periodic reporting
parents 0d025d27 98b0f80c

fs/nfs/blocklayout/blocklayout.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static void bl_write_cleanup(struct work_struct *work) 
			PAGE_SIZE - 1) & (loff_t)PAGE_MASK;



		ext_tree_mark_written(bl, start >> SECTOR_SHIFT,

					(end - start) >> SECTOR_SHIFT);

					(end - start) >> SECTOR_SHIFT, end);

	}



	pnfs_ld_write_done(hdr);

fs/nfs/blocklayout/blocklayout.h

+2 −1
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ struct pnfs_block_layout { 
	struct rb_root		bl_ext_ro;

	spinlock_t		bl_ext_lock;   /* Protects list manipulation */

	bool			bl_scsi_layout;

	u64			bl_lwb;

};



static inline struct pnfs_block_layout *
@@ -182,7 +183,7 @@ int ext_tree_insert(struct pnfs_block_layout *bl, 
int ext_tree_remove(struct pnfs_block_layout *bl, bool rw, sector_t start,

		sector_t end);

int ext_tree_mark_written(struct pnfs_block_layout *bl, sector_t start,

		sector_t len);

		sector_t len, u64 lwb);

bool ext_tree_lookup(struct pnfs_block_layout *bl, sector_t isect,

		struct pnfs_block_extent *ret, bool rw);

int ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg);

fs/nfs/blocklayout/extent_tree.c

+7 −3
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ ext_tree_split(struct rb_root *root, struct pnfs_block_extent *be, 


int

ext_tree_mark_written(struct pnfs_block_layout *bl, sector_t start,

		sector_t len)

		sector_t len, u64 lwb)

{

	struct rb_root *root = &bl->bl_ext_rw;

	sector_t end = start + len;
@@ -471,6 +471,8 @@ ext_tree_mark_written(struct pnfs_block_layout *bl, sector_t start, 
		}

	}

out:

	if (bl->bl_lwb < lwb)

		bl->bl_lwb = lwb;

	spin_unlock(&bl->bl_ext_lock);



	__ext_put_deviceids(&tmp);
@@ -518,7 +520,7 @@ static __be32 *encode_scsi_range(struct pnfs_block_extent *be, __be32 *p) 
}



static int ext_tree_encode_commit(struct pnfs_block_layout *bl, __be32 *p,

		size_t buffer_size, size_t *count)

		size_t buffer_size, size_t *count, __u64 *lastbyte)

{

	struct pnfs_block_extent *be;

	int ret = 0;
@@ -542,6 +544,8 @@ static int ext_tree_encode_commit(struct pnfs_block_layout *bl, __be32 *p, 
			p = encode_block_extent(be, p);

		be->be_tag = EXTENT_COMMITTING;

	}

	*lastbyte = bl->bl_lwb - 1;

	bl->bl_lwb = 0;

	spin_unlock(&bl->bl_ext_lock);



	return ret;
@@ -564,7 +568,7 @@ ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg) 
	arg->layoutupdate_pages = &arg->layoutupdate_page;



retry:

	ret = ext_tree_encode_commit(bl, start_p + 1, buffer_size, &count);

	ret = ext_tree_encode_commit(bl, start_p + 1, buffer_size, &count, &arg->lastbytewritten);

	if (unlikely(ret)) {

		ext_tree_free_commitdata(arg, buffer_size);

fs/nfs/callback.c

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, 
err_socks:

	svc_rpcb_cleanup(serv, net);

err_bind:

	nn->cb_users[minorversion]--;

	dprintk("NFS: Couldn't create callback socket: err = %d; "

			"net = %p\n", ret, net);

	return ret;

fs/nfs/callback_proc.c

+2 −6
Original line number Diff line number Diff line
@@ -454,11 +454,8 @@ static bool referring_call_exists(struct nfs_client *clp, 
				((u32 *)&rclist->rcl_sessionid.data)[3],

				ref->rc_sequenceid, ref->rc_slotid);



			spin_lock(&tbl->slot_tbl_lock);

			status = (test_bit(ref->rc_slotid, tbl->used_slots) &&

				  tbl->slots[ref->rc_slotid].seq_nr ==

					ref->rc_sequenceid);

			spin_unlock(&tbl->slot_tbl_lock);

			status = nfs4_slot_wait_on_seqid(tbl, ref->rc_slotid,

					ref->rc_sequenceid, HZ >> 1) < 0;

			if (status)

				goto out;

		}
@@ -487,7 +484,6 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args, 
		goto out;



	tbl = &clp->cl_session->bc_slot_table;

	slot = tbl->slots + args->csa_slotid;



	/* Set up res before grabbing the spinlock */

	memcpy(&res->csr_sessionid, &args->csa_sessionid,

CRA Git | Maintained and supported by SUSTech CRA and CCSE