X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fquota_interface.c;h=168f6dfd8edfef3f5e21964770f6f44f7eda296f;hb=e67c6e366752611ffd2baeb7cefa24c9f289eb78;hp=e6d376f0442d1dece0766e8ac8970f21e343f730;hpb=7661294557774975dbd7aa90014f4ab1610db7df;p=fs%2Flustre-release.git diff --git a/lustre/quota/quota_interface.c b/lustre/quota/quota_interface.c index e6d376f..168f6df 100644 --- a/lustre/quota/quota_interface.c +++ b/lustre/quota/quota_interface.c @@ -68,7 +68,7 @@ #ifdef HAVE_QUOTA_SUPPORT static cfs_time_t last_print = 0; -static spinlock_t last_print_lock = SPIN_LOCK_UNLOCKED; +static cfs_spinlock_t last_print_lock = CFS_SPIN_LOCK_UNLOCKED; static int filter_quota_setup(struct obd_device *obd) { @@ -76,9 +76,9 @@ static int filter_quota_setup(struct obd_device *obd) struct obd_device_target *obt = &obd->u.obt; ENTRY; - init_rwsem(&obt->obt_rwsem); + cfs_init_rwsem(&obt->obt_rwsem); obt->obt_qfmt = LUSTRE_QUOTA_V2; - atomic_set(&obt->obt_quotachecking, 1); + cfs_sema_init(&obt->obt_quotachecking, 1); rc = qctxt_init(obd, NULL); if (rc) CERROR("initialize quota context failed! (rc:%d)\n", rc); @@ -103,14 +103,14 @@ static int filter_quota_setinfo(struct obd_device *obd, void *data) LASSERT(imp != NULL); /* setup the quota context import */ - spin_lock(&qctxt->lqc_lock); + cfs_spin_lock(&qctxt->lqc_lock); if (qctxt->lqc_import != NULL) { - spin_unlock(&qctxt->lqc_lock); + cfs_spin_unlock(&qctxt->lqc_lock); if (qctxt->lqc_import == imp) CDEBUG(D_WARNING, "%s: lqc_import(%p) of obd(%p) was " "activated already.\n", obd->obd_name, imp, obd); else - CDEBUG(D_ERROR, "%s: lqc_import(%p:%p) of obd(%p) was " + CERROR("%s: lqc_import(%p:%p) of obd(%p) was " "activated by others.\n", obd->obd_name, qctxt->lqc_import, imp, obd); } else { @@ -120,7 +120,7 @@ static int filter_quota_setinfo(struct obd_device *obd, void *data) imp->imp_connect_data.ocd_connect_flags |= (exp->exp_connect_flags & (OBD_CONNECT_QUOTA64 | OBD_CONNECT_CHANGE_QS)); - spin_unlock(&qctxt->lqc_lock); + cfs_spin_unlock(&qctxt->lqc_lock); CDEBUG(D_QUOTA, "%s: lqc_import(%p) of obd(%p) is reactivated " "now.\n", obd->obd_name, imp, obd); @@ -146,16 +146,16 @@ static int filter_quota_clearinfo(struct obd_export *exp, struct obd_device *obd /* when exp->exp_imp_reverse is destroyed, the corresponding lqc_import * should be invalid b=12374 */ - spin_lock(&qctxt->lqc_lock); + cfs_spin_lock(&qctxt->lqc_lock); if (qctxt->lqc_import == imp) { qctxt->lqc_import = NULL; - spin_unlock(&qctxt->lqc_lock); + cfs_spin_unlock(&qctxt->lqc_lock); CDEBUG(D_QUOTA, "%s: lqc_import(%p) of obd(%p) is invalid now.\n", obd->obd_name, imp, obd); ptlrpc_cleanup_imp(imp); dqacq_interrupt(qctxt); } else { - spin_unlock(&qctxt->lqc_lock); + cfs_spin_unlock(&qctxt->lqc_lock); } RETURN(0); } @@ -164,7 +164,7 @@ static int filter_quota_enforce(struct obd_device *obd, unsigned int ignore) { ENTRY; - if (!sb_any_quota_enabled(obd->u.obt.obt_sb)) + if (!ll_sb_any_quota_active(obd->u.obt.obt_sb)) RETURN(0); if (ignore) { @@ -186,14 +186,12 @@ static int filter_quota_getflag(struct obd_device *obd, struct obdo *oa) struct obd_quotactl *oqctl; ENTRY; - if (!sb_any_quota_enabled(obt->obt_sb)) + if (!ll_sb_any_quota_active(obt->obt_sb)) RETURN(0); OBD_ALLOC_PTR(oqctl); - if (!oqctl) { - CERROR("Not enough memory!"); + if (!oqctl) RETURN(-ENOMEM); - } /* set over quota flags for a uid/gid */ oa->o_valid |= OBD_MD_FLUSRQUOTA | OBD_MD_FLGRPQUOTA; @@ -206,13 +204,19 @@ static int filter_quota_getflag(struct obd_device *obd, struct obdo *oa) qctxt, 0); if (lqs == NULL || IS_ERR(lqs)) { rc = PTR_ERR(lqs); + if (rc) + CDEBUG(D_QUOTA, "search lqs for %s %d failed, " + "(rc = %d)\n", + cnt == USRQUOTA ? "user" : "group", + cnt == USRQUOTA ? oa->o_uid : oa->o_gid, + rc); break; } else { - spin_lock(&lqs->lqs_lock); + cfs_spin_lock(&lqs->lqs_lock); if (lqs->lqs_bunit_sz <= qctxt->lqc_sync_blk) { oa->o_flags |= (cnt == USRQUOTA) ? OBD_FL_NO_USRQUOTA : OBD_FL_NO_GRPQUOTA; - spin_unlock(&lqs->lqs_lock); + cfs_spin_unlock(&lqs->lqs_lock); CDEBUG(D_QUOTA, "set sync flag: bunit(%lu), " "sync_blk(%d)\n", lqs->lqs_bunit_sz, qctxt->lqc_sync_blk); @@ -220,7 +224,7 @@ static int filter_quota_getflag(struct obd_device *obd, struct obdo *oa) lqs_putref(lqs); continue; } - spin_unlock(&lqs->lqs_lock); + cfs_spin_unlock(&lqs->lqs_lock); /* this is for quota_search_lqs */ lqs_putref(lqs); } @@ -236,14 +240,22 @@ static int filter_quota_getflag(struct obd_device *obd, struct obdo *oa) rc = err; oa->o_valid &= ~((cnt == USRQUOTA) ? OBD_MD_FLUSRQUOTA : OBD_MD_FLGRPQUOTA); + CDEBUG(D_QUOTA, "fsfilt getquota for %s %d failed, " + "(rc = %d)\n", + cnt == USRQUOTA ? "user" : "group", + cnt == USRQUOTA ? oa->o_uid : oa->o_gid, err); continue; } if (oqctl->qc_dqblk.dqb_bhardlimit && (toqb(oqctl->qc_dqblk.dqb_curspace) >= - oqctl->qc_dqblk.dqb_bhardlimit)) + oqctl->qc_dqblk.dqb_bhardlimit)) { oa->o_flags |= (cnt == USRQUOTA) ? OBD_FL_NO_USRQUOTA : OBD_FL_NO_GRPQUOTA; + CDEBUG(D_QUOTA, "out of quota for %s %d\n", + cnt == USRQUOTA ? "user" : "group", + cnt == USRQUOTA ? oa->o_uid : oa->o_gid); + } } OBD_FREE_PTR(oqctl); RETURN(rc); @@ -264,12 +276,12 @@ static int quota_check_common(struct obd_device *obd, const unsigned int id[], int rc = 0, rc2[2] = { 0, 0 }; ENTRY; - spin_lock(&qctxt->lqc_lock); + cfs_spin_lock(&qctxt->lqc_lock); if (!qctxt->lqc_valid){ - spin_unlock(&qctxt->lqc_lock); + cfs_spin_unlock(&qctxt->lqc_lock); RETURN(rc); } - spin_unlock(&qctxt->lqc_lock); + cfs_spin_unlock(&qctxt->lqc_lock); for (i = 0; i < MAXQUOTAS; i++) { struct lustre_qunit_size *lqs = NULL; @@ -297,7 +309,7 @@ static int quota_check_common(struct obd_device *obd, const unsigned int id[], } rc2[i] = compute_remquota(obd, qctxt, &qdata[i], isblk); - spin_lock(&lqs->lqs_lock); + cfs_spin_lock(&lqs->lqs_lock); if (!cycle) { if (isblk) { pending[i] = count * CFS_PAGE_SIZE; @@ -307,11 +319,12 @@ static int quota_check_common(struct obd_device *obd, const unsigned int id[], if (inode) { mb = pending[i]; rc = fsfilt_get_mblk(obd, qctxt->lqc_sb, - &mb, inode,frags); + &mb, inode, + frags); if (rc) - CDEBUG(D_ERROR, - "can't get extra " - "meta blocks.\n"); + CERROR("%s: can't get extra " + "meta blocks\n", + obd->obd_name); else pending[i] += mb; } @@ -352,7 +365,7 @@ static int quota_check_common(struct obd_device *obd, const unsigned int id[], rc2[i] = QUOTA_RET_ACQUOTA; } - spin_unlock(&lqs->lqs_lock); + cfs_spin_unlock(&lqs->lqs_lock); if (lqs->lqs_blk_rec < 0 && qdata[i].qd_count < @@ -380,7 +393,7 @@ int quota_is_set(struct obd_device *obd, const unsigned int id[], int flag) struct lustre_qunit_size *lqs; int i, q_set = 0; - if (!sb_any_quota_enabled(obd->u.obt.obt_qctxt.lqc_sb)) + if (!ll_sb_any_quota_active(obd->u.obt.obt_qctxt.lqc_sb)) RETURN(0); for (i = 0; i < MAXQUOTAS; i++) { @@ -396,8 +409,9 @@ int quota_is_set(struct obd_device *obd, const unsigned int id[], int flag) return q_set; } -static int quota_chk_acq_common(struct obd_device *obd, const unsigned int id[], - int pending[], int count, quota_acquire acquire, +static int quota_chk_acq_common(struct obd_device *obd, struct obd_export *exp, + const unsigned int id[], int pending[], + int count, quota_acquire acquire, struct obd_trans_info *oti, int isblk, struct inode *inode, int frags) { @@ -412,20 +426,26 @@ static int quota_chk_acq_common(struct obd_device *obd, const unsigned int id[], if (!quota_is_set(obd, id, isblk ? QB_SET : QI_SET)) RETURN(0); + if (isblk && (exp->exp_failed || exp->exp_abort_active_req)) + /* If the client has been evicted or if it + * timed out and tried to reconnect already, + * abort the request immediately */ + RETURN(-ENOTCONN); + CDEBUG(D_QUOTA, "check quota for %s\n", obd->obd_name); pending[USRQUOTA] = pending[GRPQUOTA] = 0; /* Unfortunately, if quota master is too busy to handle the * pre-dqacq in time and quota hash on ost is used up, we * have to wait for the completion of in flight dqacq/dqrel, * in order to get enough quota for write b=12588 */ - do_gettimeofday(&work_start); + cfs_gettimeofday(&work_start); while ((rc = quota_check_common(obd, id, pending, count, cycle, isblk, inode, frags)) & QUOTA_RET_ACQUOTA) { - spin_lock(&qctxt->lqc_lock); + cfs_spin_lock(&qctxt->lqc_lock); if (!qctxt->lqc_import && oti) { - spin_unlock(&qctxt->lqc_lock); + cfs_spin_unlock(&qctxt->lqc_lock); LASSERT(oti && oti->oti_thread && oti->oti_thread->t_watchdog); @@ -436,9 +456,9 @@ static int quota_chk_acq_common(struct obd_device *obd, const unsigned int id[], &lwi); CDEBUG(D_QUOTA, "wake up when quota master is back\n"); lc_watchdog_touch(oti->oti_thread->t_watchdog, - GET_TIMEOUT(oti->oti_thread->t_svc)); + CFS_GET_TIMEOUT(oti->oti_thread->t_svc)); } else { - spin_unlock(&qctxt->lqc_lock); + cfs_spin_unlock(&qctxt->lqc_lock); } cycle++; @@ -461,6 +481,18 @@ static int quota_chk_acq_common(struct obd_device *obd, const unsigned int id[], break; } + /* Related quota has been disabled by master, but enabled by + * slave, do not try again. */ + if (unlikely(rc == -ESRCH)) { + CERROR("mismatched quota configuration, stop try.\n"); + break; + } + + if (isblk && (exp->exp_failed || exp->exp_abort_active_req)) + /* The client has been evicted or tried to + * to reconnect already, abort the request */ + RETURN(-ENOTCONN); + /* -EBUSY and others, wait a second and try again */ if (rc < 0) { cfs_waitq_t waitq; @@ -468,42 +500,44 @@ static int quota_chk_acq_common(struct obd_device *obd, const unsigned int id[], if (oti && oti->oti_thread && oti->oti_thread->t_watchdog) lc_watchdog_touch(oti->oti_thread->t_watchdog, - GET_TIMEOUT(oti->oti_thread->t_svc)); + CFS_GET_TIMEOUT(oti->oti_thread->t_svc)); CDEBUG(D_QUOTA, "rc: %d, count_err: %d\n", rc, count_err++); - init_waitqueue_head(&waitq); + cfs_waitq_init(&waitq); lwi = LWI_TIMEOUT(cfs_time_seconds(min(cycle, 10)), NULL, NULL); l_wait_event(waitq, 0, &lwi); } - if (rc < 0 || cycle % 10 == 2) { - spin_lock(&last_print_lock); + if (rc < 0 || cycle % 10 == 0) { + cfs_spin_lock(&last_print_lock); if (last_print == 0 || cfs_time_before((last_print + cfs_time_seconds(30)), cfs_time_current())) { last_print = cfs_time_current(); - spin_unlock(&last_print_lock); + cfs_spin_unlock(&last_print_lock); CWARN("still haven't managed to acquire quota " "space from the quota master after %d " "retries (err=%d, rc=%d)\n", cycle, count_err - 1, rc); } else { - spin_unlock(&last_print_lock); + cfs_spin_unlock(&last_print_lock); } } CDEBUG(D_QUOTA, "recheck quota with rc: %d, cycle: %d\n", rc, cycle); } - do_gettimeofday(&work_end); + cfs_gettimeofday(&work_end); timediff = cfs_timeval_sub(&work_end, &work_start, NULL); lprocfs_counter_add(qctxt->lqc_stats, isblk ? LQUOTA_WAIT_FOR_CHK_BLK : LQUOTA_WAIT_FOR_CHK_INO, timediff); + if (rc > 0) + rc = 0; RETURN(rc); } @@ -524,10 +558,10 @@ static int quota_pending_commit(struct obd_device *obd, const unsigned int id[], CDEBUG(D_QUOTA, "commit pending quota for %s\n", obd->obd_name); CLASSERT(MAXQUOTAS < 4); - if (!sb_any_quota_enabled(qctxt->lqc_sb)) + if (!ll_sb_any_quota_active(qctxt->lqc_sb)) RETURN(0); - do_gettimeofday(&work_start); + cfs_gettimeofday(&work_start); for (i = 0; i < MAXQUOTAS; i++) { struct lustre_qunit_size *lqs = NULL; @@ -554,7 +588,7 @@ static int quota_pending_commit(struct obd_device *obd, const unsigned int id[], continue; } - spin_lock(&lqs->lqs_lock); + cfs_spin_lock(&lqs->lqs_lock); if (isblk) { LASSERTF(lqs->lqs_bwrite_pending >= pending[i], "there are too many blocks! [id %u] [%c] " @@ -576,14 +610,14 @@ static int quota_pending_commit(struct obd_device *obd, const unsigned int id[], obd->obd_name, isblk ? lqs->lqs_bwrite_pending : lqs->lqs_iwrite_pending, i, pending[i], isblk); - spin_unlock(&lqs->lqs_lock); + cfs_spin_unlock(&lqs->lqs_lock); /* for quota_search_lqs in pending_commit */ lqs_putref(lqs); /* for quota_search_lqs in quota_check */ lqs_putref(lqs); } - do_gettimeofday(&work_end); + cfs_gettimeofday(&work_end); timediff = cfs_timeval_sub(&work_end, &work_start, NULL); lprocfs_counter_add(qctxt->lqc_stats, isblk ? LQUOTA_WAIT_FOR_COMMIT_BLK : @@ -616,15 +650,16 @@ static int mds_quota_setup(struct obd_device *obd) RETURN(0); } - init_rwsem(&obt->obt_rwsem); + cfs_init_rwsem(&obt->obt_rwsem); obt->obt_qfmt = LUSTRE_QUOTA_V2; mds->mds_quota_info.qi_version = LUSTRE_QUOTA_V2; - atomic_set(&obt->obt_quotachecking, 1); + cfs_sema_init(&obt->obt_quotachecking, 1); /* initialize quota master and quota context */ - sema_init(&mds->mds_qonoff_sem, 1); + cfs_sema_init(&mds->mds_qonoff_sem, 1); rc = qctxt_init(obd, dqacq_handler); if (rc) { - CERROR("initialize quota context failed! (rc:%d)\n", rc); + CERROR("%s: initialize quota context failed! (rc:%d)\n", + obd->obd_name, rc); RETURN(rc); } mds->mds_quota = 1; @@ -669,9 +704,9 @@ static int mds_quota_fs_cleanup(struct obd_device *obd) memset(&oqctl, 0, sizeof(oqctl)); oqctl.qc_type = UGQUOTA; - down(&mds->mds_qonoff_sem); + cfs_down(&mds->mds_qonoff_sem); mds_admin_quota_off(obd, &oqctl); - up(&mds->mds_qonoff_sem); + cfs_up(&mds->mds_qonoff_sem); RETURN(0); } @@ -690,15 +725,15 @@ static int quota_acquire_common(struct obd_device *obd, const unsigned int id[], #endif /* __KERNEL__ */ struct osc_quota_info { - struct list_head oqi_hash; /* hash list */ + cfs_list_t oqi_hash; /* hash list */ struct client_obd *oqi_cli; /* osc obd */ unsigned int oqi_id; /* uid/gid of a file */ short oqi_type; /* quota type */ }; -spinlock_t qinfo_list_lock = SPIN_LOCK_UNLOCKED; +cfs_spinlock_t qinfo_list_lock = CFS_SPIN_LOCK_UNLOCKED; -static struct list_head qinfo_hash[NR_DQHASH]; +static cfs_list_t qinfo_hash[NR_DQHASH]; /* SLAB cache for client quota context */ cfs_mem_cache_t *qinfo_cachep = NULL; @@ -715,18 +750,18 @@ static inline int hashfn(struct client_obd *cli, unsigned long id, int type) /* caller must hold qinfo_list_lock */ static inline void insert_qinfo_hash(struct osc_quota_info *oqi) { - struct list_head *head = qinfo_hash + + cfs_list_t *head = qinfo_hash + hashfn(oqi->oqi_cli, oqi->oqi_id, oqi->oqi_type); LASSERT_SPIN_LOCKED(&qinfo_list_lock); - list_add(&oqi->oqi_hash, head); + cfs_list_add(&oqi->oqi_hash, head); } /* caller must hold qinfo_list_lock */ static inline void remove_qinfo_hash(struct osc_quota_info *oqi) { LASSERT_SPIN_LOCKED(&qinfo_list_lock); - list_del_init(&oqi->oqi_hash); + cfs_list_del_init(&oqi->oqi_hash); } /* caller must hold qinfo_list_lock */ @@ -738,7 +773,7 @@ static inline struct osc_quota_info *find_qinfo(struct client_obd *cli, ENTRY; LASSERT_SPIN_LOCKED(&qinfo_list_lock); - list_for_each_entry(oqi, &qinfo_hash[hashent], oqi_hash) { + cfs_list_for_each_entry(oqi, &qinfo_hash[hashent], oqi_hash) { if (oqi->oqi_cli == cli && oqi->oqi_id == id && oqi->oqi_type == type) return oqi; @@ -775,7 +810,7 @@ int osc_quota_chkdq(struct client_obd *cli, const unsigned int qid[]) int cnt, rc = QUOTA_OK; ENTRY; - spin_lock(&qinfo_list_lock); + cfs_spin_lock(&qinfo_list_lock); for (cnt = 0; cnt < MAXQUOTAS; cnt++) { struct osc_quota_info *oqi = NULL; @@ -786,8 +821,11 @@ int osc_quota_chkdq(struct client_obd *cli, const unsigned int qid[]) break; } } - spin_unlock(&qinfo_list_lock); + cfs_spin_unlock(&qinfo_list_lock); + if (rc == NO_QUOTA) + CDEBUG(D_QUOTA, "chkdq found noquota for %s %d\n", + cnt == USRQUOTA ? "user" : "group", id); RETURN(rc); } @@ -812,26 +850,32 @@ int osc_quota_setdq(struct client_obd *cli, const unsigned int qid[], (flags & OBD_FL_NO_USRQUOTA) : (flags & OBD_FL_NO_GRPQUOTA); oqi = alloc_qinfo(cli, id, cnt); - if (oqi) { - spin_lock(&qinfo_list_lock); - - old = find_qinfo(cli, id, cnt); - if (old && !noquota) - remove_qinfo_hash(old); - else if (!old && noquota) - insert_qinfo_hash(oqi); - - spin_unlock(&qinfo_list_lock); - - if (old || !noquota) - free_qinfo(oqi); - if (old && !noquota) - free_qinfo(old); - } else { - CERROR("not enough mem!\n"); + if (!oqi) { rc = -ENOMEM; + CDEBUG(D_QUOTA, "setdq for %s %d failed, (rc = %d)\n", + cnt == USRQUOTA ? "user" : "group", id, rc); break; } + + cfs_spin_lock(&qinfo_list_lock); + old = find_qinfo(cli, id, cnt); + if (old && !noquota) + remove_qinfo_hash(old); + else if (!old && noquota) + insert_qinfo_hash(oqi); + cfs_spin_unlock(&qinfo_list_lock); + + if (old || !noquota) + free_qinfo(oqi); + if (old && !noquota) + free_qinfo(old); + + if (old && !noquota) + CDEBUG(D_QUOTA, "setdq to remove for %s %d\n", + cnt == USRQUOTA ? "user" : "group", id); + else if (!old && noquota) + CDEBUG(D_QUOTA, "setdq to insert for %s %d\n", + cnt == USRQUOTA ? "user" : "group", id); } RETURN(rc); @@ -844,16 +888,16 @@ int osc_quota_cleanup(struct obd_device *obd) int i; ENTRY; - spin_lock(&qinfo_list_lock); + cfs_spin_lock(&qinfo_list_lock); for (i = 0; i < NR_DQHASH; i++) { - list_for_each_entry_safe(oqi, n, &qinfo_hash[i], oqi_hash) { + cfs_list_for_each_entry_safe(oqi, n, &qinfo_hash[i], oqi_hash) { if (oqi->oqi_cli != cli) continue; remove_qinfo_hash(oqi); free_qinfo(oqi); } } - spin_unlock(&qinfo_list_lock); + cfs_spin_unlock(&qinfo_list_lock); RETURN(0); } @@ -882,14 +926,14 @@ int osc_quota_exit(void) int i, rc; ENTRY; - spin_lock(&qinfo_list_lock); + cfs_spin_lock(&qinfo_list_lock); for (i = 0; i < NR_DQHASH; i++) { - list_for_each_entry_safe(oqi, n, &qinfo_hash[i], oqi_hash) { + cfs_list_for_each_entry_safe(oqi, n, &qinfo_hash[i], oqi_hash) { remove_qinfo_hash(oqi); free_qinfo(oqi); } } - spin_unlock(&qinfo_list_lock); + cfs_spin_unlock(&qinfo_list_lock); rc = cfs_mem_cache_destroy(qinfo_cachep); LASSERTF(rc == 0, "couldn't destory qinfo_cachep slab\n");