lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 214/717] RDMA/hns: Only record vlan info for HIP08
    Date
    From: Weihang Li <liweihang@huawei.com>

    [ Upstream commit 7406c0036f851ee1cd93cb08349f24b051b4cbf8 ]

    Information about vlan is stored in GMV(GID/MAC/VLAN) table for HIP09, so
    there is no need to copy it to address vector.

    Link: https://lore.kernel.org/r/1605526408-6936-2-git-send-email-liweihang@huawei.com
    Signed-off-by: Weihang Li <liweihang@huawei.com>
    Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/hw/hns/hns_roce_ah.c | 51 ++++++++++-----------
    drivers/infiniband/hw/hns/hns_roce_device.h | 2 +-
    drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 13 ++++--
    3 files changed, 33 insertions(+), 33 deletions(-)

    diff --git a/drivers/infiniband/hw/hns/hns_roce_ah.c b/drivers/infiniband/hw/hns/hns_roce_ah.c
    index 75b06db60f7c2..3be80d42e03a9 100644
    --- a/drivers/infiniband/hw/hns/hns_roce_ah.c
    +++ b/drivers/infiniband/hw/hns/hns_roce_ah.c
    @@ -31,13 +31,13 @@
    */

    #include <linux/platform_device.h>
    +#include <linux/pci.h>
    #include <rdma/ib_addr.h>
    #include <rdma/ib_cache.h>
    #include "hns_roce_device.h"

    -#define HNS_ROCE_PORT_NUM_SHIFT 24
    -#define HNS_ROCE_VLAN_SL_BIT_MASK 7
    -#define HNS_ROCE_VLAN_SL_SHIFT 13
    +#define VLAN_SL_MASK 7
    +#define VLAN_SL_SHIFT 13

    static inline u16 get_ah_udp_sport(const struct rdma_ah_attr *ah_attr)
    {
    @@ -58,37 +58,16 @@ static inline u16 get_ah_udp_sport(const struct rdma_ah_attr *ah_attr)
    int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr,
    struct ib_udata *udata)
    {
    - struct hns_roce_dev *hr_dev = to_hr_dev(ibah->device);
    - const struct ib_gid_attr *gid_attr;
    - struct device *dev = hr_dev->dev;
    - struct hns_roce_ah *ah = to_hr_ah(ibah);
    struct rdma_ah_attr *ah_attr = init_attr->ah_attr;
    const struct ib_global_route *grh = rdma_ah_read_grh(ah_attr);
    - u16 vlan_id = 0xffff;
    - bool vlan_en = false;
    - int ret;
    -
    - gid_attr = ah_attr->grh.sgid_attr;
    - ret = rdma_read_gid_l2_fields(gid_attr, &vlan_id, NULL);
    - if (ret)
    - return ret;
    + struct hns_roce_dev *hr_dev = to_hr_dev(ibah->device);
    + struct hns_roce_ah *ah = to_hr_ah(ibah);
    + int ret = 0;

    - /* Get mac address */
    memcpy(ah->av.mac, ah_attr->roce.dmac, ETH_ALEN);

    - if (vlan_id < VLAN_N_VID) {
    - vlan_en = true;
    - vlan_id |= (rdma_ah_get_sl(ah_attr) &
    - HNS_ROCE_VLAN_SL_BIT_MASK) <<
    - HNS_ROCE_VLAN_SL_SHIFT;
    - }
    -
    ah->av.port = rdma_ah_get_port_num(ah_attr);
    ah->av.gid_index = grh->sgid_index;
    - ah->av.vlan_id = vlan_id;
    - ah->av.vlan_en = vlan_en;
    - dev_dbg(dev, "gid_index = 0x%x,vlan_id = 0x%x\n", ah->av.gid_index,
    - ah->av.vlan_id);

    if (rdma_ah_get_static_rate(ah_attr))
    ah->av.stat_rate = IB_RATE_10_GBPS;
    @@ -98,7 +77,23 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr,
    ah->av.flowlabel = grh->flow_label;
    ah->av.udp_sport = get_ah_udp_sport(ah_attr);

    - return 0;
    + /* HIP08 needs to record vlan info in Address Vector */
    + if (hr_dev->pci_dev->revision <= PCI_REVISION_ID_HIP08) {
    + ah->av.vlan_en = 0;
    +
    + ret = rdma_read_gid_l2_fields(ah_attr->grh.sgid_attr,
    + &ah->av.vlan_id, NULL);
    + if (ret)
    + return ret;
    +
    + if (ah->av.vlan_id < VLAN_N_VID) {
    + ah->av.vlan_en = 1;
    + ah->av.vlan_id |= (rdma_ah_get_sl(ah_attr) & VLAN_SL_MASK) <<
    + VLAN_SL_SHIFT;
    + }
    + }
    +
    + return ret;
    }

    int hns_roce_query_ah(struct ib_ah *ibah, struct rdma_ah_attr *ah_attr)
    diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
    index 6d2acff69f982..b025841e08154 100644
    --- a/drivers/infiniband/hw/hns/hns_roce_device.h
    +++ b/drivers/infiniband/hw/hns/hns_roce_device.h
    @@ -547,7 +547,7 @@ struct hns_roce_av {
    u8 dgid[HNS_ROCE_GID_SIZE];
    u8 mac[ETH_ALEN];
    u16 vlan_id;
    - bool vlan_en;
    + u8 vlan_en;
    };

    struct hns_roce_ah {
    diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
    index 0468028ffe390..d127e0e4c3cda 100644
    --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
    +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
    @@ -495,8 +495,6 @@ static inline int set_ud_wqe(struct hns_roce_qp *qp,
    roce_set_field(ud_sq_wqe->byte_32, V2_UD_SEND_WQE_BYTE_32_DQPN_M,
    V2_UD_SEND_WQE_BYTE_32_DQPN_S, ud_wr(wr)->remote_qpn);

    - roce_set_field(ud_sq_wqe->byte_36, V2_UD_SEND_WQE_BYTE_36_VLAN_M,
    - V2_UD_SEND_WQE_BYTE_36_VLAN_S, ah->av.vlan_id);
    roce_set_field(ud_sq_wqe->byte_36, V2_UD_SEND_WQE_BYTE_36_HOPLIMIT_M,
    V2_UD_SEND_WQE_BYTE_36_HOPLIMIT_S, ah->av.hop_limit);
    roce_set_field(ud_sq_wqe->byte_36, V2_UD_SEND_WQE_BYTE_36_TCLASS_M,
    @@ -508,11 +506,18 @@ static inline int set_ud_wqe(struct hns_roce_qp *qp,
    roce_set_field(ud_sq_wqe->byte_40, V2_UD_SEND_WQE_BYTE_40_PORTN_M,
    V2_UD_SEND_WQE_BYTE_40_PORTN_S, qp->port);

    - roce_set_bit(ud_sq_wqe->byte_40, V2_UD_SEND_WQE_BYTE_40_UD_VLAN_EN_S,
    - ah->av.vlan_en ? 1 : 0);
    roce_set_field(ud_sq_wqe->byte_48, V2_UD_SEND_WQE_BYTE_48_SGID_INDX_M,
    V2_UD_SEND_WQE_BYTE_48_SGID_INDX_S, ah->av.gid_index);

    + if (hr_dev->pci_dev->revision <= PCI_REVISION_ID_HIP08) {
    + roce_set_bit(ud_sq_wqe->byte_40,
    + V2_UD_SEND_WQE_BYTE_40_UD_VLAN_EN_S,
    + ah->av.vlan_en);
    + roce_set_field(ud_sq_wqe->byte_36,
    + V2_UD_SEND_WQE_BYTE_36_VLAN_M,
    + V2_UD_SEND_WQE_BYTE_36_VLAN_S, ah->av.vlan_id);
    + }
    +
    memcpy(&ud_sq_wqe->dgid[0], &ah->av.dgid[0], GID_LEN_V2);

    set_extend_sge(qp, wr, &curr_idx, valid_num_sge);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:09    [W:3.326 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site