redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: lustre: lnet: change lnet_msg_t to proper structure

Browse source 
Change lnet_msg_t from typedef to proper structure.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/20831
Reviewed-by: Olaf Weber <olaf@sgi.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
James Simmons 2017-02-26 19:41:31 -05:00 committed by Greg Kroah-Hartman
parent 971175ccde
commit a9a5ac68c5
11 changed files with 102 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
drivers/staging/lustre/include/linux/lnet/lib-lnet.h
View file

@ -248,10 +248,10 @@ lnet_me_free(lnet_me_t *me)
LIBCFS_FREE(me, sizeof(*me)); LIBCFS_FREE(me, sizeof(*me));
} }
static inline lnet_msg_t * static inline struct lnet_msg *
lnet_msg_alloc(void) lnet_msg_alloc(void)
{ {
lnet_msg_t *msg; struct lnet_msg *msg;
LIBCFS_ALLOC(msg, sizeof(*msg)); LIBCFS_ALLOC(msg, sizeof(*msg));
@ -260,7 +260,7 @@ lnet_msg_alloc(void)
} }
static inline void static inline void
lnet_msg_free(lnet_msg_t *msg) lnet_msg_free(struct lnet_msg *msg)
{ {
LASSERT(!msg->msg_onactivelist); LASSERT(!msg->msg_onactivelist);
LIBCFS_FREE(msg, sizeof(*msg)); 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_islocalnid(lnet_nid_t nid);
int lnet_islocalnet(__u32 net); 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); 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_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_build_msg_event(struct lnet_msg *msg, lnet_event_kind_t ev_type);
void lnet_msg_commit(lnet_msg_t *msg, int cpt); void lnet_msg_commit(struct lnet_msg *msg, int cpt);
void lnet_msg_decommit(lnet_msg_t *msg, int cpt, int status); 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_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); unsigned int offset, unsigned int len);
int lnet_send(lnet_nid_t nid, lnet_msg_t *msg, lnet_nid_t rtr_nid); int lnet_send(lnet_nid_t nid, struct lnet_msg *msg, lnet_nid_t rtr_nid);
void lnet_return_tx_credits_locked(lnet_msg_t *msg); void lnet_return_tx_credits_locked(struct lnet_msg *msg);
void lnet_return_rx_credits_locked(lnet_msg_t *msg); void lnet_return_rx_credits_locked(struct lnet_msg *msg);
void lnet_schedule_blocked_locked(lnet_rtrbufpool_t *rbp); void lnet_schedule_blocked_locked(lnet_rtrbufpool_t *rbp);
void lnet_drop_routed_msgs_locked(struct list_head *list, int cpt); void lnet_drop_routed_msgs_locked(struct list_head *list, int cpt);
@ -554,19 +554,22 @@ void lnet_portals_destroy(void);
/* message functions */ /* message functions */
int lnet_parse(lnet_ni_t *ni, struct lnet_hdr *hdr, int lnet_parse(lnet_ni_t *ni, struct lnet_hdr *hdr,
lnet_nid_t fromnid, void *private, int rdma_req); lnet_nid_t fromnid, void *private, int rdma_req);
int lnet_parse_local(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, lnet_msg_t *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, void lnet_recv(lnet_ni_t *ni, void *private, struct lnet_msg *msg,
unsigned int offset, unsigned int mlen, unsigned int rlen); int delayed, unsigned int offset, unsigned int mlen,
void lnet_ni_recv(lnet_ni_t *ni, void *private, lnet_msg_t *msg, unsigned int rlen);
void lnet_ni_recv(lnet_ni_t *ni, void *private, struct lnet_msg *msg,
int delayed, unsigned int offset, int delayed, unsigned int offset,
unsigned int mlen, unsigned int rlen); unsigned int mlen, unsigned int rlen);
lnet_msg_t *lnet_create_reply_msg(lnet_ni_t *ni, lnet_msg_t *get_msg); struct lnet_msg *lnet_create_reply_msg(lnet_ni_t *ni,
void lnet_set_reply_msg_len(lnet_ni_t *ni, lnet_msg_t *msg, unsigned int len); 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, void lnet_drop_message(lnet_ni_t *ni, int cpt, void *private,
unsigned int nob); unsigned int nob);

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

@ -54,7 +54,7 @@
/* forward refs */ /* forward refs */
struct lnet_libmd; struct lnet_libmd;
typedef struct lnet_msg { struct lnet_msg {
struct list_head msg_activelist; struct list_head msg_activelist;
struct list_head msg_list; /* Q for credits/MD */ struct list_head msg_list; /* Q for credits/MD */
@ -106,7 +106,7 @@ typedef struct lnet_msg {
lnet_event_t msg_ev; lnet_event_t msg_ev;
struct lnet_hdr msg_hdr; struct lnet_hdr msg_hdr;
} lnet_msg_t; };
typedef struct lnet_libhandle { typedef struct lnet_libhandle {
struct list_head lh_hash_chain; struct list_head lh_hash_chain;
@ -210,7 +210,8 @@ typedef struct lnet_lnd {
* non-zero for immediate failure, otherwise complete later with * non-zero for immediate failure, otherwise complete later with
* lnet_finalize() * 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 * 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 * complete later with lnet_finalize(). This also gives back a receive
* credit if the LND does flow control. * 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); 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. * release resources; lnd_recv() will not be called.
*/ */
int (*lnd_eager_recv)(struct lnet_ni *ni, void *private, 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 */ /* notification of peer health */
void (*lnd_notify)(struct lnet_ni *ni, lnet_nid_t peer, int alive); void (*lnd_notify)(struct lnet_ni *ni, lnet_nid_t peer, int alive);

8
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
View file

@ -490,7 +490,7 @@ struct kib_tx { /* transmit message */
int tx_status; /* LNET completion status */ int tx_status; /* LNET completion status */
unsigned long tx_deadline; /* completion deadline */ unsigned long tx_deadline; /* completion deadline */
__u64 tx_cookie; /* completion cookie */ __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) */ struct kib_msg *tx_msg; /* message buffer (host vaddr) */
__u64 tx_msgaddr; /* message buffer (I/O addr) */ __u64 tx_msgaddr; /* message buffer (I/O addr) */
DECLARE_PCI_UNMAP_ADDR(tx_msgunmap); /* for dma_unmap_single() */ 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_unpack_msg(struct kib_msg *msg, int nob);
int kiblnd_post_rx(struct kib_rx *rx, int credit); 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_send(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg);
int kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed, int kiblnd_recv(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg,
struct iov_iter *to, unsigned int rlen); int delayed, struct iov_iter *to, unsigned int rlen);

10
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
View file

@ -53,7 +53,7 @@ static void kiblnd_check_sends_locked(struct kib_conn *conn);
static void static void
kiblnd_tx_done(lnet_ni_t *ni, struct kib_tx *tx) 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; struct kib_net *net = ni->ni_data;
int rc; int rc;
int i; int i;
@ -1475,7 +1475,7 @@ kiblnd_launch_tx(lnet_ni_t *ni, struct kib_tx *tx, lnet_nid_t nid)
} }
int 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; struct lnet_hdr *hdr = &lntmsg->msg_hdr;
int type = lntmsg->msg_type; int type = lntmsg->msg_type;
@ -1648,7 +1648,7 @@ kiblnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
} }
static void 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; lnet_process_id_t target = lntmsg->msg_target;
unsigned int niov = lntmsg->msg_niov; 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 int
kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed, kiblnd_recv(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg,
struct iov_iter *to, unsigned int rlen) int delayed, struct iov_iter *to, unsigned int rlen)
{ {
struct kib_rx *rx = private; struct kib_rx *rx = private;
struct kib_msg *rxmsg = rx->rx_msg; struct kib_msg *rxmsg = rx->rx_msg;

6
drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
View file

@ -284,7 +284,7 @@ struct ksock_tx { /* transmit packet */
unsigned short tx_nonblk:1; /* it's a non-blocking ACK */ unsigned short tx_nonblk:1; /* it's a non-blocking ACK */
lnet_kiov_t *tx_kiov; /* packet page frags */ lnet_kiov_t *tx_kiov; /* packet page frags */
struct ksock_conn *tx_conn; /* owning conn */ 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 */ unsigned long tx_deadline; /* when (in jiffies) tx times out */
struct ksock_msg tx_msg; /* socklnd message buffer */ 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); int ksocknal_startup(lnet_ni_t *ni);
void ksocknal_shutdown(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_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_send(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg);
int ksocknal_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int ksocknal_recv(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg,
int delayed, struct iov_iter *to, unsigned int rlen); int delayed, struct iov_iter *to, unsigned int rlen);
int ksocknal_accept(lnet_ni_t *ni, struct socket *sock); int ksocknal_accept(lnet_ni_t *ni, struct socket *sock);

8
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
View file

@ -395,7 +395,7 @@ ksocknal_receive(struct ksock_conn *conn)
void void
ksocknal_tx_done(lnet_ni_t *ni, struct ksock_tx *tx) ksocknal_tx_done(lnet_ni_t *ni, struct ksock_tx *tx)
{ {
lnet_msg_t *lnetmsg = tx->tx_lnetmsg; struct lnet_msg *lnetmsg = tx->tx_lnetmsg;
int rc = (!tx->tx_resid && !tx->tx_zc_aborted) ? 0 : -EIO; int rc = (!tx->tx_resid && !tx->tx_zc_aborted) ? 0 : -EIO;
LASSERT(ni || tx->tx_conn); LASSERT(ni || tx->tx_conn);
@ -938,7 +938,7 @@ ksocknal_launch_packet(lnet_ni_t *ni, struct ksock_tx *tx, lnet_process_id_t id)
} }
int int
ksocknal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) ksocknal_send(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg)
{ {
int mpflag = 1; int mpflag = 1;
int type = lntmsg->msg_type; int type = lntmsg->msg_type;
@ -1333,8 +1333,8 @@ ksocknal_process_receive(struct ksock_conn *conn)
} }
int int
ksocknal_recv(lnet_ni_t *ni, void *private, lnet_msg_t *msg, int delayed, ksocknal_recv(lnet_ni_t *ni, void *private, struct lnet_msg *msg,
struct iov_iter *to, unsigned int rlen) int delayed, struct iov_iter *to, unsigned int rlen)
{ {
struct ksock_conn *conn = private; struct ksock_conn *conn = private;
struct ksock_sched *sched = conn->ksnc_scheduler; struct ksock_sched *sched = conn->ksnc_scheduler;

2
drivers/staging/lustre/lnet/lnet/api-ni.c
View file

@ -1173,7 +1173,7 @@ lnet_shutdown_lndnis(void)
/* /*
* Clear lazy portals and drop delayed messages which hold refs * Clear lazy portals and drop delayed messages which hold refs
* on their lnet_msg_t::msg_rxpeer * on their lnet_msg::msg_rxpeer
*/ */
for (i = 0; i < the_lnet.ln_nportals; i++) for (i = 0; i < the_lnet.ln_nportals; i++)
LNetClearLazyPortal(i); LNetClearLazyPortal(i);

75
drivers/staging/lustre/lnet/lnet/lib-move.c
View file

@ -364,8 +364,9 @@ lnet_extract_kiov(int dst_niov, lnet_kiov_t *dst,
EXPORT_SYMBOL(lnet_extract_kiov); EXPORT_SYMBOL(lnet_extract_kiov);
void void
lnet_ni_recv(lnet_ni_t *ni, void *private, lnet_msg_t *msg, int delayed, lnet_ni_recv(lnet_ni_t *ni, void *private, struct lnet_msg *msg,
unsigned int offset, unsigned int mlen, unsigned int rlen) int delayed, unsigned int offset, unsigned int mlen,
unsigned int rlen)
{ {
unsigned int niov = 0; unsigned int niov = 0;
struct kvec *iov = NULL; struct kvec *iov = NULL;
@ -409,7 +410,7 @@ lnet_ni_recv(lnet_ni_t *ni, void *private, lnet_msg_t *msg, int delayed,
} }
static void static void
lnet_setpayloadbuffer(lnet_msg_t *msg) lnet_setpayloadbuffer(struct lnet_msg *msg)
{ {
lnet_libmd_t *md = msg->msg_md; lnet_libmd_t *md = msg->msg_md;
@ -428,7 +429,7 @@ lnet_setpayloadbuffer(lnet_msg_t *msg)
} }
void void
lnet_prep_send(lnet_msg_t *msg, int type, lnet_process_id_t target, lnet_prep_send(struct lnet_msg *msg, int type, lnet_process_id_t target,
unsigned int offset, unsigned int len) unsigned int offset, unsigned int len)
{ {
msg->msg_type = type; msg->msg_type = type;
@ -449,7 +450,7 @@ lnet_prep_send(lnet_msg_t *msg, int type, lnet_process_id_t target,
} }
static void static void
lnet_ni_send(lnet_ni_t *ni, lnet_msg_t *msg) lnet_ni_send(lnet_ni_t *ni, struct lnet_msg *msg)
{ {
void *priv = msg->msg_private; void *priv = msg->msg_private;
int rc; int rc;
@ -464,7 +465,7 @@ lnet_ni_send(lnet_ni_t *ni, lnet_msg_t *msg)
} }
static int static int
lnet_ni_eager_recv(lnet_ni_t *ni, lnet_msg_t *msg) lnet_ni_eager_recv(lnet_ni_t *ni, struct lnet_msg *msg)
{ {
int rc; int rc;
@ -595,7 +596,7 @@ lnet_peer_alive_locked(lnet_peer_t *lp)
* \retval -ECANCELED If the MD of the message has been unlinked. * \retval -ECANCELED If the MD of the message has been unlinked.
*/ */
static int static int
lnet_post_send_locked(lnet_msg_t *msg, int do_send) lnet_post_send_locked(struct lnet_msg *msg, int do_send)
{ {
lnet_peer_t *lp = msg->msg_txpeer; lnet_peer_t *lp = msg->msg_txpeer;
lnet_ni_t *ni = lp->lp_ni; lnet_ni_t *ni = lp->lp_ni;
@ -680,7 +681,7 @@ lnet_post_send_locked(lnet_msg_t *msg, int do_send)
} }
static lnet_rtrbufpool_t * static lnet_rtrbufpool_t *
lnet_msg2bufpool(lnet_msg_t *msg) lnet_msg2bufpool(struct lnet_msg *msg)
{ {
lnet_rtrbufpool_t *rbp; lnet_rtrbufpool_t *rbp;
int cpt; int cpt;
@ -700,7 +701,7 @@ lnet_msg2bufpool(lnet_msg_t *msg)
} }
static int static int
lnet_post_routed_recv_locked(lnet_msg_t *msg, int do_recv) lnet_post_routed_recv_locked(struct lnet_msg *msg, int do_recv)
{ {
/* /*
* lnet_parse is going to lnet_net_unlock immediately after this, so it * lnet_parse is going to lnet_net_unlock immediately after this, so it
@ -776,10 +777,10 @@ lnet_post_routed_recv_locked(lnet_msg_t *msg, int do_recv)
} }
void void
lnet_return_tx_credits_locked(lnet_msg_t *msg) lnet_return_tx_credits_locked(struct lnet_msg *msg)
{ {
lnet_peer_t *txpeer = msg->msg_txpeer; lnet_peer_t *txpeer = msg->msg_txpeer;
lnet_msg_t *msg2; struct lnet_msg *msg2;
if (msg->msg_txcredit) { if (msg->msg_txcredit) {
struct lnet_ni *ni = txpeer->lp_ni; struct lnet_ni *ni = txpeer->lp_ni;
@ -794,7 +795,7 @@ lnet_return_tx_credits_locked(lnet_msg_t *msg)
tq->tq_credits++; tq->tq_credits++;
if (tq->tq_credits <= 0) { if (tq->tq_credits <= 0) {
msg2 = list_entry(tq->tq_delayed.next, msg2 = list_entry(tq->tq_delayed.next,
lnet_msg_t, msg_list); struct lnet_msg, msg_list);
list_del(&msg2->msg_list); list_del(&msg2->msg_list);
LASSERT(msg2->msg_txpeer->lp_ni == ni); LASSERT(msg2->msg_txpeer->lp_ni == ni);
@ -817,7 +818,7 @@ lnet_return_tx_credits_locked(lnet_msg_t *msg)
txpeer->lp_txcredits++; txpeer->lp_txcredits++;
if (txpeer->lp_txcredits <= 0) { if (txpeer->lp_txcredits <= 0) {
msg2 = list_entry(txpeer->lp_txq.next, msg2 = list_entry(txpeer->lp_txq.next,
lnet_msg_t, msg_list); struct lnet_msg, msg_list);
list_del(&msg2->msg_list); list_del(&msg2->msg_list);
LASSERT(msg2->msg_txpeer == txpeer); LASSERT(msg2->msg_txpeer == txpeer);
@ -836,12 +837,12 @@ lnet_return_tx_credits_locked(lnet_msg_t *msg)
void void
lnet_schedule_blocked_locked(lnet_rtrbufpool_t *rbp) lnet_schedule_blocked_locked(lnet_rtrbufpool_t *rbp)
{ {
lnet_msg_t *msg; struct lnet_msg *msg;
if (list_empty(&rbp->rbp_msgs)) if (list_empty(&rbp->rbp_msgs))
return; return;
msg = list_entry(rbp->rbp_msgs.next, msg = list_entry(rbp->rbp_msgs.next,
lnet_msg_t, msg_list); struct lnet_msg, msg_list);
list_del(&msg->msg_list); list_del(&msg->msg_list);
(void)lnet_post_routed_recv_locked(msg, 1); (void)lnet_post_routed_recv_locked(msg, 1);
@ -851,8 +852,8 @@ void
lnet_drop_routed_msgs_locked(struct list_head *list, int cpt) lnet_drop_routed_msgs_locked(struct list_head *list, int cpt)
{ {
struct list_head drop; struct list_head drop;
lnet_msg_t *msg; struct lnet_msg *msg;
lnet_msg_t *tmp; struct lnet_msg *tmp;
INIT_LIST_HEAD(&drop); INIT_LIST_HEAD(&drop);
@ -871,10 +872,10 @@ lnet_drop_routed_msgs_locked(struct list_head *list, int cpt)
} }
void void
lnet_return_rx_credits_locked(lnet_msg_t *msg) lnet_return_rx_credits_locked(struct lnet_msg *msg)
{ {
lnet_peer_t *rxpeer = msg->msg_rxpeer; lnet_peer_t *rxpeer = msg->msg_rxpeer;
lnet_msg_t *msg2; struct lnet_msg *msg2;
if (msg->msg_rtrcredit) { if (msg->msg_rtrcredit) {
/* give back global router credits */ /* give back global router credits */
@ -943,7 +944,7 @@ routing_off:
msg->msg_rx_cpt); msg->msg_rx_cpt);
} else if (rxpeer->lp_rtrcredits <= 0) { } else if (rxpeer->lp_rtrcredits <= 0) {
msg2 = list_entry(rxpeer->lp_rtrq.next, msg2 = list_entry(rxpeer->lp_rtrq.next,
lnet_msg_t, msg_list); struct lnet_msg, msg_list);
list_del(&msg2->msg_list); list_del(&msg2->msg_list);
(void)lnet_post_routed_recv_locked(msg2, 1); (void)lnet_post_routed_recv_locked(msg2, 1);
@ -1057,7 +1058,7 @@ lnet_find_route_locked(lnet_ni_t *ni, lnet_nid_t target, lnet_nid_t rtr_nid)
} }
int int
lnet_send(lnet_nid_t src_nid, lnet_msg_t *msg, lnet_nid_t rtr_nid) lnet_send(lnet_nid_t src_nid, struct lnet_msg *msg, lnet_nid_t rtr_nid)
{ {
lnet_nid_t dst_nid = msg->msg_target.nid; lnet_nid_t dst_nid = msg->msg_target.nid;
struct lnet_ni *src_ni; struct lnet_ni *src_ni;
@ -1243,7 +1244,7 @@ lnet_drop_message(lnet_ni_t *ni, int cpt, void *private, unsigned int nob)
} }
static void static void
lnet_recv_put(lnet_ni_t *ni, lnet_msg_t *msg) lnet_recv_put(lnet_ni_t *ni, struct lnet_msg *msg)
{ {
struct lnet_hdr *hdr = &msg->msg_hdr; struct lnet_hdr *hdr = &msg->msg_hdr;
@ -1264,7 +1265,7 @@ lnet_recv_put(lnet_ni_t *ni, lnet_msg_t *msg)
} }
static int static int
lnet_parse_put(lnet_ni_t *ni, lnet_msg_t *msg) lnet_parse_put(lnet_ni_t *ni, struct lnet_msg *msg)
{ {
struct lnet_hdr *hdr = &msg->msg_hdr; struct lnet_hdr *hdr = &msg->msg_hdr;
struct lnet_match_info info; struct lnet_match_info info;
@ -1322,7 +1323,7 @@ lnet_parse_put(lnet_ni_t *ni, lnet_msg_t *msg)
} }
static int static int
lnet_parse_get(lnet_ni_t *ni, lnet_msg_t *msg, int rdma_get) lnet_parse_get(lnet_ni_t *ni, struct lnet_msg *msg, int rdma_get)
{ {
struct lnet_match_info info; struct lnet_match_info info;
struct lnet_hdr *hdr = &msg->msg_hdr; struct lnet_hdr *hdr = &msg->msg_hdr;
@ -1386,7 +1387,7 @@ lnet_parse_get(lnet_ni_t *ni, lnet_msg_t *msg, int rdma_get)
} }
static int static int
lnet_parse_reply(lnet_ni_t *ni, lnet_msg_t *msg) lnet_parse_reply(lnet_ni_t *ni, struct lnet_msg *msg)
{ {
void *private = msg->msg_private; void *private = msg->msg_private;
struct lnet_hdr *hdr = &msg->msg_hdr; struct lnet_hdr *hdr = &msg->msg_hdr;
@ -1451,7 +1452,7 @@ lnet_parse_reply(lnet_ni_t *ni, lnet_msg_t *msg)
} }
static int static int
lnet_parse_ack(lnet_ni_t *ni, lnet_msg_t *msg) lnet_parse_ack(lnet_ni_t *ni, struct lnet_msg *msg)
{ {
struct lnet_hdr *hdr = &msg->msg_hdr; struct lnet_hdr *hdr = &msg->msg_hdr;
lnet_process_id_t src = {0}; lnet_process_id_t src = {0};
@ -1506,7 +1507,7 @@ lnet_parse_ack(lnet_ni_t *ni, lnet_msg_t *msg)
* \retval -ve error code * \retval -ve error code
*/ */
int int
lnet_parse_forward_locked(lnet_ni_t *ni, lnet_msg_t *msg) lnet_parse_forward_locked(lnet_ni_t *ni, struct lnet_msg *msg)
{ {
int rc = 0; int rc = 0;
@ -1530,7 +1531,7 @@ lnet_parse_forward_locked(lnet_ni_t *ni, lnet_msg_t *msg)
} }
int int
lnet_parse_local(lnet_ni_t *ni, lnet_msg_t *msg) lnet_parse_local(lnet_ni_t *ni, struct lnet_msg *msg)
{ {
int rc; int rc;
@ -1874,9 +1875,9 @@ lnet_drop_delayed_msg_list(struct list_head *head, char *reason)
{ {
while (!list_empty(head)) { while (!list_empty(head)) {
lnet_process_id_t id = {0}; lnet_process_id_t id = {0};
lnet_msg_t *msg; struct lnet_msg *msg;
msg = list_entry(head->next, lnet_msg_t, msg_list); msg = list_entry(head->next, struct lnet_msg, msg_list);
list_del(&msg->msg_list); list_del(&msg->msg_list);
id.nid = msg->msg_hdr.src_nid; id.nid = msg->msg_hdr.src_nid;
@ -1915,10 +1916,10 @@ void
lnet_recv_delayed_msg_list(struct list_head *head) lnet_recv_delayed_msg_list(struct list_head *head)
{ {
while (!list_empty(head)) { while (!list_empty(head)) {
lnet_msg_t *msg; struct lnet_msg *msg;
lnet_process_id_t id; lnet_process_id_t id;
msg = list_entry(head->next, lnet_msg_t, msg_list); msg = list_entry(head->next, struct lnet_msg, msg_list);
list_del(&msg->msg_list); list_del(&msg->msg_list);
/* /*
@ -2009,7 +2010,7 @@ LNetPut(lnet_nid_t self, struct lnet_handle_md mdh, lnet_ack_req_t ack,
msg = lnet_msg_alloc(); msg = lnet_msg_alloc();
if (!msg) { if (!msg) {
CERROR("Dropping PUT to %s: ENOMEM on lnet_msg_t\n", CERROR("Dropping PUT to %s: ENOMEM on struct lnet_msg\n",
libcfs_id2str(target)); libcfs_id2str(target));
return -ENOMEM; return -ENOMEM;
} }
@ -2072,8 +2073,8 @@ LNetPut(lnet_nid_t self, struct lnet_handle_md mdh, lnet_ack_req_t ack,
} }
EXPORT_SYMBOL(LNetPut); EXPORT_SYMBOL(LNetPut);
lnet_msg_t * struct lnet_msg *
lnet_create_reply_msg(lnet_ni_t *ni, lnet_msg_t *getmsg) lnet_create_reply_msg(lnet_ni_t *ni, struct lnet_msg *getmsg)
{ {
/* /*
* The LND can DMA direct to the GET md (i.e. no REPLY msg). This * The LND can DMA direct to the GET md (i.e. no REPLY msg). This
@ -2151,7 +2152,7 @@ lnet_create_reply_msg(lnet_ni_t *ni, lnet_msg_t *getmsg)
EXPORT_SYMBOL(lnet_create_reply_msg); EXPORT_SYMBOL(lnet_create_reply_msg);
void void
lnet_set_reply_msg_len(lnet_ni_t *ni, lnet_msg_t *reply, unsigned int len) lnet_set_reply_msg_len(lnet_ni_t *ni, struct lnet_msg *reply, unsigned int len)
{ {
/* /*
* Set the REPLY length, now the RDMA that elides the REPLY message has * Set the REPLY length, now the RDMA that elides the REPLY message has
@ -2213,7 +2214,7 @@ LNetGet(lnet_nid_t self, struct lnet_handle_md mdh,
msg = lnet_msg_alloc(); msg = lnet_msg_alloc();
if (!msg) { if (!msg) {
CERROR("Dropping GET to %s: ENOMEM on lnet_msg_t\n", CERROR("Dropping GET to %s: ENOMEM on struct lnet_msg\n",
libcfs_id2str(target)); libcfs_id2str(target));
return -ENOMEM; return -ENOMEM;
} }

25
drivers/staging/lustre/lnet/lnet/lib-msg.c
View file

@ -54,7 +54,7 @@ lnet_build_unlink_event(lnet_libmd_t *md, lnet_event_t *ev)
* Don't need any lock, must be called after lnet_commit_md * Don't need any lock, must be called after lnet_commit_md
*/ */
void void
lnet_build_msg_event(lnet_msg_t *msg, lnet_event_kind_t ev_type) lnet_build_msg_event(struct lnet_msg *msg, lnet_event_kind_t ev_type)
{ {
struct lnet_hdr *hdr = &msg->msg_hdr; struct lnet_hdr *hdr = &msg->msg_hdr;
lnet_event_t *ev = &msg->msg_ev; lnet_event_t *ev = &msg->msg_ev;
@ -129,7 +129,7 @@ lnet_build_msg_event(lnet_msg_t *msg, lnet_event_kind_t ev_type)
} }
void void
lnet_msg_commit(lnet_msg_t *msg, int cpt) lnet_msg_commit(struct lnet_msg *msg, int cpt)
{ {
struct lnet_msg_container *container = the_lnet.ln_msg_containers[cpt]; struct lnet_msg_container *container = the_lnet.ln_msg_containers[cpt];
lnet_counters_t *counters = the_lnet.ln_counters[cpt]; lnet_counters_t *counters = the_lnet.ln_counters[cpt];
@ -162,7 +162,7 @@ lnet_msg_commit(lnet_msg_t *msg, int cpt)
} }
static void static void
lnet_msg_decommit_tx(lnet_msg_t *msg, int status) lnet_msg_decommit_tx(struct lnet_msg *msg, int status)
{ {
lnet_counters_t *counters; lnet_counters_t *counters;
lnet_event_t *ev = &msg->msg_ev; lnet_event_t *ev = &msg->msg_ev;
@ -214,7 +214,7 @@ lnet_msg_decommit_tx(lnet_msg_t *msg, int status)
} }
static void static void
lnet_msg_decommit_rx(lnet_msg_t *msg, int status) lnet_msg_decommit_rx(struct lnet_msg *msg, int status)
{ {
lnet_counters_t *counters; lnet_counters_t *counters;
lnet_event_t *ev = &msg->msg_ev; lnet_event_t *ev = &msg->msg_ev;
@ -272,7 +272,7 @@ lnet_msg_decommit_rx(lnet_msg_t *msg, int status)
} }
void void
lnet_msg_decommit(lnet_msg_t *msg, int cpt, int status) lnet_msg_decommit(struct lnet_msg *msg, int cpt, int status)
{ {
int cpt2 = cpt; int cpt2 = cpt;
@ -306,7 +306,7 @@ lnet_msg_decommit(lnet_msg_t *msg, int cpt, int status)
} }
void void
lnet_msg_attach_md(lnet_msg_t *msg, lnet_libmd_t *md, lnet_msg_attach_md(struct lnet_msg *msg, lnet_libmd_t *md,
unsigned int offset, unsigned int mlen) unsigned int offset, unsigned int mlen)
{ {
/* NB: @offset and @len are only useful for receiving */ /* NB: @offset and @len are only useful for receiving */
@ -336,7 +336,7 @@ lnet_msg_attach_md(lnet_msg_t *msg, lnet_libmd_t *md,
} }
void void
lnet_msg_detach_md(lnet_msg_t *msg, int status) lnet_msg_detach_md(struct lnet_msg *msg, int status)
{ {
lnet_libmd_t *md = msg->msg_md; lnet_libmd_t *md = msg->msg_md;
int unlink; int unlink;
@ -359,7 +359,7 @@ lnet_msg_detach_md(lnet_msg_t *msg, int status)
} }
static int static int
lnet_complete_msg_locked(lnet_msg_t *msg, int cpt) lnet_complete_msg_locked(struct lnet_msg *msg, int cpt)
{ {
struct lnet_handle_wire ack_wmd; struct lnet_handle_wire ack_wmd;
int rc; int rc;
@ -437,7 +437,7 @@ lnet_complete_msg_locked(lnet_msg_t *msg, int cpt)
} }
void void
lnet_finalize(lnet_ni_t *ni, lnet_msg_t *msg, int status) lnet_finalize(lnet_ni_t *ni, struct lnet_msg *msg, int status)
{ {
struct lnet_msg_container *container; struct lnet_msg_container *container;
int my_slot; int my_slot;
@ -502,7 +502,7 @@ lnet_finalize(lnet_ni_t *ni, lnet_msg_t *msg, int status)
while (!list_empty(&container->msc_finalizing)) { while (!list_empty(&container->msc_finalizing)) {
msg = list_entry(container->msc_finalizing.next, msg = list_entry(container->msc_finalizing.next,
lnet_msg_t, msg_list); struct lnet_msg, msg_list);
list_del(&msg->msg_list); list_del(&msg->msg_list);
@ -538,9 +538,10 @@ lnet_msg_container_cleanup(struct lnet_msg_container *container)
return; return;
while (!list_empty(&container->msc_active)) { while (!list_empty(&container->msc_active)) {
lnet_msg_t *msg = list_entry(container->msc_active.next, struct lnet_msg *msg;
lnet_msg_t, msg_activelist);
msg = list_entry(container->msc_active.next,
struct lnet_msg, msg_activelist);
LASSERT(msg->msg_onactivelist); LASSERT(msg->msg_onactivelist);
msg->msg_onactivelist = 0; msg->msg_onactivelist = 0;
list_del(&msg->msg_activelist); list_del(&msg->msg_activelist);

4
drivers/staging/lustre/lnet/lnet/lib-ptl.c
View file

@ -657,8 +657,8 @@ lnet_ptl_attach_md(lnet_me_t *me, lnet_libmd_t *md,
struct lnet_portal *ptl = the_lnet.ln_portals[me->me_portal]; struct lnet_portal *ptl = the_lnet.ln_portals[me->me_portal];
struct lnet_match_table *mtable; struct lnet_match_table *mtable;
struct list_head *head; struct list_head *head;
lnet_msg_t *tmp; struct lnet_msg *tmp;
lnet_msg_t *msg; struct lnet_msg *msg;
int exhausted = 0; int exhausted = 0;
int cpt; int cpt;

6
drivers/staging/lustre/lnet/lnet/lo.c
View file

@ -32,7 +32,7 @@
#include "../../include/linux/lnet/lib-lnet.h" #include "../../include/linux/lnet/lib-lnet.h"
static int static int
lolnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) lolnd_send(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg)
{ {
LASSERT(!lntmsg->msg_routing); LASSERT(!lntmsg->msg_routing);
LASSERT(!lntmsg->msg_target_is_router); LASSERT(!lntmsg->msg_target_is_router);
@ -41,10 +41,10 @@ lolnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
} }
static int static int
lolnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, lolnd_recv(lnet_ni_t *ni, void *private, struct lnet_msg *lntmsg,
int delayed, struct iov_iter *to, unsigned int rlen) int delayed, struct iov_iter *to, unsigned int rlen)
{ {
lnet_msg_t *sendmsg = private; struct lnet_msg *sendmsg = private;
if (lntmsg) { /* not discarding */ if (lntmsg) { /* not discarding */
if (sendmsg->msg_iov) if (sendmsg->msg_iov)