X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flod%2Flod_qos.c;h=1892deeb73cb1554ae49721d0aea0e9a5925ce1d;hp=01beb59194c3b44e8c4c840bb3f87451cfd4b5b1;hb=45222b2ef279d62ac3aab0e7babc55d77e3c93a2;hpb=b879bbc27db53ecc899f6007bf4fe0d993615def diff --git a/lustre/lod/lod_qos.c b/lustre/lod/lod_qos.c index 01beb59..1892dee 100644 --- a/lustre/lod/lod_qos.c +++ b/lustre/lod/lod_qos.c @@ -23,7 +23,7 @@ * Copyright 2009 Sun Microsystems, Inc. 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/ @@ -38,6 +38,8 @@ #define DEBUG_SUBSYSTEM S_LOV #include +#include + #include #include #include @@ -59,117 +61,6 @@ OST_TGT(lod,i)->ltd_statfs.os_bsize) /** - * Add a new target to Quality of Service (QoS) target table. - * - * Add a new OST target to the structure representing an OSS. Resort the list - * of known OSSs by the number of OSTs attached to each OSS. The OSS list is - * protected internally and no external locking is required. - * - * \param[in] lod LOD device - * \param[in] ost_desc OST description - * - * \retval 0 on success - * \retval -ENOMEM on error - */ -int qos_add_tgt(struct lod_device *lod, struct lod_tgt_desc *ost_desc) -{ - struct lod_qos_oss *oss = NULL, *temposs; - struct obd_export *exp = ost_desc->ltd_exp; - int rc = 0, found = 0; - struct list_head *list; - ENTRY; - - down_write(&lod->lod_qos.lq_rw_sem); - /* - * a bit hacky approach to learn NID of corresponding connection - * but there is no official API to access information like this - * with OSD API. - */ - list_for_each_entry(oss, &lod->lod_qos.lq_oss_list, lqo_oss_list) { - if (obd_uuid_equals(&oss->lqo_uuid, - &exp->exp_connection->c_remote_uuid)) { - found++; - break; - } - } - - if (!found) { - OBD_ALLOC_PTR(oss); - if (!oss) - GOTO(out, rc = -ENOMEM); - memcpy(&oss->lqo_uuid, &exp->exp_connection->c_remote_uuid, - sizeof(oss->lqo_uuid)); - } else { - /* Assume we have to move this one */ - list_del(&oss->lqo_oss_list); - } - - oss->lqo_ost_count++; - ost_desc->ltd_qos.ltq_oss = oss; - - CDEBUG(D_QOS, "add tgt %s to OSS %s (%d OSTs)\n", - obd_uuid2str(&ost_desc->ltd_uuid), obd_uuid2str(&oss->lqo_uuid), - oss->lqo_ost_count); - - /* Add sorted by # of OSTs. Find the first entry that we're - bigger than... */ - list = &lod->lod_qos.lq_oss_list; - list_for_each_entry(temposs, list, lqo_oss_list) { - if (oss->lqo_ost_count > temposs->lqo_ost_count) - break; - } - /* ...and add before it. If we're the first or smallest, temposs - points to the list head, and we add to the end. */ - list_add_tail(&oss->lqo_oss_list, &temposs->lqo_oss_list); - - lod->lod_qos.lq_dirty = 1; - lod->lod_qos.lq_rr.lqr_dirty = 1; - -out: - up_write(&lod->lod_qos.lq_rw_sem); - RETURN(rc); -} - -/** - * Remove OST target from QoS table. - * - * Removes given OST target from QoS table and releases related OSS structure - * if no OSTs remain on the OSS. - * - * \param[in] lod LOD device - * \param[in] ost_desc OST description - * - * \retval 0 on success - * \retval -ENOENT if no OSS was found - */ -int qos_del_tgt(struct lod_device *lod, struct lod_tgt_desc *ost_desc) -{ - struct lod_qos_oss *oss; - int rc = 0; - ENTRY; - - down_write(&lod->lod_qos.lq_rw_sem); - oss = ost_desc->ltd_qos.ltq_oss; - if (!oss) - GOTO(out, rc = -ENOENT); - - oss->lqo_ost_count--; - if (oss->lqo_ost_count == 0) { - CDEBUG(D_QOS, "removing OSS %s\n", - obd_uuid2str(&oss->lqo_uuid)); - list_del(&oss->lqo_oss_list); - ost_desc->ltd_qos.ltq_oss = NULL; - OBD_FREE_PTR(oss); - } - - lod->lod_qos.lq_dirty = 1; - lod->lod_qos.lq_rr.lqr_dirty = 1; -out: - up_write(&lod->lod_qos.lq_rw_sem); - RETURN(rc); -} - -/** * Check whether the target is available for new OST objects. * * Request statfs data from the given target and verify it's active and not @@ -180,7 +71,8 @@ out: * * \param[in] env execution environment for this thread * \param[in] d LOD device - * \param[in] index index of OST target to check + * \param[in] ltd target table + * \param[in] index target index * \param[out] sfs buffer for statfs data * * \retval 0 if the target is good @@ -188,17 +80,19 @@ out: */ static int lod_statfs_and_check(const struct lu_env *env, struct lod_device *d, - int index, struct obd_statfs *sfs) + struct lu_tgt_descs *ltd, int index, + struct obd_statfs *sfs) { - struct lod_tgt_desc *ost; - int rc; + struct lov_desc *desc = <d->ltd_lov_desc; + struct lu_tgt_desc *tgt = LTD_TGT(ltd, index); + int rc; + ENTRY; LASSERT(d); - ost = OST_TGT(d,index); - LASSERT(ost); + LASSERT(tgt); - rc = dt_statfs(env, ost->ltd_ost, sfs); + rc = dt_statfs(env, tgt->ltd_tgt, sfs); if (rc == 0 && ((sfs->os_state & OS_STATE_ENOSPC) || (sfs->os_state & OS_STATE_ENOINO && sfs->os_fprecreated == 0))) @@ -211,37 +105,41 @@ static int lod_statfs_and_check(const struct lu_env *env, struct lod_device *d, if (sfs->os_state & OS_STATE_READONLY) rc = -EROFS; + /* object precreation is skipped on the OST with max_create_count=0 */ + if (sfs->os_state & OS_STATE_NOPRECREATE) + rc = -ENOBUFS; + /* check whether device has changed state (active, inactive) */ - if (rc != 0 && ost->ltd_active) { + if (rc != 0 && tgt->ltd_active) { /* turned inactive? */ spin_lock(&d->lod_lock); - if (ost->ltd_active) { - ost->ltd_active = 0; + if (tgt->ltd_active) { + tgt->ltd_active = 0; if (rc == -ENOTCONN) - ost->ltd_connecting = 1; + tgt->ltd_connecting = 1; - LASSERT(d->lod_desc.ld_active_tgt_count > 0); - d->lod_desc.ld_active_tgt_count--; - d->lod_qos.lq_dirty = 1; - d->lod_qos.lq_rr.lqr_dirty = 1; + LASSERT(desc->ld_active_tgt_count > 0); + desc->ld_active_tgt_count--; + ltd->ltd_qos.lq_dirty = 1; + ltd->ltd_qos.lq_rr.lqr_dirty = 1; CDEBUG(D_CONFIG, "%s: turns inactive\n", - ost->ltd_exp->exp_obd->obd_name); + tgt->ltd_exp->exp_obd->obd_name); } spin_unlock(&d->lod_lock); - } else if (rc == 0 && ost->ltd_active == 0) { + } else if (rc == 0 && tgt->ltd_active == 0) { /* turned active? */ - LASSERTF(d->lod_desc.ld_active_tgt_count < d->lod_ostnr, - "active tgt count %d, ost nr %d\n", - d->lod_desc.ld_active_tgt_count, d->lod_ostnr); + LASSERTF(desc->ld_active_tgt_count < desc->ld_tgt_count, + "active tgt count %d, tgt nr %d\n", + desc->ld_active_tgt_count, desc->ld_tgt_count); spin_lock(&d->lod_lock); - if (ost->ltd_active == 0) { - ost->ltd_active = 1; - ost->ltd_connecting = 0; - d->lod_desc.ld_active_tgt_count++; - d->lod_qos.lq_dirty = 1; - d->lod_qos.lq_rr.lqr_dirty = 1; + if (tgt->ltd_active == 0) { + tgt->ltd_active = 1; + tgt->ltd_connecting = 0; + desc->ld_active_tgt_count++; + ltd->ltd_qos.lq_dirty = 1; + ltd->ltd_qos.lq_rr.lqr_dirty = 1; CDEBUG(D_CONFIG, "%s: turns active\n", - ost->ltd_exp->exp_obd->obd_name); + tgt->ltd_exp->exp_obd->obd_name); } spin_unlock(&d->lod_lock); } @@ -259,290 +157,45 @@ static int lod_statfs_and_check(const struct lu_env *env, struct lod_device *d, * \param[in] env execution environment for this thread * \param[in] lod LOD device */ -static void lod_qos_statfs_update(const struct lu_env *env, - struct lod_device *lod) +void lod_qos_statfs_update(const struct lu_env *env, struct lod_device *lod) { struct obd_device *obd = lod2obd(lod); - struct ost_pool *osts = &(lod->lod_pool_info); - unsigned int i; - int idx; - __u64 max_age, avail; + struct lu_tgt_pool *osts = &lod->lod_ost_descs.ltd_tgt_pool; + time64_t max_age; + unsigned int i; + u64 avail; + int idx; ENTRY; - max_age = cfs_time_shift_64(-2 * lod->lod_desc.ld_qos_maxage); + max_age = ktime_get_seconds() - + 2 * lod->lod_ost_descs.ltd_lov_desc.ld_qos_maxage; - if (cfs_time_beforeq_64(max_age, obd->obd_osfs_age)) + if (obd->obd_osfs_age > max_age) /* statfs data are quite recent, don't need to refresh it */ RETURN_EXIT; - down_write(&lod->lod_qos.lq_rw_sem); - if (cfs_time_beforeq_64(max_age, obd->obd_osfs_age)) + down_write(&lod->lod_ost_descs.ltd_qos.lq_rw_sem); + + if (obd->obd_osfs_age > max_age) goto out; for (i = 0; i < osts->op_count; i++) { idx = osts->op_array[i]; avail = OST_TGT(lod,idx)->ltd_statfs.os_bavail; - if (lod_statfs_and_check(env, lod, idx, + if (lod_statfs_and_check(env, lod, &lod->lod_ost_descs, idx, &OST_TGT(lod, idx)->ltd_statfs)) continue; if (OST_TGT(lod,idx)->ltd_statfs.os_bavail != avail) /* recalculate weigths */ - lod->lod_qos.lq_dirty = 1; + lod->lod_ost_descs.ltd_qos.lq_dirty = 1; } - obd->obd_osfs_age = cfs_time_current_64(); + obd->obd_osfs_age = ktime_get_seconds(); out: - up_write(&lod->lod_qos.lq_rw_sem); + up_write(&lod->lod_ost_descs.ltd_qos.lq_rw_sem); EXIT; } -/** - * Calculate per-OST and per-OSS penalties - * - * Re-calculate penalties when the configuration changes, active targets - * change and after statfs refresh (all these are reflected by lq_dirty flag). - * On every OST and OSS: decay the penalty by half for every 8x the update - * interval that the device has been idle. That gives lots of time for the - * statfs information to be updated (which the penalty is only a proxy for), - * and avoids penalizing OSS/OSTs under light load. - * See lod_qos_calc_weight() for how penalties are factored into the weight. - * - * \param[in] lod LOD device - * - * \retval 0 on success - * \retval -EAGAIN the number of OSTs isn't enough - */ -static int lod_qos_calc_ppo(struct lod_device *lod) -{ - struct lod_qos_oss *oss; - __u64 ba_max, ba_min, temp; - __u32 num_active; - unsigned int i; - int rc, prio_wide; - time_t now, age; - ENTRY; - - if (!lod->lod_qos.lq_dirty) - GOTO(out, rc = 0); - - num_active = lod->lod_desc.ld_active_tgt_count - 1; - if (num_active < 1) - GOTO(out, rc = -EAGAIN); - - /* find bavail on each OSS */ - list_for_each_entry(oss, &lod->lod_qos.lq_oss_list, lqo_oss_list) - oss->lqo_bavail = 0; - lod->lod_qos.lq_active_oss_count = 0; - - /* - * How badly user wants to select OSTs "widely" (not recently chosen - * and not on recent OSS's). As opposed to "freely" (free space - * avail.) 0-256 - */ - prio_wide = 256 - lod->lod_qos.lq_prio_free; - - ba_min = (__u64)(-1); - ba_max = 0; - now = cfs_time_current_sec(); - /* Calculate OST penalty per object - * (lod ref taken in lod_qos_prep_create()) */ - cfs_foreach_bit(lod->lod_ost_bitmap, i) { - LASSERT(OST_TGT(lod,i)); - temp = TGT_BAVAIL(i); - if (!temp) - continue; - ba_min = min(temp, ba_min); - ba_max = max(temp, ba_max); - - /* Count the number of usable OSS's */ - if (OST_TGT(lod,i)->ltd_qos.ltq_oss->lqo_bavail == 0) - lod->lod_qos.lq_active_oss_count++; - OST_TGT(lod,i)->ltd_qos.ltq_oss->lqo_bavail += temp; - - /* per-OST penalty is prio * TGT_bavail / (num_ost - 1) / 2 */ - temp >>= 1; - do_div(temp, num_active); - OST_TGT(lod,i)->ltd_qos.ltq_penalty_per_obj = - (temp * prio_wide) >> 8; - - age = (now - OST_TGT(lod,i)->ltd_qos.ltq_used) >> 3; - if (lod->lod_qos.lq_reset || - age > 32 * lod->lod_desc.ld_qos_maxage) - OST_TGT(lod,i)->ltd_qos.ltq_penalty = 0; - else if (age > lod->lod_desc.ld_qos_maxage) - /* Decay OST penalty. */ - OST_TGT(lod,i)->ltd_qos.ltq_penalty >>= - (age / lod->lod_desc.ld_qos_maxage); - } - - num_active = lod->lod_qos.lq_active_oss_count - 1; - if (num_active < 1) { - /* If there's only 1 OSS, we can't penalize it, so instead - we have to double the OST penalty */ - num_active = 1; - cfs_foreach_bit(lod->lod_ost_bitmap, i) - OST_TGT(lod,i)->ltd_qos.ltq_penalty_per_obj <<= 1; - } - - /* Per-OSS penalty is prio * oss_avail / oss_osts / (num_oss - 1) / 2 */ - list_for_each_entry(oss, &lod->lod_qos.lq_oss_list, lqo_oss_list) { - temp = oss->lqo_bavail >> 1; - do_div(temp, oss->lqo_ost_count * num_active); - oss->lqo_penalty_per_obj = (temp * prio_wide) >> 8; - - age = (now - oss->lqo_used) >> 3; - if (lod->lod_qos.lq_reset || - age > 32 * lod->lod_desc.ld_qos_maxage) - oss->lqo_penalty = 0; - else if (age > lod->lod_desc.ld_qos_maxage) - /* Decay OSS penalty. */ - oss->lqo_penalty >>= age / lod->lod_desc.ld_qos_maxage; - } - - lod->lod_qos.lq_dirty = 0; - lod->lod_qos.lq_reset = 0; - - /* If each ost has almost same free space, - * do rr allocation for better creation performance */ - lod->lod_qos.lq_same_space = 0; - if ((ba_max * (256 - lod->lod_qos.lq_threshold_rr)) >> 8 < ba_min) { - lod->lod_qos.lq_same_space = 1; - /* Reset weights for the next time we enter qos mode */ - lod->lod_qos.lq_reset = 1; - } - rc = 0; - -out: -#ifndef FORCE_QOS - if (!rc && lod->lod_qos.lq_same_space) - RETURN(-EAGAIN); -#endif - RETURN(rc); -} - -/** - * Calculate weight for a given OST target. - * - * The final OST weight is the number of bytes available minus the OST and - * OSS penalties. See lod_qos_calc_ppo() for how penalties are calculated. - * - * \param[in] lod LOD device, where OST targets are listed - * \param[in] i OST target index - * - * \retval 0 - */ -static int lod_qos_calc_weight(struct lod_device *lod, int i) -{ - __u64 temp, temp2; - - temp = TGT_BAVAIL(i); - temp2 = OST_TGT(lod,i)->ltd_qos.ltq_penalty + - OST_TGT(lod,i)->ltd_qos.ltq_oss->lqo_penalty; - if (temp < temp2) - OST_TGT(lod,i)->ltd_qos.ltq_weight = 0; - else - OST_TGT(lod,i)->ltd_qos.ltq_weight = temp - temp2; - return 0; -} - -/** - * Re-calculate weights. - * - * The function is called when some OST target was used for a new object. In - * this case we should re-calculate all the weights to keep new allocations - * balanced well. - * - * \param[in] lod LOD device - * \param[in] osts OST pool where a new object was placed - * \param[in] index OST target where a new object was placed - * \param[out] total_wt new total weight for the pool - * - * \retval 0 - */ -static int lod_qos_used(struct lod_device *lod, struct ost_pool *osts, - __u32 index, __u64 *total_wt) -{ - struct lod_tgt_desc *ost; - struct lod_qos_oss *oss; - unsigned int j; - ENTRY; - - ost = OST_TGT(lod,index); - LASSERT(ost); - - /* Don't allocate on this devuce anymore, until the next alloc_qos */ - ost->ltd_qos.ltq_usable = 0; - - oss = ost->ltd_qos.ltq_oss; - - /* Decay old penalty by half (we're adding max penalty, and don't - want it to run away.) */ - ost->ltd_qos.ltq_penalty >>= 1; - oss->lqo_penalty >>= 1; - - /* mark the OSS and OST as recently used */ - ost->ltd_qos.ltq_used = oss->lqo_used = cfs_time_current_sec(); - - /* Set max penalties for this OST and OSS */ - ost->ltd_qos.ltq_penalty += - ost->ltd_qos.ltq_penalty_per_obj * lod->lod_ostnr; - oss->lqo_penalty += oss->lqo_penalty_per_obj * - lod->lod_qos.lq_active_oss_count; - - /* Decrease all OSS penalties */ - list_for_each_entry(oss, &lod->lod_qos.lq_oss_list, lqo_oss_list) { - if (oss->lqo_penalty < oss->lqo_penalty_per_obj) - oss->lqo_penalty = 0; - else - oss->lqo_penalty -= oss->lqo_penalty_per_obj; - } - - *total_wt = 0; - /* Decrease all OST penalties */ - for (j = 0; j < osts->op_count; j++) { - int i; - - i = osts->op_array[j]; - if (!cfs_bitmap_check(lod->lod_ost_bitmap, i)) - continue; - - ost = OST_TGT(lod,i); - LASSERT(ost); - - if (ost->ltd_qos.ltq_penalty < - ost->ltd_qos.ltq_penalty_per_obj) - ost->ltd_qos.ltq_penalty = 0; - else - ost->ltd_qos.ltq_penalty -= - ost->ltd_qos.ltq_penalty_per_obj; - - lod_qos_calc_weight(lod, i); - - /* Recalc the total weight of usable osts */ - if (ost->ltd_qos.ltq_usable) - *total_wt += ost->ltd_qos.ltq_weight; - - QOS_DEBUG("recalc tgt %d usable=%d avail=%llu" - " ostppo=%llu ostp=%llu ossppo=%llu" - " ossp=%llu wt=%llu\n", - i, ost->ltd_qos.ltq_usable, TGT_BAVAIL(i) >> 10, - ost->ltd_qos.ltq_penalty_per_obj >> 10, - ost->ltd_qos.ltq_penalty >> 10, - ost->ltd_qos.ltq_oss->lqo_penalty_per_obj >> 10, - ost->ltd_qos.ltq_oss->lqo_penalty >> 10, - ost->ltd_qos.ltq_weight >> 10); - } - - RETURN(0); -} - -void lod_qos_rr_init(struct lod_qos_rr *lqr) -{ - spin_lock_init(&lqr->lqr_alloc); - lqr->lqr_dirty = 1; -} - - #define LOV_QOS_EMPTY ((__u32)-1) /** @@ -561,10 +214,10 @@ void lod_qos_rr_init(struct lod_qos_rr *lqr) * \retval 0 on success * \retval -ENOMEM fails to allocate the array */ -static int lod_qos_calc_rr(struct lod_device *lod, struct ost_pool *src_pool, - struct lod_qos_rr *lqr) +static int lod_qos_calc_rr(struct lod_device *lod, struct lu_tgt_pool *src_pool, + struct lu_qos_rr *lqr) { - struct lod_qos_oss *oss; + struct lu_svr_qos *oss; struct lod_tgt_desc *ost; unsigned placed, real_count; unsigned int i; @@ -577,7 +230,7 @@ static int lod_qos_calc_rr(struct lod_device *lod, struct ost_pool *src_pool, } /* Do actual allocation. */ - down_write(&lod->lod_qos.lq_rw_sem); + down_write(&lod->lod_ost_descs.ltd_qos.lq_rw_sem); /* * Check again. While we were sleeping on @lq_rw_sem something could @@ -585,7 +238,7 @@ static int lod_qos_calc_rr(struct lod_device *lod, struct ost_pool *src_pool, */ if (!lqr->lqr_dirty) { LASSERT(lqr->lqr_pool.op_size); - up_write(&lod->lod_qos.lq_rw_sem); + up_write(&lod->lod_ost_descs.ltd_qos.lq_rw_sem); RETURN(0); } @@ -598,7 +251,7 @@ static int lod_qos_calc_rr(struct lod_device *lod, struct ost_pool *src_pool, lqr->lqr_pool.op_count = real_count; rc = lod_ost_pool_extend(&lqr->lqr_pool, real_count); if (rc) { - up_write(&lod->lod_qos.lq_rw_sem); + up_write(&lod->lod_ost_descs.ltd_qos.lq_rw_sem); RETURN(rc); } for (i = 0; i < lqr->lqr_pool.op_count; i++) @@ -606,7 +259,8 @@ static int lod_qos_calc_rr(struct lod_device *lod, struct ost_pool *src_pool, /* Place all the OSTs from 1 OSS at the same time. */ placed = 0; - list_for_each_entry(oss, &lod->lod_qos.lq_oss_list, lqo_oss_list) { + list_for_each_entry(oss, &lod->lod_ost_descs.ltd_qos.lq_svr_list, + lsq_svr_list) { int j = 0; for (i = 0; i < lqr->lqr_pool.op_count; i++) { @@ -617,12 +271,12 @@ static int lod_qos_calc_rr(struct lod_device *lod, struct ost_pool *src_pool, continue; ost = OST_TGT(lod,src_pool->op_array[i]); - LASSERT(ost && ost->ltd_ost); - if (ost->ltd_qos.ltq_oss != oss) + LASSERT(ost && ost->ltd_tgt); + if (ost->ltd_qos.ltq_svr != oss) continue; /* Evenly space these OSTs across arrayspace */ - next = j * lqr->lqr_pool.op_count / oss->lqo_ost_count; + next = j * lqr->lqr_pool.op_count / oss->lsq_tgt_count; while (lqr->lqr_pool.op_array[next] != LOV_QOS_EMPTY) next = (next + 1) % lqr->lqr_pool.op_count; @@ -633,7 +287,7 @@ static int lod_qos_calc_rr(struct lod_device *lod, struct ost_pool *src_pool, } lqr->lqr_dirty = 0; - up_write(&lod->lod_qos.lq_rw_sem); + up_write(&lod->lod_ost_descs.ltd_qos.lq_rw_sem); if (placed != real_count) { /* This should never happen */ @@ -689,12 +343,12 @@ static struct dt_object *lod_qos_declare_object_on(const struct lu_env *env, ENTRY; LASSERT(d); - LASSERT(ost_idx < d->lod_osts_size); + LASSERT(ost_idx < d->lod_ost_descs.ltd_tgts_size); ost = OST_TGT(d,ost_idx); LASSERT(ost); - LASSERT(ost->ltd_ost); + LASSERT(ost->ltd_tgt); - nd = &ost->ltd_ost->dd_lu_dev; + nd = &ost->ltd_tgt->dd_lu_dev; /* * allocate anonymous object with zero fid, real fid @@ -819,65 +473,130 @@ static int lod_qos_is_ost_used(const struct lu_env *env, int ost, __u32 stripes) return 0; } +static inline bool +lod_obj_is_ost_use_skip_cb(const struct lu_env *env, struct lod_object *lo, + int comp_idx, struct lod_obj_stripe_cb_data *data) +{ + struct lod_layout_component *comp = &lo->ldo_comp_entries[comp_idx]; + + return comp->llc_ost_indices == NULL; +} + +static inline int +lod_obj_is_ost_use_cb(const struct lu_env *env, struct lod_object *lo, + int comp_idx, struct lod_obj_stripe_cb_data *data) +{ + struct lod_layout_component *comp = &lo->ldo_comp_entries[comp_idx]; + int i; + + for (i = 0; i < comp->llc_stripe_count; i++) { + if (comp->llc_ost_indices[i] == data->locd_ost_index) { + data->locd_ost_index = -1; + return -EEXIST; + } + } + + return 0; +} + /** * Check is OST used in a composite layout * - * \param[in] inuse all inuse ost indexs + * \param[in] lo lod object * \param[in] ost OST target index to check * - * \retval 0 not used - * \retval 1 used + * \retval false not used + * \retval true used */ -static inline int lod_comp_is_ost_used(struct ost_pool *inuse, int ost) +static inline bool lod_comp_is_ost_used(const struct lu_env *env, + struct lod_object *lo, int ost) { - __u32 j; - LASSERT(inuse != NULL); + struct lod_obj_stripe_cb_data data = { { 0 } }; - if (inuse->op_size == 0) - return 0; + data.locd_ost_index = ost; + data.locd_comp_skip_cb = lod_obj_is_ost_use_skip_cb; + data.locd_comp_cb = lod_obj_is_ost_use_cb; - LASSERT(inuse->op_count * sizeof(inuse->op_array[0]) <= inuse->op_size); - for (j = 0; j < inuse->op_count; j++) { - if (inuse->op_array[j] == ost) - return 1; - } - return 0; + (void)lod_obj_for_each_stripe(env, lo, NULL, &data); + + return data.locd_ost_index == -1; } -/** - * Mark the given target as used for a composite layout - * - * \param[in] inuse inuse ost index array - * \param[in] idx index in the array - */ -static inline void lod_comp_ost_in_use(struct ost_pool *inuse, int ost) +static inline void lod_avoid_update(struct lod_object *lo, + struct lod_avoid_guide *lag) +{ + if (!lod_is_flr(lo)) + return; + + lag->lag_ost_avail--; +} + +static inline bool lod_should_avoid_ost(struct lod_object *lo, + struct lod_avoid_guide *lag, + __u32 index) { - LASSERT(inuse != NULL); - if (inuse->op_size && !lod_comp_is_ost_used(inuse, ost)) { - LASSERT(inuse->op_count * sizeof(inuse->op_array[0]) < - inuse->op_size); - inuse->op_array[inuse->op_count] = ost; - inuse->op_count++; + struct lod_device *lod = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev); + struct lod_tgt_desc *ost = OST_TGT(lod, index); + struct lu_svr_qos *lsq = ost->ltd_qos.ltq_svr; + bool used = false; + int i; + + if (!cfs_bitmap_check(lod->lod_ost_bitmap, index)) { + QOS_DEBUG("OST%d: been used in conflicting mirror component\n", + index); + return true; + } + + /** + * we've tried our best, all available OSTs have been used in + * overlapped components in the other mirror + */ + if (lag->lag_ost_avail == 0) + return false; + + /* check OSS use */ + for (i = 0; i < lag->lag_oaa_count; i++) { + if (lag->lag_oss_avoid_array[i] == lsq->lsq_id) { + used = true; + break; + } } + /** + * if the OSS which OST[index] resides has not been used, we'd like to + * use it + */ + if (!used) + return false; + + /* if the OSS has been used, check whether the OST has been used */ + if (!cfs_bitmap_check(lag->lag_ost_avoid_bitmap, index)) + used = false; + else + QOS_DEBUG("OST%d: been used in conflicting mirror component\n", + index); + return used; } static int lod_check_and_reserve_ost(const struct lu_env *env, - struct lod_device *m, + struct lod_object *lo, + struct lod_layout_component *lod_comp, struct obd_statfs *sfs, __u32 ost_idx, __u32 speed, __u32 *s_idx, struct dt_object **stripe, + __u32 *ost_indices, struct thandle *th, - struct ost_pool *inuse) + bool *overstriped) { + struct lod_device *lod = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev); + struct lod_avoid_guide *lag = &lod_env_info(env)->lti_avoid; struct dt_object *o; __u32 stripe_idx = *s_idx; int rc; + ENTRY; - rc = lod_statfs_and_check(env, m, ost_idx, sfs); - if (rc) { - /* this OSP doesn't feel well */ - goto out_return; - } + rc = lod_statfs_and_check(env, lod, &lod->lod_ost_descs, ost_idx, sfs); + if (rc) + RETURN(rc); /* * We expect number of precreated objects in f_ffree at @@ -885,7 +604,7 @@ static int lod_check_and_reserve_ost(const struct lu_env *env, */ if (sfs->os_fprecreated == 0 && speed == 0) { QOS_DEBUG("#%d: precreation is empty\n", ost_idx); - goto out_return; + RETURN(rc); } /* @@ -893,44 +612,57 @@ static int lod_check_and_reserve_ost(const struct lu_env *env, */ if (sfs->os_state & OS_STATE_DEGRADED && speed < 2) { QOS_DEBUG("#%d: degraded\n", ost_idx); - goto out_return; + RETURN(rc); } /* * try not allocate on OST which has been used by other * component */ - if (speed == 0 && lod_comp_is_ost_used(inuse, ost_idx)) { - QOS_DEBUG("#%d: used by other component\n", ost_idx); - goto out_return; + if (speed == 0 && lod_comp_is_ost_used(env, lo, ost_idx)) { + QOS_DEBUG("iter %d: OST%d used by other component\n", + speed, ost_idx); + RETURN(rc); } - /* - * do not put >1 objects on a single OST + /** + * try not allocate OSTs used by conflicting component of other mirrors + * for the first and second time. */ - if (lod_qos_is_ost_used(env, ost_idx, stripe_idx)) - goto out_return; + if (speed < 2 && lod_should_avoid_ost(lo, lag, ost_idx)) { + QOS_DEBUG("iter %d: OST%d used by conflicting mirror " + "component\n", speed, ost_idx); + RETURN(rc); + } - o = lod_qos_declare_object_on(env, m, ost_idx, th); + /* do not put >1 objects on a single OST, except for overstriping */ + if (lod_qos_is_ost_used(env, ost_idx, stripe_idx)) { + if (lod_comp->llc_pattern & LOV_PATTERN_OVERSTRIPING) + *overstriped = true; + else + RETURN(rc); + } + + o = lod_qos_declare_object_on(env, lod, ost_idx, th); if (IS_ERR(o)) { CDEBUG(D_OTHER, "can't declare new object on #%u: %d\n", ost_idx, (int) PTR_ERR(o)); rc = PTR_ERR(o); - goto out_return; + RETURN(rc); } /* * We've successfully declared (reserved) an object */ + lod_avoid_update(lo, lag); lod_qos_ost_in_use(env, stripe_idx, ost_idx); - lod_comp_ost_in_use(inuse, ost_idx); stripe[stripe_idx] = o; + ost_indices[stripe_idx] = ost_idx; OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_LOV_CREATE_RACE, 2); stripe_idx++; *s_idx = stripe_idx; -out_return: - return rc; + RETURN(rc); } /** @@ -947,34 +679,35 @@ out_return: * time we give priority to targets which already have objects precreated. * Full OSTs are skipped (see lod_qos_dev_is_full() for the details). * - * \param[in] env execution environment for this thread - * \param[in] lo LOD object - * \param[out] stripe striping created - * \param[in] flags allocation flags (0 or LOV_USES_DEFAULT_STRIPE) - * \param[in] th transaction handle - * \param[in] comp_idx index of ldo_comp_entries - * \param[in|out] inuse array of inuse ost index + * \param[in] env execution environment for this thread + * \param[in] lo LOD object + * \param[out] stripe striping created + * \param[out] ost_indices ost indices of striping created + * \param[in] flags allocation flags (0 or LOV_USES_DEFAULT_STRIPE) + * \param[in] th transaction handle + * \param[in] comp_idx index of ldo_comp_entries * * \retval 0 on success * \retval -ENOSPC if not enough OSTs are found * \retval negative negated errno for other failures */ static int lod_alloc_rr(const struct lu_env *env, struct lod_object *lo, - struct dt_object **stripe, int flags, - struct thandle *th, int comp_idx, - struct ost_pool *inuse) + struct dt_object **stripe, __u32 *ost_indices, + int flags, struct thandle *th, int comp_idx) { struct lod_layout_component *lod_comp; struct lod_device *m = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev); struct obd_statfs *sfs = &lod_env_info(env)->lti_osfs; struct pool_desc *pool = NULL; - struct ost_pool *osts; - struct lod_qos_rr *lqr; - unsigned int i, array_idx; + struct lu_tgt_pool *osts; + struct lu_qos_rr *lqr; + unsigned int i, array_idx; __u32 ost_start_idx_temp; __u32 stripe_idx = 0; __u32 stripe_count, stripe_count_min, ost_idx; int rc, speed = 0, ost_connecting = 0; + int stripes_per_ost = 1; + bool overstriped = false; ENTRY; LASSERT(lo->ldo_comp_cnt > comp_idx && lo->ldo_comp_entries != NULL); @@ -990,8 +723,8 @@ static int lod_alloc_rr(const struct lu_env *env, struct lod_object *lo, osts = &(pool->pool_obds); lqr = &(pool->pool_rr); } else { - osts = &(m->lod_pool_info); - lqr = &(m->lod_qos.lq_rr); + osts = &m->lod_ost_descs.ltd_tgt_pool; + lqr = &(m->lod_ost_descs.ltd_qos.lq_rr); } rc = lod_qos_calc_rr(m, osts, lqr); @@ -1002,10 +735,10 @@ static int lod_alloc_rr(const struct lu_env *env, struct lod_object *lo, if (rc) GOTO(out, rc); - down_read(&m->lod_qos.lq_rw_sem); + down_read(&m->lod_ost_descs.ltd_qos.lq_rw_sem); spin_lock(&lqr->lqr_alloc); if (--lqr->lqr_start_count <= 0) { - lqr->lqr_start_idx = cfs_rand() % osts->op_count; + lqr->lqr_start_idx = prandom_u32_max(osts->op_count); lqr->lqr_start_count = (LOV_CREATE_RESEED_MIN / max(osts->op_count, 1U) + LOV_CREATE_RESEED_MULT) * max(osts->op_count, 1U); @@ -1028,7 +761,12 @@ repeat_find: stripe_count, lqr->lqr_start_idx, lqr->lqr_start_count, lqr->lqr_offset_idx, osts->op_count, osts->op_count); - for (i = 0; i < osts->op_count && stripe_idx < stripe_count; i++) { + if (lod_comp->llc_pattern & LOV_PATTERN_OVERSTRIPING) + stripes_per_ost = + (lod_comp->llc_stripe_count - 1)/osts->op_count + 1; + + for (i = 0; i < osts->op_count * stripes_per_ost + && stripe_idx < stripe_count; i++) { array_idx = (lqr->lqr_start_idx + lqr->lqr_offset_idx) % osts->op_count; ++lqr->lqr_start_idx; @@ -1048,8 +786,9 @@ repeat_find: continue; spin_unlock(&lqr->lqr_alloc); - rc = lod_check_and_reserve_ost(env, m, sfs, ost_idx, speed, - &stripe_idx, stripe, th, inuse); + rc = lod_check_and_reserve_ost(env, lo, lod_comp, sfs, ost_idx, + speed, &stripe_idx, stripe, + ost_indices, th, &overstriped); spin_lock(&lqr->lqr_alloc); if (rc != 0 && OST_TGT(m, ost_idx)->ltd_connecting) @@ -1065,7 +804,13 @@ repeat_find: } spin_unlock(&lqr->lqr_alloc); - up_read(&m->lod_qos.lq_rw_sem); + up_read(&m->lod_ost_descs.ltd_qos.lq_rw_sem); + + /* If there are enough OSTs, a component with overstriping requested + * will not actually end up overstriped. The comp should reflect this. + */ + if (!overstriped) + lod_comp->llc_pattern &= ~LOV_PATTERN_OVERSTRIPING; if (stripe_idx) { lod_comp->llc_stripe_count = stripe_idx; @@ -1102,12 +847,12 @@ out: * structures are protected, but no concurrent allocation is allowed on the * same objects. * - * \param[in] env execution environment for this thread - * \param[in] lo LOD object - * \param[out] stripe striping created - * \param[in] th transaction handle - * \param[in] comp_idx index of ldo_comp_entries - * \param[in|out] inuse array of inuse ost index + * \param[in] env execution environment for this thread + * \param[in] lo LOD object + * \param[out] stripe striping created + * \param[out] ost_indices ost indices of striping created + * \param[in] th transaction handle + * \param[in] comp_idx index of ldo_comp_entries * * \retval 0 on success * \retval -ENODEV OST index does not exist on file system @@ -1115,8 +860,8 @@ out: * \retval negative negated errno on error */ static int lod_alloc_ost_list(const struct lu_env *env, struct lod_object *lo, - struct dt_object **stripe, struct thandle *th, - int comp_idx, struct ost_pool *inuse) + struct dt_object **stripe, __u32 *ost_indices, + struct thandle *th, int comp_idx) { struct lod_layout_component *lod_comp; struct lod_device *m = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev); @@ -1132,11 +877,16 @@ static int lod_alloc_ost_list(const struct lu_env *env, struct lod_object *lo, LASSERT(lo->ldo_comp_cnt > comp_idx && lo->ldo_comp_entries != NULL); lod_comp = &lo->ldo_comp_entries[comp_idx]; LASSERT(lod_comp->llc_ostlist.op_array); + LASSERT(lod_comp->llc_ostlist.op_count); rc = lod_qos_ost_in_use_clear(env, lod_comp->llc_stripe_count); if (rc < 0) RETURN(rc); + if (lod_comp->llc_stripe_offset == LOV_OFFSET_DEFAULT) + lod_comp->llc_stripe_offset = + lod_comp->llc_ostlist.op_array[0]; + for (i = 0; i < lod_comp->llc_stripe_count; i++) { if (lod_comp->llc_ostlist.op_array[i] == lod_comp->llc_stripe_offset) { @@ -1160,15 +910,17 @@ static int lod_alloc_ost_list(const struct lu_env *env, struct lod_object *lo, break; } - /* - * do not put >1 objects on a single OST + /* do not put >1 objects on a single OST, except for + * overstriping */ - if (lod_qos_is_ost_used(env, ost_idx, stripe_count)) { + if (lod_qos_is_ost_used(env, ost_idx, stripe_count) && + !(lod_comp->llc_pattern & LOV_PATTERN_OVERSTRIPING)) { rc = -EINVAL; break; } - rc = lod_statfs_and_check(env, m, ost_idx, sfs); + rc = lod_statfs_and_check(env, m, &m->lod_ost_descs, ost_idx, + sfs); if (rc < 0) /* this OSP doesn't feel well */ break; @@ -1185,8 +937,8 @@ static int lod_alloc_ost_list(const struct lu_env *env, struct lod_object *lo, * We've successfully declared (reserved) an object */ lod_qos_ost_in_use(env, stripe_count, ost_idx); - lod_comp_ost_in_use(inuse, ost_idx); stripe[stripe_count] = o; + ost_indices[stripe_count] = ost_idx; stripe_count++; } @@ -1205,13 +957,13 @@ static int lod_alloc_ost_list(const struct lu_env *env, struct lod_object *lo, * release the stripes allocated. All the internal structures are protected, * but no concurrent allocation is allowed on the same objects. * - * \param[in] env execution environment for this thread - * \param[in] lo LOD object - * \param[out] stripe striping created - * \param[in] flags not used - * \param[in] th transaction handle - * \param[in] comp_idx index of ldo_comp_entries - * \param[in|out]inuse array of inuse ost index + * \param[in] env execution environment for this thread + * \param[in] lo LOD object + * \param[out] stripe striping created + * \param[out] ost_indices ost indices of striping created + * \param[in] flags not used + * \param[in] th transaction handle + * \param[in] comp_idx index of ldo_comp_entries * * \retval 0 on success * \retval -ENOSPC if no OST objects are available at all @@ -1220,20 +972,21 @@ static int lod_alloc_ost_list(const struct lu_env *env, struct lod_object *lo, * \retval negative errno on failure */ static int lod_alloc_specific(const struct lu_env *env, struct lod_object *lo, - struct dt_object **stripe, int flags, - struct thandle *th, int comp_idx, - struct ost_pool *inuse) + struct dt_object **stripe, __u32 *ost_indices, + int flags, struct thandle *th, int comp_idx) { struct lod_layout_component *lod_comp; struct lod_device *m = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev); struct obd_statfs *sfs = &lod_env_info(env)->lti_osfs; - struct dt_object *o; - __u32 ost_idx; - unsigned int i, array_idx, ost_count; - int rc, stripe_num = 0; - int speed = 0; - struct pool_desc *pool = NULL; - struct ost_pool *osts; + struct dt_object *o; + __u32 ost_idx; + unsigned int i, array_idx, ost_count; + int rc, stripe_num = 0; + int speed = 0; + struct pool_desc *pool = NULL; + struct lu_tgt_pool *osts; + int stripes_per_ost = 1; + bool overstriped = false; ENTRY; LASSERT(lo->ldo_comp_cnt > comp_idx && lo->ldo_comp_entries != NULL); @@ -1250,7 +1003,7 @@ static int lod_alloc_specific(const struct lu_env *env, struct lod_object *lo, down_read(&pool_tgt_rw_sem(pool)); osts = &(pool->pool_obds); } else { - osts = &(m->lod_pool_info); + osts = &m->lod_ost_descs.ltd_tgt_pool; } ost_count = osts->op_count; @@ -1271,7 +1024,11 @@ repeat_find: GOTO(out, rc = -EINVAL); } - for (i = 0; i < ost_count; + if (lod_comp->llc_pattern & LOV_PATTERN_OVERSTRIPING) + stripes_per_ost = + (lod_comp->llc_stripe_count - 1)/ost_count + 1; + + for (i = 0; i < ost_count * stripes_per_ost; i++, array_idx = (array_idx + 1) % ost_count) { ost_idx = osts->op_array[array_idx]; @@ -1284,16 +1041,21 @@ repeat_find: continue; /* - * do not put >1 objects on a single OST + * do not put >1 objects on a single OST, except for + * overstriping, where it is intended */ - if (lod_qos_is_ost_used(env, ost_idx, stripe_num)) - continue; + if (lod_qos_is_ost_used(env, ost_idx, stripe_num)) { + if (lod_comp->llc_pattern & LOV_PATTERN_OVERSTRIPING) + overstriped = true; + else + continue; + } /* * try not allocate on the OST used by other component */ if (speed == 0 && i != 0 && - lod_comp_is_ost_used(inuse, ost_idx)) + lod_comp_is_ost_used(env, lo, ost_idx)) continue; /* Drop slow OSCs if we can, but not for requested start idx. @@ -1302,16 +1064,17 @@ repeat_find: * start OST, then it can be skipped, otherwise skip it only * if it is inactive/recovering/out-of-space." */ - rc = lod_statfs_and_check(env, m, ost_idx, sfs); + rc = lod_statfs_and_check(env, m, &m->lod_ost_descs, ost_idx, + sfs); if (rc) { /* this OSP doesn't feel well */ continue; } /* - * We expect number of precreated objects in f_ffree at - * the first iteration, skip OSPs with no objects ready - * don't apply this logic to OST specified with stripe_offset + * We expect number of precreated objects at the first + * iteration. Skip OSPs with no objects ready. Don't apply + * this logic to OST specified with stripe_offset. */ if (i != 0 && sfs->os_fprecreated == 0 && speed == 0) continue; @@ -1327,8 +1090,8 @@ repeat_find: * We've successfully declared (reserved) an object */ lod_qos_ost_in_use(env, stripe_num, ost_idx); - lod_comp_ost_in_use(inuse, ost_idx); stripe[stripe_num] = o; + ost_indices[stripe_num] = ost_idx; stripe_num++; /* We have enough stripes */ @@ -1349,6 +1112,13 @@ repeat_find: PFID(lu_object_fid(lod2lu_obj(lo))), stripe_num, lod_comp->llc_stripe_count); rc = stripe_num == 0 ? -ENOSPC : -EFBIG; + + /* If there are enough OSTs, a component with overstriping requessted + * will not actually end up overstriped. The comp should reflect this. + */ + if (rc == 0 && !overstriped) + lod_comp->llc_pattern &= ~LOV_PATTERN_OVERSTRIPING; + out: if (pool != NULL) { up_read(&pool_tgt_rw_sem(pool)); @@ -1360,36 +1130,6 @@ out: } /** - * Check whether QoS allocation should be used. - * - * A simple helper to decide when QoS allocation should be used: - * if it's just a single available target or the used space is - * evenly distributed among the targets at the moment, then QoS - * allocation algorithm should not be used. - * - * \param[in] lod LOD device - * - * \retval 0 should not be used - * \retval 1 should be used - */ -static inline int lod_qos_is_usable(struct lod_device *lod) -{ -#ifdef FORCE_QOS - /* to be able to debug QoS code */ - return 1; -#endif - - /* Detect -EAGAIN early, before expensive lock is taken. */ - if (!lod->lod_qos.lq_dirty && lod->lod_qos.lq_same_space) - return 0; - - if (lod->lod_desc.ld_active_tgt_count < 2) - return 0; - - return 1; -} - -/** * Allocate a striping using an algorithm with weights. * * The function allocates OST objects to create a striping. The algorithm @@ -1411,13 +1151,13 @@ static inline int lod_qos_is_usable(struct lod_device *lod) * An OST with a higher weight is proportionately more likely to be selected * than one with a lower weight. * - * \param[in] env execution environment for this thread - * \param[in] lo LOD object - * \param[out] stripe striping created - * \param[in] flags 0 or LOV_USES_DEFAULT_STRIPE - * \param[in] th transaction handle - * \param[in] comp_idx index of ldo_comp_entries - * \param[in|out]inuse array of inuse ost index + * \param[in] env execution environment for this thread + * \param[in] lo LOD object + * \param[out] stripe striping created + * \param[out] ost_indices ost indices of striping created + * \param[in] flags 0 or LOV_USES_DEFAULT_STRIPE + * \param[in] th transaction handle + * \param[in] comp_idx index of ldo_comp_entries * * \retval 0 on success * \retval -EAGAIN not enough OSTs are found for specified stripe count @@ -1425,20 +1165,22 @@ static inline int lod_qos_is_usable(struct lod_device *lod) * \retval negative errno on failure */ static int lod_alloc_qos(const struct lu_env *env, struct lod_object *lo, - struct dt_object **stripe, int flags, - struct thandle *th, int comp_idx, - struct ost_pool *inuse) + struct dt_object **stripe, __u32 *ost_indices, + int flags, struct thandle *th, int comp_idx) { struct lod_layout_component *lod_comp; struct lod_device *lod = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev); struct obd_statfs *sfs = &lod_env_info(env)->lti_osfs; + struct lod_avoid_guide *lag = &lod_env_info(env)->lti_avoid; struct lod_tgt_desc *ost; struct dt_object *o; __u64 total_weight = 0; struct pool_desc *pool = NULL; - struct ost_pool *osts; + struct lu_tgt_pool *osts; unsigned int i; - __u32 nfound, good_osts, stripe_count, stripe_count_min; + __u32 nfound, good_osts, stripe_count, stripe_count_min; + bool overstriped = false; + int stripes_per_ost = 1; int rc = 0; ENTRY; @@ -1456,24 +1198,28 @@ static int lod_alloc_qos(const struct lu_env *env, struct lod_object *lo, down_read(&pool_tgt_rw_sem(pool)); osts = &(pool->pool_obds); } else { - osts = &(lod->lod_pool_info); + osts = &lod->lod_ost_descs.ltd_tgt_pool; } /* Detect -EAGAIN early, before expensive lock is taken. */ - if (!lod_qos_is_usable(lod)) + if (!ltd_qos_is_usable(&lod->lod_ost_descs)) GOTO(out_nolock, rc = -EAGAIN); + if (lod_comp->llc_pattern & LOV_PATTERN_OVERSTRIPING) + stripes_per_ost = + (lod_comp->llc_stripe_count - 1)/osts->op_count + 1; + /* Do actual allocation, use write lock here. */ - down_write(&lod->lod_qos.lq_rw_sem); + down_write(&lod->lod_ost_descs.ltd_qos.lq_rw_sem); /* * Check again, while we were sleeping on @lq_rw_sem things could * change. */ - if (!lod_qos_is_usable(lod)) + if (!ltd_qos_is_usable(&lod->lod_ost_descs)) GOTO(out, rc = -EAGAIN); - rc = lod_qos_calc_ppo(lod); + rc = ltd_qos_penalties_calc(&lod->lod_ost_descs); if (rc) GOTO(out, rc); @@ -1490,7 +1236,8 @@ static int lod_alloc_qos(const struct lu_env *env, struct lod_object *lo, ost = OST_TGT(lod, osts->op_array[i]); ost->ltd_qos.ltq_usable = 0; - rc = lod_statfs_and_check(env, lod, osts->op_array[i], sfs); + rc = lod_statfs_and_check(env, lod, &lod->lod_ost_descs, + osts->op_array[i], sfs); if (rc) { /* this OSP doesn't feel well */ continue; @@ -1506,7 +1253,7 @@ static int lod_alloc_qos(const struct lu_env *env, struct lod_object *lo, continue; ost->ltd_qos.ltq_usable = 1; - lod_qos_calc_weight(lod, osts->op_array[i]); + lu_tgt_qos_weight_calc(ost); total_weight += ost->ltd_qos.ltq_weight; good_osts++; @@ -1517,49 +1264,28 @@ static int lod_alloc_qos(const struct lu_env *env, struct lod_object *lo, if (good_osts < stripe_count_min) GOTO(out, rc = -EAGAIN); - /* We have enough osts */ - if (good_osts < stripe_count) - stripe_count = good_osts; + /* If we do not have enough OSTs for the requested stripe count, do not + * put more stripes per OST than requested. + */ + if (stripe_count / stripes_per_ost > good_osts) + stripe_count = good_osts * stripes_per_ost; /* Find enough OSTs with weighted random allocation. */ nfound = 0; while (nfound < stripe_count) { - __u64 rand, cur_weight; + u64 rand, cur_weight; cur_weight = 0; rc = -ENOSPC; - if (total_weight) { -#if BITS_PER_LONG == 32 - rand = cfs_rand() % (unsigned)total_weight; - /* If total_weight > 32-bit, first generate the high - * 32 bits of the random number, then add in the low - * 32 bits (truncated to the upper limit, if needed) */ - if (total_weight > 0xffffffffULL) - rand = (__u64)(cfs_rand() % - (unsigned)(total_weight >> 32)) << 32; - else - rand = 0; - - if (rand == (total_weight & 0xffffffff00000000ULL)) - rand |= cfs_rand() % (unsigned)total_weight; - else - rand |= cfs_rand(); - -#else - rand = ((__u64)cfs_rand() << 32 | cfs_rand()) % - total_weight; -#endif - } else { - rand = 0; - } + rand = lu_prandom_u64_max(total_weight); /* On average, this will hit larger-weighted OSTs more often. * 0-weight OSTs will always get used last (only when rand=0) */ for (i = 0; i < osts->op_count; i++) { __u32 idx = osts->op_array[i]; - if (!cfs_bitmap_check(lod->lod_ost_bitmap, idx)) + if (lod_should_avoid_ost(lo, lag, idx)) continue; ost = OST_TGT(lod, idx); @@ -1578,12 +1304,21 @@ static int lod_alloc_qos(const struct lu_env *env, struct lod_object *lo, QOS_DEBUG("stripe=%d to idx=%d\n", nfound, idx); /* - * do not put >1 objects on a single OST + * do not put >1 objects on a single OST, except for + * overstriping */ - if (lod_qos_is_ost_used(env, idx, nfound) || - lod_comp_is_ost_used(inuse, idx)) + if ((lod_comp_is_ost_used(env, lo, idx)) && + !(lod_comp->llc_pattern & LOV_PATTERN_OVERSTRIPING)) continue; + if (lod_qos_is_ost_used(env, idx, nfound)) { + if (lod_comp->llc_pattern & + LOV_PATTERN_OVERSTRIPING) + overstriped = true; + else + continue; + } + o = lod_qos_declare_object_on(env, lod, idx, th); if (IS_ERR(o)) { QOS_DEBUG("can't declare object on #%u: %d\n", @@ -1591,10 +1326,12 @@ static int lod_alloc_qos(const struct lu_env *env, struct lod_object *lo, continue; } + lod_avoid_update(lo, lag); lod_qos_ost_in_use(env, nfound, idx); - lod_comp_ost_in_use(inuse, idx); - stripe[nfound++] = o; - lod_qos_used(lod, osts, idx, &total_weight); + stripe[nfound] = o; + ost_indices[nfound] = idx; + ltd_qos_update(&lod->lod_ost_descs, ost, &total_weight); + nfound++; rc = 0; break; } @@ -1620,19 +1357,22 @@ static int lod_alloc_qos(const struct lu_env *env, struct lod_object *lo, dt_object_put(env, stripe[i]); stripe[i] = NULL; } - LASSERTF(nfound <= inuse->op_count, - "nfound:%d, op_count:%u\n", nfound, inuse->op_count); - inuse->op_count -= nfound; /* makes sense to rebalance next time */ - lod->lod_qos.lq_dirty = 1; - lod->lod_qos.lq_same_space = 0; + lod->lod_ost_descs.ltd_qos.lq_dirty = 1; + lod->lod_ost_descs.ltd_qos.lq_same_space = 0; rc = -EAGAIN; } + /* If there are enough OSTs, a component with overstriping requessted + * will not actually end up overstriped. The comp should reflect this. + */ + if (rc == 0 && !overstriped) + lod_comp->llc_pattern &= ~LOV_PATTERN_OVERSTRIPING; + out: - up_write(&lod->lod_qos.lq_rw_sem); + up_write(&lod->lod_ost_descs.ltd_qos.lq_rw_sem); out_nolock: if (pool != NULL) { @@ -1645,12 +1385,15 @@ out_nolock: } /** - * Find largest stripe count the caller can use. + * Check stripe count the caller can use. + * + * For new layouts (no initialized components), check the total size of the + * layout against the maximum EA size from the backing file system. This + * stops us from creating a layout which will be too large once initialized. * + * For existing layouts (with initialized components): * Find the maximal possible stripe count not greater than \a stripe_count. - * Sometimes suggested stripecount can't be reached for a number of reasons: - * lack of enough active OSTs or the backend does not support EAs that large. - * If the passed one is 0, then the filesystem's default one is used. + * If the provided stripe count is 0, then the filesystem's default is used. * * \param[in] lod LOD device * \param[in] lo The lod_object @@ -1659,44 +1402,58 @@ out_nolock: * \retval the maximum usable stripe count */ __u16 lod_get_stripe_count(struct lod_device *lod, struct lod_object *lo, - __u16 stripe_count) + __u16 stripe_count, bool overstriping) { __u32 max_stripes = LOV_MAX_STRIPE_COUNT_OLD; + /* max stripe count is based on OSD ea size */ + unsigned int easize = lod->lod_osd_max_easize; + int i; + if (!stripe_count) - stripe_count = lod->lod_desc.ld_default_stripe_count; - if (stripe_count > lod->lod_desc.ld_active_tgt_count) - stripe_count = lod->lod_desc.ld_active_tgt_count; + stripe_count = + lod->lod_ost_descs.ltd_lov_desc.ld_default_stripe_count; if (!stripe_count) stripe_count = 1; + /* Overstriping allows more stripes than targets */ + if (stripe_count > + lod->lod_ost_descs.ltd_lov_desc.ld_active_tgt_count && + !overstriping) + stripe_count = + lod->lod_ost_descs.ltd_lov_desc.ld_active_tgt_count; + + if (lo->ldo_is_composite) { + struct lod_layout_component *lod_comp; + unsigned int header_sz = sizeof(struct lov_comp_md_v1); + unsigned int init_comp_sz = 0; + unsigned int total_comp_sz = 0; + unsigned int comp_sz; + + header_sz += sizeof(struct lov_comp_md_entry_v1) * + lo->ldo_comp_cnt; + + for (i = 0; i < lo->ldo_comp_cnt; i++) { + lod_comp = &lo->ldo_comp_entries[i]; + comp_sz = lov_mds_md_size(lod_comp->llc_stripe_count, + LOV_MAGIC_V3); + total_comp_sz += comp_sz; + if (lod_comp->llc_flags & LCME_FL_INIT) + init_comp_sz += comp_sz; + } - /* stripe count is based on whether OSD can handle larger EA sizes */ - if (lod->lod_osd_max_easize > 0) { - unsigned int easize = lod->lod_osd_max_easize; - int i; + if (init_comp_sz > 0) + total_comp_sz = init_comp_sz; - if (lo->ldo_is_composite) { - struct lod_layout_component *lod_comp; - unsigned int header_sz = sizeof(struct lov_comp_md_v1); - - header_sz += sizeof(struct lov_comp_md_entry_v1) * - lo->ldo_comp_cnt; - for (i = 0; i < lo->ldo_comp_cnt; i++) { - lod_comp = &lo->ldo_comp_entries[i]; - if (lod_comp->llc_flags & LCME_FL_INIT) - header_sz += lov_mds_md_size( - lod_comp->llc_stripe_count, - LOV_MAGIC_V3); - } - if (easize > header_sz) - easize -= header_sz; - else - easize = 0; - } + header_sz += total_comp_sz; - max_stripes = lov_mds_md_max_stripe_count(easize, LOV_MAGIC_V3); + if (easize > header_sz) + easize -= header_sz; + else + easize = 0; } + max_stripes = lov_mds_md_max_stripe_count(easize, LOV_MAGIC_V3); + return (stripe_count < max_stripes) ? stripe_count : max_stripes; } @@ -1726,29 +1483,64 @@ int lod_use_defined_striping(const struct lu_env *env, struct lov_ost_data_v1 *objs; __u32 magic; __u16 comp_cnt; + __u16 mirror_cnt; int rc = 0, i; ENTRY; + mutex_lock(&mo->ldo_layout_mutex); + lod_striping_free_nolock(env, mo); + magic = le32_to_cpu(v1->lmm_magic) & ~LOV_MAGIC_DEFINED; if (magic != LOV_MAGIC_V1 && magic != LOV_MAGIC_V3 && - magic != LOV_MAGIC_COMP_V1) - RETURN(-EINVAL); + magic != LOV_MAGIC_COMP_V1 && magic != LOV_MAGIC_FOREIGN) + GOTO(unlock, rc = -EINVAL); if (magic == LOV_MAGIC_COMP_V1) { comp_v1 = buf->lb_buf; comp_cnt = le16_to_cpu(comp_v1->lcm_entry_count); if (comp_cnt == 0) - RETURN(-EINVAL); + GOTO(unlock, rc = -EINVAL); + mirror_cnt = le16_to_cpu(comp_v1->lcm_mirror_count) + 1; + mo->ldo_flr_state = le16_to_cpu(comp_v1->lcm_flags) & + LCM_FL_FLR_MASK; mo->ldo_is_composite = 1; + } else if (magic == LOV_MAGIC_FOREIGN) { + struct lov_foreign_md *foreign; + size_t length; + + if (buf->lb_len < offsetof(typeof(*foreign), lfm_value)) { + CDEBUG(D_LAYOUT, + "buf len %zu < min lov_foreign_md size (%zu)\n", + buf->lb_len, + offsetof(typeof(*foreign), lfm_value)); + GOTO(out, rc = -EINVAL); + } + foreign = (struct lov_foreign_md *)buf->lb_buf; + length = foreign_size_le(foreign); + if (buf->lb_len < length) { + CDEBUG(D_LAYOUT, + "buf len %zu < this lov_foreign_md size (%zu)\n", + buf->lb_len, length); + GOTO(out, rc = -EINVAL); + } + + /* just cache foreign LOV EA raw */ + rc = lod_alloc_foreign_lov(mo, length); + if (rc) + GOTO(out, rc); + memcpy(mo->ldo_foreign_lov, buf->lb_buf, length); + GOTO(out, rc); } else { mo->ldo_is_composite = 0; comp_cnt = 1; + mirror_cnt = 0; } + mo->ldo_layout_gen = le16_to_cpu(v1->lmm_layout_gen); - rc = lod_alloc_comp_entries(mo, comp_cnt); + rc = lod_alloc_comp_entries(mo, mirror_cnt, comp_cnt); if (rc) - RETURN(rc); + GOTO(unlock, rc); for (i = 0; i < comp_cnt; i++) { struct lu_extent *ext; @@ -1760,6 +1552,7 @@ int lod_use_defined_striping(const struct lu_env *env, if (mo->ldo_is_composite) { offs = le32_to_cpu(comp_v1->lcm_entries[i].lcme_offset); v1 = (struct lov_mds_md_v1 *)((char *)comp_v1 + offs); + v3 = (struct lov_mds_md_v3 *)v1; magic = le32_to_cpu(v1->lmm_magic); ext = &comp_v1->lcm_entries[i].lcme_extent; @@ -1768,6 +1561,9 @@ int lod_use_defined_striping(const struct lu_env *env, lod_comp->llc_extent.e_end = le64_to_cpu(ext->e_end); lod_comp->llc_flags = le32_to_cpu(comp_v1->lcm_entries[i].lcme_flags); + if (lod_comp->llc_flags & LCME_FL_NOSYNC) + lod_comp->llc_timestamp = le64_to_cpu( + comp_v1->lcm_entries[i].lcme_timestamp); lod_comp->llc_id = le32_to_cpu(comp_v1->lcm_entries[i].lcme_id); if (lod_comp->llc_id == LCME_ID_INVAL) @@ -1806,9 +1602,14 @@ int lod_use_defined_striping(const struct lu_env *env, GOTO(out, rc); } } + + rc = lod_fill_mirrors(mo); + GOTO(out, rc); out: if (rc) - lod_object_free_striping(env, mo); + lod_striping_free_nolock(env, mo); +unlock: + mutex_unlock(&mo->ldo_layout_mutex); RETURN(rc); } @@ -1834,28 +1635,41 @@ int lod_qos_parse_config(const struct lu_env *env, struct lod_object *lo, const struct lu_buf *buf) { struct lod_layout_component *lod_comp; - struct lod_device *d = lu2lod_dev(lod2lu_obj(lo)->lo_dev); - struct lov_desc *desc = &d->lod_desc; - struct lov_user_md_v1 *v1 = NULL; - struct lov_user_md_v3 *v3 = NULL; - struct lov_comp_md_v1 *comp_v1 = NULL; - __u32 magic; - __u16 comp_cnt; - int i, rc; + struct lod_device *d = lu2lod_dev(lod2lu_obj(lo)->lo_dev); + struct lov_desc *desc = &d->lod_ost_descs.ltd_lov_desc; + struct lov_user_md_v1 *v1 = NULL; + struct lov_user_md_v3 *v3 = NULL; + struct lov_comp_md_v1 *comp_v1 = NULL; + struct lov_foreign_md *lfm = NULL; + char def_pool[LOV_MAXPOOLNAME + 1]; + __u32 magic; + __u16 comp_cnt; + __u16 mirror_cnt; + int i, rc; ENTRY; if (buf == NULL || buf->lb_buf == NULL || buf->lb_len == 0) RETURN(0); + memset(def_pool, 0, sizeof(def_pool)); + if (lo->ldo_comp_entries != NULL) + lod_layout_get_pool(lo->ldo_comp_entries, lo->ldo_comp_cnt, + def_pool, sizeof(def_pool)); + + /* free default striping info */ + if (lo->ldo_is_foreign) + lod_free_foreign_lov(lo); + else + lod_free_comp_entries(lo); + rc = lod_verify_striping(d, lo, buf, false); if (rc) RETURN(-EINVAL); - lod_free_comp_entries(lo); - v3 = buf->lb_buf; v1 = buf->lb_buf; comp_v1 = buf->lb_buf; + /* {lmm,lfm}_magic position/length work for all LOV formats */ magic = v1->lmm_magic; if (unlikely(le32_to_cpu(magic) & LOV_MAGIC_DEFINED)) { @@ -1891,6 +1705,22 @@ int lod_qos_parse_config(const struct lu_env *env, struct lod_object *lo, /* fall trhough */ case LOV_USER_MAGIC_COMP_V1: break; + case __swab32(LOV_USER_MAGIC_FOREIGN): + lfm = buf->lb_buf; + __swab32s(&lfm->lfm_magic); + __swab32s(&lfm->lfm_length); + __swab32s(&lfm->lfm_type); + __swab32s(&lfm->lfm_flags); + magic = lfm->lfm_magic; + /* fall through */ + case LOV_USER_MAGIC_FOREIGN: + if (!lfm) + lfm = buf->lb_buf; + rc = lod_alloc_foreign_lov(lo, foreign_size(lfm)); + if (rc) + RETURN(rc); + memcpy(lo->ldo_foreign_lov, buf->lb_buf, foreign_size(lfm)); + RETURN(0); default: CERROR("%s: unrecognized magic %X\n", lod2obd(d)->obd_name, magic); @@ -1903,16 +1733,22 @@ int lod_qos_parse_config(const struct lu_env *env, struct lod_object *lo, comp_cnt = comp_v1->lcm_entry_count; if (comp_cnt == 0) RETURN(-EINVAL); + mirror_cnt = comp_v1->lcm_mirror_count + 1; + if (mirror_cnt > 1) + lo->ldo_flr_state = LCM_FL_RDONLY; lo->ldo_is_composite = 1; } else { comp_cnt = 1; + mirror_cnt = 0; lo->ldo_is_composite = 0; } - rc = lod_alloc_comp_entries(lo, comp_cnt); + rc = lod_alloc_comp_entries(lo, mirror_cnt, comp_cnt); if (rc) RETURN(rc); + LASSERT(lo->ldo_comp_entries); + for (i = 0; i < comp_cnt; i++) { struct pool_desc *pool; struct lu_extent *ext; @@ -1925,42 +1761,34 @@ int lod_qos_parse_config(const struct lu_env *env, struct lod_object *lo, comp_v1->lcm_entries[i].lcme_offset); ext = &comp_v1->lcm_entries[i].lcme_extent; lod_comp->llc_extent = *ext; + lod_comp->llc_flags = + comp_v1->lcm_entries[i].lcme_flags & + LCME_CL_COMP_FLAGS; } pool_name = NULL; if (v1->lmm_magic == LOV_USER_MAGIC_V3 || v1->lmm_magic == LOV_USER_MAGIC_SPECIFIC) { - int j; - v3 = (struct lov_user_md_v3 *)v1; if (v3->lmm_pool_name[0] != '\0') pool_name = v3->lmm_pool_name; if (v3->lmm_magic == LOV_USER_MAGIC_SPECIFIC) { - if (v3->lmm_stripe_offset == LOV_OFFSET_DEFAULT) - v3->lmm_stripe_offset = - v3->lmm_objects[0].l_ost_idx; - - /* copy ost list from lmm */ - lod_comp->llc_ostlist.op_count = - v3->lmm_stripe_count; - lod_comp->llc_ostlist.op_size = - v3->lmm_stripe_count * sizeof(__u32); - OBD_ALLOC(lod_comp->llc_ostlist.op_array, - lod_comp->llc_ostlist.op_size); - if (!lod_comp->llc_ostlist.op_array) - GOTO(free_comp, rc = -ENOMEM); - - for (j = 0; j < v3->lmm_stripe_count; j++) - lod_comp->llc_ostlist.op_array[j] = - v3->lmm_objects[j].l_ost_idx; + rc = lod_comp_copy_ost_lists(lod_comp, v3); + if (rc) + GOTO(free_comp, rc); } } + if (pool_name == NULL && def_pool[0] != '\0') + pool_name = def_pool; + if (v1->lmm_pattern == 0) v1->lmm_pattern = LOV_PATTERN_RAID0; if (lov_pattern(v1->lmm_pattern) != LOV_PATTERN_RAID0 && - lov_pattern(v1->lmm_pattern) != LOV_PATTERN_MDT) { + lov_pattern(v1->lmm_pattern) != LOV_PATTERN_MDT && + lov_pattern(v1->lmm_pattern) != + (LOV_PATTERN_RAID0 | LOV_PATTERN_OVERSTRIPING)) { CDEBUG(D_LAYOUT, "%s: invalid pattern: %x\n", lod2obd(d)->obd_name, v1->lmm_pattern); GOTO(free_comp, rc = -EINVAL); @@ -2004,7 +1832,8 @@ int lod_qos_parse_config(const struct lu_env *env, struct lod_object *lo, } } - if (lod_comp->llc_stripe_count > pool_tgt_count(pool)) + if (lod_comp->llc_stripe_count > pool_tgt_count(pool) && + !(lod_comp->llc_pattern & LOV_PATTERN_OVERSTRIPING)) lod_comp->llc_stripe_count = pool_tgt_count(pool); lod_pool_putref(pool); @@ -2018,6 +1847,147 @@ free_comp: } /** + * prepare enough OST avoidance bitmap space + */ +int lod_prepare_avoidance(const struct lu_env *env, struct lod_object *lo) +{ + struct lod_device *lod = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev); + struct lod_avoid_guide *lag = &lod_env_info(env)->lti_avoid; + struct cfs_bitmap *bitmap = NULL; + __u32 *new_oss = NULL; + + lag->lag_ost_avail = lod->lod_ost_count; + + /* reset OSS avoid guide array */ + lag->lag_oaa_count = 0; + if (lag->lag_oss_avoid_array && + lag->lag_oaa_size < lod->lod_ost_count) { + OBD_FREE(lag->lag_oss_avoid_array, + sizeof(__u32) * lag->lag_oaa_size); + lag->lag_oss_avoid_array = NULL; + lag->lag_oaa_size = 0; + } + + /* init OST avoid guide bitmap */ + if (lag->lag_ost_avoid_bitmap) { + if (lod->lod_ost_count <= lag->lag_ost_avoid_bitmap->size) { + CFS_RESET_BITMAP(lag->lag_ost_avoid_bitmap); + } else { + CFS_FREE_BITMAP(lag->lag_ost_avoid_bitmap); + lag->lag_ost_avoid_bitmap = NULL; + } + } + + if (!lag->lag_ost_avoid_bitmap) { + bitmap = CFS_ALLOCATE_BITMAP(lod->lod_ost_count); + if (!bitmap) + return -ENOMEM; + } + + if (!lag->lag_oss_avoid_array) { + /** + * usually there are multiple OSTs in one OSS, but we don't + * know the exact OSS number, so we choose a safe option, + * using OST count to allocate the array to store the OSS + * id. + */ + OBD_ALLOC(new_oss, sizeof(*new_oss) * lod->lod_ost_count); + if (!new_oss) { + CFS_FREE_BITMAP(bitmap); + return -ENOMEM; + } + } + + if (new_oss) { + lag->lag_oss_avoid_array = new_oss; + lag->lag_oaa_size = lod->lod_ost_count; + } + if (bitmap) + lag->lag_ost_avoid_bitmap = bitmap; + + return 0; +} + +/** + * Collect information of used OSTs and OSSs in the overlapped components + * of other mirrors + */ +void lod_collect_avoidance(struct lod_object *lo, struct lod_avoid_guide *lag, + int comp_idx) +{ + struct lod_device *lod = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev); + struct lod_layout_component *lod_comp = &lo->ldo_comp_entries[comp_idx]; + struct cfs_bitmap *bitmap = lag->lag_ost_avoid_bitmap; + int i, j; + + /* iterate mirrors */ + for (i = 0; i < lo->ldo_mirror_count; i++) { + struct lod_layout_component *comp; + + /** + * skip mirror containing component[comp_idx], we only + * collect OSTs info of conflicting component in other mirrors, + * so that during read, if OSTs of a mirror's component are + * not available, we still have other mirror with different + * OSTs to read the data. + */ + comp = &lo->ldo_comp_entries[lo->ldo_mirrors[i].lme_start]; + if (comp->llc_id != LCME_ID_INVAL && + mirror_id_of(comp->llc_id) == + mirror_id_of(lod_comp->llc_id)) + continue; + + /* iterate components of a mirror */ + lod_foreach_mirror_comp(comp, lo, i) { + /** + * skip non-overlapped or un-instantiated components, + * NOTE: don't use lod_comp_inited(comp) to judge + * whether @comp has been inited, since during + * declare phase, comp->llc_stripe has been allocated + * while it's init flag not been set until the exec + * phase. + */ + if (!lu_extent_is_overlapped(&comp->llc_extent, + &lod_comp->llc_extent) || + !comp->llc_stripe) + continue; + + /** + * collect used OSTs index and OSS info from a + * component + */ + for (j = 0; j < comp->llc_stripe_count; j++) { + struct lod_tgt_desc *ost; + struct lu_svr_qos *lsq; + int k; + + ost = OST_TGT(lod, comp->llc_ost_indices[j]); + lsq = ost->ltd_qos.ltq_svr; + + if (cfs_bitmap_check(bitmap, ost->ltd_index)) + continue; + + QOS_DEBUG("OST%d used in conflicting mirror " + "component\n", ost->ltd_index); + cfs_bitmap_set(bitmap, ost->ltd_index); + lag->lag_ost_avail--; + + for (k = 0; k < lag->lag_oaa_count; k++) { + if (lag->lag_oss_avoid_array[k] == + lsq->lsq_id) + break; + } + if (k == lag->lag_oaa_count) { + lag->lag_oss_avoid_array[k] = + lsq->lsq_id; + lag->lag_oaa_count++; + } + } + } + } +} + +/** * Create a striping for an obejct. * * The function creates a new striping for the object. The function tries QoS @@ -2031,26 +2001,28 @@ free_comp: * \param[in] attr attributes OST objects will be declared with * \param[in] th transaction handle * \param[in] comp_idx index of ldo_comp_entries - * \param[in|out] inuse array of inuse ost index * * \retval 0 on success * \retval negative negated errno on error */ int lod_qos_prep_create(const struct lu_env *env, struct lod_object *lo, struct lu_attr *attr, struct thandle *th, - int comp_idx, struct ost_pool *inuse) + int comp_idx) { struct lod_layout_component *lod_comp; struct lod_device *d = lu2lod_dev(lod2lu_obj(lo)->lo_dev); - struct dt_object **stripe; int stripe_len; int flag = LOV_USES_ASSIGNED_STRIPE; int i, rc = 0; + struct lod_avoid_guide *lag = &lod_env_info(env)->lti_avoid; + struct dt_object **stripe = NULL; + __u32 *ost_indices = NULL; ENTRY; LASSERT(lo); LASSERT(lo->ldo_comp_cnt > comp_idx && lo->ldo_comp_entries != NULL); lod_comp = &lo->ldo_comp_entries[comp_idx]; + LASSERT(!(lod_comp->llc_flags & LCME_FL_EXTENSION)); /* A released component is being created */ if (lod_comp->llc_pattern & LOV_PATTERN_F_RELEASED) @@ -2071,43 +2043,61 @@ int lod_qos_prep_create(const struct lu_env *env, struct lod_object *lo, */ lod_qos_statfs_update(env, d); stripe_len = lod_get_stripe_count(d, lo, - lod_comp->llc_stripe_count); + lod_comp->llc_stripe_count, + lod_comp->llc_pattern & + LOV_PATTERN_OVERSTRIPING); + if (stripe_len == 0) GOTO(out, rc = -ERANGE); lod_comp->llc_stripe_count = stripe_len; OBD_ALLOC(stripe, sizeof(stripe[0]) * stripe_len); if (stripe == NULL) GOTO(out, rc = -ENOMEM); + OBD_ALLOC(ost_indices, sizeof(*ost_indices) * stripe_len); + if (!ost_indices) + GOTO(out, rc = -ENOMEM); lod_getref(&d->lod_ost_descs); /* XXX: support for non-0 files w/o objects */ CDEBUG(D_OTHER, "tgt_count %d stripe_count %d\n", - d->lod_desc.ld_tgt_count, stripe_len); + d->lod_ost_count, stripe_len); - if (lod_comp->llc_ostlist.op_array) { - rc = lod_alloc_ost_list(env, lo, stripe, th, comp_idx, - inuse); + if (lod_comp->llc_ostlist.op_array && + lod_comp->llc_ostlist.op_count) { + rc = lod_alloc_ost_list(env, lo, stripe, ost_indices, + th, comp_idx); } else if (lod_comp->llc_stripe_offset == LOV_OFFSET_DEFAULT) { - rc = lod_alloc_qos(env, lo, stripe, flag, th, - comp_idx, inuse); + /** + * collect OSTs and OSSs used in other mirrors whose + * components cross the ldo_comp_entries[comp_idx] + */ + rc = lod_prepare_avoidance(env, lo); + if (rc) + GOTO(put_ldts, rc); + + QOS_DEBUG("collecting conflict osts for comp[%d]\n", + comp_idx); + lod_collect_avoidance(lo, lag, comp_idx); + + rc = lod_alloc_qos(env, lo, stripe, ost_indices, flag, + th, comp_idx); if (rc == -EAGAIN) - rc = lod_alloc_rr(env, lo, stripe, flag, th, - comp_idx, inuse); + rc = lod_alloc_rr(env, lo, stripe, ost_indices, + flag, th, comp_idx); } else { - rc = lod_alloc_specific(env, lo, stripe, flag, th, - comp_idx, inuse); + rc = lod_alloc_specific(env, lo, stripe, ost_indices, + flag, th, comp_idx); } +put_ldts: lod_putref(d, &d->lod_ost_descs); - if (rc < 0) { for (i = 0; i < stripe_len; i++) if (stripe[i] != NULL) dt_object_put(env, stripe[i]); - - OBD_FREE(stripe, sizeof(stripe[0]) * stripe_len); lod_comp->llc_stripe_count = 0; } else { lod_comp->llc_stripe = stripe; + lod_comp->llc_ost_indices = ost_indices; lod_comp->llc_stripes_allocated = stripe_len; } } else { @@ -2138,88 +2128,14 @@ int lod_qos_prep_create(const struct lu_env *env, struct lod_object *lo, } out: - RETURN(rc); -} - -int lod_obj_stripe_set_inuse_cb(const struct lu_env *env, - struct lod_object *lo, - struct dt_object *dt, struct thandle *th, - int stripe_idx, - struct lod_obj_stripe_cb_data *data) -{ - struct lod_thread_info *info = lod_env_info(env); - struct lod_device *d = lu2lod_dev(lod2lu_obj(lo)->lo_dev); - struct lu_fid *fid = &info->lti_fid; - __u32 index; - int rc, type = LU_SEQ_RANGE_OST; - - *fid = *lu_object_fid(&dt->do_lu); - rc = lod_fld_lookup(env, d, fid, &index, &type); if (rc < 0) { - CERROR("%s: fail to locate "DFID": rc = %d\n", - lod2obd(d)->obd_name, PFID(fid), rc); - return rc; + if (stripe) + OBD_FREE(stripe, sizeof(stripe[0]) * stripe_len); + if (ost_indices) + OBD_FREE(ost_indices, + sizeof(*ost_indices) * stripe_len); } - lod_comp_ost_in_use(data->locd_inuse, index); - return 0; -} - -/** - * Resize per-thread ost list to hold OST target index list already used. - * - * \param[in,out] inuse structure contains ost list array - * \param[in] cnt total stripe count of all components - * \param[in] max array's max size if @max > 0 - * - * \retval 0 on success - * \retval -ENOMEM reallocation failed - */ -static int lod_inuse_resize(struct ost_pool *inuse, __u16 cnt, __u16 max) -{ - __u32 *array; - __u32 new = cnt * sizeof(inuse->op_array[0]); - - inuse->op_count = 0; - - if (new <= inuse->op_size) - return 0; - - if (max) - new = min_t(__u32, new, max); - - OBD_ALLOC(array, new); - if (!array) - return -ENOMEM; - - if (inuse->op_array) - OBD_FREE(inuse->op_array, inuse->op_size); - - inuse->op_array = array; - inuse->op_size = new; - - return 0; -} - -int lod_prepare_inuse(const struct lu_env *env, struct lod_object *lo) -{ - struct lod_thread_info *info = lod_env_info(env); - struct lod_device *d = lu2lod_dev(lod2lu_obj(lo)->lo_dev); - struct ost_pool *inuse = &info->lti_inuse_osts; - struct lod_obj_stripe_cb_data data; - __u32 stripe_count = 0; - int i; - int rc; - - for (i = 0; i < lo->ldo_comp_cnt; i++) - stripe_count += lod_comp_entry_stripe_count(lo, - &lo->ldo_comp_entries[i], false); - rc = lod_inuse_resize(inuse, stripe_count, d->lod_osd_max_easize); - if (rc) - return rc; - - data.locd_inuse = inuse; - return lod_obj_for_each_stripe(env, lo, NULL, - lod_obj_stripe_set_inuse_cb, &data); + RETURN(rc); } int lod_prepare_create(const struct lu_env *env, struct lod_object *lo, @@ -2227,10 +2143,7 @@ int lod_prepare_create(const struct lu_env *env, struct lod_object *lo, struct thandle *th) { - struct lod_thread_info *info = lod_env_info(env); struct lod_device *d = lu2lod_dev(lod2lu_obj(lo)->lo_dev); - struct ost_pool inuse_osts = { 0 }; - struct ost_pool *inuse = &inuse_osts; uint64_t size = 0; int i; int rc; @@ -2241,7 +2154,7 @@ int lod_prepare_create(const struct lu_env *env, struct lod_object *lo, /* no OST available */ /* XXX: should we be waiting a bit to prevent failures during * cluster initialization? */ - if (d->lod_ostnr == 0) + if (!d->lod_ost_count) RETURN(-EIO); /* @@ -2259,14 +2172,6 @@ int lod_prepare_create(const struct lu_env *env, struct lod_object *lo, if (attr->la_valid & LA_SIZE) size = attr->la_size; - /* only prepare inuse if multiple components to be created */ - if (size && lo->ldo_is_composite) { - rc = lod_prepare_inuse(env, lo); - if (rc) - RETURN(rc); - inuse = &info->lti_inuse_osts; - } - /** * prepare OST object creation for the component covering file's * size, the 1st component (including plain layout file) is always @@ -2278,10 +2183,9 @@ int lod_prepare_create(const struct lu_env *env, struct lod_object *lo, lod_comp = &lo->ldo_comp_entries[i]; extent = &lod_comp->llc_extent; - CDEBUG(D_QOS, "%lld [%lld, %lld)\n", - size, extent->e_start, extent->e_end); + QOS_DEBUG("comp[%d] %lld "DEXT"\n", i, size, PEXT(extent)); if (!lo->ldo_is_composite || size >= extent->e_start) { - rc = lod_qos_prep_create(env, lo, attr, th, i, inuse); + rc = lod_qos_prep_create(env, lo, attr, th, i); if (rc) break; }