2012/6/21 Jeff Layton <jlayton@xxxxxxxxxx>:
> On Wed, 20 Jun 2012 18:30:46 +0400
> Pavel Shilovsky <pshilovsky@xxxxxxxxx> wrote:
>
>> For SMB2 protocol we can add more than one credit for one received
>> request: it depends on CreditRequest field in SMB2 response header.
>> Also we divide all requests by type: echos, oplocks and others. Each
>> type uses its own slot pull.
>>
>> Signed-off-by: Pavel Shilovsky <pshilovsky@xxxxxxxxx>
>> ---
>> fs/cifs/cifsglob.h | 5 +++
>> fs/cifs/cifsproto.h | 1 +
>> fs/cifs/connect.c | 2 +-
>> fs/cifs/smb2ops.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++
>> 4 files changed, 84 insertions(+), 1 deletions(-)
>>
>> diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
>> index 3575f0f..d94d3ee 100644
>> --- a/fs/cifs/cifsglob.h
>> +++ b/fs/cifs/cifsglob.h
>> @@ -343,6 +343,11 @@ struct TCP_Server_Info {
>> char server_GUID[16];
>> __u16 sec_mode;
>> bool session_estab; /* mark when very first sess is established */
>> +#ifdef CONFIG_CIFS_SMB2
>> + int echo_credits; /* echo reserved slots */
>> + int oplock_credits; /* oplock break reserved slots */
>> + bool echos:1; /* enable echos */
>> +#endif
>> u16 dialect; /* dialect index that server chose */
>> enum securityEnum secType;
>> bool oplocks:1; /* enable oplocks */
>> diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
>> index 80d35ee..907f43c 100644
>> --- a/fs/cifs/cifsproto.h
>> +++ b/fs/cifs/cifsproto.h
>> @@ -91,6 +91,7 @@ extern int SendReceiveBlockingLock(const unsigned int xid,
>> struct smb_hdr *in_buf ,
>> struct smb_hdr *out_buf,
>> int *bytes_returned);
>> +extern int cifs_reconnect(struct TCP_Server_Info *server);
>> extern int checkSMB(char *buf, unsigned int length);
>> extern bool is_valid_oplock_break(char *, struct TCP_Server_Info *);
>> extern bool backup_cred(struct cifs_sb_info *);
>> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
>> index 718bbea..cced470 100644
>> --- a/fs/cifs/connect.c
>> +++ b/fs/cifs/connect.c
>> @@ -296,7 +296,7 @@ static int cifs_setup_volume_info(struct smb_vol *volume_info, char *mount_data,
>> * reconnect tcp session
>> * wake up waiters on reconnection? - (not needed currently)
>> */
>> -static int
>> +int
>> cifs_reconnect(struct TCP_Server_Info *server)
>> {
>> int rc = 0;
>> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
>> index 09530f4..ab2590f 100644
>> --- a/fs/cifs/smb2ops.c
>> +++ b/fs/cifs/smb2ops.c
>> @@ -20,6 +20,79 @@
>> #include "cifsglob.h"
>> #include "smb2pdu.h"
>> #include "smb2proto.h"
>> +#include "cifsproto.h"
>> +#include "cifs_debug.h"
>> +
>> +static void
>> +change_conf(struct TCP_Server_Info *server)
>> +{
>> + server->credits += server->echo_credits + server->oplock_credits;
>> + server->oplock_credits = server->echo_credits = 0;
>> + switch (server->credits) {
>> + case 0:
>> + cifs_reconnect(server);
>> + return;
>> + case 1:
>> + server->echos = false;
>
> minor nit if you end up respinning this. The proper
> spelling in English is "echoes".
Thanks - will fix it.
>
>> + server->oplocks = false;
>> + cERROR(1, "disabling echos and oplocks");
>> + break;
>> + case 2:
>> + server->echos = true;
>> + server->oplocks = false;
>> + server->echo_credits = 1;
>> + cFYI(1, "disabling oplocks");
>> + break;
>> + default:
>> + server->echos = true;
>> + server->oplocks = true;
>> + server->echo_credits = 1;
>> + server->oplock_credits = 1;
>> + }
>> + server->credits -= server->echo_credits + server->oplock_credits;
>> +}
>> +
>> +static void
>> +smb2_add_credits(struct TCP_Server_Info *server, const unsigned int add,
>> + const int optype)
>> +{
>> + int *val;
>> + spin_lock(&server->req_lock);
>> + val = server->ops->get_credits_field(server, optype);
>> + *val += add;
>> + server->in_flight--;
>> + if (server->in_flight == 0)
>> + change_conf(server);
>> + spin_unlock(&server->req_lock);
>> + wake_up(&server->request_q);
>> +}
>> +
>> +static void
>> +smb2_set_credits(struct TCP_Server_Info *server, const int val)
>> +{
>> + spin_lock(&server->req_lock);
>> + server->credits = val;
>> + spin_unlock(&server->req_lock);
>> +}
>> +
>> +static int *
>> +smb2_get_credits_field(struct TCP_Server_Info *server, const int optype)
>> +{
>> + switch (optype) {
>> + case CIFS_ECHO_OP:
>> + return &server->echo_credits;
>> + case CIFS_OBREAK_OP:
>> + return &server->oplock_credits;
>> + default:
>> + return &server->credits;
>> + }
>> +}
>> +
>> +static unsigned int
>> +smb2_get_credits(struct mid_q_entry *mid)
>> +{
>> + return le16_to_cpu(((struct smb2_hdr *)mid->resp_buf)->CreditRequest);
>> +}
>>
>> static __u64
>> smb2_get_next_mid(struct TCP_Server_Info *server)
>> @@ -35,6 +108,10 @@ smb2_get_next_mid(struct TCP_Server_Info *server)
>> struct smb_version_operations smb21_operations = {
>> .setup_request = smb2_setup_request,
>> .check_receive = smb2_check_receive,
>> + .add_credits = smb2_add_credits,
>> + .set_credits = smb2_set_credits,
>> + .get_credits_field = smb2_get_credits_field,
>> + .get_credits = smb2_get_credits,
>> .get_next_mid = smb2_get_next_mid,
>> };
>>
>
> Looks fine.
>
> Reviewed-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
--
Best regards,
Pavel Shilovsky.
--
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
