Commit d63528eb authored by Hyunchul Lee's avatar Hyunchul Lee Committed by Namjae Jeon
Browse files

ksmbd: free ksmbd_lock when file is closed 



Append ksmbd_lock into the connection's
lock list and the ksmbd_file's lock list.
And when a file is closed, detach ksmbd_lock
from these lists and free it.

Signed-off-by: default avatarHyunchul Lee <hyc.lee@gmail.com>
Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 4b92841e

fs/ksmbd/connection.c

+5 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ static DEFINE_MUTEX(init_lock); 


static struct ksmbd_conn_ops default_conn_ops;



static LIST_HEAD(conn_list);

static DEFINE_RWLOCK(conn_list_lock);

LIST_HEAD(conn_list);

DEFINE_RWLOCK(conn_list_lock);



/**

 * ksmbd_conn_free() - free resources of the connection instance
@@ -70,6 +70,9 @@ struct ksmbd_conn *ksmbd_conn_alloc(void) 
	spin_lock_init(&conn->credits_lock);

	ida_init(&conn->async_ida);



	spin_lock_init(&conn->llist_lock);

	INIT_LIST_HEAD(&conn->lock_list);



	write_lock(&conn_list_lock);

	list_add(&conn->conns_list, &conn_list);

	write_unlock(&conn_list_lock);

fs/ksmbd/connection.h

+6 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ struct ksmbd_conn { 
		char			*ntlmssp_cryptkey;

	};



	spinlock_t			llist_lock;

	struct list_head		lock_list;



	struct preauth_integrity_info	*preauth_info;



	bool				need_neg;
@@ -138,6 +141,9 @@ struct ksmbd_transport { 
#define KSMBD_TCP_SEND_TIMEOUT	(5 * HZ)

#define KSMBD_TCP_PEER_SOCKADDR(c)	((struct sockaddr *)&((c)->peer_addr))



extern struct list_head conn_list;

extern rwlock_t conn_list_lock;



bool ksmbd_conn_alive(struct ksmbd_conn *conn);

void ksmbd_conn_wait_idle(struct ksmbd_conn *conn);

struct ksmbd_conn *ksmbd_conn_alloc(void);

fs/ksmbd/smb2pdu.c

+95 −59
Original line number Diff line number Diff line
@@ -6513,8 +6513,9 @@ static struct ksmbd_lock *smb2_lock_init(struct file_lock *flock, 
	lock->flags = flags;

	if (lock->start == lock->end)

		lock->zero_len = 1;

	INIT_LIST_HEAD(&lock->clist);

	INIT_LIST_HEAD(&lock->flist);

	INIT_LIST_HEAD(&lock->llist);

	INIT_LIST_HEAD(&lock->glist);

	list_add_tail(&lock->llist, lock_list);



	return lock;
@@ -6553,7 +6554,8 @@ int smb2_lock(struct ksmbd_work *work) 
	int cmd = 0;

	int err = 0, i;

	u64 lock_start, lock_length;

	struct ksmbd_lock *smb_lock = NULL, *cmp_lock, *tmp;

	struct ksmbd_lock *smb_lock = NULL, *cmp_lock, *tmp, *tmp2;

	struct ksmbd_conn *conn;

	int nolock = 0;

	LIST_HEAD(lock_list);

	LIST_HEAD(rollback_list);
@@ -6662,11 +6664,14 @@ int smb2_lock(struct ksmbd_work *work) 


		if (!(smb_lock->flags & SMB2_LOCKFLAG_UNLOCK) &&

		    !(smb_lock->flags & SMB2_LOCKFLAG_FAIL_IMMEDIATELY))

			goto no_check_gl;

			goto no_check_cl;



		nolock = 1;

		/* check locks in global list */

		list_for_each_entry(cmp_lock, &global_lock_list, glist) {

		/* check locks in connection list */

		read_lock(&conn_list_lock);

		list_for_each_entry(conn, &conn_list, conns_list) {

			spin_lock(&conn->llist_lock);

			list_for_each_entry_safe(cmp_lock, tmp2, &conn->lock_list, clist) {

				if (file_inode(cmp_lock->fl->fl_file) !=

				    file_inode(smb_lock->fl->fl_file))

					continue;
@@ -6677,10 +6682,14 @@ int smb2_lock(struct ksmbd_work *work) 
					    cmp_lock->end == smb_lock->end &&

					    !lock_defer_pending(cmp_lock->fl)) {

						nolock = 0;

						list_del(&cmp_lock->flist);

						list_del(&cmp_lock->clist);

						spin_unlock(&conn->llist_lock);

						read_unlock(&conn_list_lock);



						locks_free_lock(cmp_lock->fl);

					list_del(&cmp_lock->glist);

						kfree(cmp_lock);

					break;

						goto out_check_cl;

					}

					continue;

				}
@@ -6697,6 +6706,8 @@ int smb2_lock(struct ksmbd_work *work) 
				if (cmp_lock->zero_len && !smb_lock->zero_len &&

				    cmp_lock->start > smb_lock->start &&

				    cmp_lock->start < smb_lock->end) {

					spin_unlock(&conn->llist_lock);

					read_unlock(&conn_list_lock);

					pr_err("previous lock conflict with zero byte lock range\n");

					rsp->hdr.Status = STATUS_LOCK_NOT_GRANTED;

						goto out;
@@ -6705,6 +6716,8 @@ int smb2_lock(struct ksmbd_work *work) 
				if (smb_lock->zero_len && !cmp_lock->zero_len &&

				    smb_lock->start > cmp_lock->start &&

				    smb_lock->start < cmp_lock->end) {

					spin_unlock(&conn->llist_lock);

					read_unlock(&conn_list_lock);

					pr_err("current lock conflict with zero byte lock range\n");

					rsp->hdr.Status = STATUS_LOCK_NOT_GRANTED;

						goto out;
@@ -6712,22 +6725,28 @@ int smb2_lock(struct ksmbd_work *work) 


				if (((cmp_lock->start <= smb_lock->start &&

				      cmp_lock->end > smb_lock->start) ||

			     (cmp_lock->start < smb_lock->end && cmp_lock->end >= smb_lock->end)) &&

				     (cmp_lock->start < smb_lock->end &&

				      cmp_lock->end >= smb_lock->end)) &&

				    !cmp_lock->zero_len && !smb_lock->zero_len) {

					spin_unlock(&conn->llist_lock);

					read_unlock(&conn_list_lock);

					pr_err("Not allow lock operation on exclusive lock range\n");

					rsp->hdr.Status =

						STATUS_LOCK_NOT_GRANTED;

					goto out;

				}

			}



			spin_unlock(&conn->llist_lock);

		}

		read_unlock(&conn_list_lock);

out_check_cl:

		if (smb_lock->fl->fl_type == F_UNLCK && nolock) {

			pr_err("Try to unlock nolocked range\n");

			rsp->hdr.Status = STATUS_RANGE_NOT_LOCKED;

			goto out;

		}



no_check_gl:

no_check_cl:

		if (smb_lock->zero_len) {

			err = 0;

			goto skip;
@@ -6753,8 +6772,10 @@ int smb2_lock(struct ksmbd_work *work) 


				ksmbd_debug(SMB,

					    "would have to wait for getting lock\n");

				list_add_tail(&smb_lock->glist,

					      &global_lock_list);

				spin_lock(&work->conn->llist_lock);

				list_add_tail(&smb_lock->clist,

					      &work->conn->lock_list);

				spin_unlock(&work->conn->llist_lock);

				list_add(&smb_lock->llist, &rollback_list);



				argv = kmalloc(sizeof(void *), GFP_KERNEL);
@@ -6782,7 +6803,9 @@ int smb2_lock(struct ksmbd_work *work) 


				if (work->state != KSMBD_WORK_ACTIVE) {

					list_del(&smb_lock->llist);

					list_del(&smb_lock->glist);

					spin_lock(&work->conn->llist_lock);

					list_del(&smb_lock->clist);

					spin_unlock(&work->conn->llist_lock);

					locks_free_lock(flock);



					if (work->state == KSMBD_WORK_CANCELLED) {
@@ -6806,14 +6829,21 @@ int smb2_lock(struct ksmbd_work *work) 
				}



				list_del(&smb_lock->llist);

				list_del(&smb_lock->glist);

				spin_lock(&work->conn->llist_lock);

				list_del(&smb_lock->clist);

				spin_unlock(&work->conn->llist_lock);



				spin_lock(&fp->f_lock);

				list_del(&work->fp_entry);

				spin_unlock(&fp->f_lock);

				goto retry;

			} else if (!err) {

				list_add_tail(&smb_lock->glist,

					      &global_lock_list);

				spin_lock(&work->conn->llist_lock);

				list_add_tail(&smb_lock->clist,

					      &work->conn->lock_list);

				list_add_tail(&smb_lock->flist,

					      &fp->lock_list);

				spin_unlock(&work->conn->llist_lock);

				list_add(&smb_lock->llist, &rollback_list);

				ksmbd_debug(SMB, "successful in taking lock\n");

			} else {
@@ -6852,8 +6882,14 @@ int smb2_lock(struct ksmbd_work *work) 
		err = vfs_lock_file(filp, 0, rlock, NULL);

		if (err)

			pr_err("rollback unlock fail : %d\n", err);



		list_del(&smb_lock->llist);

		list_del(&smb_lock->glist);

		spin_lock(&work->conn->llist_lock);

		if (!list_empty(&smb_lock->flist))

			list_del(&smb_lock->flist);

		list_del(&smb_lock->clist);

		spin_unlock(&work->conn->llist_lock);



		locks_free_lock(smb_lock->fl);

		locks_free_lock(rlock);

		kfree(smb_lock);

fs/ksmbd/smb_common.c

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ static const char basechars[43] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_-!@#$%"; 
#define mangle(V) ((char)(basechars[(V) % MANGLE_BASE]))

#define KSMBD_MIN_SUPPORTED_HEADER_SIZE	(sizeof(struct smb2_hdr))



LIST_HEAD(global_lock_list);



struct smb_protocol {

	int		index;

	char		*name;

fs/ksmbd/smb_common.h

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ 
#define CIFS_DEFAULT_IOSIZE	(64 * 1024)

#define MAX_CIFS_SMALL_BUFFER_SIZE 448 /* big enough for most */



extern struct list_head global_lock_list;



/* RFC 1002 session packet types */

#define RFC1002_SESSION_MESSAGE			0x00

#define RFC1002_SESSION_REQUEST			0x81