Commit 233839b1 authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Steve French
Browse files

CIFS: Fix fast lease break after open problem 



Now we walk though cifsFileInfo's list for every incoming lease
break and look for an equivalent there. That approach misses lease
breaks that come just after an open response - we don't have time
to populate new cifsFileInfo structure to the list. Fix this by
adding new list of pending opens and look for a lease there if we
didn't find it in the list of cifsFileInfo structures.

Signed-off-by: default avatarPavel Shilovsky <pshilovsky@etersoft.ru>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 0822f514

fs/cifs/cifsglob.h

+12 −0
Original line number Diff line number Diff line
@@ -715,6 +715,7 @@ struct cifs_ses { 
	__u16 session_flags;

#endif /* CONFIG_CIFS_SMB2 */

};



/* no more than one of the following three session flags may be set */

#define CIFS_SES_NT4 1

#define CIFS_SES_OS2 2
@@ -821,6 +822,7 @@ struct cifs_tcon { 
	u64 resource_id;		/* server resource id */

	struct fscache_cookie *fscache;	/* cookie for share */

#endif

	struct list_head pending_opens;	/* list of incomplete opens */

	/* BB add field for back pointer to sb struct(s)? */

};
@@ -863,6 +865,15 @@ cifs_get_tlink(struct tcon_link *tlink) 
/* This function is always expected to succeed */

extern struct cifs_tcon *cifs_sb_master_tcon(struct cifs_sb_info *cifs_sb);



#define CIFS_OPLOCK_NO_CHANGE 0xfe



struct cifs_pending_open {

	struct list_head olist;

	struct tcon_link *tlink;

	__u8 lease_key[16];

	__u32 oplock;

};



/*

 * This info hangs off the cifsFileInfo structure, pointed to by llist.

 * This is used to track byte stream locks on the file
@@ -903,6 +914,7 @@ struct cifs_fid { 
	__u64 volatile_fid;	/* volatile file id for smb2 */

	__u8 lease_key[SMB2_LEASE_KEY_SIZE];	/* lease key for smb2 */

#endif

	struct cifs_pending_open *pending_open;

};



struct cifs_fid_locks {

fs/cifs/cifsproto.h

+7 −0
Original line number Diff line number Diff line
@@ -184,6 +184,13 @@ extern bool cifs_find_lock_conflict(struct cifsFileInfo *cfile, __u64 offset, 
				    __u64 length, __u8 type,

				    struct cifsLockInfo **conf_lock,

				    bool rw_check);

extern void cifs_add_pending_open(struct cifs_fid *fid,

				  struct tcon_link *tlink,

				  struct cifs_pending_open *open);

extern void cifs_add_pending_open_locked(struct cifs_fid *fid,

					 struct tcon_link *tlink,

					 struct cifs_pending_open *open);

extern void cifs_del_pending_open(struct cifs_pending_open *open);



#if IS_ENABLED(CONFIG_CIFS_DFS_UPCALL)

extern void cifs_dfs_release_automount_timer(void);

fs/cifs/connect.c

+1 −0
Original line number Diff line number Diff line
@@ -2645,6 +2645,7 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb_vol *volume_info) 
	tcon->retry = volume_info->retry;

	tcon->nocase = volume_info->nocase;

	tcon->local_lease = volume_info->local_lease;

	INIT_LIST_HEAD(&tcon->pending_opens);



	spin_lock(&cifs_tcp_ses_lock);

	list_add(&tcon->tcon_list, &ses->tcon_list);

fs/cifs/dir.c

+8 −1
Original line number Diff line number Diff line
@@ -382,6 +382,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, 
	struct cifs_tcon *tcon;

	struct TCP_Server_Info *server;

	struct cifs_fid fid;

	struct cifs_pending_open open;

	__u32 oplock;

	struct cifsFileInfo *file_info;
@@ -423,16 +424,21 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, 
	if (server->ops->new_lease_key)

		server->ops->new_lease_key(&fid);



	cifs_add_pending_open(&fid, tlink, &open);



	rc = cifs_do_create(inode, direntry, xid, tlink, oflags, mode,

			    &oplock, &fid, opened);



	if (rc)

	if (rc) {

		cifs_del_pending_open(&open);

		goto out;

	}



	rc = finish_open(file, direntry, generic_file_open, opened);

	if (rc) {

		if (server->ops->close)

			server->ops->close(xid, tcon, &fid);

		cifs_del_pending_open(&open);

		goto out;

	}
@@ -440,6 +446,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, 
	if (file_info == NULL) {

		if (server->ops->close)

			server->ops->close(xid, tcon, &fid);

		cifs_del_pending_open(&open);

		rc = -ENOMEM;

	}

fs/cifs/file.c

+31 −4
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ cifs_new_fileinfo(struct cifs_fid *fid, struct file *file, 
	struct cifsInodeInfo *cinode = CIFS_I(inode);

	struct cifsFileInfo *cfile;

	struct cifs_fid_locks *fdlocks;

	struct cifs_tcon *tcon = tlink_tcon(tlink);



	cfile = kzalloc(sizeof(struct cifsFileInfo), GFP_KERNEL);

	if (cfile == NULL)
@@ -274,10 +275,15 @@ cifs_new_fileinfo(struct cifs_fid *fid, struct file *file, 
	cfile->tlink = cifs_get_tlink(tlink);

	INIT_WORK(&cfile->oplock_break, cifs_oplock_break);

	mutex_init(&cfile->fh_mutex);

	tlink_tcon(tlink)->ses->server->ops->set_fid(cfile, fid, oplock);



	spin_lock(&cifs_file_list_lock);

	list_add(&cfile->tlist, &(tlink_tcon(tlink)->openFileList));

	if (fid->pending_open->oplock != CIFS_OPLOCK_NO_CHANGE)

		oplock = fid->pending_open->oplock;

	list_del(&fid->pending_open->olist);



	tlink_tcon(tlink)->ses->server->ops->set_fid(cfile, fid, oplock);



	list_add(&cfile->tlist, &tcon->openFileList);

	/* if readable file instance put first in list*/

	if (file->f_mode & FMODE_READ)

		list_add(&cfile->flist, &cinode->openFileList);
@@ -307,9 +313,12 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file) 
{

	struct inode *inode = cifs_file->dentry->d_inode;

	struct cifs_tcon *tcon = tlink_tcon(cifs_file->tlink);

	struct TCP_Server_Info *server = tcon->ses->server;

	struct cifsInodeInfo *cifsi = CIFS_I(inode);

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	struct cifsLockInfo *li, *tmp;

	struct cifs_fid fid;

	struct cifs_pending_open open;



	spin_lock(&cifs_file_list_lock);

	if (--cifs_file->count > 0) {
@@ -317,6 +326,12 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file) 
		return;

	}



	if (server->ops->get_lease_key)

		server->ops->get_lease_key(inode, &fid);



	/* store open in pending opens to make sure we don't miss lease break */

	cifs_add_pending_open_locked(&fid, cifs_file->tlink, &open);



	/* remove it from the lists */

	list_del(&cifs_file->flist);

	list_del(&cifs_file->tlist);
@@ -348,6 +363,8 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file) 
		free_xid(xid);

	}



	cifs_del_pending_open(&open);



	/*

	 * Delete any outstanding lock records. We'll lose them when the file

	 * is closed anyway.
@@ -368,6 +385,7 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file) 
}



int cifs_open(struct inode *inode, struct file *file)



{

	int rc = -EACCES;

	unsigned int xid;
@@ -380,6 +398,7 @@ int cifs_open(struct inode *inode, struct file *file) 
	char *full_path = NULL;

	bool posix_open_ok = false;

	struct cifs_fid fid;

	struct cifs_pending_open open;



	xid = get_xid();
@@ -401,7 +420,7 @@ int cifs_open(struct inode *inode, struct file *file) 
	cFYI(1, "inode = 0x%p file flags are 0x%x for %s",

		 inode, file->f_flags, full_path);



	if (tcon->ses->server->oplocks)

	if (server->oplocks)

		oplock = REQ_OPLOCK;

	else

		oplock = 0;
@@ -434,20 +453,28 @@ int cifs_open(struct inode *inode, struct file *file) 
		 */

	}



	if (server->ops->get_lease_key)

		server->ops->get_lease_key(inode, &fid);



	cifs_add_pending_open(&fid, tlink, &open);



	if (!posix_open_ok) {

		if (server->ops->get_lease_key)

			server->ops->get_lease_key(inode, &fid);



		rc = cifs_nt_open(full_path, inode, cifs_sb, tcon,

				  file->f_flags, &oplock, &fid, xid);

		if (rc)

		if (rc) {

			cifs_del_pending_open(&open);

			goto out;

		}

	}



	cfile = cifs_new_fileinfo(&fid, file, tlink, oplock);

	if (cfile == NULL) {

		if (server->ops->close)

			server->ops->close(xid, tcon, &fid);

		cifs_del_pending_open(&open);

		rc = -ENOMEM;

		goto out;

	}