X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_internal.h;h=7b37b0d0221411bde725f6f212a5ea4689a16cc2;hb=3c6137d088196c6e46812b4fd24b0ac781c07ed7;hp=c41f9923d7f4f2995aeb571605503cc52732da23;hpb=a42560217562c7b00e5b680b347687f894939601;p=fs%2Flustre-release.git diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h index c41f992..7b37b0d 100644 --- a/lustre/ofd/ofd_internal.h +++ b/lustre/ofd/ofd_internal.h @@ -49,6 +49,11 @@ #define OFD_INCOMPAT_SUPP (OBD_INCOMPAT_GROUPS | OBD_INCOMPAT_OST | \ OBD_INCOMPAT_COMMON_LR) #define OFD_MAX_GROUPS 256 +#define OFD_PRECREATE_BATCH_DEFAULT (FILTER_SUBDIR_COUNT * 4) + +/* Limit the returned fields marked valid to those that we actually might set */ +#define OFD_VALID_FLAGS (LA_TYPE | LA_MODE | LA_SIZE | LA_BLOCKS | \ + LA_BLKSIZE | LA_ATIME | LA_MTIME | LA_CTIME) /* per-client-per-object persistent state (LRU) */ struct ofd_mod_data { @@ -68,9 +73,28 @@ enum { LPROC_OFD_LAST, }; +/* for job stats */ +enum { + LPROC_OFD_STATS_READ = 0, + LPROC_OFD_STATS_WRITE = 1, + LPROC_OFD_STATS_SETATTR = 2, + LPROC_OFD_STATS_PUNCH = 3, + LPROC_OFD_STATS_SYNC = 4, + LPROC_OFD_STATS_LAST, +}; + +static inline void ofd_counter_incr(struct obd_export *exp, int opcode, + char *jobid, long amount) +{ + if (exp->exp_obd && exp->exp_obd->u.obt.obt_jobstats.ojs_hash && + (exp->exp_connect_flags & OBD_CONNECT_JOBSTATS)) + lprocfs_job_stats_log(exp->exp_obd, jobid, opcode, amount); +} + struct ofd_device { struct dt_device ofd_dt_dev; struct dt_device *ofd_osd; + struct obd_export *ofd_osd_exp; struct dt_device_param ofd_dt_conf; /* DLM name-space for meta-data locks maintained by this server */ struct ldlm_namespace *ofd_namespace; @@ -87,12 +111,14 @@ struct ofd_device { int ofd_max_group; obd_id ofd_last_objids[OFD_MAX_GROUPS]; - cfs_mutex_t ofd_create_locks[OFD_MAX_GROUPS]; + struct mutex ofd_create_locks[OFD_MAX_GROUPS]; struct dt_object *ofd_lastid_obj[OFD_MAX_GROUPS]; - cfs_spinlock_t ofd_objid_lock; + spinlock_t ofd_objid_lock; + unsigned long ofd_destroys_in_progress; + int ofd_precreate_batch; /* protect all statfs-related counters */ - cfs_spinlock_t ofd_osfs_lock; + spinlock_t ofd_osfs_lock; /* statfs optimization: we cache a bit */ struct obd_statfs ofd_osfs; __u64 ofd_osfs_age; @@ -109,7 +135,7 @@ struct ofd_device { /* grants: all values in bytes */ /* grant lock to protect all grant counters */ - cfs_spinlock_t ofd_grant_lock; + spinlock_t ofd_grant_lock; /* total amount of dirty data reported by clients in incoming obdo */ obd_size ofd_tot_dirty; /* sum of filesystem space granted to clients for async writes */ @@ -128,7 +154,7 @@ struct ofd_device { int ofd_fmd_max_num; /* per ofd ofd_mod_data */ cfs_duration_t ofd_fmd_max_age; /* time to fmd expiry */ - cfs_spinlock_t ofd_flags_lock; + spinlock_t ofd_flags_lock; unsigned long ofd_raid_degraded:1, /* sync journal on writes */ ofd_syncjournal:1, @@ -137,8 +163,6 @@ struct ofd_device { /* shall we grant space to clients not * supporting OBD_CONNECT_GRANT_PARAM? */ ofd_grant_compat_disable:1; - - struct lu_site ofd_site; }; static inline struct ofd_device *ofd_dev(struct lu_device *d) @@ -253,6 +277,8 @@ struct ofd_thread_info { struct lu_fid fti_fid; struct lu_attr fti_attr; struct lu_attr fti_attr2; + struct ldlm_res_id fti_resid; + struct filter_fid fti_mds_fid; struct filter_fid fti_mds_fid2; struct ost_id fti_ostid; struct ofd_object *fti_obj; @@ -269,6 +295,7 @@ struct ofd_thread_info { /* Space used by the I/O, used by grant code */ unsigned long fti_used; + struct ost_lvb fti_lvb; }; extern void target_recovery_fini(struct obd_device *obd); @@ -282,6 +309,7 @@ void ofd_free_capa_keys(struct ofd_device *ofd); /* ofd_dev.c */ extern struct lu_context_key ofd_thread_key; +int ofd_postrecov(const struct lu_env *env, struct ofd_device *ofd); /* ofd_obd.c */ extern struct obd_ops ofd_obd_ops; @@ -292,10 +320,25 @@ int ofd_statfs_internal(const struct lu_env *env, struct ofd_device *ofd, /* ofd_fs.c */ obd_id ofd_last_id(struct ofd_device *ofd, obd_seq seq); void ofd_last_id_set(struct ofd_device *ofd, obd_id id, obd_seq seq); +int ofd_last_id_write(const struct lu_env *env, struct ofd_device *ofd, + obd_seq seq); int ofd_group_load(const struct lu_env *env, struct ofd_device *ofd, int); int ofd_fs_setup(const struct lu_env *env, struct ofd_device *ofd, struct obd_device *obd); void ofd_fs_cleanup(const struct lu_env *env, struct ofd_device *ofd); +int ofd_precreate_batch(struct ofd_device *ofd, int batch); + +/* ofd_io.c */ +int ofd_preprw(const struct lu_env *env,int cmd, struct obd_export *exp, + struct obdo *oa, int objcount, struct obd_ioobj *obj, + struct niobuf_remote *rnb, int *nr_local, + struct niobuf_local *lnb, struct obd_trans_info *oti, + struct lustre_capa *capa); +int ofd_commitrw(const struct lu_env *env, int cmd, struct obd_export *exp, + struct obdo *oa, int objcount, struct obd_ioobj *obj, + struct niobuf_remote *rnb, int npages, + struct niobuf_local *lnb, struct obd_trans_info *oti, + int old_rc); /* ofd_trans.c */ struct thandle *ofd_trans_create(const struct lu_env *env, @@ -309,9 +352,19 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn, void *cookie); /* lproc_ofd.c */ +#ifdef LPROCFS void lprocfs_ofd_init_vars(struct lprocfs_static_vars *lvars); int lproc_ofd_attach_seqstat(struct obd_device *dev); extern struct file_operations ofd_per_nid_stats_fops; +void ofd_stats_counter_init(struct lprocfs_stats *stats); +#else +static void lprocfs_ofd_init_vars(struct lprocfs_static_vars *lvars) +{ + memset(lvars, 0, sizeof(*lvars)); +} +static inline int lproc_ofd_attach_seqstat(struct obd_device *dev) {} +static inline void ofd_stats_counter_init(struct lprocfs_stats *stats) {} +#endif /* ofd_objects.c */ struct ofd_object *ofd_object_find(const struct lu_env *env, @@ -322,8 +375,8 @@ struct ofd_object *ofd_object_find_or_create(const struct lu_env *env, const struct lu_fid *fid, struct lu_attr *attr); int ofd_object_ff_check(const struct lu_env *env, struct ofd_object *fo); -int ofd_precreate_object(const struct lu_env *env, struct ofd_device *ofd, - obd_id id, obd_seq seq); +int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd, + obd_id id, obd_seq group, int nr); void ofd_object_put(const struct lu_env *env, struct ofd_object *fo); int ofd_attr_set(const struct lu_env *env, struct ofd_object *fo, @@ -407,6 +460,14 @@ void ofd_fmd_drop(struct obd_export *exp, struct lu_fid *fid); #define ofd_fmd_drop(exp, fid) do {} while (0) #endif +/* ofd_lvb.c */ +extern struct ldlm_valblock_ops ofd_lvbo; + +/* ofd_dlm.c */ +int ofd_intent_policy(struct ldlm_namespace *ns, struct ldlm_lock **lockp, + void *req_cookie, ldlm_mode_t mode, __u64 flags, + void *data); + static inline struct ofd_thread_info * ofd_info(const struct lu_env *env) { struct ofd_thread_info *info; @@ -437,6 +498,59 @@ static inline struct ofd_thread_info * ofd_info_init(const struct lu_env *env, return info; } +/* The same as osc_build_res_name() */ +static inline void ofd_build_resid(const struct lu_fid *fid, + struct ldlm_res_id *resname) +{ + if (fid_is_idif(fid)) { + /* get id/seq like ostid_idif_pack() does */ + osc_build_res_name(fid_idif_id(fid_seq(fid), fid_oid(fid), + fid_ver(fid)), + FID_SEQ_OST_MDT0, resname); + } else { + /* In the future, where OSTs have FID sequences allocated. */ + fid_build_reg_res_name(fid, resname); + } +} + +static inline void ofd_fid_from_resid(struct lu_fid *fid, + const struct ldlm_res_id *name) +{ + /* if seq is FID_SEQ_OST_MDT0 then we have IDIF and resid was built + * using osc_build_res_name function. */ + if (fid_seq_is_mdt0(name->name[LUSTRE_RES_ID_VER_OID_OFF])) { + struct ost_id ostid; + + ostid.oi_id = name->name[LUSTRE_RES_ID_SEQ_OFF]; + ostid.oi_seq = name->name[LUSTRE_RES_ID_VER_OID_OFF]; + fid_ostid_unpack(fid, &ostid, 0); + } else { + fid->f_seq = name->name[LUSTRE_RES_ID_SEQ_OFF]; + fid->f_oid = (__u32)name->name[LUSTRE_RES_ID_VER_OID_OFF]; + fid->f_ver = name->name[LUSTRE_RES_ID_VER_OID_OFF] >> 32; + } +} + +static inline void ofd_oti2info(struct ofd_thread_info *info, + struct obd_trans_info *oti) +{ + info->fti_xid = oti->oti_xid; + info->fti_transno = oti->oti_transno; + info->fti_pre_version = oti->oti_pre_version; +} + +static inline void ofd_info2oti(struct ofd_thread_info *info, + struct obd_trans_info *oti) +{ + oti->oti_xid = info->fti_xid; + LASSERTF(ergo(oti->oti_transno > 0, + oti->oti_transno == info->fti_transno), + "Overwrite replay transno "LPX64" by "LPX64"\n", + oti->oti_transno, info->fti_transno); + oti->oti_transno = info->fti_transno; + oti->oti_pre_version = info->fti_pre_version; +} + /* sync on lock cancel is useless when we force a journal flush, * and if we enable async journal commit, we should also turn on * sync on lock cancel if it is not enabled already. */ @@ -464,9 +578,12 @@ static inline void ofd_prepare_fidea(struct filter_fid *ff, struct obdo *oa) ff->ff_seq = cpu_to_le64(oa->o_seq); } -/* niobuf_local has no rnb_ prefix in master */ +/* niobuf_remote has no rnb_ prefix in master */ #define rnb_offset offset #define rnb_flags flags #define rnb_len len +/* the same for niobuf_local */ +#define lnb_flags flags +#define lnb_rc rc #endif /* _OFD_INTERNAL_H */