X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_internal.h;h=afc210b97e4c5990e44877cba6172190bac199b3;hb=dc52a88cde1e7cea093b25fc9a15509fe0ac527a;hp=88467863fa515c1c4cce24d52694a89c1c771d4f;hpb=6a81ffa1e9e44231d812e331c73cfa9df67746ed;p=fs%2Flustre-release.git diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h index 8846786..afc210b9 100644 --- a/lustre/ofd/ofd_internal.h +++ b/lustre/ofd/ofd_internal.h @@ -23,7 +23,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2016, Intel Corporation. + * Copyright (c) 2012, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -56,12 +56,12 @@ 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 */ - cfs_time_t fmd_expire; /* time when the fmd should expire */ + 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 msecs_to_jiffies((obd_timeout+10)*MSEC_PER_SEC) +#define OFD_FMD_MAX_AGE_DEFAULT (obd_timeout + 10) #define OFD_SOFT_SYNC_LIMIT_DEFAULT 16 @@ -106,14 +106,14 @@ struct ofd_seq { struct mutex os_create_lock; atomic_t os_refc; struct dt_object *os_lastid_obj; - unsigned long os_destroys_in_progress:1; + unsigned long os_destroys_in_progress:1, + os_last_id_synced:1; }; 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; @@ -122,7 +122,6 @@ struct ofd_device { struct dt_object *ofd_health_check_file; struct local_oid_storage *ofd_los; - int ofd_subdir_count; __u64 ofd_inconsistency_self_detected; __u64 ofd_inconsistency_self_repaired; @@ -132,54 +131,26 @@ struct ofd_device { int ofd_precreate_batch; spinlock_t ofd_batch_lock; - /* protect all statfs-related counters */ - spinlock_t ofd_osfs_lock; - /* statfs optimization: we cache a bit */ - struct obd_statfs ofd_osfs; - __u64 ofd_osfs_age; - int ofd_blockbits; - /* writes between prep & commit which might be accounted twice in - * ofd_osfs.os_bavail */ - u64 ofd_osfs_unstable; - - /* counters used during statfs update, protected by ofd_osfs_lock. - * record when some statfs refresh are in progress */ - int ofd_statfs_inflight; - /* track writes completed while statfs refresh is underway. - * tracking is only effective when ofd_statfs_inflight > 1 */ - u64 ofd_osfs_inflight; - - /* grants: all values in bytes */ - /* grant lock to protect all grant counters */ - spinlock_t ofd_grant_lock; - /* total amount of dirty data reported by clients in incoming obdo */ - u64 ofd_tot_dirty; - /* sum of filesystem space granted to clients for async writes */ - u64 ofd_tot_granted; - /* grant used by I/Os in progress (between prepare and commit) */ - u64 ofd_tot_pending; - /* number of clients using grants */ - int ofd_tot_granted_clients; - /* 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 */ - cfs_duration_t ofd_fmd_max_age; /* time to fmd expiry */ + 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 */ - ofd_syncjournal:1, - /* shall we grant space to clients not - * supporting OBD_CONNECT_GRANT_PARAM? */ - ofd_grant_compat_disable:1, + ofd_sync_journal:1, /* Protected by ofd_lastid_rwsem. */ ofd_lastid_rebuilding:1, ofd_record_fid_accessed:1, ofd_lfsck_verify_pfid:1, - ofd_skip_lfsck:1; + ofd_skip_lfsck:1, + /* Whether to enforce T10PI checksum of RPC */ + ofd_checksum_t10pi_enforce: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; @@ -189,6 +160,10 @@ struct ofd_device { struct ptlrpc_thread ofd_inconsistency_thread; 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; }; static inline struct ofd_device *ofd_dev(struct lu_device *d) @@ -214,7 +189,7 @@ static inline char *ofd_name(struct ofd_device *ofd) struct ofd_object { struct lu_object_header ofo_header; struct dt_object ofo_obj; - struct lu_fid ofo_pfid; + struct filter_fid ofo_ff; unsigned int ofo_pfid_checking:1, ofo_pfid_verified:1; }; @@ -296,10 +271,7 @@ struct ofd_thread_info { struct lu_attr fti_attr; struct lu_attr fti_attr2; struct ldlm_res_id fti_resid; - union { - struct filter_fid fti_mds_fid; - struct filter_fid_old fti_mds_fid_old; - }; + struct filter_fid fti_mds_fid; struct ost_id fti_ostid; struct ofd_object *fti_obj; union { @@ -313,11 +285,9 @@ struct ofd_thread_info { struct lu_buf fti_buf; loff_t fti_off; - /* Space used by the I/O, used by grant code */ - unsigned long fti_used; struct ost_lvb fti_lvb; union { - struct lfsck_request fti_lr; + struct lfsck_req_local fti_lrl; struct obd_connect_data fti_ocd; }; }; @@ -333,13 +303,10 @@ int ofd_fiemap_get(const struct lu_env *env, struct ofd_device *ofd, /* ofd_obd.c */ extern struct obd_ops ofd_obd_ops; -int ofd_statfs_internal(const struct lu_env *env, struct ofd_device *ofd, - struct obd_statfs *osfs, __u64 max_age, - int *from_cache); 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, - struct obd_statfs *osfs, __u64 max_age, __u32 flags); + struct obd_statfs *osfs, time64_t max_age, __u32 flags); int ofd_obd_disconnect(struct obd_export *exp); /* ofd_fs.c */ @@ -365,6 +332,8 @@ int ofd_start_inconsistency_verification_thread(struct ofd_device *ofd); int ofd_stop_inconsistency_verification_thread(struct ofd_device *ofd); int ofd_verify_ff(const struct lu_env *env, struct ofd_object *fo, struct obdo *oa); +int ofd_verify_layout_version(const struct lu_env *env, + struct ofd_object *fo, const struct obdo *oa); 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, @@ -386,8 +355,8 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn, void *cookie); /* lproc_ofd.c */ +int ofd_tunables_init(struct ofd_device *ofd); #ifdef CONFIG_PROC_FS -extern struct lprocfs_vars lprocfs_ofd_obd_vars[]; void ofd_stats_counter_init(struct lprocfs_stats *stats); #else static inline void ofd_stats_counter_init(struct lprocfs_stats *stats) {} @@ -398,19 +367,25 @@ struct ofd_object *ofd_object_find(const struct lu_env *env, struct ofd_device *ofd, const struct lu_fid *fid); int ofd_object_ff_load(const struct lu_env *env, struct ofd_object *fo); +int ofd_object_ff_update(const struct lu_env *env, struct ofd_object *fo, + const struct obdo *oa, struct filter_fid *ff); int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd, u64 id, struct ofd_seq *oseq, int nr, int sync); -void ofd_object_put(const struct lu_env *env, struct ofd_object *fo); +static inline void ofd_object_put(const struct lu_env *env, + struct ofd_object *fo) +{ + dt_object_put(env, &fo->ofo_obj); +} int ofd_attr_set(const struct lu_env *env, struct ofd_object *fo, - struct lu_attr *la, struct filter_fid *ff); + struct lu_attr *la, struct obdo *oa); int ofd_object_punch(const struct lu_env *env, struct ofd_object *fo, __u64 start, __u64 end, struct lu_attr *la, - struct filter_fid *ff, struct obdo *oa); -int ofd_object_destroy(const struct lu_env *, struct ofd_object *, int); + 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); -int ofd_attr_handle_ugid(const struct lu_env *env, struct ofd_object *fo, +int ofd_attr_handle_id(const struct lu_env *env, struct ofd_object *fo, struct lu_attr *la, int is_setattr); static inline @@ -428,43 +403,6 @@ struct ofd_object *ofd_object_find_exists(const struct lu_env *env, return fo; } -/* ofd_grants.c */ -static inline int ofd_grant_param_supp(struct obd_export *exp) -{ - return !!(exp_connect_flags(exp) & OBD_CONNECT_GRANT_PARAM); -} - -/* Blocksize used for client not supporting OBD_CONNECT_GRANT_PARAM. - * That's 4KB=2^12 which is the biggest block size known to work whatever - * the client's page size is. */ -#define COMPAT_BSIZE_SHIFT 12 - -static inline int ofd_grant_prohibit(struct obd_export *exp, - struct ofd_device *ofd) -{ - /* When ofd_grant_compat_disable is set, we don't grant any space to - * clients not supporting OBD_CONNECT_GRANT_PARAM. - * Otherwise, space granted to such a client is inflated since it - * consumes PAGE_SIZE of grant space per block */ - return !!(ofd_obd(ofd)->obd_self_export != exp && - !ofd_grant_param_supp(exp) && ofd->ofd_grant_compat_disable); -} - -void ofd_grant_sanity_check(struct obd_device *obd, const char *func); -void ofd_grant_connect(const struct lu_env *env, struct obd_export *exp, - struct obd_connect_data *data, bool new_conn); -void ofd_grant_discard(struct obd_export *exp); -void ofd_grant_prepare_read(const struct lu_env *env, struct obd_export *exp, - struct obdo *oa); -void ofd_grant_prepare_write(const struct lu_env *env, struct obd_export *exp, - struct obdo *oa, struct niobuf_remote *rnb, - int niocount); -void ofd_grant_commit(struct obd_export *exp, unsigned long grant_used, int rc); -int ofd_grant_commit_cb_add(struct thandle *th, struct obd_export *exp, - unsigned long grant); -long ofd_grant_create(const struct lu_env *env, struct obd_export *exp, - int *nr); - /* ofd_fmd.c */ int ofd_fmd_init(void); void ofd_fmd_exit(void); @@ -491,9 +429,11 @@ int ofd_fid_fini(const struct lu_env *env, struct ofd_device *ofd); 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, enum ldlm_mode mode, __u64 flags, - void *data); +extern struct kmem_cache *ldlm_glimpse_work_kmem; + +int ofd_intent_policy(const struct lu_env *env, struct ldlm_namespace *ns, + struct ldlm_lock **lockp, void *req_cookie, + enum ldlm_mode mode, __u64 flags, void *data); static inline struct ofd_thread_info *ofd_info(const struct lu_env *env) { @@ -550,25 +490,12 @@ static inline struct ofd_thread_info *tsi2ofd_info(struct tgt_session_info *tsi) * sync on lock cancel if it is not enabled already. */ static inline void ofd_slc_set(struct ofd_device *ofd) { - if (ofd->ofd_syncjournal == 1) + 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; } -static inline void ofd_prepare_fidea(struct filter_fid *ff, - const struct obdo *oa) -{ - /* packing fid and converting it to LE for storing into EA. - * Here ->o_stripe_idx should be filled by LOV and rest of - * fields - by client. */ - ff->ff_parent.f_seq = cpu_to_le64(oa->o_parent_seq); - ff->ff_parent.f_oid = cpu_to_le32(oa->o_parent_oid); - /* XXX: we are ignoring o_parent_ver here, since this should - * be the same for all objects in this fileset. */ - ff->ff_parent.f_ver = cpu_to_le32(oa->o_stripe_idx); -} - static inline int ofd_validate_seq(struct obd_export *exp, __u64 seq) { struct filter_export_data *fed = &exp->exp_filter_data;