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

Commit c1b7b8eb authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman
Browse files

lustre: pass iov_iter to ->lnd_recv() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03766dca

drivers/staging/lustre/include/linux/lnet/lib-types.h

+1 −4
Original line number Diff line number Diff line
@@ -220,10 +220,7 @@ typedef struct lnet_lnd { 
	 * credit if the LND does flow control.

	 */

	int (*lnd_recv)(struct lnet_ni *ni, void *private, lnet_msg_t *msg,

			int delayed, unsigned int niov,

			struct kvec *iov, lnet_kiov_t *kiov,

			unsigned int offset, unsigned int mlen,

			unsigned int rlen);

			int delayed, struct iov_iter *to, unsigned int rlen);



	/*

	 * lnet_parse() has had to delay processing of this message

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

+1 −2
Original line number Diff line number Diff line
@@ -1036,5 +1036,4 @@ int kiblnd_post_rx(struct kib_rx *rx, int credit); 


int  kiblnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg);

int  kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed,

		 unsigned int niov, struct kvec *iov, lnet_kiov_t *kiov,

		 unsigned int offset, unsigned int mlen, unsigned int rlen);
 
		 struct iov_iter *to, unsigned int rlen);

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

+17 −15
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static int kiblnd_map_tx(lnet_ni_t *ni, struct kib_tx *tx, struct kib_rdma_desc 


static int

kiblnd_setup_rd_iov(lnet_ni_t *ni, struct kib_tx *tx, struct kib_rdma_desc *rd,

		    unsigned int niov, struct kvec *iov, int offset, int nob)

		    unsigned int niov, const struct kvec *iov, int offset, int nob)

{

	struct kib_net *net = ni->ni_data;

	struct page *page;
@@ -707,7 +707,7 @@ kiblnd_setup_rd_iov(lnet_ni_t *ni, struct kib_tx *tx, struct kib_rdma_desc *rd, 


static int

kiblnd_setup_rd_kiov(lnet_ni_t *ni, struct kib_tx *tx, struct kib_rdma_desc *rd,

		     int nkiov, lnet_kiov_t *kiov, int offset, int nob)

		     int nkiov, const lnet_kiov_t *kiov, int offset, int nob)

{

	struct kib_net *net = ni->ni_data;

	struct scatterlist *sg;
@@ -1711,8 +1711,7 @@ kiblnd_reply(lnet_ni_t *ni, struct kib_rx *rx, lnet_msg_t *lntmsg) 


int

kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed,

	    unsigned int niov, struct kvec *iov, lnet_kiov_t *kiov,

	    unsigned int offset, unsigned int mlen, unsigned int rlen)

	    struct iov_iter *to, unsigned int rlen)

{

	struct kib_rx *rx = private;

	struct kib_msg *rxmsg = rx->rx_msg;
@@ -1722,10 +1721,9 @@ kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed, 
	int post_credit = IBLND_POSTRX_PEER_CREDIT;

	int rc = 0;



	LASSERT(mlen <= rlen);

	LASSERT(iov_iter_count(to) <= rlen);

	LASSERT(!in_interrupt());

	/* Either all pages or all vaddrs */

	LASSERT(!(kiov && iov));



	switch (rxmsg->ibm_type) {

	default:
@@ -1741,16 +1739,16 @@ kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed, 
			break;

		}



		if (kiov)

			lnet_copy_flat2kiov(niov, kiov, offset,

		if (to->type & ITER_BVEC)

			lnet_copy_flat2kiov(to->nr_segs, to->bvec, to->iov_offset,

					    IBLND_MSG_SIZE, rxmsg,

					    offsetof(struct kib_msg, ibm_u.immediate.ibim_payload),

					    mlen);

					    iov_iter_count(to));

		else

			lnet_copy_flat2iov(niov, iov, offset,

			lnet_copy_flat2iov(to->nr_segs, to->kvec, to->iov_offset,

					   IBLND_MSG_SIZE, rxmsg,

					   offsetof(struct kib_msg, ibm_u.immediate.ibim_payload),

					   mlen);

					   iov_iter_count(to));

		lnet_finalize(ni, lntmsg, 0);

		break;
@@ -1758,7 +1756,7 @@ kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed, 
		struct kib_msg	*txmsg;

		struct kib_rdma_desc *rd;



		if (!mlen) {

		if (!iov_iter_count(to)) {

			lnet_finalize(ni, lntmsg, 0);

			kiblnd_send_completion(rx->rx_conn, IBLND_MSG_PUT_NAK, 0,

					       rxmsg->ibm_u.putreq.ibprm_cookie);
@@ -1776,12 +1774,16 @@ 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)

		if (!(to->type & ITER_BVEC))

			rc = kiblnd_setup_rd_iov(ni, tx, rd,

						 niov, iov, offset, mlen);

						 to->nr_segs, to->kvec,

						 to->iov_offset,

						 iov_iter_count(to));

		else

			rc = kiblnd_setup_rd_kiov(ni, tx, rd,

						  niov, kiov, offset, mlen);

						  to->nr_segs, to->bvec,

						  to->iov_offset,

						  iov_iter_count(to));

		if (rc) {

			CERROR("Can't setup PUT sink for %s: %d\n",

			       libcfs_nid2str(conn->ibc_peer->ibp_nid), rc);

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

+1 −3
Original line number Diff line number Diff line
@@ -614,9 +614,7 @@ void ksocknal_shutdown(lnet_ni_t *ni); 
int ksocknal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg);

int ksocknal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg);

int ksocknal_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,

		  int delayed, unsigned int niov,

		  struct kvec *iov, lnet_kiov_t *kiov,

		  unsigned int offset, unsigned int mlen, unsigned int rlen);

		  int delayed, struct iov_iter *to, unsigned int rlen);

int ksocknal_accept(lnet_ni_t *ni, struct socket *sock);



int ksocknal_add_peer(lnet_ni_t *ni, lnet_process_id_t id, __u32 ip, int port);

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c

+9 −12
Original line number Diff line number Diff line
@@ -1325,39 +1325,36 @@ ksocknal_process_receive(struct ksock_conn *conn) 


int

ksocknal_recv(lnet_ni_t *ni, void *private, lnet_msg_t *msg, int delayed,

	      unsigned int niov, struct kvec *iov, lnet_kiov_t *kiov,

	      unsigned int offset, unsigned int mlen, unsigned int rlen)

	      struct iov_iter *to, unsigned int rlen)

{

	struct ksock_conn *conn = private;

	struct ksock_sched *sched = conn->ksnc_scheduler;



	LASSERT(mlen <= rlen);

	LASSERT(niov <= LNET_MAX_IOV);

	LASSERT(iov_iter_count(to) <= rlen);

	LASSERT(to->nr_segs <= LNET_MAX_IOV);



	conn->ksnc_cookie = msg;

	conn->ksnc_rx_nob_wanted = mlen;

	conn->ksnc_rx_nob_wanted = iov_iter_count(to);

	conn->ksnc_rx_nob_left = rlen;



	if (!mlen || iov) {

	if (to->type & ITER_KVEC) {

		conn->ksnc_rx_nkiov = 0;

		conn->ksnc_rx_kiov = NULL;

		conn->ksnc_rx_iov = conn->ksnc_rx_iov_space.iov;

		conn->ksnc_rx_niov =

			lnet_extract_iov(LNET_MAX_IOV, conn->ksnc_rx_iov,

					 niov, iov, offset, mlen);

					 to->nr_segs, to->kvec,

					 to->iov_offset, iov_iter_count(to));

	} else {

		conn->ksnc_rx_niov = 0;

		conn->ksnc_rx_iov = NULL;

		conn->ksnc_rx_kiov = conn->ksnc_rx_iov_space.kiov;

		conn->ksnc_rx_nkiov =

			lnet_extract_kiov(LNET_MAX_IOV, conn->ksnc_rx_kiov,

					  niov, kiov, offset, mlen);

					 to->nr_segs, to->bvec,

					 to->iov_offset, iov_iter_count(to));

	}



	LASSERT(mlen ==

		lnet_iov_nob(conn->ksnc_rx_niov, conn->ksnc_rx_iov) +

		lnet_kiov_nob(conn->ksnc_rx_nkiov, conn->ksnc_rx_kiov));



	LASSERT(conn->ksnc_rx_scheduled);



	spin_lock_bh(&sched->kss_lock);