korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-22 18:44:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

RDMA/rxe: Fix small problem in network_type patch

Browse Source 
The patch referenced below has a typo that results in using the wrong L2
header size for outbound traffic. (V4 <-> V6).

It also breaks kernel-side RC traffic because they use AVs that use
RDMA_NETWORK_XXX enums instead of RXE_NETWORK_TYPE_XXX enums. Fix this by
transcoding between these enum types.

Fixes: e0d696d201 ("RDMA/rxe: Move the definitions for rxe_av.network_type to uAPI")
Link: https://lore.kernel.org/r/20201016211343.22906-1-rpearson@hpe.com
Signed-off-by: Bob Pearson <rpearson@hpe.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
This commit is contained in:
Bob Pearson 2020-10-16 16:13:44 -05:00 committed by Jason Gunthorpe
parent 3650b228f8
commit edebc8407b
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/infiniband/sw/rxe/rxe_av.c
View File

@ -16,15 +16,24 @@ void rxe_init_av(struct rdma_ah_attr *attr, struct rxe_av *av)
int rxe_av_chk_attr(struct rxe_dev *rxe, struct rdma_ah_attr *attr) int rxe_av_chk_attr(struct rxe_dev *rxe, struct rdma_ah_attr *attr)
{ {
const struct ib_global_route *grh = rdma_ah_read_grh(attr);
struct rxe_port *port; struct rxe_port *port;
int type;
port = &rxe->port; port = &rxe->port;
if (rdma_ah_get_ah_flags(attr) & IB_AH_GRH) { if (rdma_ah_get_ah_flags(attr) & IB_AH_GRH) {
u8 sgid_index = rdma_ah_read_grh(attr)->sgid_index; if (grh->sgid_index > port->attr.gid_tbl_len) {
pr_warn("invalid sgid index = %d\n",
grh->sgid_index);
return -EINVAL;
}
if (sgid_index > port->attr.gid_tbl_len) { type = rdma_gid_attr_network_type(grh->sgid_attr);
pr_warn("invalid sgid index = %d\n", sgid_index); if (type < RDMA_NETWORK_IPV4 ||
type > RDMA_NETWORK_IPV6) {
pr_warn("invalid network type for rdma_rxe = %d\n",
type);
return -EINVAL; return -EINVAL;
} }
} }
@ -65,11 +74,29 @@ void rxe_av_to_attr(struct rxe_av *av, struct rdma_ah_attr *attr)
void rxe_av_fill_ip_info(struct rxe_av *av, struct rdma_ah_attr *attr) void rxe_av_fill_ip_info(struct rxe_av *av, struct rdma_ah_attr *attr)
{ {
const struct ib_gid_attr *sgid_attr = attr->grh.sgid_attr; const struct ib_gid_attr *sgid_attr = attr->grh.sgid_attr;
int ibtype;
int type;
rdma_gid2ip((struct sockaddr *)&av->sgid_addr, &sgid_attr->gid); rdma_gid2ip((struct sockaddr *)&av->sgid_addr, &sgid_attr->gid);
rdma_gid2ip((struct sockaddr *)&av->dgid_addr, rdma_gid2ip((struct sockaddr *)&av->dgid_addr,
&rdma_ah_read_grh(attr)->dgid); &rdma_ah_read_grh(attr)->dgid);
av->network_type = rdma_gid_attr_network_type(sgid_attr);
ibtype = rdma_gid_attr_network_type(sgid_attr);
switch (ibtype) {
case RDMA_NETWORK_IPV4:
type = RXE_NETWORK_TYPE_IPV4;
break;
case RDMA_NETWORK_IPV6:
type = RXE_NETWORK_TYPE_IPV4;
break;
default:
/* not reached - checked in rxe_av_chk_attr */
type = 0;
break;
}
av->network_type = type;
} }
struct rxe_av *rxe_get_av(struct rxe_pkt_info *pkt) struct rxe_av *rxe_get_av(struct rxe_pkt_info *pkt)

2
drivers/infiniband/sw/rxe/rxe_net.c
View File

@ -442,7 +442,7 @@ struct sk_buff *rxe_init_packet(struct rxe_dev *rxe, struct rxe_av *av,
if (IS_ERR(attr)) if (IS_ERR(attr))
return NULL; return NULL;
if (av->network_type == RXE_NETWORK_TYPE_IPV6) if (av->network_type == RXE_NETWORK_TYPE_IPV4)
hdr_len = ETH_HLEN + sizeof(struct udphdr) + hdr_len = ETH_HLEN + sizeof(struct udphdr) +
sizeof(struct iphdr); sizeof(struct iphdr);
else else