X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_internal.h;h=0282d660f77d9450b3732bb8807a3a33592e5465;hb=cb3c65d4a10b2ad0a6c70d5e38719bca3d501efb;hp=afc210b97e4c5990e44877cba6172190bac199b3;hpb=dc52a88cde1e7cea093b25fc9a15509fe0ac527a;p=fs%2Flustre-release.git diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h index afc210b9..0282d66 100644 --- a/lustre/ofd/ofd_internal.h +++ b/lustre/ofd/ofd_internal.h @@ -38,6 +38,7 @@ #include #include #include +#include #define OFD_INIT_OBJID 0 #define OFD_PRECREATE_BATCH_DEFAULT (OBJ_SUBDIR_COUNT * 4) @@ -51,23 +52,19 @@ #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 { - struct list_head fmd_list; /* linked to fed_mod_list */ - struct lu_fid fmd_fid; /* FID being written to */ - __u64 fmd_mactime_xid; /* xid highest {m,a,c}time setattr */ - time64_t fmd_expire; /* time when the fmd should expire */ - int fmd_refcount; /* reference counter - list holds 1 */ -}; - -#define OFD_FMD_MAX_NUM_DEFAULT 128 -#define OFD_FMD_MAX_AGE_DEFAULT (obd_timeout + 10) - #define OFD_SOFT_SYNC_LIMIT_DEFAULT 16 +/* + * update atime if on-disk value older than client's one + * by OFD_ATIME_DIFF or more + */ +#define OFD_DEF_ATIME_DIFF 0 /* disabled */ + /* request stats */ enum { - LPROC_OFD_STATS_READ = 0, + LPROC_OFD_STATS_READ_BYTES = 0, + LPROC_OFD_STATS_WRITE_BYTES, + LPROC_OFD_STATS_READ, LPROC_OFD_STATS_WRITE, LPROC_OFD_STATS_GETATTR, LPROC_OFD_STATS_SETATTR, @@ -79,6 +76,7 @@ enum { LPROC_OFD_STATS_GET_INFO, LPROC_OFD_STATS_SET_INFO, LPROC_OFD_STATS_QUOTACTL, + LPROC_OFD_STATS_PREALLOC, LPROC_OFD_STATS_LAST, }; @@ -105,6 +103,7 @@ struct ofd_seq { spinlock_t os_last_oid_lock; struct mutex os_create_lock; atomic_t os_refc; + atomic_t os_precreate_in_progress; struct dt_object *os_lastid_obj; unsigned long os_destroys_in_progress:1, os_last_id_synced:1; @@ -125,6 +124,10 @@ struct ofd_device { __u64 ofd_inconsistency_self_detected; __u64 ofd_inconsistency_self_repaired; + struct ofd_access_log *ofd_access_log; + unsigned int ofd_access_log_size; + unsigned int ofd_access_log_mask; + struct list_head ofd_seq_list; rwlock_t ofd_seq_list_lock; int ofd_seq_count; @@ -133,13 +136,6 @@ struct ofd_device { /* preferred BRW size, decided by storage type and capability */ __u32 ofd_brw_size; - /* checksum types supported on this node */ - enum cksum_types ofd_cksum_types_supported; - - /* ofd mod data: ofd_device wide values */ - int ofd_fmd_max_num; /* per ofd ofd_mod_data */ - time64_t ofd_fmd_max_age; /* time to fmd expiry */ - spinlock_t ofd_flags_lock; unsigned long ofd_raid_degraded:1, /* sync journal on writes */ @@ -148,27 +144,27 @@ struct ofd_device { ofd_lastid_rebuilding:1, ofd_record_fid_accessed:1, ofd_lfsck_verify_pfid:1, - ofd_skip_lfsck:1, - /* Whether to enforce T10PI checksum of RPC */ - ofd_checksum_t10pi_enforce:1; + ofd_no_precreate:1, + ofd_skip_lfsck:1; struct seq_server_site ofd_seq_site; /* the limit of SOFT_SYNC RPCs that will trigger a soft sync */ unsigned int ofd_soft_sync_limit; /* Protect ::ofd_lastid_rebuilding */ struct rw_semaphore ofd_lastid_rwsem; __u64 ofd_lastid_gen; - struct ptlrpc_thread ofd_inconsistency_thread; + struct task_struct *ofd_inconsistency_task; struct list_head ofd_inconsistency_list; spinlock_t ofd_inconsistency_lock; /* Backwards compatibility */ struct attribute *ofd_read_cache_enable; struct attribute *ofd_read_cache_max_filesize; struct attribute *ofd_write_cache_enable; + time64_t ofd_atime_diff; }; static inline struct ofd_device *ofd_dev(struct lu_device *d) { - return container_of0(d, struct ofd_device, ofd_dt_dev.dd_lu_dev); + return container_of_safe(d, struct ofd_device, ofd_dt_dev.dd_lu_dev); } static inline struct obd_device *ofd_obd(struct ofd_device *ofd) @@ -190,13 +186,15 @@ struct ofd_object { struct lu_object_header ofo_header; struct dt_object ofo_obj; struct filter_fid ofo_ff; + time64_t ofo_atime_ondisk; unsigned int ofo_pfid_checking:1, ofo_pfid_verified:1; + struct range_lock_tree ofo_write_tree; }; static inline struct ofd_object *ofd_obj(struct lu_object *o) { - return container_of0(o, struct ofd_object, ofo_obj.do_lu); + return container_of_safe(o, struct ofd_object, ofo_obj.do_lu); } static inline int ofd_object_exists(struct ofd_object *obj) @@ -216,7 +214,7 @@ static inline struct dt_object *ofd_object_child(struct ofd_object *_obj) { struct lu_object *lu = &(_obj)->ofo_obj.do_lu; - return container_of0(lu_object_next(lu), struct dt_object, do_lu); + return container_of(lu_object_next(lu), struct dt_object, do_lu); } static inline struct ofd_device *ofd_obj2dev(const struct ofd_object *fo) @@ -290,11 +288,25 @@ struct ofd_thread_info { struct lfsck_req_local fti_lrl; struct obd_connect_data fti_ocd; }; + struct range_lock fti_write_range; + unsigned fti_range_locked:1; }; extern void target_recovery_fini(struct obd_device *obd); extern void target_recovery_init(struct lu_target *lut, svc_handler_t handler); +/* ofd_access_log.c */ +bool ofd_access_log_size_is_valid(unsigned int size); +int ofd_access_log_module_init(void); +void ofd_access_log_module_exit(void); + +struct ofd_access_log; +struct ofd_access_log *ofd_access_log_create(const char *ofd_name, size_t size); +void ofd_access_log_delete(struct ofd_access_log *oal); +void ofd_access(const struct lu_env *env, struct ofd_device *m, + const struct lu_fid *parent_fid, __u64 begin, __u64 end, + unsigned int size, unsigned int segment_count, int rw); + /* ofd_dev.c */ extern struct lu_context_key ofd_thread_key; int ofd_postrecov(const struct lu_env *env, struct ofd_device *ofd); @@ -302,7 +314,7 @@ int ofd_fiemap_get(const struct lu_env *env, struct ofd_device *ofd, struct lu_fid *fid, struct fiemap *fiemap); /* ofd_obd.c */ -extern struct obd_ops ofd_obd_ops; +extern const struct obd_ops ofd_obd_ops; int ofd_destroy_by_fid(const struct lu_env *env, struct ofd_device *ofd, const struct lu_fid *fid, int orphan); int ofd_statfs(const struct lu_env *env, struct obd_export *exp, @@ -357,9 +369,10 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn, /* lproc_ofd.c */ int ofd_tunables_init(struct ofd_device *ofd); #ifdef CONFIG_PROC_FS -void ofd_stats_counter_init(struct lprocfs_stats *stats); +void ofd_stats_counter_init(struct lprocfs_stats *stats, unsigned int offset); #else -static inline void ofd_stats_counter_init(struct lprocfs_stats *stats) {} +static inline void ofd_stats_counter_init(struct lprocfs_stats *stats, + unsigned int offset) {} #endif /* ofd_objects.c */ @@ -382,6 +395,9 @@ int ofd_attr_set(const struct lu_env *env, struct ofd_object *fo, int ofd_object_punch(const struct lu_env *env, struct ofd_object *fo, __u64 start, __u64 end, struct lu_attr *la, struct obdo *oa); +int ofd_object_fallocate(const struct lu_env *env, struct ofd_object *fo, + __u64 start, __u64 end, int mode, struct lu_attr *la, + struct obdo *oa); int ofd_destroy(const struct lu_env *, struct ofd_object *, int); int ofd_attr_get(const struct lu_env *env, struct ofd_object *fo, struct lu_attr *la); @@ -403,22 +419,6 @@ struct ofd_object *ofd_object_find_exists(const struct lu_env *env, return fo; } -/* ofd_fmd.c */ -int ofd_fmd_init(void); -void ofd_fmd_exit(void); -struct ofd_mod_data *ofd_fmd_find(struct obd_export *exp, - const struct lu_fid *fid); -struct ofd_mod_data *ofd_fmd_get(struct obd_export *exp, - const struct lu_fid *fid); -void ofd_fmd_put(struct obd_export *exp, struct ofd_mod_data *fmd); -void ofd_fmd_expire(struct obd_export *exp); -void ofd_fmd_cleanup(struct obd_export *exp); -#ifdef DO_FMD_DROP -void ofd_fmd_drop(struct obd_export *exp, const struct lu_fid *fid); -#else -#define ofd_fmd_drop(exp, fid) do {} while (0) -#endif - /* ofd_dev.c */ int ofd_fid_set_index(const struct lu_env *env, struct ofd_device *ofd, int index); @@ -437,12 +437,7 @@ int ofd_intent_policy(const struct lu_env *env, struct ldlm_namespace *ns, static inline struct ofd_thread_info *ofd_info(const struct lu_env *env) { - struct ofd_thread_info *info; - - lu_env_refill((void *)env); - info = lu_context_key_get(&env->le_ctx, &ofd_thread_key); - LASSERT(info); - return info; + return lu_env_info(env, &ofd_thread_key); } static inline struct ofd_thread_info *ofd_info_init(const struct lu_env *env, @@ -491,9 +486,9 @@ static inline struct ofd_thread_info *tsi2ofd_info(struct tgt_session_info *tsi) static inline void ofd_slc_set(struct ofd_device *ofd) { if (ofd->ofd_sync_journal == 1) - ofd->ofd_lut.lut_sync_lock_cancel = NEVER_SYNC_ON_CANCEL; - else if (ofd->ofd_lut.lut_sync_lock_cancel == NEVER_SYNC_ON_CANCEL) - ofd->ofd_lut.lut_sync_lock_cancel = ALWAYS_SYNC_ON_CANCEL; + ofd->ofd_lut.lut_sync_lock_cancel = SYNC_LOCK_CANCEL_NEVER; + else if (ofd->ofd_lut.lut_sync_lock_cancel == SYNC_LOCK_CANCEL_NEVER) + ofd->ofd_lut.lut_sync_lock_cancel = SYNC_LOCK_CANCEL_ALWAYS; } static inline int ofd_validate_seq(struct obd_export *exp, __u64 seq) @@ -509,4 +504,5 @@ static inline int ofd_validate_seq(struct obd_export *exp, __u64 seq) return 0; } + #endif /* _OFD_INTERNAL_H */