X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fofd%2Fofd_internal.h;h=c838029b65601d76345e696d378007dab2508938;hp=8cebf326f97ee1da9b2cf7175875651265f38ab6;hb=e9389613eb29297f7b5a6b6cd896bafc7a5551f8;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850 diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h index 8cebf32..c838029 100644 --- a/lustre/ofd/ofd_internal.h +++ b/lustre/ofd/ofd_internal.h @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2014, Intel Corporation. + * Copyright (c) 2012, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -42,7 +38,6 @@ #include #include #include -#include #define OFD_INIT_OBJID 0 #define OFD_PRECREATE_BATCH_DEFAULT (OBJ_SUBDIR_COUNT * 4) @@ -118,15 +113,14 @@ 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; /* last_rcvd file */ struct lu_target ofd_lut; 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; @@ -136,38 +130,10 @@ 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 which might be 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; - /* free space threshold over which we stop granting space to clients - * ofd_grant_ratio is stored as a fixed-point fraction using - * OFD_GRANT_RATIO_SHIFT of the remaining free space, not in percentage - * values */ - int ofd_grant_ratio; - /* 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 */ @@ -177,13 +143,11 @@ struct ofd_device { 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, /* Protected by ofd_lastid_rwsem. */ ofd_lastid_rebuilding:1, ofd_record_fid_accessed:1, - ofd_lfsck_verify_pfid:1; + ofd_lfsck_verify_pfid: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; @@ -218,7 +182,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; }; @@ -253,13 +217,6 @@ static inline struct ofd_device *ofd_obj2dev(const struct ofd_object *fo) return ofd_dev(fo->ofo_obj.do_lu.lo_dev); } -static inline struct lustre_capa *ofd_object_capa(const struct lu_env *env, - const struct ofd_object *obj) -{ - /* TODO: see mdd_object_capa() */ - return BYPASS_CAPA; -} - static inline void ofd_read_lock(const struct lu_env *env, struct ofd_object *fo) { @@ -307,10 +264,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 { @@ -324,32 +278,24 @@ 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; - struct lfsck_request fti_lr; + union { + struct lfsck_req_local fti_lrl; + struct obd_connect_data fti_ocd; + }; }; extern void target_recovery_fini(struct obd_device *obd); extern void target_recovery_init(struct lu_target *lut, svc_handler_t handler); -/* ofd_capa.c */ -int ofd_update_capa_key(struct ofd_device *ofd, struct lustre_capa_key *key); -int ofd_auth_capa(struct obd_export *exp, const struct lu_fid *fid, - u64 seq, struct lustre_capa *capa, __u64 opc); -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); int ofd_fiemap_get(const struct lu_env *env, struct ofd_device *ofd, - struct lu_fid *fid, struct ll_user_fiemap *fiemap); + struct lu_fid *fid, struct fiemap *fiemap); /* 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, @@ -382,13 +328,11 @@ int ofd_verify_ff(const struct lu_env *env, struct ofd_object *fo, 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); + struct niobuf_local *lnb); 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); + struct niobuf_local *lnb, int old_rc); /* ofd_trans.c */ struct thandle *ofd_trans_create(const struct lu_env *env, @@ -396,14 +340,14 @@ struct thandle *ofd_trans_create(const struct lu_env *env, int ofd_trans_start(const struct lu_env *env, struct ofd_device *ofd, struct ofd_object *fo, struct thandle *th); -void ofd_trans_stop(const struct lu_env *env, struct ofd_device *ofd, +int ofd_trans_stop(const struct lu_env *env, struct ofd_device *ofd, struct thandle *th, int rc); int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn, void *cookie); /* lproc_ofd.c */ -#ifdef LPROCFS -extern struct lprocfs_seq_vars lprocfs_ofd_obd_vars[]; +#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) {} @@ -417,7 +361,11 @@ int ofd_object_ff_load(const struct lu_env *env, struct ofd_object *fo); 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); int ofd_object_punch(const struct lu_env *env, struct ofd_object *fo, @@ -426,7 +374,7 @@ int ofd_object_punch(const struct lu_env *env, struct ofd_object *fo, int ofd_object_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 @@ -444,60 +392,6 @@ struct ofd_object *ofd_object_find_exists(const struct lu_env *env, return fo; } -/* ofd_grants.c */ -#define OFD_GRANT_RATIO_SHIFT 8 -static inline u64 ofd_grant_reserved(struct ofd_device *ofd, u64 bavail) -{ - return (bavail * ofd->ofd_grant_ratio) >> OFD_GRANT_RATIO_SHIFT; -} - -static inline int ofd_grant_ratio_conv(int percentage) -{ - return (percentage << OFD_GRANT_RATIO_SHIFT) / 100; -} - -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_compat(struct obd_export *exp, - struct ofd_device *ofd) -{ - /* Clients which don't support OBD_CONNECT_GRANT_PARAM cannot handle - * a block size > page size and consume PAGE_CACHE_SIZE of grant when - * dirtying a page regardless of the block size */ - return !!(ofd_obd(ofd)->obd_self_export != exp && - ofd->ofd_blockbits > COMPAT_BSIZE_SHIFT && - !ofd_grant_param_supp(exp)); -} - -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_CACHE_SIZE of grant space per block */ - return !!(ofd_grant_compat(exp, ofd) && ofd->ofd_grant_compat_disable); -} - -void ofd_grant_sanity_check(struct obd_device *obd, const char *func); -long ofd_grant_connect(const struct lu_env *env, struct obd_export *exp, - u64 want, 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(const struct lu_env *env, struct obd_export *exp, int rc); -int 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); @@ -525,7 +419,7 @@ 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 *req_cookie, enum ldlm_mode mode, __u64 flags, void *data); static inline struct ofd_thread_info *ofd_info(const struct lu_env *env) @@ -578,20 +472,6 @@ static inline struct ofd_thread_info *tsi2ofd_info(struct tgt_session_info *tsi) return info; } -static inline void ofd_oti2info(struct ofd_thread_info *info, - struct obd_trans_info *oti) -{ - info->fti_xid = oti->oti_xid; - 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; - 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. */ @@ -614,6 +494,23 @@ static inline void ofd_prepare_fidea(struct filter_fid *ff, /* 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); + if (oa->o_valid & OBD_MD_FLOSTLAYOUT) + ost_layout_cpu_to_le(&ff->ff_layout, &oa->o_layout); + else + memset(&ff->ff_layout, 0, sizeof(ff->ff_layout)); } +static inline int ofd_validate_seq(struct obd_export *exp, __u64 seq) +{ + struct filter_export_data *fed = &exp->exp_filter_data; + + if (unlikely(seq == FID_SEQ_OST_MDT0 && fed->fed_group != 0)) { + /* IDIF request only operates on MDT0 group */ + CERROR("%s: Invalid sequence %#llx for group %u\n", + exp->exp_obd->obd_name, seq, fed->fed_group); + RETURN(-EINVAL); + } + + return 0; +} #endif /* _OFD_INTERNAL_H */