On Sat, 9 Jun 2012 10:26:01 +0400
Pavel Shilovsky <pshilovsky@xxxxxxxxx> wrote:
> 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.
>
> Signed-off-by: Pavel Shilovsky <pshilovsky@xxxxxxxxx>
> ---
> fs/cifs/cifsglob.h | 16 +++++++++++---
> fs/cifs/cifsproto.h | 2 +-
> fs/cifs/cifssmb.c | 21 ++++++++++---------
> fs/cifs/smb1ops.c | 12 +++++++++-
> fs/cifs/transport.c | 54 +++++++++++++++++++++++++++++---------------------
> 5 files changed, 65 insertions(+), 40 deletions(-)
>
> diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
> index 2aac4e5..844b77c 100644
> --- a/fs/cifs/cifsglob.h
> +++ b/fs/cifs/cifsglob.h
> @@ -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
> diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
> index 0a6cbfe..8c1c7c1 100644
> --- a/fs/cifs/cifsproto.h
> +++ b/fs/cifs/cifsproto.h
> @@ -71,7 +71,7 @@ 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 */ ,
> diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
> index 5b40073..58f1ab5 100644
> --- a/fs/cifs/cifssmb.c
> +++ b/fs/cifs/cifssmb.c
> @@ -720,7 +720,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
> @@ -747,7 +747,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);
>
> @@ -1563,7 +1563,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 */
> @@ -1619,7 +1619,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);
> @@ -2010,7 +2010,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 */
> @@ -2090,7 +2090,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);
> @@ -2268,7 +2268,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);
> @@ -2278,10 +2278,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;
> @@ -2314,7 +2315,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);
> diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
> index 28359e7..f4f8394 100644
> --- a/fs/cifs/smb1ops.c
> +++ b/fs/cifs/smb1ops.c
> @@ -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,
> diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
> index 3097ee5..54cd8dd 100644
> --- a/fs/cifs/transport.c
> +++ b/fs/cifs/transport.c
> @@ -254,13 +254,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 long_op,
> int *credits)
> {
> int rc;
>
> spin_lock(&server->req_lock);
> - if (optype == CIFS_ASYNC_OP) {
> + if (long_op == CIFS_ASYNC_OP) {
> /* oplock breaks must not be held up */
> server->in_flight++;
> *credits -= 1;
> @@ -290,7 +290,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 (long_op != CIFS_BLOCKING_OP) {
> *credits -= 1;
> server->in_flight++;
> }
Why rename the variable in this above function? "optype" seems like a better name...
> @@ -302,10 +302,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 long_op,
> + const int optype)
> {
> - return wait_for_free_credits(server, optype,
> - server->ops->get_credits_field(server));
> + return wait_for_free_credits(server, long_op,
> + server->ops->get_credits_field(server, optype));
> }
>
> static int allocate_mid(struct cifs_ses *ses, struct smb_hdr *in_buf,
> @@ -384,12 +385,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, long_op, optype;
> struct mid_q_entry *mid;
>
> - rc = wait_for_free_request(server, ignore_pend ? CIFS_ASYNC_OP : 0);
> + long_op = flags & CIFS_TIMEOUT_MASK;
> + optype = flags & CIFS_OP_MASK;
> +
> + rc = wait_for_free_request(server, long_op, optype);
> if (rc)
> return rc;
>
> @@ -397,7 +401,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;
> }
> @@ -419,7 +423,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov,
> return rc;
> out_err:
> delete_mid(mid);
> - add_credits(server, 1);
> + add_credits(server, 1, optype);
> wake_up(&server->request_q);
> return rc;
> }
> @@ -539,11 +543,13 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses,
> const int flags)
> {
> int rc = 0;
> - int long_op;
> + int long_op, optype;
> struct mid_q_entry *midQ;
> char *buf = iov[0].iov_base;
> + unsigned int credits = 1;
>
> long_op = flags & CIFS_TIMEOUT_MASK;
> + optype = flags & CIFS_OP_MASK;
>
> *pRespBufType = CIFS_NO_BUFFER; /* no response buf yet */
>
> @@ -564,7 +570,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, optype, long_op);
> if (rc) {
> cifs_small_buf_release(buf);
> return rc;
> @@ -583,7 +589,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;
> }
>
> @@ -613,7 +619,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);
> @@ -623,7 +629,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;
> }
>
> @@ -641,6 +647,8 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses,
> else
> *pRespBufType = CIFS_SMALL_BUFFER;
>
> + credits = ses->server->ops->get_credits(midQ);
> +
> rc = ses->server->ops->check_receive(midQ, ses->server,
> flags & CIFS_LOG_ERROR);
>
> @@ -649,7 +657,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;
> }
> @@ -685,7 +693,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, 0, long_op);
> if (rc)
> return rc;
>
> @@ -699,7 +707,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;
> }
>
> @@ -731,7 +739,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);
> @@ -739,7 +747,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;
> }
>
> @@ -755,7 +763,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;
> }
> @@ -820,7 +828,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, 0, CIFS_BLOCKING_OP);
> if (rc)
> return rc;
>
Other than the nit about renaming that variable, this looks reasonable,
at least until we can come up with a better scheme to handle this...
Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
