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

Commit a9a5ac68 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lnet: change lnet_msg_t to proper structure 



Change lnet_msg_t from typedef to proper structure.

Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/20831


Reviewed-by: default avatarOlaf Weber <olaf@sgi.com>
Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 971175cc

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

+23 −20
Original line number Diff line number Diff line
@@ -248,10 +248,10 @@ lnet_me_free(lnet_me_t *me) 
	LIBCFS_FREE(me, sizeof(*me));

}



static inline lnet_msg_t *

static inline struct lnet_msg *

lnet_msg_alloc(void)

{

	lnet_msg_t *msg;

	struct lnet_msg *msg;



	LIBCFS_ALLOC(msg, sizeof(*msg));
@@ -260,7 +260,7 @@ lnet_msg_alloc(void) 
}



static inline void

lnet_msg_free(lnet_msg_t *msg)

lnet_msg_free(struct lnet_msg *msg)

{

	LASSERT(!msg->msg_onactivelist);

	LIBCFS_FREE(msg, sizeof(*msg));
@@ -482,20 +482,20 @@ int lnet_clear_lazy_portal(struct lnet_ni *ni, int portal, char *reason); 
int lnet_islocalnid(lnet_nid_t nid);

int lnet_islocalnet(__u32 net);



void lnet_msg_attach_md(lnet_msg_t *msg, lnet_libmd_t *md,

void lnet_msg_attach_md(struct lnet_msg *msg, lnet_libmd_t *md,

			unsigned int offset, unsigned int mlen);

void lnet_msg_detach_md(lnet_msg_t *msg, int status);

void lnet_msg_detach_md(struct lnet_msg *msg, int status);

void lnet_build_unlink_event(lnet_libmd_t *md, lnet_event_t *ev);

void lnet_build_msg_event(lnet_msg_t *msg, lnet_event_kind_t ev_type);

void lnet_msg_commit(lnet_msg_t *msg, int cpt);

void lnet_msg_decommit(lnet_msg_t *msg, int cpt, int status);

void lnet_build_msg_event(struct lnet_msg *msg, lnet_event_kind_t ev_type);

void lnet_msg_commit(struct lnet_msg *msg, int cpt);

void lnet_msg_decommit(struct lnet_msg *msg, int cpt, int status);



void lnet_eq_enqueue_event(lnet_eq_t *eq, lnet_event_t *ev);

void lnet_prep_send(lnet_msg_t *msg, int type, lnet_process_id_t target,

void lnet_prep_send(struct lnet_msg *msg, int type, lnet_process_id_t target,

		    unsigned int offset, unsigned int len);

int lnet_send(lnet_nid_t nid, lnet_msg_t *msg, lnet_nid_t rtr_nid);

void lnet_return_tx_credits_locked(lnet_msg_t *msg);

void lnet_return_rx_credits_locked(lnet_msg_t *msg);

int lnet_send(lnet_nid_t nid, struct lnet_msg *msg, lnet_nid_t rtr_nid);

void lnet_return_tx_credits_locked(struct lnet_msg *msg);

void lnet_return_rx_credits_locked(struct lnet_msg *msg);

void lnet_schedule_blocked_locked(lnet_rtrbufpool_t *rbp);

void lnet_drop_routed_msgs_locked(struct list_head *list, int cpt);
@@ -554,19 +554,22 @@ void lnet_portals_destroy(void); 
/* message functions */

int lnet_parse(lnet_ni_t *ni, struct lnet_hdr *hdr,

	       lnet_nid_t fromnid, void *private, int rdma_req);

int lnet_parse_local(lnet_ni_t *ni, lnet_msg_t *msg);

int lnet_parse_forward_locked(lnet_ni_t *ni, lnet_msg_t *msg);

int lnet_parse_local(lnet_ni_t *ni, struct lnet_msg *msg);

int lnet_parse_forward_locked(lnet_ni_t *ni, struct lnet_msg *msg);



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

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

void lnet_ni_recv(lnet_ni_t *ni, void *private, lnet_msg_t *msg,

void lnet_recv(lnet_ni_t *ni, void *private, struct lnet_msg *msg,

	       int delayed, unsigned int offset, unsigned int mlen,

	       unsigned int rlen);

void lnet_ni_recv(lnet_ni_t *ni, void *private, struct lnet_msg *msg,

		  int delayed, unsigned int offset,

		  unsigned int mlen, unsigned int rlen);



lnet_msg_t *lnet_create_reply_msg(lnet_ni_t *ni, lnet_msg_t *get_msg);

void lnet_set_reply_msg_len(lnet_ni_t *ni, lnet_msg_t *msg, unsigned int len);

struct lnet_msg *lnet_create_reply_msg(lnet_ni_t *ni,

				       struct lnet_msg *get_msg);

void lnet_set_reply_msg_len(lnet_ni_t *ni, struct lnet_msg *msg,

			    unsigned int len);



void lnet_finalize(lnet_ni_t *ni, lnet_msg_t *msg, int rc);

void lnet_finalize(lnet_ni_t *ni, struct lnet_msg *msg, int rc);



void lnet_drop_message(lnet_ni_t *ni, int cpt, void *private,

		       unsigned int nob);

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

+6 −5
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
/* forward refs */

struct lnet_libmd;



typedef struct lnet_msg {

struct lnet_msg {

	struct list_head	msg_activelist;

	struct list_head	msg_list;	   /* Q for credits/MD */
@@ -106,7 +106,7 @@ typedef struct lnet_msg { 


	lnet_event_t		 msg_ev;

	struct lnet_hdr		 msg_hdr;

} lnet_msg_t;

};



typedef struct lnet_libhandle {

	struct list_head	lh_hash_chain;
@@ -210,7 +210,8 @@ typedef struct lnet_lnd { 
	 * non-zero for immediate failure, otherwise complete later with

	 * lnet_finalize()

	 */

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

	int (*lnd_send)(struct lnet_ni *ni, void *private,

			struct lnet_msg *msg);



	/*

	 * Start receiving 'mlen' bytes of payload data, skipping the following
@@ -219,7 +220,7 @@ typedef struct lnet_lnd { 
	 * complete later with lnet_finalize().  This also gives back a receive

	 * credit if the LND does flow control.

	 */

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

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

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



	/*
@@ -231,7 +232,7 @@ typedef struct lnet_lnd { 
	 * release resources; lnd_recv() will not be called.

	 */

	int (*lnd_eager_recv)(struct lnet_ni *ni, void *private,

			      lnet_msg_t *msg, void **new_privatep);

			      struct lnet_msg *msg, void **new_privatep);



	/* notification of peer health */

	void (*lnd_notify)(struct lnet_ni *ni, lnet_nid_t peer, int alive);

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

+4 −4
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ struct kib_tx { /* transmit message */ 
	int                   tx_status;      /* LNET completion status */

	unsigned long         tx_deadline;    /* completion deadline */

	__u64                 tx_cookie;      /* completion cookie */

	lnet_msg_t *tx_lntmsg[2]; /* lnet msgs to finalize on completion */

	struct lnet_msg		*tx_lntmsg[2];	/* lnet msgs to finalize on completion */

	struct kib_msg	      *tx_msg;        /* message buffer (host vaddr) */

	__u64                 tx_msgaddr;     /* message buffer (I/O addr) */

	DECLARE_PCI_UNMAP_ADDR(tx_msgunmap);  /* for dma_unmap_single() */
@@ -1032,6 +1032,6 @@ void kiblnd_pack_msg(lnet_ni_t *ni, struct kib_msg *msg, int version, 
int  kiblnd_unpack_msg(struct kib_msg *msg, int nob);

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,

		 struct iov_iter *to, unsigned int rlen);
 
int kiblnd_send(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg);

int kiblnd_recv(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg,

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

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

+5 −5
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static void kiblnd_check_sends_locked(struct kib_conn *conn); 
static void

kiblnd_tx_done(lnet_ni_t *ni, struct kib_tx *tx)

{

	lnet_msg_t *lntmsg[2];

	struct lnet_msg *lntmsg[2];

	struct kib_net *net = ni->ni_data;

	int rc;

	int i;
@@ -1475,7 +1475,7 @@ kiblnd_launch_tx(lnet_ni_t *ni, struct kib_tx *tx, lnet_nid_t nid) 
}



int

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

kiblnd_send(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg)

{

	struct lnet_hdr *hdr = &lntmsg->msg_hdr;

	int type = lntmsg->msg_type;
@@ -1648,7 +1648,7 @@ kiblnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) 
}



static void

kiblnd_reply(lnet_ni_t *ni, struct kib_rx *rx, lnet_msg_t *lntmsg)

kiblnd_reply(lnet_ni_t *ni, struct kib_rx *rx, struct lnet_msg *lntmsg)

{

	lnet_process_id_t target = lntmsg->msg_target;

	unsigned int niov = lntmsg->msg_niov;
@@ -1709,8 +1709,8 @@ 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,

	    struct iov_iter *to, unsigned int rlen)

kiblnd_recv(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg,

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

{

	struct kib_rx *rx = private;

	struct kib_msg *rxmsg = rx->rx_msg;

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

+3 −3
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ struct ksock_tx { /* transmit packet */ 
	unsigned short    tx_nonblk:1;     /* it's a non-blocking ACK */

	lnet_kiov_t       *tx_kiov;        /* packet page frags */

	struct ksock_conn *tx_conn;        /* owning conn */

	lnet_msg_t        *tx_lnetmsg;     /* lnet message for lnet_finalize()

	struct lnet_msg        *tx_lnetmsg;     /* lnet message for lnet_finalize()

					    */

	unsigned long     tx_deadline;     /* when (in jiffies) tx times out */

	struct ksock_msg       tx_msg;          /* socklnd message buffer */
@@ -650,8 +650,8 @@ ksocknal_peer_decref(struct ksock_peer *peer) 
int ksocknal_startup(lnet_ni_t *ni);

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 ksocknal_send(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg);

int ksocknal_recv(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg,

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

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