From 9611d53aa1600ba94a36cd7bfd6a95dbae76c8e6 Mon Sep 17 00:00:00 2001 From: Maor Gottlieb <maorg@mellanox.com> Date: Mon, 4 May 2020 08:19:32 +0300 Subject: [PATCH] RDMA/core: Consider flow label when building skb Use rdma_flow_label_to_udp_sport to calculate the UDP source port of the RoCEV2 packet. Link: https://lore.kernel.org/r/20200504051935.269708-3-leon@kernel.org Signed-off-by: Maor Gottlieb <maorg@mellanox.com> Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com> --- drivers/infiniband/core/lag.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/core/lag.c b/drivers/infiniband/core/lag.c index a29533626a7c5f..7063e41eaf2612 100644 --- a/drivers/infiniband/core/lag.c +++ b/drivers/infiniband/core/lag.c @@ -34,7 +34,8 @@ static struct sk_buff *rdma_build_skb(struct ib_device *device, skb_push(skb, sizeof(struct udphdr)); skb_reset_transport_header(skb); uh = udp_hdr(skb); - uh->source = htons(0xC000); + uh->source = + htons(rdma_flow_label_to_udp_sport(ah_attr->grh.flow_label)); uh->dest = htons(ROCE_V2_UDP_DPORT); uh->len = htons(sizeof(struct udphdr)); @@ -114,7 +115,8 @@ struct net_device *rdma_lag_get_ah_roce_slave(struct ib_device *device, struct net_device *master; if (!(ah_attr->type == RDMA_AH_ATTR_TYPE_ROCE && - ah_attr->grh.sgid_attr->gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP)) + ah_attr->grh.sgid_attr->gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP && + ah_attr->grh.flow_label)) return NULL; rcu_read_lock(); -- GitLab