lkml.org 
[lkml]   [2019]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.4 04/26] IB/{hfi1, qib}: Fix WC.byte_len calculation for UD_SEND_WITH_IMM
    Date
    From: Brian Welty <brian.welty@intel.com>

    [ Upstream commit 904bba211acc2112fdf866e5a2bc6cd9ecd0de1b ]

    The work completion length for a receiving a UD send with immediate is
    short by 4 bytes causing application using this opcode to fail.

    The UD receive logic incorrectly subtracts 4 bytes for immediate
    value. These bytes are already included in header length and are used to
    calculate header/payload split, so the result is these 4 bytes are
    subtracted twice, once when the header length subtracted from the overall
    length and once again in the UD opcode specific path.

    Remove the extra subtraction when handling the opcode.

    Fixes: 7724105686e7 ("IB/hfi1: add driver files")
    Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
    Signed-off-by: Brian Welty <brian.welty@intel.com>
    Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
    Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
    Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/hw/qib/qib_ud.c | 1 -
    drivers/staging/rdma/hfi1/ud.c | 1 -
    2 files changed, 2 deletions(-)

    diff --git a/drivers/infiniband/hw/qib/qib_ud.c b/drivers/infiniband/hw/qib/qib_ud.c
    index 59193f67ea787..56bd59bc08b54 100644
    --- a/drivers/infiniband/hw/qib/qib_ud.c
    +++ b/drivers/infiniband/hw/qib/qib_ud.c
    @@ -515,7 +515,6 @@ void qib_ud_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
    opcode == IB_OPCODE_UD_SEND_ONLY_WITH_IMMEDIATE) {
    wc.ex.imm_data = ohdr->u.ud.imm_data;
    wc.wc_flags = IB_WC_WITH_IMM;
    - tlen -= sizeof(u32);
    } else if (opcode == IB_OPCODE_UD_SEND_ONLY) {
    wc.ex.imm_data = 0;
    wc.wc_flags = 0;
    diff --git a/drivers/staging/rdma/hfi1/ud.c b/drivers/staging/rdma/hfi1/ud.c
    index 5a9c784bec04c..a88e37444be0e 100644
    --- a/drivers/staging/rdma/hfi1/ud.c
    +++ b/drivers/staging/rdma/hfi1/ud.c
    @@ -793,7 +793,6 @@ void hfi1_ud_rcv(struct hfi1_packet *packet)
    opcode == IB_OPCODE_UD_SEND_ONLY_WITH_IMMEDIATE) {
    wc.ex.imm_data = ohdr->u.ud.imm_data;
    wc.wc_flags = IB_WC_WITH_IMM;
    - tlen -= sizeof(u32);
    } else if (opcode == IB_OPCODE_UD_SEND_ONLY) {
    wc.ex.imm_data = 0;
    wc.wc_flags = 0;
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-02-23 22:15    [W:4.085 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site