hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IB/rxe: Simplify rxe_find_route() to avoid GID query for netdev 

rxe_prepare() is called on an skb which has ndev already initialized by
rxe_init_packet().
Therefore avoid querying the GID attribute again and use the available
netdevice from the skb->dev.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Tested-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Parav Pandit 2018-08-28 13:51:37 +03:00 committed by Doug Ledford
parent 8b7b59d030
commit 3db2bceb29
4 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/infiniband/sw/rxe/rxe_loc.h
View File

@ -144,8 +144,7 @@ void rxe_loopback(struct sk_buff *skb);
int rxe_send(struct rxe_pkt_info *pkt, struct sk_buff *skb); int rxe_send(struct rxe_pkt_info *pkt, struct sk_buff *skb);
struct sk_buff *rxe_init_packet(struct rxe_dev *rxe, struct rxe_av *av, struct sk_buff *rxe_init_packet(struct rxe_dev *rxe, struct rxe_av *av,
int paylen, struct rxe_pkt_info *pkt); int paylen, struct rxe_pkt_info *pkt);
int rxe_prepare(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, int rxe_prepare(struct rxe_pkt_info *pkt, struct sk_buff *skb, u32 *crc);
struct sk_buff *skb, u32 *crc);
enum rdma_link_layer rxe_link_layer(struct rxe_dev *rxe, unsigned int port_num); enum rdma_link_layer rxe_link_layer(struct rxe_dev *rxe, unsigned int port_num);
const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num); const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num);
struct device *rxe_dma_device(struct rxe_dev *rxe); struct device *rxe_dma_device(struct rxe_dev *rxe);

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

@ -182,19 +182,11 @@ static struct dst_entry *rxe_find_route6(struct net_device *ndev,
#endif #endif
static struct dst_entry *rxe_find_route(struct rxe_dev *rxe, static struct dst_entry *rxe_find_route(struct net_device *ndev,
struct rxe_qp *qp, struct rxe_qp *qp,
struct rxe_av *av) struct rxe_av *av)
{ {
const struct ib_gid_attr *attr;
struct dst_entry *dst = NULL; struct dst_entry *dst = NULL;
struct net_device *ndev;
attr = rdma_get_gid_attr(&rxe->ib_dev, qp->attr.port_num,
av->grh.sgid_index);
if (IS_ERR(attr))
return NULL;
ndev = attr->ndev;
if (qp_type(qp) == IB_QPT_RC) if (qp_type(qp) == IB_QPT_RC)
dst = sk_dst_get(qp->sk->sk); dst = sk_dst_get(qp->sk->sk);
@ -229,7 +221,6 @@ static struct dst_entry *rxe_find_route(struct rxe_dev *rxe,
sk_dst_set(qp->sk->sk, dst); sk_dst_set(qp->sk->sk, dst);
} }
} }
rdma_put_gid_attr(attr);
return dst; return dst;
} }
@ -377,8 +368,8 @@ static void prepare_ipv6_hdr(struct dst_entry *dst, struct sk_buff *skb,
ip6h->payload_len = htons(skb->len - sizeof(*ip6h)); ip6h->payload_len = htons(skb->len - sizeof(*ip6h));
} }
static int prepare4(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, static int prepare4(struct rxe_pkt_info *pkt, struct sk_buff *skb,
struct sk_buff *skb, struct rxe_av *av) struct rxe_av *av)
{ {
struct rxe_qp *qp = pkt->qp; struct rxe_qp *qp = pkt->qp;
struct dst_entry *dst; struct dst_entry *dst;
@ -387,7 +378,7 @@ static int prepare4(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
struct in_addr *saddr = &av->sgid_addr._sockaddr_in.sin_addr; struct in_addr *saddr = &av->sgid_addr._sockaddr_in.sin_addr;
struct in_addr *daddr = &av->dgid_addr._sockaddr_in.sin_addr; struct in_addr *daddr = &av->dgid_addr._sockaddr_in.sin_addr;
dst = rxe_find_route(rxe, qp, av); dst = rxe_find_route(skb->dev, qp, av);
if (!dst) { if (!dst) {
pr_err("Host not reachable\n"); pr_err("Host not reachable\n");
return -EHOSTUNREACH; return -EHOSTUNREACH;
@ -406,15 +397,15 @@ static int prepare4(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
return 0; return 0;
} }
static int prepare6(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, static int prepare6(struct rxe_pkt_info *pkt, struct sk_buff *skb,
struct sk_buff *skb, struct rxe_av *av) struct rxe_av *av)
{ {
struct rxe_qp *qp = pkt->qp; struct rxe_qp *qp = pkt->qp;
struct dst_entry *dst; struct dst_entry *dst;
struct in6_addr *saddr = &av->sgid_addr._sockaddr_in6.sin6_addr; struct in6_addr *saddr = &av->sgid_addr._sockaddr_in6.sin6_addr;
struct in6_addr *daddr = &av->dgid_addr._sockaddr_in6.sin6_addr; struct in6_addr *daddr = &av->dgid_addr._sockaddr_in6.sin6_addr;
dst = rxe_find_route(rxe, qp, av); dst = rxe_find_route(skb->dev, qp, av);
if (!dst) { if (!dst) {
pr_err("Host not reachable\n"); pr_err("Host not reachable\n");
return -EHOSTUNREACH; return -EHOSTUNREACH;
@ -434,16 +425,15 @@ static int prepare6(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
return 0; return 0;
} }
int rxe_prepare(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, int rxe_prepare(struct rxe_pkt_info *pkt, struct sk_buff *skb, u32 *crc)
struct sk_buff *skb, u32 *crc)
{ {
int err = 0; int err = 0;
struct rxe_av *av = rxe_get_av(pkt); struct rxe_av *av = rxe_get_av(pkt);
if (av->network_type == RDMA_NETWORK_IPV4) if (av->network_type == RDMA_NETWORK_IPV4)
err = prepare4(rxe, pkt, skb, av); err = prepare4(pkt, skb, av);
else if (av->network_type == RDMA_NETWORK_IPV6) else if (av->network_type == RDMA_NETWORK_IPV6)
err = prepare6(rxe, pkt, skb, av); err = prepare6(pkt, skb, av);
*crc = rxe_icrc_hdr(pkt, skb); *crc = rxe_icrc_hdr(pkt, skb);

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

@ -476,7 +476,7 @@ static int fill_packet(struct rxe_qp *qp, struct rxe_send_wqe *wqe,
u32 *p; u32 *p;
int err; int err;
err = rxe_prepare(rxe, pkt, skb, &crc); err = rxe_prepare(pkt, skb, &crc);
if (err) if (err)
return err; return err;

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

@ -637,7 +637,7 @@ static struct sk_buff *prepare_ack_packet(struct rxe_qp *qp,
if (ack->mask & RXE_ATMACK_MASK) if (ack->mask & RXE_ATMACK_MASK)
atmack_set_orig(ack, qp->resp.atomic_orig); atmack_set_orig(ack, qp->resp.atomic_orig);
err = rxe_prepare(rxe, ack, skb, &crc); err = rxe_prepare(ack, skb, &crc);
if (err) { if (err) {
kfree_skb(skb); kfree_skb(skb);
return NULL; return NULL;