Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2439a6e6 authored by Roland Dreier's avatar Roland Dreier
Browse files

IPoIB: Refactor completion handling 



Split up ipoib_ib_handle_wc() into ipoib_ib_handle_rx_wc() and
ipoib_ib_handle_tx_wc() to make the code easier to read.  This will
also help implement NAPI in the future.

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent d8111028

drivers/infiniband/ulp/ipoib/ipoib_ib.c

+100 −88
Original line number Diff line number Diff line
@@ -169,21 +169,24 @@ static int ipoib_ib_post_receives(struct net_device *dev) 
	return 0;

}



static void ipoib_ib_handle_wc(struct net_device *dev,

			       struct ib_wc *wc)

static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	unsigned int wr_id = wc->wr_id;

	unsigned int wr_id = wc->wr_id & ~IPOIB_OP_RECV;

	struct sk_buff *skb;

	dma_addr_t addr;



	ipoib_dbg_data(priv, "called: id %d, op %d, status: %d\n",

	ipoib_dbg_data(priv, "recv completion: id %d, op %d, status: %d\n",

		       wr_id, wc->opcode, wc->status);



	if (wr_id & IPOIB_OP_RECV) {

		wr_id &= ~IPOIB_OP_RECV;

	if (unlikely(wr_id >= ipoib_recvq_size)) {

		ipoib_warn(priv, "recv completion event with wrid %d (> %d)\n",

			   wr_id, ipoib_recvq_size);

		return;

	}



		if (wr_id < ipoib_recvq_size) {

			struct sk_buff *skb  = priv->rx_ring[wr_id].skb;

			dma_addr_t      addr = priv->rx_ring[wr_id].mapping;

	skb  = priv->rx_ring[wr_id].skb;

	addr = priv->rx_ring[wr_id].mapping;



	if (unlikely(wc->status != IB_WC_SUCCESS)) {

		if (wc->status != IB_WC_WR_FLUSH_ERR)
@@ -238,22 +241,24 @@ static void ipoib_ib_handle_wc(struct net_device *dev, 
	if (unlikely(ipoib_ib_post_receive(dev, wr_id)))

		ipoib_warn(priv, "ipoib_ib_post_receive failed "

			   "for buf %d\n", wr_id);

		} else

			ipoib_warn(priv, "completion event with wrid %d\n",

				   wr_id);

}



	} else {

static void ipoib_ib_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	unsigned int wr_id = wc->wr_id;

	struct ipoib_tx_buf *tx_req;

	unsigned long flags;



		if (wr_id >= ipoib_sendq_size) {

			ipoib_warn(priv, "completion event with wrid %d (> %d)\n",

	ipoib_dbg_data(priv, "send completion: id %d, op %d, status: %d\n",

		       wr_id, wc->opcode, wc->status);



	if (unlikely(wr_id >= ipoib_sendq_size)) {

		ipoib_warn(priv, "send completion event with wrid %d (> %d)\n",

			   wr_id, ipoib_sendq_size);

		return;

	}



		ipoib_dbg_data(priv, "send complete, wrid %d\n", wr_id);



	tx_req = &priv->tx_ring[wr_id];



	dma_unmap_single(priv->ca->dma_device,
@@ -280,6 +285,13 @@ static void ipoib_ib_handle_wc(struct net_device *dev, 
			   "(status=%d, wrid=%d vend_err %x)\n",

			   wc->status, wr_id, wc->vendor_err);

}



static void ipoib_ib_handle_wc(struct net_device *dev, struct ib_wc *wc)

{

	if (wc->wr_id & IPOIB_OP_RECV)

		ipoib_ib_handle_rx_wc(dev, wc);

	else

		ipoib_ib_handle_tx_wc(dev, wc);

}



void ipoib_ib_completion(struct ib_cq *cq, void *dev_ptr)