Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

CIFS: Extend credit mechanism to process request type 



Split all requests to echos, oplocks and others - each group uses
its own credit slot. This is indicated by new flags

CIFS_ECHO_OP and CIFS_OBREAK_OP

that are not used now for CIFS. This change is required to support
SMB2 protocol because of different processing of these commands.

Acked-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarPavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 316cf94a

fs/cifs/cifsglob.h

+12 −4
Original line number Diff line number Diff line
@@ -171,9 +171,11 @@ struct smb_version_operations { 
	/* check response: verify signature, map error */

	int (*check_receive)(struct mid_q_entry *, struct TCP_Server_Info *,

			     bool);

	void (*add_credits)(struct TCP_Server_Info *, const unsigned int);

	void (*add_credits)(struct TCP_Server_Info *, const unsigned int,

			    const int);

	void (*set_credits)(struct TCP_Server_Info *, const int);

	int * (*get_credits_field)(struct TCP_Server_Info *);

	int * (*get_credits_field)(struct TCP_Server_Info *, const int);

	unsigned int (*get_credits)(struct mid_q_entry *);

	__u64 (*get_next_mid)(struct TCP_Server_Info *);

	/* data offset from read response message */

	unsigned int (*read_data_offset)(char *);
@@ -392,9 +394,10 @@ has_credits(struct TCP_Server_Info *server, int *credits) 
}



static inline void

add_credits(struct TCP_Server_Info *server, const unsigned int add)

add_credits(struct TCP_Server_Info *server, const unsigned int add,

	    const int optype)

{

	server->ops->add_credits(server, add);

	server->ops->add_credits(server, add, optype);

}



static inline void
@@ -957,6 +960,11 @@ static inline void free_dfs_info_array(struct dfs_info3_param *param, 
#define   CIFS_LARGE_BUF_OP 0x020    /* large request buffer */

#define   CIFS_NO_RESP      0x040    /* no response buffer required */



/* Type of request operation */

#define   CIFS_ECHO_OP      0x080    /* echo request */

#define   CIFS_OBREAK_OP   0x0100    /* oplock break request */

#define   CIFS_OP_MASK     0x0180    /* mask request type */



/* Security Flags: indicate type of session setup needed */

#define   CIFSSEC_MAY_SIGN	0x00001

#define   CIFSSEC_MAY_NTLM	0x00002

fs/cifs/cifsproto.h

+2 −2
Original line number Diff line number Diff line
@@ -71,11 +71,11 @@ extern void DeleteMidQEntry(struct mid_q_entry *midEntry); 
extern int cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov,

			   unsigned int nvec, mid_receive_t *receive,

			   mid_callback_t *callback, void *cbdata,

			   bool ignore_pend);

			   const int flags);

extern int SendReceive(const unsigned int /* xid */ , struct cifs_ses *,

			struct smb_hdr * /* input */ ,

			struct smb_hdr * /* out */ ,

			int * /* bytes returned */ , const int long_op);

			int * /* bytes returned */ , const int);

extern int SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses,

			    char *in_buf, int flags);

extern int cifs_setup_request(struct cifs_ses *, struct kvec *, unsigned int,

fs/cifs/cifssmb.c

+11 −10
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ cifs_echo_callback(struct mid_q_entry *mid) 
	struct TCP_Server_Info *server = mid->callback_data;



	DeleteMidQEntry(mid);

	add_credits(server, 1);

	add_credits(server, 1, CIFS_ECHO_OP);

}



int
@@ -771,7 +771,7 @@ CIFSSMBEcho(struct TCP_Server_Info *server) 
	iov.iov_len = be32_to_cpu(smb->hdr.smb_buf_length) + 4;



	rc = cifs_call_async(server, &iov, 1, NULL, cifs_echo_callback,

			     server, true);

			     server, CIFS_ASYNC_OP | CIFS_ECHO_OP);

	if (rc)

		cFYI(1, "Echo request failed: %d", rc);
@@ -1589,7 +1589,7 @@ cifs_readv_callback(struct mid_q_entry *mid) 


	queue_work(cifsiod_wq, &rdata->work);

	DeleteMidQEntry(mid);

	add_credits(server, 1);

	add_credits(server, 1, 0);

}



/* cifs_async_readv - send an async write, and set up mid to handle result */
@@ -1645,7 +1645,7 @@ cifs_async_readv(struct cifs_readdata *rdata) 
	kref_get(&rdata->refcount);

	rc = cifs_call_async(tcon->ses->server, rdata->iov, 1,

			     cifs_readv_receive, cifs_readv_callback,

			     rdata, false);

			     rdata, 0);



	if (rc == 0)

		cifs_stats_inc(&tcon->num_reads);
@@ -2036,7 +2036,7 @@ cifs_writev_callback(struct mid_q_entry *mid) 


	queue_work(cifsiod_wq, &wdata->work);

	DeleteMidQEntry(mid);

	add_credits(tcon->ses->server, 1);

	add_credits(tcon->ses->server, 1, 0);

}



/* cifs_async_writev - send an async write, and set up mid to handle result */
@@ -2118,7 +2118,7 @@ cifs_async_writev(struct cifs_writedata *wdata) 


	kref_get(&wdata->refcount);

	rc = cifs_call_async(tcon->ses->server, iov, wdata->nr_pages + 1,

			     NULL, cifs_writev_callback, wdata, false);

			     NULL, cifs_writev_callback, wdata, 0);



	if (rc == 0)

		cifs_stats_inc(&tcon->num_writes);
@@ -2296,7 +2296,7 @@ CIFSSMBLock(const int xid, struct cifs_tcon *tcon, 
	LOCK_REQ *pSMB = NULL;

/*	LOCK_RSP *pSMBr = NULL; */ /* No response data other than rc to parse */

	int bytes_returned;

	int timeout = 0;

	int flags = 0;

	__u16 count;



	cFYI(1, "CIFSSMBLock timeout %d numLock %d", (int)waitFlag, numLock);
@@ -2306,10 +2306,11 @@ CIFSSMBLock(const int xid, struct cifs_tcon *tcon, 
		return rc;



	if (lockType == LOCKING_ANDX_OPLOCK_RELEASE) {

		timeout = CIFS_ASYNC_OP; /* no response expected */

		/* no response expected */

		flags = CIFS_ASYNC_OP | CIFS_OBREAK_OP;

		pSMB->Timeout = 0;

	} else if (waitFlag) {

		timeout = CIFS_BLOCKING_OP; /* blocking operation, no timeout */

		flags = CIFS_BLOCKING_OP; /* blocking operation, no timeout */

		pSMB->Timeout = cpu_to_le32(-1);/* blocking - do not time out */

	} else {

		pSMB->Timeout = 0;
@@ -2342,7 +2343,7 @@ CIFSSMBLock(const int xid, struct cifs_tcon *tcon, 
			(struct smb_hdr *) pSMB, &bytes_returned);

		cifs_small_buf_release(pSMB);

	} else {

		rc = SendReceiveNoRsp(xid, tcon->ses, (char *)pSMB, timeout);

		rc = SendReceiveNoRsp(xid, tcon->ses, (char *)pSMB, flags);

		/* SMB buffer freed by function above */

	}

	cifs_stats_inc(&tcon->num_locks);

fs/cifs/smb1ops.c

+10 −2
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ cifs_find_mid(struct TCP_Server_Info *server, char *buffer) 
}



static void

cifs_add_credits(struct TCP_Server_Info *server, const unsigned int add)

cifs_add_credits(struct TCP_Server_Info *server, const unsigned int add,

		 const int optype)

{

	spin_lock(&server->req_lock);

	server->credits += add;
@@ -120,11 +121,17 @@ cifs_set_credits(struct TCP_Server_Info *server, const int val) 
}



static int *

cifs_get_credits_field(struct TCP_Server_Info *server)

cifs_get_credits_field(struct TCP_Server_Info *server, const int optype)

{

	return &server->credits;

}



static unsigned int

cifs_get_credits(struct mid_q_entry *mid)

{

	return 1;

}



/*

 * Find a free multiplex id (SMB mid). Otherwise there could be

 * mid collisions which might cause problems, demultiplexing the
@@ -390,6 +397,7 @@ struct smb_version_operations smb1_operations = { 
	.add_credits = cifs_add_credits,

	.set_credits = cifs_set_credits,

	.get_credits_field = cifs_get_credits_field,

	.get_credits = cifs_get_credits,

	.get_next_mid = cifs_get_next_mid,

	.read_data_offset = cifs_read_data_offset,

	.read_data_length = cifs_read_data_length,

fs/cifs/transport.c

+39 −31
Original line number Diff line number Diff line
@@ -250,13 +250,13 @@ smb_send(struct TCP_Server_Info *server, struct smb_hdr *smb_buffer, 
}



static int

wait_for_free_credits(struct TCP_Server_Info *server, const int optype,

wait_for_free_credits(struct TCP_Server_Info *server, const int timeout,

		      int *credits)

{

	int rc;



	spin_lock(&server->req_lock);

	if (optype == CIFS_ASYNC_OP) {

	if (timeout == CIFS_ASYNC_OP) {

		/* oplock breaks must not be held up */

		server->in_flight++;

		*credits -= 1;
@@ -286,7 +286,7 @@ wait_for_free_credits(struct TCP_Server_Info *server, const int optype, 
			 */



			/* update # of requests on the wire to server */

			if (optype != CIFS_BLOCKING_OP) {

			if (timeout != CIFS_BLOCKING_OP) {

				*credits -= 1;

				server->in_flight++;

			}
@@ -298,10 +298,11 @@ wait_for_free_credits(struct TCP_Server_Info *server, const int optype, 
}



static int

wait_for_free_request(struct TCP_Server_Info *server, const int optype)

wait_for_free_request(struct TCP_Server_Info *server, const int timeout,

		      const int optype)

{

	return wait_for_free_credits(server, optype,

				     server->ops->get_credits_field(server));

	return wait_for_free_credits(server, timeout,

				server->ops->get_credits_field(server, optype));

}



static int allocate_mid(struct cifs_ses *ses, struct smb_hdr *in_buf,
@@ -378,12 +379,15 @@ cifs_setup_async_request(struct TCP_Server_Info *server, struct kvec *iov, 
int

cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov,

		unsigned int nvec, mid_receive_t *receive,

		mid_callback_t *callback, void *cbdata, bool ignore_pend)

		mid_callback_t *callback, void *cbdata, const int flags)

{

	int rc;

	int rc, timeout, optype;

	struct mid_q_entry *mid;



	rc = wait_for_free_request(server, ignore_pend ? CIFS_ASYNC_OP : 0);

	timeout = flags & CIFS_TIMEOUT_MASK;

	optype = flags & CIFS_OP_MASK;



	rc = wait_for_free_request(server, timeout, optype);

	if (rc)

		return rc;
@@ -391,7 +395,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov, 
	rc = cifs_setup_async_request(server, iov, nvec, &mid);

	if (rc) {

		mutex_unlock(&server->srv_mutex);

		add_credits(server, 1);

		add_credits(server, 1, optype);

		wake_up(&server->request_q);

		return rc;

	}
@@ -417,7 +421,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov, 
		return 0;



	delete_mid(mid);

	add_credits(server, 1);

	add_credits(server, 1, optype);

	wake_up(&server->request_q);

	return rc;

}
@@ -533,17 +537,19 @@ cifs_setup_request(struct cifs_ses *ses, struct kvec *iov, 


int

SendReceive2(const unsigned int xid, struct cifs_ses *ses,

	     struct kvec *iov, int n_vec, int *pRespBufType /* ret */,

	     struct kvec *iov, int n_vec, int *resp_buf_type /* ret */,

	     const int flags)

{

	int rc = 0;

	int long_op;

	int timeout, optype;

	struct mid_q_entry *midQ;

	char *buf = iov[0].iov_base;

	unsigned int credits = 1;



	long_op = flags & CIFS_TIMEOUT_MASK;

	timeout = flags & CIFS_TIMEOUT_MASK;

	optype = flags & CIFS_OP_MASK;



	*pRespBufType = CIFS_NO_BUFFER;  /* no response buf yet */

	*resp_buf_type = CIFS_NO_BUFFER;  /* no response buf yet */



	if ((ses == NULL) || (ses->server == NULL)) {

		cifs_small_buf_release(buf);
@@ -562,7 +568,7 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses, 
	 * use ses->maxReq.

	 */



	rc = wait_for_free_request(ses->server, long_op);

	rc = wait_for_free_request(ses->server, timeout, optype);

	if (rc) {

		cifs_small_buf_release(buf);

		return rc;
@@ -581,7 +587,7 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses, 
		mutex_unlock(&ses->server->srv_mutex);

		cifs_small_buf_release(buf);

		/* Update # of requests on wire to server */

		add_credits(ses->server, 1);

		add_credits(ses->server, 1, optype);

		return rc;

	}
@@ -598,7 +604,7 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses, 
		goto out;

	}



	if (long_op == CIFS_ASYNC_OP) {

	if (timeout == CIFS_ASYNC_OP) {

		cifs_small_buf_release(buf);

		goto out;

	}
@@ -611,7 +617,7 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses, 
			midQ->callback = DeleteMidQEntry;

			spin_unlock(&GlobalMid_Lock);

			cifs_small_buf_release(buf);

			add_credits(ses->server, 1);

			add_credits(ses->server, 1, optype);

			return rc;

		}

		spin_unlock(&GlobalMid_Lock);
@@ -621,7 +627,7 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses, 


	rc = cifs_sync_mid_result(midQ, ses->server);

	if (rc != 0) {

		add_credits(ses->server, 1);

		add_credits(ses->server, 1, optype);

		return rc;

	}
@@ -635,9 +641,11 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses, 
	iov[0].iov_base = buf;

	iov[0].iov_len = get_rfc1002_length(buf) + 4;

	if (midQ->large_buf)

		*pRespBufType = CIFS_LARGE_BUFFER;

		*resp_buf_type = CIFS_LARGE_BUFFER;

	else

		*pRespBufType = CIFS_SMALL_BUFFER;

		*resp_buf_type = CIFS_SMALL_BUFFER;



	credits = ses->server->ops->get_credits(midQ);



	rc = ses->server->ops->check_receive(midQ, ses->server,

					     flags & CIFS_LOG_ERROR);
@@ -647,7 +655,7 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses, 
		midQ->resp_buf = NULL;

out:

	delete_mid(midQ);

	add_credits(ses->server, 1);

	add_credits(ses->server, credits, optype);



	return rc;

}
@@ -655,7 +663,7 @@ out: 
int

SendReceive(const unsigned int xid, struct cifs_ses *ses,

	    struct smb_hdr *in_buf, struct smb_hdr *out_buf,

	    int *pbytes_returned, const int long_op)

	    int *pbytes_returned, const int timeout)

{

	int rc = 0;

	struct mid_q_entry *midQ;
@@ -683,7 +691,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, 
		return -EIO;

	}



	rc = wait_for_free_request(ses->server, long_op);

	rc = wait_for_free_request(ses->server, timeout, 0);

	if (rc)

		return rc;
@@ -697,7 +705,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, 
	if (rc) {

		mutex_unlock(&ses->server->srv_mutex);

		/* Update # of requests on wire to server */

		add_credits(ses->server, 1);

		add_credits(ses->server, 1, 0);

		return rc;

	}
@@ -718,7 +726,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, 
	if (rc < 0)

		goto out;



	if (long_op == CIFS_ASYNC_OP)

	if (timeout == CIFS_ASYNC_OP)

		goto out;



	rc = wait_for_response(ses->server, midQ);
@@ -729,7 +737,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, 
			/* no longer considered to be "in-flight" */

			midQ->callback = DeleteMidQEntry;

			spin_unlock(&GlobalMid_Lock);

			add_credits(ses->server, 1);

			add_credits(ses->server, 1, 0);

			return rc;

		}

		spin_unlock(&GlobalMid_Lock);
@@ -737,7 +745,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, 


	rc = cifs_sync_mid_result(midQ, ses->server);

	if (rc != 0) {

		add_credits(ses->server, 1);

		add_credits(ses->server, 1, 0);

		return rc;

	}
@@ -753,7 +761,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, 
	rc = cifs_check_receive(midQ, ses->server, 0);

out:

	delete_mid(midQ);

	add_credits(ses->server, 1);

	add_credits(ses->server, 1, 0);



	return rc;

}
@@ -818,7 +826,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon, 
		return -EIO;

	}



	rc = wait_for_free_request(ses->server, CIFS_BLOCKING_OP);

	rc = wait_for_free_request(ses->server, CIFS_BLOCKING_OP, 0);

	if (rc)

		return rc;