Commit 2f3622b9 authored by Isaac Huang's avatar Isaac Huang Committed by Greg Kroah-Hartman
Browse files

staging/lustre/o2iblnd: wrong uses of kib_tx_t::tx_nfrags 



The kib_tx_t::tx_nfrags field is the # entries in
the kib_tx_t::tx_frags array, rather than # DMA
mapped entries. So kiblnd_send/kiblnd_recv should
use kib_rdma_desc_t::rd_nfrags instead.

Signed-off-by: default avatarIsaac Huang <he.huang@intel.com>
Reviewed-on: http://review.whamcloud.com/12857
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5956


Reviewed-by: default avatarLiang Zhen <liang.zhen@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4dcb7109

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h

+0 −3
Original line number Diff line number Diff line
@@ -912,9 +912,6 @@ struct ib_mr *kiblnd_find_dma_mr(kib_hca_dev_t *hdev, 
				 __u64 addr, __u64 size);

void kiblnd_map_rx_descs(kib_conn_t *conn);

void kiblnd_unmap_rx_descs(kib_conn_t *conn);

int kiblnd_map_tx(lnet_ni_t *ni, kib_tx_t *tx,

		  kib_rdma_desc_t *rd, int nfrags);

void kiblnd_unmap_tx(lnet_ni_t *ni, kib_tx_t *tx);

void kiblnd_pool_free_node(kib_pool_t *pool, struct list_head *node);

struct list_head *kiblnd_pool_alloc_node(kib_poolset_t *ps);

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

+19 −18
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 


#include "o2iblnd.h"



static void kiblnd_unmap_tx(lnet_ni_t *ni, kib_tx_t *tx);



static void

kiblnd_tx_done(lnet_ni_t *ni, kib_tx_t *tx)

{
@@ -596,8 +598,7 @@ kiblnd_fmr_map_tx(kib_net_t *net, kib_tx_t *tx, kib_rdma_desc_t *rd, int nob) 
	return 0;

}



void

kiblnd_unmap_tx(lnet_ni_t *ni, kib_tx_t *tx)

static void kiblnd_unmap_tx(lnet_ni_t *ni, kib_tx_t *tx)

{

	kib_net_t *net = ni->ni_data;
@@ -615,9 +616,8 @@ kiblnd_unmap_tx(lnet_ni_t *ni, kib_tx_t *tx) 
	}

}



int

kiblnd_map_tx(lnet_ni_t *ni, kib_tx_t *tx,

	      kib_rdma_desc_t *rd, int nfrags)

static int kiblnd_map_tx(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd,

			 int nfrags)

{

	kib_hca_dev_t *hdev = tx->tx_pool->tpo_hdev;

	kib_net_t *net = ni->ni_data;
@@ -1427,6 +1427,7 @@ kiblnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) 
	unsigned int payload_offset = lntmsg->msg_offset;

	unsigned int payload_nob = lntmsg->msg_len;

	kib_msg_t *ibmsg;

	kib_rdma_desc_t  *rd;

	kib_tx_t *tx;

	int nob;

	int rc;
@@ -1470,16 +1471,14 @@ kiblnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) 
		}



		ibmsg = tx->tx_msg;



		rd = &ibmsg->ibm_u.get.ibgm_rd;

		if ((lntmsg->msg_md->md_options & LNET_MD_KIOV) == 0)

			rc = kiblnd_setup_rd_iov(ni, tx,

						 &ibmsg->ibm_u.get.ibgm_rd,

			rc = kiblnd_setup_rd_iov(ni, tx, rd,

						 lntmsg->msg_md->md_niov,

						 lntmsg->msg_md->md_iov.iov,

						 0, lntmsg->msg_md->md_length);

		else

			rc = kiblnd_setup_rd_kiov(ni, tx,

						  &ibmsg->ibm_u.get.ibgm_rd,

			rc = kiblnd_setup_rd_kiov(ni, tx, rd,

						  lntmsg->msg_md->md_niov,

						  lntmsg->msg_md->md_iov.kiov,

						  0, lntmsg->msg_md->md_length);
@@ -1490,7 +1489,7 @@ kiblnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) 
			return -EIO;

		}



		nob = offsetof(kib_get_msg_t, ibgm_rd.rd_frags[tx->tx_nfrags]);

		nob = offsetof(kib_get_msg_t, ibgm_rd.rd_frags[rd->rd_nfrags]);

		ibmsg->ibm_u.get.ibgm_cookie = tx->tx_cookie;

		ibmsg->ibm_u.get.ibgm_hdr = *hdr;
@@ -1655,7 +1654,6 @@ kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed, 
	kib_msg_t *rxmsg = rx->rx_msg;

	kib_conn_t *conn = rx->rx_conn;

	kib_tx_t *tx;

	kib_msg_t *txmsg;

	int nob;

	int post_credit = IBLND_POSTRX_PEER_CREDIT;

	int rc = 0;
@@ -1692,7 +1690,10 @@ kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed, 
		lnet_finalize(ni, lntmsg, 0);

		break;



	case IBLND_MSG_PUT_REQ:

	case IBLND_MSG_PUT_REQ: {

		kib_msg_t	*txmsg;

		kib_rdma_desc_t *rd;



		if (mlen == 0) {

			lnet_finalize(ni, lntmsg, 0);

			kiblnd_send_completion(rx->rx_conn, IBLND_MSG_PUT_NAK, 0,
@@ -1710,13 +1711,12 @@ kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed, 
		}



		txmsg = tx->tx_msg;

		rd = &txmsg->ibm_u.putack.ibpam_rd;

		if (kiov == NULL)

			rc = kiblnd_setup_rd_iov(ni, tx,

						 &txmsg->ibm_u.putack.ibpam_rd,

			rc = kiblnd_setup_rd_iov(ni, tx, rd,

						 niov, iov, offset, mlen);

		else

			rc = kiblnd_setup_rd_kiov(ni, tx,

						  &txmsg->ibm_u.putack.ibpam_rd,

			rc = kiblnd_setup_rd_kiov(ni, tx, rd,

						  niov, kiov, offset, mlen);

		if (rc != 0) {

			CERROR("Can't setup PUT sink for %s: %d\n",
@@ -1728,7 +1728,7 @@ kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed, 
			break;

		}



		nob = offsetof(kib_putack_msg_t, ibpam_rd.rd_frags[tx->tx_nfrags]);

		nob = offsetof(kib_putack_msg_t, ibpam_rd.rd_frags[rd->rd_nfrags]);

		txmsg->ibm_u.putack.ibpam_src_cookie = rxmsg->ibm_u.putreq.ibprm_cookie;

		txmsg->ibm_u.putack.ibpam_dst_cookie = tx->tx_cookie;
@@ -1741,6 +1741,7 @@ kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed, 
		/* reposted buffer reserved for PUT_DONE */

		post_credit = IBLND_POSTRX_NO_CREDIT;

		break;

		}



	case IBLND_MSG_GET_REQ:

		if (lntmsg != NULL) {