Commit 8688d954 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-4.2-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

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

  Stable patches:
   - Fix a crash in the NFSv4 file locking code.
   - Fix an fsync() regression, where we were failing to retry I/O in
     some circumstances.
   - Fix an infinite loop in NFSv4.0 OPEN stateid recovery
   - Fix a memory leak when an attempted pnfs fails.
   - Fix a memory leak in the backchannel code
   - Large hostnames were not supported correctly in NFSv4.1
   - Fix a pNFS/flexfiles bug that was impeding error reporting on I/O.
   - Fix a couple of credential issues in pNFS/flexfiles

  Bugfixes + cleanups:
   - Open flag sanity checks in the NFSv4 atomic open codepath
   - More NFSv4 delegation related bugfixes
   - Various NFSv4.1 backchannel bugfixes and cleanups
   - Fix the NFS swap socket code
   - Various cleanups of the NFSv4 SETCLIENTID and EXCHANGE_ID code
   - Fix a UDP transport deadlock issue

  Features:
   - More RDMA client transport improvements
   - NFSv4.2 LAYOUTSTATS functionality for pnfs flexfiles"

* tag 'nfs-for-4.2-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (87 commits)
  nfs: Remove invalid tk_pid from debug message
  nfs: Remove invalid NFS_ATTR_FATTR_V4_REFERRAL checking in nfs4_get_rootfh
  nfs: Drop bad comment in nfs41_walk_client_list()
  nfs: Remove unneeded micro checking of CONFIG_PROC_FS
  nfs: Don't setting FILE_CREATED flags always
  nfs: Use remove_proc_subtree() instead remove_proc_entry()
  nfs: Remove unused argument in nfs_server_set_fsinfo()
  nfs: Fix a memory leak when meeting an unsupported state protect
  nfs: take extra reference to fl->fl_file when running a LOCKU operation
  NFSv4: When returning a delegation, don't reclaim an incompatible open mode.
  NFSv4.2: LAYOUTSTATS is optional to implement
  NFSv4.2: Fix up a decoding error in layoutstats
  pNFS/flexfiles: Fix the reset of struct pgio_header when resending
  pNFS/flexfiles: Turn off layoutcommit for servers that don't need it
  pnfs/flexfiles: protect ktime manipulation with mirror lock
  nfs: provide pnfs_report_layoutstat when NFS42 is disabled
  nfs: verify open flags before allowing open
  nfs: always update creds in mirror, even when we have an already connected ds
  nfs: fix potential credential leak in ff_layout_update_mirror_cred
  pnfs/flexfiles: report layoutstat regularly
  ...
parents 320cd413 b4839ebe

fs/nfs/callback.c

+3 −3
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ check_gss_callback_principal(struct nfs_client *clp, struct svc_rqst *rqstp) 
 * pg_authenticate method for nfsv4 callback threads.

 *

 * The authflavor has been negotiated, so an incorrect flavor is a server

 * bug. Drop packets with incorrect authflavor.

 * bug. Deny packets with incorrect authflavor.

 *

 * All other checking done after NFS decoding where the nfs_client can be

 * found in nfs4_callback_compound
@@ -468,12 +468,12 @@ static int nfs_callback_authenticate(struct svc_rqst *rqstp) 
	switch (rqstp->rq_authop->flavour) {

	case RPC_AUTH_NULL:

		if (rqstp->rq_proc != CB_NULL)

			return SVC_DROP;

			return SVC_DENIED;

		break;

	case RPC_AUTH_GSS:

		/* No RPC_AUTH_GSS support yet in NFSv4.1 */

		 if (svc_is_backchannel(rqstp))

			return SVC_DROP;

			return SVC_DENIED;

	}

	return SVC_OK;

}

fs/nfs/callback_proc.c

+23 −15
Original line number Diff line number Diff line
@@ -327,10 +327,8 @@ validate_seqid(struct nfs4_slot_table *tbl, struct cb_sequenceargs * args) 
	dprintk("%s slot table seqid: %u\n", __func__, slot->seq_nr);



	/* Normal */

	if (likely(args->csa_sequenceid == slot->seq_nr + 1)) {

		slot->seq_nr++;

	if (likely(args->csa_sequenceid == slot->seq_nr + 1))

		goto out_ok;

	}



	/* Replay */

	if (args->csa_sequenceid == slot->seq_nr) {
@@ -418,6 +416,7 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args, 
			      struct cb_process_state *cps)

{

	struct nfs4_slot_table *tbl;

	struct nfs4_slot *slot;

	struct nfs_client *clp;

	int i;

	__be32 status = htonl(NFS4ERR_BADSESSION);
@@ -429,25 +428,32 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args, 


	if (!(clp->cl_session->flags & SESSION4_BACK_CHAN))

		goto out;



	tbl = &clp->cl_session->bc_slot_table;

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



	spin_lock(&tbl->slot_tbl_lock);

	/* state manager is resetting the session */

	if (test_bit(NFS4_SLOT_TBL_DRAINING, &tbl->slot_tbl_state)) {

		spin_unlock(&tbl->slot_tbl_lock);

		status = htonl(NFS4ERR_DELAY);

		/* Return NFS4ERR_BADSESSION if we're draining the session

		 * in order to reset it.

		 */

		if (test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state))

			status = htonl(NFS4ERR_BADSESSION);

		goto out;

		goto out_unlock;

	}



	status = validate_seqid(&clp->cl_session->bc_slot_table, args);

	spin_unlock(&tbl->slot_tbl_lock);

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

	       sizeof(res->csr_sessionid));

	res->csr_sequenceid = args->csa_sequenceid;

	res->csr_slotid = args->csa_slotid;

	res->csr_highestslotid = NFS41_BC_MAX_CALLBACKS - 1;

	res->csr_target_highestslotid = NFS41_BC_MAX_CALLBACKS - 1;



	status = validate_seqid(tbl, args);

	if (status)

		goto out;

		goto out_unlock;



	cps->slotid = args->csa_slotid;
@@ -458,15 +464,17 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args, 
	 */

	if (referring_call_exists(clp, args->csa_nrclists, args->csa_rclists)) {

		status = htonl(NFS4ERR_DELAY);

		goto out;

		goto out_unlock;

	}



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

	       sizeof(res->csr_sessionid));

	res->csr_sequenceid = args->csa_sequenceid;

	res->csr_slotid = args->csa_slotid;

	res->csr_highestslotid = NFS41_BC_MAX_CALLBACKS - 1;

	res->csr_target_highestslotid = NFS41_BC_MAX_CALLBACKS - 1;

	/*

	 * RFC5661 20.9.3

	 * If CB_SEQUENCE returns an error, then the state of the slot

	 * (sequence ID, cached reply) MUST NOT change.

	 */

	slot->seq_nr++;

out_unlock:

	spin_unlock(&tbl->slot_tbl_lock);



out:

	cps->clp = clp; /* put in nfs4_callback_compound */

fs/nfs/callback_xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r 
	xdr_init_encode(&xdr_out, &rqstp->rq_res, p);



	status = decode_compound_hdr_arg(&xdr_in, &hdr_arg);

	if (status == __constant_htonl(NFS4ERR_RESOURCE))

	if (status == htonl(NFS4ERR_RESOURCE))

		return rpc_garbage_args;



	if (hdr_arg.minorversion == 0) {

fs/nfs/client.c

+15 −25
Original line number Diff line number Diff line
@@ -825,7 +825,6 @@ error: 
 * Load up the server record from information gained in an fsinfo record

 */

static void nfs_server_set_fsinfo(struct nfs_server *server,

				  struct nfs_fh *mntfh,

				  struct nfs_fsinfo *fsinfo)

{

	unsigned long max_rpc_payload;
@@ -901,7 +900,7 @@ int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, struct nfs 
	if (error < 0)

		goto out_error;



	nfs_server_set_fsinfo(server, mntfh, &fsinfo);

	nfs_server_set_fsinfo(server, &fsinfo);



	/* Get some general file system info */

	if (server->namelen == 0) {
@@ -1193,8 +1192,6 @@ void nfs_clients_init(struct net *net) 
}



#ifdef CONFIG_PROC_FS

static struct proc_dir_entry *proc_fs_nfs;



static int nfs_server_list_open(struct inode *inode, struct file *file);

static void *nfs_server_list_start(struct seq_file *p, loff_t *pos);

static void *nfs_server_list_next(struct seq_file *p, void *v, loff_t *pos);
@@ -1364,27 +1361,29 @@ static int nfs_volume_list_show(struct seq_file *m, void *v) 
{

	struct nfs_server *server;

	struct nfs_client *clp;

	char dev[8], fsid[17];

	char dev[13];	// 8 for 2^24, 1 for ':', 3 for 2^8, 1 for '\0'

	char fsid[34];	// 2 * 16 for %llx, 1 for ':', 1 for '\0'

	struct nfs_net *nn = net_generic(seq_file_net(m), nfs_net_id);



	/* display header on line 1 */

	if (v == &nn->nfs_volume_list) {

		seq_puts(m, "NV SERVER   PORT DEV     FSID              FSC\n");

		seq_puts(m, "NV SERVER   PORT DEV          FSID"

			    "                              FSC\n");

		return 0;

	}

	/* display one transport per line on subsequent lines */

	server = list_entry(v, struct nfs_server, master_link);

	clp = server->nfs_client;



	snprintf(dev, 8, "%u:%u",

	snprintf(dev, sizeof(dev), "%u:%u",

		 MAJOR(server->s_dev), MINOR(server->s_dev));



	snprintf(fsid, 17, "%llx:%llx",

	snprintf(fsid, sizeof(fsid), "%llx:%llx",

		 (unsigned long long) server->fsid.major,

		 (unsigned long long) server->fsid.minor);



	rcu_read_lock();

	seq_printf(m, "v%u %s %s %-7s %-17s %s\n",

	seq_printf(m, "v%u %s %s %-12s %-33s %s\n",

		   clp->rpc_ops->version,

		   rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_HEX_ADDR),

		   rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_HEX_PORT),
@@ -1434,27 +1433,20 @@ void nfs_fs_proc_net_exit(struct net *net) 
 */

int __init nfs_fs_proc_init(void)

{

	struct proc_dir_entry *p;



	proc_fs_nfs = proc_mkdir("fs/nfsfs", NULL);

	if (!proc_fs_nfs)

	if (!proc_mkdir("fs/nfsfs", NULL))

		goto error_0;



	/* a file of servers with which we're dealing */

	p = proc_symlink("servers", proc_fs_nfs, "../../net/nfsfs/servers");

	if (!p)

	if (!proc_symlink("fs/nfsfs/servers", NULL, "../../net/nfsfs/servers"))

		goto error_1;



	/* a file of volumes that we have mounted */

	p = proc_symlink("volumes", proc_fs_nfs, "../../net/nfsfs/volumes");

	if (!p)

		goto error_2;

	return 0;

	if (!proc_symlink("fs/nfsfs/volumes", NULL, "../../net/nfsfs/volumes"))

		goto error_1;



error_2:

	remove_proc_entry("servers", proc_fs_nfs);

	return 0;

error_1:

	remove_proc_entry("fs/nfsfs", NULL);

	remove_proc_subtree("fs/nfsfs", NULL);

error_0:

	return -ENOMEM;

}
@@ -1464,9 +1456,7 @@ error_0: 
 */

void nfs_fs_proc_exit(void)

{

	remove_proc_entry("volumes", proc_fs_nfs);

	remove_proc_entry("servers", proc_fs_nfs);

	remove_proc_entry("fs/nfsfs", NULL);

	remove_proc_subtree("fs/nfsfs", NULL);

}



#endif /* CONFIG_PROC_FS */

fs/nfs/dir.c

+0 −3
Original line number Diff line number Diff line
@@ -1470,9 +1470,6 @@ static int nfs_finish_open(struct nfs_open_context *ctx, 
{

	int err;



	if ((open_flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))

		*opened |= FILE_CREATED;



	err = finish_open(file, dentry, do_open, opened);

	if (err)

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE