X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flu_target.h;h=e16e5bc52182bac30e0a8c3ace8021a97454b9fd;hp=25e75f802158ba3e550b2a269c0ec0c0e56cde30;hb=c438fba7f068b0713d96dce1f0183ec6da7ab000;hpb=0c9bb26fc4d9157aaa10df2ba0a1796f2e5fc21e diff --git a/lustre/include/lu_target.h b/lustre/include/lu_target.h index 25e75f8..e16e5bc 100644 --- a/lustre/include/lu_target.h +++ b/lustre/include/lu_target.h @@ -97,8 +97,9 @@ struct target_distribute_txn_data { struct list_head tdtd_list; /* Threads to manage distribute transaction */ - wait_queue_head_t tdtd_commit_thread_waitq; + struct task_struct *tdtd_commit_task; atomic_t tdtd_refcount; + struct lu_env tdtd_env; /* recovery update */ distribute_txn_replay_handler_t tdtd_replay_handler; @@ -157,7 +158,6 @@ struct lu_target { struct dt_device_param lut_dt_conf; struct target_distribute_txn_data *lut_tdtd; - struct ptlrpc_thread lut_tdtd_commit_thread; /* supported opcodes and handlers for this target */ struct tgt_opc_slice *lut_slice; @@ -171,7 +171,9 @@ struct lu_target { unsigned int lut_syncjournal:1, lut_sync_lock_cancel:2, /* e.g. OST node */ - lut_no_reconstruct:1; + lut_no_reconstruct:1, + /* enforce recovery for local clients */ + lut_local_recovery:1; /** last_rcvd file */ struct dt_object *lut_last_rcvd; /* transaction callbacks */ @@ -204,12 +206,24 @@ struct lu_target { /* target grants fields */ struct tg_grants_data lut_tgd; + + /* target tunables */ + const struct attribute **lut_attrs; + + /* FMD (file modification data) values */ + int lut_fmd_max_num; + time64_t lut_fmd_max_age; }; +#define LUT_FMD_MAX_NUM_DEFAULT 128 +#define LUT_FMD_MAX_AGE_DEFAULT (obd_timeout + 10) + /* number of slots in reply bitmap */ #define LUT_REPLY_SLOTS_PER_CHUNK (1<<20) #define LUT_REPLY_SLOTS_MAX_CHUNKS 16 +#define TRD_INDEX_MEMORY -1 + /** * Target reply data */ @@ -323,30 +337,22 @@ enum tgt_handler_flags { /* * struct *_body is passed in the incoming message, and object * identified by this fid exists on disk. - * * - * "habeo corpus" == "I have a body" */ - HABEO_CORPUS = (1 << 0), + HAS_BODY = BIT(0), /* * struct ldlm_request is passed in the incoming message. - * - * "habeo clavis" == "I have a key" - * */ - HABEO_CLAVIS = (1 << 1), + */ + HAS_KEY = BIT(1), /* * this request has fixed reply format, so that reply message can be * packed by generic code. - * - * "habeo refero" == "I have a reply" */ - HABEO_REFERO = (1 << 2), + HAS_REPLY = BIT(2), /* * this request will modify something, so check whether the file system * is readonly or not, then return -EROFS to client asap if necessary. - * - * "mutabor" == "I shall modify" */ - MUTABOR = (1 << 3) + IS_MUTABLE = BIT(3) }; struct tgt_handler { @@ -396,6 +402,10 @@ static inline bool tgt_is_multimodrpcs_client(struct obd_export *exp) return exp_connect_flags(exp) & OBD_CONNECT_MULTIMODRPCS; } +static inline bool tgt_is_increasing_xid_client(struct obd_export *exp) +{ + return exp_connect_flags2(exp) & OBD_CONNECT2_INC_XID; +} /* target/tgt_handler.c */ int tgt_request_handle(struct ptlrpc_request *req); @@ -412,8 +422,6 @@ int tgt_convert(struct tgt_session_info *tsi); int tgt_bl_callback(struct tgt_session_info *tsi); int tgt_cp_callback(struct tgt_session_info *tsi); int tgt_llog_open(struct tgt_session_info *tsi); -int tgt_llog_close(struct tgt_session_info *tsi); -int tgt_llog_destroy(struct tgt_session_info *tsi); int tgt_llog_read_header(struct tgt_session_info *tsi); int tgt_llog_next_block(struct tgt_session_info *tsi); int tgt_llog_prev_block(struct tgt_session_info *tsi); @@ -431,9 +439,10 @@ void tgt_io_thread_done(struct ptlrpc_thread *thread); int tgt_mdt_data_lock(struct ldlm_namespace *ns, struct ldlm_res_id *res_id, struct lustre_handle *lh, int mode, __u64 *flags); -int tgt_extent_lock(struct ldlm_namespace *ns, struct ldlm_res_id *res_id, - __u64 start, __u64 end, struct lustre_handle *lh, - int mode, __u64 *flags); +void tgt_mdt_data_unlock(struct lustre_handle *lh, enum ldlm_mode mode); +int tgt_extent_lock(const struct lu_env *env, struct ldlm_namespace *ns, + struct ldlm_res_id *res_id, __u64 start, __u64 end, + struct lustre_handle *lh, int mode, __u64 *flags); void tgt_extent_unlock(struct lustre_handle *lh, enum ldlm_mode mode); int tgt_brw_read(struct tgt_session_info *tsi); int tgt_brw_write(struct tgt_session_info *tsi); @@ -450,7 +459,7 @@ void tgt_register_lfsck_query(int (*query)(const struct lu_env *, struct lfsck_request *, struct lfsck_reply *, struct lfsck_query *)); -bool req_can_reconstruct(struct ptlrpc_request *req, struct tg_reply_data *trd); +int req_can_reconstruct(struct ptlrpc_request *req, struct tg_reply_data *trd); extern struct tgt_handler tgt_sec_ctx_handlers[]; extern struct tgt_handler tgt_lfsck_handlers[]; @@ -488,12 +497,15 @@ int tgt_client_new(const struct lu_env *env, struct obd_export *exp); int tgt_server_data_update(const struct lu_env *env, struct lu_target *tg, int sync); int tgt_reply_data_init(const struct lu_env *env, struct lu_target *tgt); -bool tgt_lookup_reply(struct ptlrpc_request *req, struct tg_reply_data *trd); -int tgt_add_reply_data(const struct lu_env *env, struct lu_target *tgt, - struct tg_export_data *ted, struct tg_reply_data *trd, - struct thandle *th, bool update_lrd_file); +int tgt_lookup_reply(struct ptlrpc_request *req, struct tg_reply_data *trd); +int tgt_mk_reply_data(const struct lu_env *env, struct lu_target *tgt, + struct tg_export_data *ted, struct ptlrpc_request *req, + __u64 opdata, struct thandle *th, bool write_update, + __u64 transno); struct tg_reply_data *tgt_lookup_reply_by_xid(struct tg_export_data *ted, __u64 xid); +int tgt_tunables_init(struct lu_target *lut); +void tgt_tunables_fini(struct lu_target *lut); /* target/tgt_grant.c */ static inline int exp_grant_param_supp(struct obd_export *exp) @@ -523,13 +535,34 @@ long tgt_grant_create(const struct lu_env *env, struct obd_export *exp, int tgt_statfs_internal(const struct lu_env *env, struct lu_target *lut, struct obd_statfs *osfs, time64_t max_age, int *from_cache); -int tgt_tot_dirty_seq_show(struct seq_file *m, void *data); -int tgt_tot_granted_seq_show(struct seq_file *m, void *data); -int tgt_tot_pending_seq_show(struct seq_file *m, void *data); -int tgt_grant_compat_disable_seq_show(struct seq_file *m, void *data); -ssize_t tgt_grant_compat_disable_seq_write(struct file *file, - const char __user *buffer, - size_t count, loff_t *off); +ssize_t tot_dirty_show(struct kobject *kobj, struct attribute *attr, + char *buf); +ssize_t tot_granted_show(struct kobject *kobj, struct attribute *attr, + char *buf); +ssize_t tot_pending_show(struct kobject *kobj, struct attribute *attr, + char *buf); +ssize_t grant_compat_disable_show(struct kobject *kobj, struct attribute *attr, + char *buf); +ssize_t grant_compat_disable_store(struct kobject *kobj, + struct attribute *attr, + const char *buffer, size_t count); +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 16, 53, 0) +ssize_t sync_lock_cancel_show(struct kobject *kobj, + struct attribute *attr, char *buf); +ssize_t sync_lock_cancel_store(struct kobject *kobj, struct attribute *attr, + const char *buffer, size_t count); +#endif + +/* FMD */ +void tgt_fmd_update(struct obd_export *exp, const struct lu_fid *fid, + __u64 xid); +bool tgt_fmd_check(struct obd_export *exp, const struct lu_fid *fid, + __u64 xid); +#ifdef DO_FMD_DROP +void tgt_fmd_drop(struct obd_export *exp, const struct lu_fid *fid); +#else +#define tgt_fmd_drop(exp, fid) do {} while (0) +#endif /* target/update_trans.c */ int distribute_txn_init(const struct lu_env *env,