Commit 36fbb03d authored by Bob Pearson's avatar Bob Pearson Committed by Jason Gunthorpe
Browse files

RDMA/rxe: Move rxe_xmit_packet to a subroutine 

rxe_xmit_packet() was an overlong inline subroutine. This patch moves it
into rxe_net.c as an ordinary subroutine.

Link: https://lore.kernel.org/r/20210707040040.15434-3-rpearsonhpe@gmail.com


Signed-off-by: default avatarBob Pearson <rpearsonhpe@gmail.com>
Reviewed-by: default avatarZhu Yanjun <zyjzyj2000@gmail.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent fe87fb17

drivers/infiniband/sw/rxe/rxe_loc.h

+2 −43
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ 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,

				int paylen, struct rxe_pkt_info *pkt);

int rxe_prepare(struct rxe_pkt_info *pkt, struct sk_buff *skb, u32 *crc);

int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt,

		    struct sk_buff *skb);

const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num);

int rxe_mcast_add(struct rxe_dev *rxe, union ib_gid *mgid);

int rxe_mcast_delete(struct rxe_dev *rxe, union ib_gid *mgid);
@@ -206,47 +208,4 @@ static inline unsigned int wr_opcode_mask(int opcode, struct rxe_qp *qp) 
	return rxe_wr_opcode_info[opcode].mask[qp->ibqp.qp_type];

}



static inline int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt,

				  struct sk_buff *skb)

{

	int err;

	int is_request = pkt->mask & RXE_REQ_MASK;

	struct rxe_dev *rxe = to_rdev(qp->ibqp.device);



	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;

	}



	if (pkt->mask & RXE_LOOPBACK_MASK) {

		memcpy(SKB_TO_PKT(skb), pkt, sizeof(*pkt));

		rxe_loopback(skb);

		err = 0;

	} else {

		err = rxe_send(pkt, skb);

	}



	if (err) {

		rxe->xmit_errors++;

		rxe_counter_inc(rxe, RXE_CNT_SEND_ERR);

		return err;

	}



	if ((qp_type(qp) != IB_QPT_RC) &&

	    (pkt->mask & RXE_END_MASK)) {

		pkt->wqe->state = wqe_state_done;

		rxe_run_task(&qp->comp.task, 1);

	}



	rxe_counter_inc(rxe, RXE_CNT_SENT_PKTS);

	goto done;



drop:

	kfree_skb(skb);

	err = 0;

done:

	return err;

}



#endif /* RXE_LOC_H */

drivers/infiniband/sw/rxe/rxe_net.c

+43 −0
Original line number Diff line number Diff line
@@ -421,6 +421,49 @@ void rxe_loopback(struct sk_buff *skb) 
		rxe_rcv(skb);

}



int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt,

		    struct sk_buff *skb)

{

	int err;

	int is_request = pkt->mask & RXE_REQ_MASK;

	struct rxe_dev *rxe = to_rdev(qp->ibqp.device);



	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;

	}



	if (pkt->mask & RXE_LOOPBACK_MASK) {

		memcpy(SKB_TO_PKT(skb), pkt, sizeof(*pkt));

		rxe_loopback(skb);

		err = 0;

	} else {

		err = rxe_send(pkt, skb);

	}



	if (err) {

		rxe->xmit_errors++;

		rxe_counter_inc(rxe, RXE_CNT_SEND_ERR);

		return err;

	}



	if ((qp_type(qp) != IB_QPT_RC) &&

	    (pkt->mask & RXE_END_MASK)) {

		pkt->wqe->state = wqe_state_done;

		rxe_run_task(&qp->comp.task, 1);

	}



	rxe_counter_inc(rxe, RXE_CNT_SENT_PKTS);

	goto done;



drop:

	kfree_skb(skb);

	err = 0;

done:

	return err;

}



struct sk_buff *rxe_init_packet(struct rxe_dev *rxe, struct rxe_av *av,

				int paylen, struct rxe_pkt_info *pkt)

{