X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Ftarget%2Ftgt_grant.c;h=e863581e45413322bb848782f2ead5824b5052d5;hb=55c33b70c46fde1b62f9852dc361d382a7722009;hp=42b5a6728d7e41f689c0a2deb13c5a25dd99f0e0;hpb=5ed65fd0594741e69999216db27d85f7f6f7f5d6;p=fs%2Flustre-release.git diff --git a/lustre/target/tgt_grant.c b/lustre/target/tgt_grant.c index 42b5a67..e863581 100644 --- a/lustre/target/tgt_grant.c +++ b/lustre/target/tgt_grant.c @@ -71,7 +71,7 @@ * Author: Johann Lombardi */ -#define DEBUG_SUBSYSTEM S_FILTER +#define DEBUG_SUBSYSTEM S_CLASS #include #include @@ -499,8 +499,7 @@ static void tgt_grant_incoming(const struct lu_env *env, struct obd_export *exp, struct tg_export_data *ted = &exp->exp_target_data; struct obd_device *obd = exp->exp_obd; struct tg_grants_data *tgd = &obd->u.obt.obt_lut->lut_tgd; - long dirty; - long dropped; + long long dirty, dropped; ENTRY; assert_spin_locked(&tgd->tgd_grant_lock); @@ -524,10 +523,19 @@ static void tgt_grant_incoming(const struct lu_env *env, struct obd_export *exp, /* inflate grant counters if required */ if (!exp_grant_param_supp(exp)) { + u64 tmp; oa->o_grant = tgt_grant_inflate(tgd, oa->o_grant); oa->o_dirty = tgt_grant_inflate(tgd, oa->o_dirty); - oa->o_dropped = tgt_grant_inflate(tgd, (u64)oa->o_dropped); - oa->o_undirty = tgt_grant_inflate(tgd, oa->o_undirty); + /* inflation can bump client's wish to >4GB which doesn't fit + * 32bit o_undirty, limit that .. */ + tmp = tgt_grant_inflate(tgd, oa->o_undirty); + if (tmp >= OBD_MAX_GRANT) + tmp = OBD_MAX_GRANT & ~(1ULL << tgd->tgd_blockbits); + oa->o_undirty = tmp; + tmp = tgt_grant_inflate(tgd, oa->o_dropped); + if (tmp >= OBD_MAX_GRANT) + tmp = OBD_MAX_GRANT & ~(1ULL << tgd->tgd_blockbits); + oa->o_dropped = tmp; } dirty = oa->o_dirty; @@ -542,13 +550,13 @@ static void tgt_grant_incoming(const struct lu_env *env, struct obd_export *exp, tgd->tgd_tot_dirty += dirty - ted->ted_dirty; if (ted->ted_grant < dropped) { CDEBUG(D_CACHE, - "%s: cli %s/%p reports %lu dropped > grant %lu\n", + "%s: cli %s/%p reports %llu dropped > grant %lu\n", obd->obd_name, exp->exp_client_uuid.uuid, exp, dropped, ted->ted_grant); dropped = 0; } if (tgd->tgd_tot_granted < dropped) { - CERROR("%s: cli %s/%p reports %lu dropped > tot_grant %llu\n", + CERROR("%s: cli %s/%p reports %llu dropped > tot_grant %llu\n", obd->obd_name, exp->exp_client_uuid.uuid, exp, dropped, tgd->tgd_tot_granted); dropped = 0; @@ -597,6 +605,14 @@ static void tgt_grant_shrink(struct obd_export *exp, struct obdo *oa, grant_shrink = oa->o_grant; + if (ted->ted_grant < grant_shrink) { + CDEBUG(D_CACHE, + "%s: cli %s/%p wants %lu shrinked > grant %lu\n", + obd->obd_name, exp->exp_client_uuid.uuid, exp, + grant_shrink, ted->ted_grant); + grant_shrink = ted->ted_grant; + } + ted->ted_grant -= grant_shrink; tgd->tgd_tot_granted -= grant_shrink; @@ -937,6 +953,8 @@ static long tgt_grant_alloc(struct obd_export *exp, u64 curgrant, * client would like to have by more than grants for 2 full * RPCs */ + if (want + chunk <= ted->ted_grant) + RETURN(0); if (ted->ted_grant + grant > want + chunk) grant = want + chunk - ted->ted_grant; @@ -1527,65 +1545,68 @@ EXPORT_SYMBOL(tgt_grant_commit_cb_add); /** * Show estimate of total amount of dirty data on clients. * - * \param[in] m seq_file handle - * \param[in] data unused for single entry + * @kobj kobject embedded in obd_device + * @attr unused + * @buf buf used by sysfs to print out data * - * \retval 0 on success - * \retval negative value on error + * Return: 0 on success + * negative value on error */ -int tgt_tot_dirty_seq_show(struct seq_file *m, void *data) +ssize_t tot_dirty_show(struct kobject *kobj, struct attribute *attr, + char *buf) { - struct obd_device *obd = m->private; + struct obd_device *obd = container_of(kobj, struct obd_device, + obd_kset.kobj); struct tg_grants_data *tgd; - LASSERT(obd != NULL); tgd = &obd->u.obt.obt_lut->lut_tgd; - seq_printf(m, "%llu\n", tgd->tgd_tot_dirty); - return 0; + return scnprintf(buf, PAGE_SIZE, "%llu\n", tgd->tgd_tot_dirty); } -EXPORT_SYMBOL(tgt_tot_dirty_seq_show); +EXPORT_SYMBOL(tot_dirty_show); /** * Show total amount of space granted to clients. * - * \param[in] m seq_file handle - * \param[in] data unused for single entry + * @kobj kobject embedded in obd_device + * @attr unused + * @buf buf used by sysfs to print out data * - * \retval 0 on success - * \retval negative value on error + * Return: 0 on success + * negative value on error */ -int tgt_tot_granted_seq_show(struct seq_file *m, void *data) +ssize_t tot_granted_show(struct kobject *kobj, struct attribute *attr, + char *buf) { - struct obd_device *obd = m->private; + struct obd_device *obd = container_of(kobj, struct obd_device, + obd_kset.kobj); struct tg_grants_data *tgd; - LASSERT(obd != NULL); tgd = &obd->u.obt.obt_lut->lut_tgd; - seq_printf(m, "%llu\n", tgd->tgd_tot_granted); - return 0; + return scnprintf(buf, PAGE_SIZE, "%llu\n", tgd->tgd_tot_granted); } -EXPORT_SYMBOL(tgt_tot_granted_seq_show); +EXPORT_SYMBOL(tot_granted_show); /** * Show total amount of space used by IO in progress. * - * \param[in] m seq_file handle - * \param[in] data unused for single entry + * @kobj kobject embedded in obd_device + * @attr unused + * @buf buf used by sysfs to print out data * - * \retval 0 on success - * \retval negative value on error + * Return: 0 on success + * negative value on error */ -int tgt_tot_pending_seq_show(struct seq_file *m, void *data) +ssize_t tot_pending_show(struct kobject *kobj, struct attribute *attr, + char *buf) { - struct obd_device *obd = m->private; + struct obd_device *obd = container_of(kobj, struct obd_device, + obd_kset.kobj); struct tg_grants_data *tgd; - LASSERT(obd != NULL); tgd = &obd->u.obt.obt_lut->lut_tgd; - seq_printf(m, "%llu\n", tgd->tgd_tot_pending); - return 0; + return scnprintf(buf, PAGE_SIZE, "%llu\n", tgd->tgd_tot_pending); } -EXPORT_SYMBOL(tgt_tot_pending_seq_show); +EXPORT_SYMBOL(tot_pending_show); /** * Show if grants compatibility mode is disabled. @@ -1596,21 +1617,22 @@ EXPORT_SYMBOL(tgt_tot_pending_seq_show); * block, (i.e. typically 4kB units), but underlaying file system might have * block size bigger than page size, e.g. ZFS. See LU-2049 for details. * - * \param[in] m seq_file handle - * \param[in] data unused for single entry + * @kobj kobject embedded in obd_device + * @attr unused + * @buf buf used by sysfs to print out data * - * \retval 0 on success - * \retval negative value on error + * Return: string length of @buf output on success */ -int tgt_grant_compat_disable_seq_show(struct seq_file *m, void *data) +ssize_t grant_compat_disable_show(struct kobject *kobj, struct attribute *attr, + char *buf) { - struct obd_device *obd = m->private; + struct obd_device *obd = container_of(kobj, struct obd_device, + obd_kset.kobj); struct tg_grants_data *tgd = &obd->u.obt.obt_lut->lut_tgd; - seq_printf(m, "%u\n", tgd->tgd_grant_compat_disable); - return 0; + return scnprintf(buf, PAGE_SIZE, "%u\n", tgd->tgd_grant_compat_disable); } -EXPORT_SYMBOL(tgt_grant_compat_disable_seq_show); +EXPORT_SYMBOL(grant_compat_disable_show); /** * Change grant compatibility mode. @@ -1618,27 +1640,27 @@ EXPORT_SYMBOL(tgt_grant_compat_disable_seq_show); * Setting tgd_grant_compat_disable prohibit any space granting to clients * not supporting OBD_CONNECT_GRANT_PARAM. See details above. * - * \param[in] file proc file - * \param[in] buffer string which represents mode - * 1: disable compatibility mode - * 0: enable compatibility mode - * \param[in] count \a buffer length - * \param[in] off unused for single entry + * @kobj kobject embedded in obd_device + * @attr unused + * @buffer string which represents mode + * 1: disable compatibility mode + * 0: enable compatibility mode + * @count @buffer length * - * \retval \a count on success - * \retval negative number on error + * Return: @count on success + * negative number on error */ -ssize_t tgt_grant_compat_disable_seq_write(struct file *file, - const char __user *buffer, - size_t count, loff_t *off) +ssize_t grant_compat_disable_store(struct kobject *kobj, + struct attribute *attr, + const char *buffer, size_t count) { - struct seq_file *m = file->private_data; - struct obd_device *obd = m->private; + struct obd_device *obd = container_of(kobj, struct obd_device, + obd_kset.kobj); struct tg_grants_data *tgd = &obd->u.obt.obt_lut->lut_tgd; bool val; int rc; - rc = kstrtobool_from_user(buffer, count, &val); + rc = kstrtobool(buffer, &val); if (rc) return rc; @@ -1646,4 +1668,4 @@ ssize_t tgt_grant_compat_disable_seq_write(struct file *file, return count; } -EXPORT_SYMBOL(tgt_grant_compat_disable_seq_write); +EXPORT_SYMBOL(grant_compat_disable_store);