X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_writeback.c;h=9a400135e4f574832bdc8c642e5b2a8c96769c88;hb=31170f9ceca91684ea66e0b16757881563a8cf26;hp=3109ca37df76a89f946ddc9277c6a0792dbeccd8;hpb=5522990660248930108e84c89bc7e5807bda9ea0;p=fs%2Flustre-release.git diff --git a/lustre/quota/qsd_writeback.c b/lustre/quota/qsd_writeback.c index 3109ca3..9a40013 100644 --- a/lustre/quota/qsd_writeback.c +++ b/lustre/quota/qsd_writeback.c @@ -21,7 +21,7 @@ * GPL HEADER END */ /* - * Copyright (c) 2012, 2014, Intel Corporation. + * Copyright (c) 2012, 2017, Intel Corporation. * Use is subject to license terms. * * Author: Johann Lombardi @@ -33,8 +33,6 @@ #include #include "qsd_internal.h" -extern struct kmem_cache *upd_kmem; - /* * Allocate and fill an qsd_upd_rec structure to be processed by the writeback * thread. @@ -121,9 +119,14 @@ static void qsd_add_deferred(struct qsd_instance *qsd, struct list_head *list, * updates. We should just delete the legacy record in such * case. */ if (upd->qur_ver == tmp->qur_ver) { - LASSERT(tmp->qur_lqe); - LQUOTA_ERROR(tmp->qur_lqe, "Found a conflict record " - "with ver:"LPU64"", tmp->qur_ver); + if (tmp->qur_lqe) + LQUOTA_WARN(tmp->qur_lqe, "Found a conflict " + "record with ver:%llu", + tmp->qur_ver); + else + CWARN("%s: Found a conflict record with ver: " + "%llu\n", qsd->qsd_svname, tmp->qur_ver); + list_del_init(&tmp->qur_link); qsd_upd_free(tmp); } else if (upd->qur_ver < tmp->qur_ver) { @@ -151,7 +154,7 @@ static void qsd_kickoff_deferred(struct qsd_qtype_info *qqi, /* drop this update */ list_del_init(&upd->qur_link); CDEBUG(D_QUOTA, "%s: skipping deferred update ver:" - LPU64"/"LPU64", global:%d, qid:"LPU64"\n", + "%llu/%llu, global:%d, qid:%llu\n", qqi->qqi_qsd->qsd_svname, upd->qur_ver, ver, upd->qur_global, upd->qur_qid.qid_uid); qsd_upd_free(upd); @@ -165,11 +168,11 @@ static void qsd_kickoff_deferred(struct qsd_qtype_info *qqi, RETURN_EXIT; CDEBUG(D_QUOTA, "%s: found deferred update record. " - "version:"LPU64"/"LPU64", global:%d, qid:"LPU64"\n", + "version:%llu/%llu, global:%d, qid:%llu\n", qqi->qqi_qsd->qsd_svname, upd->qur_ver, ver, upd->qur_global, upd->qur_qid.qid_uid); - LASSERTF(upd->qur_ver > ver, "lur_ver:"LPU64", cur_ver:"LPU64"\n", + LASSERTF(upd->qur_ver > ver, "lur_ver:%llu, cur_ver:%llu\n", upd->qur_ver, ver); /* Kick off the deferred udpate */ @@ -223,7 +226,7 @@ void qsd_upd_schedule(struct qsd_qtype_info *qqi, struct lquota_entry *lqe, __u64 cur_ver; ENTRY; - CDEBUG(D_QUOTA, "%s: schedule update. global:%s, version:"LPU64"\n", + CDEBUG(D_QUOTA, "%s: schedule update. global:%s, version:%llu\n", qsd->qsd_svname, global ? "true" : "false", ver); upd = qsd_upd_alloc(qqi, lqe, qid, rec, ver, global); @@ -248,11 +251,11 @@ void qsd_upd_schedule(struct qsd_qtype_info *qqi, struct lquota_entry *lqe, /* legitimate race between glimpse AST and * reintegration */ CDEBUG(D_QUOTA, "%s: discarding glb update from glimpse" - " ver:"LPU64" local ver:"LPU64"\n", + " ver:%llu local ver:%llu\n", qsd->qsd_svname, ver, cur_ver); else - CERROR("%s: discard slv update, ver:"LPU64" local ver:" - LPU64"\n", qsd->qsd_svname, ver, cur_ver); + CERROR("%s: discard slv update, ver:%llu local ver:" + "%llu\n", qsd->qsd_svname, ver, cur_ver); qsd_upd_free(upd); } else if ((ver == cur_ver + 1) && qqi->qqi_glb_uptodate && qqi->qqi_slv_uptodate) { @@ -293,6 +296,11 @@ static int qsd_process_upd(const struct lu_env *env, struct qsd_upd_rec *upd) GOTO(out, rc); /* refresh usage */ qsd_refresh_usage(env, lqe); + + spin_lock(&qqi->qqi_qsd->qsd_adjust_lock); + lqe->lqe_adjust_time = 0; + spin_unlock(&qqi->qqi_qsd->qsd_adjust_lock); + /* Report usage asynchronously */ rc = qsd_adjust(env, lqe); if (rc) @@ -302,6 +310,21 @@ static int qsd_process_upd(const struct lu_env *env, struct qsd_upd_rec *upd) rc = qsd_update_index(env, qqi, &upd->qur_qid, upd->qur_global, upd->qur_ver, &upd->qur_rec); out: + if (upd->qur_global && rc == 0 && + upd->qur_rec.lqr_glb_rec.qbr_softlimit == 0 && + upd->qur_rec.lqr_glb_rec.qbr_hardlimit == 0 && + (LQUOTA_FLAG(upd->qur_rec.lqr_glb_rec.qbr_time) & + LQUOTA_FLAG_DEFAULT)) { + lqe->lqe_is_default = true; + if (qqi->qqi_default_softlimit == 0 && + qqi->qqi_default_hardlimit == 0) + lqe->lqe_enforced = false; + else + lqe->lqe_enforced = true; + + LQUOTA_DEBUG(lqe, "update to use default quota"); + } + if (lqe && !IS_ERR(lqe)) { lqe_putref(lqe); upd->qur_lqe = NULL; @@ -333,12 +356,14 @@ void qsd_adjust_schedule(struct lquota_entry *lqe, bool defer, bool cancel) } if (list_empty(&lqe->lqe_link)) { - if (cancel) + if (!cancel) { + lqe->lqe_adjust_time = ktime_get_seconds(); + if (defer) + lqe->lqe_adjust_time += QSD_WB_INTERVAL; + } else { lqe->lqe_adjust_time = 0; - else - lqe->lqe_adjust_time = defer ? - cfs_time_shift_64(QSD_WB_INTERVAL) : - cfs_time_current_64(); + } + /* lqe reference transferred to list */ if (defer) list_add_tail(&lqe->lqe_link, @@ -371,8 +396,7 @@ static bool qsd_job_pending(struct qsd_instance *qsd, struct list_head *upd, struct lquota_entry *lqe; lqe = list_entry(qsd->qsd_adjust_list.next, struct lquota_entry, lqe_link); - if (cfs_time_beforeq_64(lqe->lqe_adjust_time, - cfs_time_current_64())) + if (ktime_get_seconds() >= lqe->lqe_adjust_time) job_pending = true; } spin_unlock(&qsd->qsd_adjust_lock); @@ -383,16 +407,14 @@ static bool qsd_job_pending(struct qsd_instance *qsd, struct list_head *upd, job_pending = true; } - if (qsd->qsd_acct_failed) { - /* don't bother kicking off reintegration if space accounting - * failed to be enabled */ - write_unlock(&qsd->qsd_lock); - return job_pending; - } - for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) { struct qsd_qtype_info *qqi = qsd->qsd_type_array[qtype]; + /* don't bother kicking off reintegration if space accounting + * failed to be enabled */ + if (qqi->qqi_acct_failed) + continue; + if (!qsd_type_enabled(qsd, qtype)) continue; @@ -411,14 +433,13 @@ static int qsd_upd_thread(void *arg) { struct qsd_instance *qsd = (struct qsd_instance *)arg; struct ptlrpc_thread *thread = &qsd->qsd_upd_thread; - struct l_wait_info lwi; struct list_head queue; struct qsd_upd_rec *upd, *n; struct lu_env *env; int qtype, rc = 0; bool uptodate; struct lquota_entry *lqe; - __u64 cur_time; + time64_t cur_time; ENTRY; OBD_ALLOC_PTR(env); @@ -436,11 +457,12 @@ static int qsd_upd_thread(void *arg) wake_up(&thread->t_ctl_waitq); INIT_LIST_HEAD(&queue); - lwi = LWI_TIMEOUT(cfs_time_seconds(QSD_WB_INTERVAL), NULL, NULL); while (1) { - l_wait_event(thread->t_ctl_waitq, - qsd_job_pending(qsd, &queue, &uptodate) || - !thread_is_running(thread), &lwi); + wait_event_idle_timeout( + thread->t_ctl_waitq, + qsd_job_pending(qsd, &queue, &uptodate) || + !thread_is_running(thread), + cfs_time_seconds(QSD_WB_INTERVAL)); list_for_each_entry_safe(upd, n, &queue, qur_link) { list_del_init(&upd->qur_link); @@ -449,13 +471,12 @@ static int qsd_upd_thread(void *arg) } spin_lock(&qsd->qsd_adjust_lock); - cur_time = cfs_time_current_64(); + cur_time = ktime_get_seconds(); while (!list_empty(&qsd->qsd_adjust_list)) { lqe = list_entry(qsd->qsd_adjust_list.next, struct lquota_entry, lqe_link); /* deferred items are sorted by time */ - if (!cfs_time_beforeq_64(lqe->lqe_adjust_time, - cur_time)) + if (lqe->lqe_adjust_time > cur_time) break; list_del_init(&lqe->lqe_link); @@ -493,7 +514,6 @@ static int qsd_upd_thread(void *arg) int qsd_start_upd_thread(struct qsd_instance *qsd) { struct ptlrpc_thread *thread = &qsd->qsd_upd_thread; - struct l_wait_info lwi = { 0 }; struct task_struct *task; ENTRY; @@ -506,9 +526,8 @@ int qsd_start_upd_thread(struct qsd_instance *qsd) RETURN(PTR_ERR(task)); } - l_wait_event(thread->t_ctl_waitq, - thread_is_running(thread) || thread_is_stopped(thread), - &lwi); + wait_event_idle(thread->t_ctl_waitq, + thread_is_running(thread) || thread_is_stopped(thread)); RETURN(0); } @@ -526,8 +545,8 @@ static void qsd_cleanup_deferred(struct qsd_instance *qsd) write_lock(&qsd->qsd_lock); list_for_each_entry_safe(upd, tmp, &qqi->qqi_deferred_glb, qur_link) { - CWARN("%s: Free global deferred upd: ID:"LPU64", " - "ver:"LPU64"/"LPU64"\n", qsd->qsd_svname, + CWARN("%s: Free global deferred upd: ID:%llu, " + "ver:%llu/%llu\n", qsd->qsd_svname, upd->qur_qid.qid_uid, upd->qur_ver, qqi->qqi_glb_ver); list_del_init(&upd->qur_link); @@ -535,8 +554,8 @@ static void qsd_cleanup_deferred(struct qsd_instance *qsd) } list_for_each_entry_safe(upd, tmp, &qqi->qqi_deferred_slv, qur_link) { - CWARN("%s: Free slave deferred upd: ID:"LPU64", " - "ver:"LPU64"/"LPU64"\n", qsd->qsd_svname, + CWARN("%s: Free slave deferred upd: ID:%llu, " + "ver:%llu/%llu\n", qsd->qsd_svname, upd->qur_qid.qid_uid, upd->qur_ver, qqi->qqi_slv_ver); list_del_init(&upd->qur_link); @@ -563,14 +582,12 @@ static void qsd_cleanup_adjust(struct qsd_instance *qsd) void qsd_stop_upd_thread(struct qsd_instance *qsd) { struct ptlrpc_thread *thread = &qsd->qsd_upd_thread; - struct l_wait_info lwi = { 0 }; if (!thread_is_stopped(thread)) { thread_set_flags(thread, SVC_STOPPING); wake_up(&thread->t_ctl_waitq); - l_wait_event(thread->t_ctl_waitq, thread_is_stopped(thread), - &lwi); + wait_event_idle(thread->t_ctl_waitq, thread_is_stopped(thread)); } qsd_cleanup_deferred(qsd); qsd_cleanup_adjust(qsd);