X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flustre_net.h;h=30224e27a0b8a30651e162e400fba91e42feecc2;hb=627f3b67348ba134e5025acfb741134be6ad5d06;hp=3dea90588121b2d1db8bee8ebe8a578ae3ec0bc8;hpb=50a5347dcacaea85aca2a0596fa11c97adb74f2d;p=fs%2Flustre-release.git diff --git a/lustre/include/linux/lustre_net.h b/lustre/include/linux/lustre_net.h index 3dea905..30224e2 100644 --- a/lustre/include/linux/lustre_net.h +++ b/lustre/include/linux/lustre_net.h @@ -36,11 +36,11 @@ #define CONNMGR_REQUEST_PORTAL 1 #define CONNMGR_REPLY_PORTAL 2 -#define OSC_REQUEST_PORTAL 3 +//#define OSC_REQUEST_PORTAL 3 #define OSC_REPLY_PORTAL 4 #define OSC_BULK_PORTAL 5 #define OST_REQUEST_PORTAL 6 -#define OST_REPLY_PORTAL 7 +//#define OST_REPLY_PORTAL 7 #define OST_BULK_PORTAL 8 #define MDC_REQUEST_PORTAL 9 #define MDC_REPLY_PORTAL 10 @@ -54,20 +54,35 @@ #define LDLM_CLI_REPLY_PORTAL 18 /* default rpc ring length */ -#define RPC_RING_LENGTH 2 - -#define SVC_STOPPING 1 -#define SVC_RUNNING 2 -#define SVC_STOPPED 4 -#define SVC_KILLED 8 -#define SVC_EVENT 16 -#define SVC_HA_EVENT 32 -#define SVC_SIGNAL 64 +#define RPC_RING_LENGTH 10 + +#define SVC_KILLED 1 +#define SVC_EVENT 2 +#define SVC_SIGNAL 4 +#define SVC_RUNNING 8 +#define SVC_STOPPING 16 +#define SVC_STOPPED 32 + +#define RECOVD_STOPPING 1 /* how cleanup tells recovd to quit */ +#define RECOVD_IDLE 2 /* normal state */ +#define RECOVD_STOPPED 4 /* after recovd has stopped */ +#define RECOVD_FAIL 8 /* RPC timeout: wakeup recovd, sets flag */ +#define RECOVD_TIMEOUT 16 /* set when recovd detects a timeout */ +#define RECOVD_UPCALL_WAIT 32 /* an upcall has been placed */ +#define RECOVD_UPCALL_ANSWER 64 /* an upcall has been answered */ + +#define LUSTRE_CONN_NEW 1 +#define LUSTRE_CONN_CON 2 +#define LUSTRE_CONN_RECOVD 3 +#define LUSTRE_CONN_FULL 4 struct ptlrpc_connection { struct list_head c_link; struct lustre_peer c_peer; + __u8 c_local_uuid[37]; /* XXX do we need this? */ + __u8 c_remote_uuid[37]; + int c_level; __u32 c_generation; /* changes upon new connection */ __u32 c_epoch; /* changes when peer changes */ __u32 c_bootcount; /* peer's boot count */ @@ -86,46 +101,67 @@ struct ptlrpc_client { struct obd_device *cli_obd; __u32 cli_request_portal; __u32 cli_reply_portal; + __u64 cli_last_rcvd; + __u64 cli_last_committed; + __u32 cli_target_devno; + void *cli_data; struct semaphore cli_rpc_sem; /* limits outstanding requests */ spinlock_t cli_lock; /* protects lists */ + struct list_head cli_delayed_head; /* delayed until after recovery */ struct list_head cli_sending_head; - struct list_head cli_sent_head; - struct list_head cli_ha_item; + struct list_head cli_dying_head; + struct list_head cli_ha_item; + int (*cli_recover)(struct ptlrpc_client *); - struct connmgr_obd *cli_ha_mgr; + struct recovd_obd *cli_recovd; + char *cli_name; }; -/* These do double-duty in rq_type and rq_flags */ -#define PTL_RPC_INTR 1 -#define PTL_RPC_REQUEST 2 -#define PTL_RPC_REPLY 3 -#define PTL_RPC_BULK 4 -#define PTL_RPC_SENT 5 -#define PTL_BULK_SENT 6 -#define PTL_BULK_RCVD 7 -#define PTL_RPC_ERR 8 +/* packet types */ +#define PTL_RPC_TYPE_REQUEST 2 +#define PTL_RPC_TYPE_REPLY 3 + +/* state flags of requests */ +#define PTL_RPC_FL_INTR (1 << 0) +#define PTL_RPC_FL_REPLIED (1 << 1) /* reply was received */ +#define PTL_RPC_FL_SENT (1 << 2) +#define PTL_BULK_FL_SENT (1 << 3) +#define PTL_BULK_FL_RCVD (1 << 4) +#define PTL_RPC_FL_ERR (1 << 5) +#define PTL_RPC_FL_TIMEOUT (1 << 6) +#define PTL_RPC_FL_RESEND (1 << 7) +#define PTL_RPC_FL_RECOVERY (1 << 8) /* retransmission for recovery */ +#define PTL_RPC_FL_FINISHED (1 << 9) +#define PTL_RPC_FL_RETAIN (1 << 10) /* retain for replay after reply */ +#define PTL_RPC_FL_REPLAY (1 << 11) /* replay upon recovery */ +#define PTL_RPC_FL_ALLOCREP (1 << 12) /* reply buffer allocated */ struct ptlrpc_request { int rq_type; /* one of PTL_RPC_REQUEST, PTL_RPC_REPLY, PTL_RPC_BULK */ - spinlock_t rq_lock; struct list_head rq_list; + struct list_head rq_multi; struct obd_device *rq_obd; int rq_status; int rq_flags; __u32 rq_connid; + atomic_t rq_refcount; int rq_reqlen; struct lustre_msg *rq_reqmsg; int rq_replen; struct lustre_msg *rq_repmsg; + __u64 rq_transno; + __u64 rq_xid; char *rq_bulkbuf; int rq_bulklen; + int rq_level; time_t rq_time; + time_t rq_timeout; // void * rq_reply_handle; wait_queue_head_t rq_wait_for_rep; @@ -142,24 +178,45 @@ struct ptlrpc_request { struct ptlrpc_client *rq_client; }; -struct ptlrpc_bulk_desc { - int b_flags; - struct ptlrpc_connection *b_connection; - __u32 b_portal; +struct ptlrpc_bulk_page { + struct ptlrpc_bulk_desc *b_desc; + struct list_head b_link; char *b_buf; int b_buflen; - int (*b_cb)(struct ptlrpc_bulk_desc *, void *); struct page *b_page; - struct obd_conn b_conn; __u32 b_xid; - - wait_queue_head_t b_waitq; + __u32 b_flags; + struct dentry *b_dentry; + int (*b_cb)(struct ptlrpc_bulk_page *); ptl_md_t b_md; ptl_handle_md_t b_md_h; ptl_handle_me_t b_me_h; }; +struct ptlrpc_bulk_desc { + int b_flags; + struct ptlrpc_connection *b_connection; + struct ptlrpc_client *b_client; + __u32 b_portal; + struct obd_conn b_conn; + void (*b_cb)(struct ptlrpc_bulk_desc *, void *); + void *b_cb_data; + + wait_queue_head_t b_waitq; + struct list_head b_page_list; + __u32 b_page_count; + atomic_t b_pages_remaining; + void *b_desc_private; +}; + +struct ptlrpc_thread { + struct list_head t_link; + + __u32 t_flags; + wait_queue_head_t t_ctl_waitq; +}; + struct ptlrpc_service { time_t srv_time; time_t srv_timeout; @@ -179,27 +236,26 @@ struct ptlrpc_service { /* event queue */ ptl_handle_eq_t srv_eq_h; - __u32 srv_flags; struct lustre_peer srv_self; - ptl_process_id_t srv_id; - struct task_struct *srv_thread; - wait_queue_head_t srv_waitq; - wait_queue_head_t srv_ctl_waitq; + wait_queue_head_t srv_waitq; /* all threads sleep on this */ spinlock_t srv_lock; struct list_head srv_reqs; - ptl_event_t srv_ev; + struct list_head srv_threads; int (*srv_handler)(struct obd_device *obddev, struct ptlrpc_service *svc, struct ptlrpc_request *req); }; +typedef void (*bulk_callback_t)(struct ptlrpc_bulk_desc *, void *); + typedef int (*svc_handler_t)(struct obd_device *obddev, struct ptlrpc_service *svc, struct ptlrpc_request *req); /* rpc/connection.c */ +void ptlrpc_readdress_connection(struct ptlrpc_connection *conn, char *uuid); struct ptlrpc_connection *ptlrpc_get_connection(struct lustre_peer *peer); int ptlrpc_put_connection(struct ptlrpc_connection *c); struct ptlrpc_connection *ptlrpc_connection_addref(struct ptlrpc_connection *); @@ -207,33 +263,46 @@ void ptlrpc_init_connection(void); void ptlrpc_cleanup_connection(void); /* rpc/niobuf.c */ -int ptlrpc_check_bulk_sent(struct ptlrpc_bulk_desc *); -int ptlrpc_send_bulk(struct ptlrpc_bulk_desc *, int portal); +int ptlrpc_check_bulk_sent(struct ptlrpc_bulk_desc *bulk); +int ptlrpc_send_bulk(struct ptlrpc_bulk_desc *); int ptlrpc_register_bulk(struct ptlrpc_bulk_desc *); int ptlrpc_abort_bulk(struct ptlrpc_bulk_desc *bulk); int ptlrpc_reply(struct ptlrpc_service *svc, struct ptlrpc_request *req); int ptlrpc_error(struct ptlrpc_service *svc, struct ptlrpc_request *req); +void ptlrpc_resend_req(struct ptlrpc_request *request); int ptl_send_rpc(struct ptlrpc_request *request); void ptlrpc_link_svc_me(struct ptlrpc_service *service, int i); /* rpc/client.c */ -void ptlrpc_init_client(struct connmgr_obd *, int req_portal, int rep_portal, +void ptlrpc_init_client(struct recovd_obd *, + int (*recover)(struct ptlrpc_client *), + int req_portal, int rep_portal, struct ptlrpc_client *); +void ptlrpc_cleanup_client(struct ptlrpc_client *cli); +__u8 *ptlrpc_req_to_uuid(struct ptlrpc_request *req); struct ptlrpc_connection *ptlrpc_uuid_to_connection(char *uuid); + int ptlrpc_queue_wait(struct ptlrpc_request *req); +void ptlrpc_continue_req(struct ptlrpc_request *req); +int ptlrpc_replay_req(struct ptlrpc_request *req); +void ptlrpc_restart_req(struct ptlrpc_request *req); + struct ptlrpc_request *ptlrpc_prep_req(struct ptlrpc_client *cl, struct ptlrpc_connection *u, int opcode, int count, int *lengths, char **bufs); -void ptlrpc_free_bulk(struct ptlrpc_bulk_desc *bulk); void ptlrpc_free_req(struct ptlrpc_request *request); +void ptlrpc_req_finished(struct ptlrpc_request *request); struct ptlrpc_bulk_desc *ptlrpc_prep_bulk(struct ptlrpc_connection *); +void ptlrpc_free_bulk(struct ptlrpc_bulk_desc *bulk); +struct ptlrpc_bulk_page *ptlrpc_prep_bulk_page(struct ptlrpc_bulk_desc *desc); +void ptlrpc_free_bulk_page(struct ptlrpc_bulk_page *page); int ptlrpc_check_status(struct ptlrpc_request *req, int err); /* rpc/service.c */ struct ptlrpc_service * ptlrpc_init_svc(__u32 bufsize, int req_portal, int rep_portal, char *uuid, svc_handler_t); -void ptlrpc_stop_thread(struct ptlrpc_service *svc); +void ptlrpc_stop_all_threads(struct ptlrpc_service *svc); int ptlrpc_start_thread(struct obd_device *dev, struct ptlrpc_service *svc, char *name); int rpc_unregister_service(struct ptlrpc_service *service); @@ -241,6 +310,7 @@ int rpc_unregister_service(struct ptlrpc_service *service); struct ptlrpc_svc_data { char *name; struct ptlrpc_service *svc; + struct ptlrpc_thread *thread; struct obd_device *dev; }; @@ -250,5 +320,4 @@ int lustre_pack_msg(int count, int *lens, char **bufs, int *len, int lustre_msg_size(int count, int *lengths); int lustre_unpack_msg(struct lustre_msg *m, int len); void *lustre_msg_buf(struct lustre_msg *m, int n); - #endif