RDMA/rxe: Extend rxe_net.c to support xrc qps
Subsystems (2)
PATCH 12/13 RDMA/rxe: Extend rxe_net.c to support xrc qps
Extend code in rxe_net.c to support xrc qp types.
Signed-off-by Bob Pearson <[email protected]>
--- drivers/infiniband/sw/rxe/rxe_net.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
drivers/infiniband/sw/rxe/rxe_net.c +16 -7
@@ -92,7 +92,7 @@ static struct dst_entry *rxe_find_route(struct net_device *ndev, {struct dst_entry *dst =NULL ; -if (qp_type (qp) ==IB_QPT_RC ) +if (qp_type (qp) ==IB_QPT_RC ||qp_type (qp) ==IB_QPT_XRC_INI ) dst =sk_dst_get (qp->sk->sk);if (!dst || !dst_check (dst, qp->dst_cookie)) {
@@ -120,7 +120,8 @@ static struct dst_entry *rxe_find_route(struct net_device *ndev,#endif } -if (dst && (qp_type (qp) ==IB_QPT_RC )) { +if (dst && (qp_type (qp) ==IB_QPT_RC || +qp_type (qp) ==IB_QPT_XRC_INI )) {dst_hold (dst);sk_dst_set (qp->sk->sk, dst); }
@@ -386,14 +387,23 @@ static int rxe_send(struct sk_buff *skb, struct rxe_pkt_info *pkt)*/ static int rxe_loopback (struct sk_buff *skb,struct rxe_pkt_info *pkt) { -memcpy (SKB_TO_PKT (skb), pkt,sizeof (*pkt)); +struct rxe_pkt_info *new_pkt =SKB_TO_PKT (skb); + +memset (new_pkt,0 ,sizeof (*new_pkt)); + +/* match rxe_udp_encap_recv */ + new_pkt->rxe = pkt->rxe; + new_pkt->port_num =1 ; + new_pkt->hdr = pkt->hdr; + new_pkt->mask =RXE_GRH_MASK ; + new_pkt->paylen = pkt->paylen;if (skb->protocol ==htons (ETH_P_IP ))skb_pull (skb,sizeof (struct iphdr ));else skb_pull (skb,sizeof (struct ipv6hdr )); -if (WARN_ON (!ib_device_try_get (&pkt->rxe->ib_dev))) { +if (WARN_ON (!ib_device_try_get (&new_pkt->rxe->ib_dev))) {kfree_skb (skb);return -EIO ; }
@@ -412,7 +422,6 @@ int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt,if ((is_request && (qp->req.state !=QP_STATE_READY )) || (!is_request && (qp->resp.state !=QP_STATE_READY ))) { -pr_info ("Packet dropped. QP is not in ready state\n" ); goto drop; }
@@ -427,8 +436,8 @@ int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt,return err; } -if ((qp_type (qp) !=IB_QPT_RC ) && - (pkt->mask &RXE_LAST_MASK )) { +if ((pkt->mask &RXE_REQ_MASK ) && (pkt->mask &RXE_LAST_MASK ) && + (qp_type (qp) !=IB_QPT_RC &&qp_type (qp) !=IB_QPT_XRC_INI )) { pkt->wqe->state = wqe_state_done;rxe_run_task (&qp->comp.task,1 ); }
Signature · 1 line
2.34.1