From 4cd98c50df3f006ec71afb076113c0046c89a3d8 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Fri, 22 Dec 2017 02:17:56 -0500 Subject: [PATCH] LU-6142 gnilnd: handle LNet core typedef removal The LNet layer has removed all the typedefs. Update the gnilnd driver to handle the removals. Test-parameters: trivial Change-Id: I96377a977bc9ef689a0c48afb77106aa2a8993a1 Signed-off-by: James Simmons Reviewed-on: https://review.whamcloud.com/30474 Reviewed-by: Chris Horn Reviewed-by: Doug Oucharek Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lnet/klnds/gnilnd/gnilnd.c | 12 ++++++------ lnet/klnds/gnilnd/gnilnd.h | 25 ++++++++++++------------- lnet/klnds/gnilnd/gnilnd_cb.c | 24 ++++++++++++------------ 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/lnet/klnds/gnilnd/gnilnd.c b/lnet/klnds/gnilnd/gnilnd.c index 4b79eeb..2001875 100644 --- a/lnet/klnds/gnilnd/gnilnd.c +++ b/lnet/klnds/gnilnd/gnilnd.c @@ -25,7 +25,7 @@ #include "gnilnd.h" /* Primary entry points from LNET. There are no guarantees against reentrance. */ -lnd_t the_kgnilnd = { +struct lnet_lnd the_kgnilnd = { .lnd_type = GNILND, .lnd_startup = kgnilnd_startup, .lnd_shutdown = kgnilnd_shutdown, @@ -1800,7 +1800,7 @@ kgnilnd_report_node_state(lnet_nid_t nid, int down) } int -kgnilnd_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) +kgnilnd_ctl(struct lnet_ni *ni, unsigned int cmd, void *arg) { struct libcfs_ioctl_data *data = arg; kgn_net_t *net = ni->ni_data; @@ -1920,13 +1920,13 @@ kgnilnd_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) } void -kgnilnd_query(lnet_ni_t *ni, lnet_nid_t nid, cfs_time_t *when) +kgnilnd_query(struct lnet_ni *ni, lnet_nid_t nid, cfs_time_t *when) { kgn_net_t *net = ni->ni_data; kgn_tx_t *tx; kgn_peer_t *peer = NULL; kgn_conn_t *conn = NULL; - lnet_process_id_t id = { + struct lnet_process_id id = { .nid = nid, .pid = LNET_PID_LUSTRE, }; @@ -2677,7 +2677,7 @@ kgnilnd_base_shutdown(void) } int -kgnilnd_startup(lnet_ni_t *ni) +kgnilnd_startup(struct lnet_ni *ni) { int rc, devno; kgn_net_t *net; @@ -2775,7 +2775,7 @@ kgnilnd_startup(lnet_ni_t *ni) } void -kgnilnd_shutdown(lnet_ni_t *ni) +kgnilnd_shutdown(struct lnet_ni *ni) { kgn_net_t *net = ni->ni_data; int i; diff --git a/lnet/klnds/gnilnd/gnilnd.h b/lnet/klnds/gnilnd/gnilnd.h index 2ec071d..e56fc9f 100644 --- a/lnet/klnds/gnilnd/gnilnd.h +++ b/lnet/klnds/gnilnd/gnilnd.h @@ -62,7 +62,6 @@ #define DEBUG_SUBSYSTEM S_LND #include -#include #include #include @@ -614,7 +613,7 @@ typedef struct kgn_device { typedef struct kgn_net { struct list_head gnn_list; /* chain on kgni_data::kgn_nets */ kgn_device_t *gnn_dev; /* device for this net */ - lnet_ni_t *gnn_ni; /* network interface instance */ + struct lnet_ni *gnn_ni; /* network interface instance */ atomic_t gnn_refcount; /* # current references */ int gnn_shutdown; /* lnd_shutdown set */ __u16 gnn_netnum; /* stash netnum for quicker lookup */ @@ -682,7 +681,7 @@ typedef struct kgn_tx { /* message descriptor */ kgn_tx_list_state_t tx_list_state;/* where in state machine is this TX ? */ struct list_head *tx_list_p; /* pointer to current list */ struct kgn_conn *tx_conn; /* owning conn */ - lnet_msg_t *tx_lntmsg[2]; /* ptl msgs to finalize on completion */ + struct lnet_msg *tx_lntmsg[2]; /* ptl msgs to finalize on completion */ unsigned long tx_qtime; /* when tx started to wait for something (jiffies) */ unsigned long tx_cred_wait; /* time spend waiting for smsg creds */ struct list_head tx_map_list; /* list entry on device map list */ @@ -808,7 +807,7 @@ typedef struct kgn_peer { typedef struct kgn_rx { kgn_conn_t *grx_conn; /* connection */ kgn_msg_t *grx_msg; /* message */ - lnet_msg_t *grx_lntmsg; /* lnet msg for this rx (eager only) */ + struct lnet_msg *grx_lntmsg; /* lnet msg for this rx (eager only) */ int grx_eager; /* if eager, we copied msg to somewhere */ struct timespec grx_received; /* time this msg received */ } kgn_rx_t; @@ -1769,8 +1768,8 @@ kgnilnd_find_net(lnet_nid_t nid, kgn_net_t **netp) int kgnilnd_dev_init(kgn_device_t *dev); void kgnilnd_dev_fini(kgn_device_t *dev); -int kgnilnd_startup(lnet_ni_t *ni); -void kgnilnd_shutdown(lnet_ni_t *ni); +int kgnilnd_startup(struct lnet_ni *ni); +void kgnilnd_shutdown(struct lnet_ni *ni); int kgnilnd_base_startup(void); void kgnilnd_base_shutdown(void); @@ -1779,12 +1778,12 @@ int kgnilnd_map_phys_fmablk(kgn_device_t *device); void kgnilnd_unmap_fma_blocks(kgn_device_t *device); void kgnilnd_free_phys_fmablk(kgn_device_t *device); -int kgnilnd_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg); -void kgnilnd_query(lnet_ni_t *ni, lnet_nid_t nid, cfs_time_t *when); -int kgnilnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg); -int kgnilnd_eager_recv(lnet_ni_t *ni, void *private, - lnet_msg_t *lntmsg, void **new_private); -int kgnilnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, +int kgnilnd_ctl(struct lnet_ni *ni, unsigned int cmd, void *arg); +void kgnilnd_query(struct lnet_ni *ni, lnet_nid_t nid, cfs_time_t *when); +int kgnilnd_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg); +int kgnilnd_eager_recv(struct lnet_ni *ni, void *private, + struct lnet_msg *lntmsg, void **new_private); +int kgnilnd_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg, int delayed, unsigned int niov, struct kvec *iov, lnet_kiov_t *kiov, unsigned int offset, unsigned int mlen, unsigned int rlen); @@ -1816,7 +1815,7 @@ int kgnilnd_del_conn_or_peer(kgn_net_t *net, lnet_nid_t nid, int command, int er void kgnilnd_peer_increase_reconnect_locked(kgn_peer_t *peer); void kgnilnd_queue_reply(kgn_conn_t *conn, kgn_tx_t *tx); void kgnilnd_queue_tx(kgn_conn_t *conn, kgn_tx_t *tx); -void kgnilnd_launch_tx(kgn_tx_t *tx, kgn_net_t *net, lnet_process_id_t *target); +void kgnilnd_launch_tx(kgn_tx_t *tx, kgn_net_t *net, struct lnet_process_id *target); int kgnilnd_send_mapped_tx(kgn_tx_t *tx, int try_map_if_full); void kgnilnd_consume_rx(kgn_rx_t *rx); diff --git a/lnet/klnds/gnilnd/gnilnd_cb.c b/lnet/klnds/gnilnd/gnilnd_cb.c index 8ff626a..443d7fea 100644 --- a/lnet/klnds/gnilnd/gnilnd_cb.c +++ b/lnet/klnds/gnilnd/gnilnd_cb.c @@ -792,7 +792,7 @@ kgnilnd_setup_rdma_buffer(kgn_tx_t *tx, unsigned int niov, * transfer. */ static void -kgnilnd_parse_lnet_rdma(lnet_msg_t *lntmsg, unsigned int *niov, +kgnilnd_parse_lnet_rdma(struct lnet_msg *lntmsg, unsigned int *niov, unsigned int *offset, unsigned int *nob, lnet_kiov_t **kiov, int put_len) { @@ -819,7 +819,7 @@ kgnilnd_compute_rdma_cksum(kgn_tx_t *tx, int put_len) { unsigned int niov, offset, nob; lnet_kiov_t *kiov; - lnet_msg_t *lntmsg = tx->tx_lntmsg[0]; + struct lnet_msg *lntmsg = tx->tx_lntmsg[0]; int dump_cksum = (*kgnilnd_tunables.kgn_checksum_dump > 1); GNITX_ASSERTF(tx, ((tx->tx_msg.gnm_type == GNILND_MSG_PUT_DONE) || @@ -871,7 +871,7 @@ kgnilnd_verify_rdma_cksum(kgn_tx_t *tx, __u16 rx_cksum, int put_len) __u16 cksum; unsigned int niov, offset, nob; lnet_kiov_t *kiov; - lnet_msg_t *lntmsg = tx->tx_lntmsg[0]; + struct lnet_msg *lntmsg = tx->tx_lntmsg[0]; int dump_on_err = *kgnilnd_tunables.kgn_checksum_dump; /* we can only match certain requests */ @@ -1216,9 +1216,9 @@ kgnilnd_unmap_buffer(kgn_tx_t *tx, int error) void kgnilnd_tx_done(kgn_tx_t *tx, int completion) { - lnet_msg_t *lntmsg0, *lntmsg1; + struct lnet_msg *lntmsg0, *lntmsg1; int status0, status1; - lnet_ni_t *ni = NULL; + struct lnet_ni *ni = NULL; kgn_conn_t *conn = tx->tx_conn; LASSERT(!in_interrupt()); @@ -1759,7 +1759,7 @@ kgnilnd_queue_tx(kgn_conn_t *conn, kgn_tx_t *tx) } void -kgnilnd_launch_tx(kgn_tx_t *tx, kgn_net_t *net, lnet_process_id_t *target) +kgnilnd_launch_tx(kgn_tx_t *tx, kgn_net_t *net, struct lnet_process_id *target) { kgn_peer_t *peer; kgn_peer_t *new_peer = NULL; @@ -2100,11 +2100,11 @@ kgnilnd_consume_rx(kgn_rx_t *rx) } int -kgnilnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) +kgnilnd_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg) { struct lnet_hdr *hdr = &lntmsg->msg_hdr; int type = lntmsg->msg_type; - lnet_process_id_t target = lntmsg->msg_target; + struct lnet_process_id target = lntmsg->msg_target; int target_is_router = lntmsg->msg_target_is_router; int routing = lntmsg->msg_routing; unsigned int niov = lntmsg->msg_niov; @@ -2272,7 +2272,7 @@ out: } void -kgnilnd_setup_rdma(lnet_ni_t *ni, kgn_rx_t *rx, lnet_msg_t *lntmsg, int mlen) +kgnilnd_setup_rdma(struct lnet_ni *ni, kgn_rx_t *rx, struct lnet_msg *lntmsg, int mlen) { kgn_conn_t *conn = rx->grx_conn; kgn_msg_t *rxmsg = rx->grx_msg; @@ -2333,7 +2333,7 @@ kgnilnd_setup_rdma(lnet_ni_t *ni, kgn_rx_t *rx, lnet_msg_t *lntmsg, int mlen) } int -kgnilnd_eager_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, +kgnilnd_eager_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg, void **new_private) { kgn_rx_t *rx = private; @@ -2424,7 +2424,7 @@ kgnilnd_eager_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, } int -kgnilnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, +kgnilnd_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg, int delayed, unsigned int niov, struct kvec *iov, lnet_kiov_t *kiov, unsigned int offset, unsigned int mlen, unsigned int rlen) @@ -3131,7 +3131,7 @@ int kgnilnd_recv_bte_get(kgn_tx_t *tx) { unsigned niov, offset, nob; lnet_kiov_t *kiov; - lnet_msg_t *lntmsg = tx->tx_lntmsg[0]; + struct lnet_msg *lntmsg = tx->tx_lntmsg[0]; kgnilnd_parse_lnet_rdma(lntmsg, &niov, &offset, &nob, &kiov, tx->tx_nob_rdma); if (kiov != NULL) { -- 1.8.3.1