lkml.org 
[lkml]   [2018]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 051/177] IB/mlx5: Set correct SL in completion for RoCE
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Moni Shoua <monis@mellanox.com>


    [ Upstream commit 12f8fedef2ec94c783f929126b20440a01512c14 ]

    There is a difference when parsing a completion entry between Ethernet
    and IB ports. When link layer is Ethernet the bits describe the type of
    L3 header in the packet. In the case when link layer is Ethernet and VLAN
    header is present the value of SL is equal to the 3 UP bits in the VLAN
    header. If VLAN header is not present then the SL is undefined and consumer
    of the completion should check if IB_WC_WITH_VLAN is set.

    While that, this patch also fills the vlan_id field in the completion if
    present.

    Signed-off-by: Moni Shoua <monis@mellanox.com>
    Reviewed-by: Majd Dibbiny <majd@mellanox.com>
    Signed-off-by: Leon Romanovsky <leon@kernel.org>
    Signed-off-by: Doug Ledford <dledford@redhat.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/infiniband/hw/mlx5/cq.c | 19 ++++++++++++++++---
    1 file changed, 16 insertions(+), 3 deletions(-)

    --- a/drivers/infiniband/hw/mlx5/cq.c
    +++ b/drivers/infiniband/hw/mlx5/cq.c
    @@ -172,6 +172,8 @@ static void handle_responder(struct ib_w
    struct mlx5_ib_srq *srq;
    struct mlx5_ib_wq *wq;
    u16 wqe_ctr;
    + u8 roce_packet_type;
    + bool vlan_present;
    u8 g;

    if (qp->ibqp.srq || qp->ibqp.xrcd) {
    @@ -223,7 +225,6 @@ static void handle_responder(struct ib_w
    break;
    }
    wc->slid = be16_to_cpu(cqe->slid);
    - wc->sl = (be32_to_cpu(cqe->flags_rqpn) >> 24) & 0xf;
    wc->src_qp = be32_to_cpu(cqe->flags_rqpn) & 0xffffff;
    wc->dlid_path_bits = cqe->ml_path;
    g = (be32_to_cpu(cqe->flags_rqpn) >> 28) & 3;
    @@ -237,10 +238,22 @@ static void handle_responder(struct ib_w
    wc->pkey_index = 0;
    }

    - if (ll != IB_LINK_LAYER_ETHERNET)
    + if (ll != IB_LINK_LAYER_ETHERNET) {
    + wc->sl = (be32_to_cpu(cqe->flags_rqpn) >> 24) & 0xf;
    return;
    + }
    +
    + vlan_present = cqe->l4_l3_hdr_type & 0x1;
    + roce_packet_type = (be32_to_cpu(cqe->flags_rqpn) >> 24) & 0x3;
    + if (vlan_present) {
    + wc->vlan_id = (be16_to_cpu(cqe->vlan_info)) & 0xfff;
    + wc->sl = (be16_to_cpu(cqe->vlan_info) >> 13) & 0x7;
    + wc->wc_flags |= IB_WC_WITH_VLAN;
    + } else {
    + wc->sl = 0;
    + }

    - switch (wc->sl & 0x3) {
    + switch (roce_packet_type) {
    case MLX5_CQE_ROCE_L3_HEADER_TYPE_GRH:
    wc->network_hdr_type = RDMA_NETWORK_IB;
    break;

    \
     
     \ /
      Last update: 2018-03-23 12:31    [W:4.197 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site