lkml.org 
[lkml]   [2019]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 55/65] CIFS: Do not assume one credit for async responses
    Date
    From: Pavel Shilovsky <pshilov@microsoft.com>

    [ Upstream commit 0fd1d37b0501efc6e295f56ab55cdaff784aa50c ]

    If we don't receive a response we can't assume that the server
    granted one credit. Assume zero credits in such cases.

    Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
    Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
    Signed-off-by: Steve French <stfrench@microsoft.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/cifs/smb2pdu.c | 15 +++++++++++----
    1 file changed, 11 insertions(+), 4 deletions(-)

    diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
    index 8a01e89ff827..1e5a1171212f 100644
    --- a/fs/cifs/smb2pdu.c
    +++ b/fs/cifs/smb2pdu.c
    @@ -2814,9 +2814,10 @@ smb2_echo_callback(struct mid_q_entry *mid)
    {
    struct TCP_Server_Info *server = mid->callback_data;
    struct smb2_echo_rsp *rsp = (struct smb2_echo_rsp *)mid->resp_buf;
    - unsigned int credits_received = 1;
    + unsigned int credits_received = 0;

    - if (mid->mid_state == MID_RESPONSE_RECEIVED)
    + if (mid->mid_state == MID_RESPONSE_RECEIVED
    + || mid->mid_state == MID_RESPONSE_MALFORMED)
    credits_received = le16_to_cpu(rsp->sync_hdr.CreditRequest);

    DeleteMidQEntry(mid);
    @@ -3073,7 +3074,7 @@ smb2_readv_callback(struct mid_q_entry *mid)
    struct TCP_Server_Info *server = tcon->ses->server;
    struct smb2_sync_hdr *shdr =
    (struct smb2_sync_hdr *)rdata->iov[0].iov_base;
    - unsigned int credits_received = 1;
    + unsigned int credits_received = 0;
    struct smb_rqst rqst = { .rq_iov = rdata->iov,
    .rq_nvec = 2,
    .rq_pages = rdata->pages,
    @@ -3112,6 +3113,9 @@ smb2_readv_callback(struct mid_q_entry *mid)
    task_io_account_read(rdata->got_bytes);
    cifs_stats_bytes_read(tcon, rdata->got_bytes);
    break;
    + case MID_RESPONSE_MALFORMED:
    + credits_received = le16_to_cpu(shdr->CreditRequest);
    + /* fall through */
    default:
    if (rdata->result != -ENODATA)
    rdata->result = -EIO;
    @@ -3305,7 +3309,7 @@ smb2_writev_callback(struct mid_q_entry *mid)
    struct cifs_tcon *tcon = tlink_tcon(wdata->cfile->tlink);
    unsigned int written;
    struct smb2_write_rsp *rsp = (struct smb2_write_rsp *)mid->resp_buf;
    - unsigned int credits_received = 1;
    + unsigned int credits_received = 0;

    switch (mid->mid_state) {
    case MID_RESPONSE_RECEIVED:
    @@ -3333,6 +3337,9 @@ smb2_writev_callback(struct mid_q_entry *mid)
    case MID_RETRY_NEEDED:
    wdata->result = -EAGAIN;
    break;
    + case MID_RESPONSE_MALFORMED:
    + credits_received = le16_to_cpu(rsp->sync_hdr.CreditRequest);
    + /* fall through */
    default:
    wdata->result = -EIO;
    break;
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-02-15 03:31    [W:4.166 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site