* Author: Johann Lombardi <johann.lombardi@intel.com>
*/
-#define DEBUG_SUBSYSTEM S_FILTER
+#define DEBUG_SUBSYSTEM S_CLASS
#include <obd.h>
#include <obd_class.h>
#include "tgt_internal.h"
+int lbug_on_grant_miscount;
+module_param(lbug_on_grant_miscount, int, 0644);
+MODULE_PARM_DESC(lbug_on_grant_miscount, "LBUG on grant miscount");
+
/* Clients typically hold 2x their max_rpcs_in_flight of grant space */
#define TGT_GRANT_SHRINK_LIMIT(exp) (2ULL * 8 * exp_max_brw_size(exp))
* argument. LBUG is only called in case of serious counter corruption (i.e.
* value larger than the device size).
* Those sanity checks can be pretty expensive and are disabled if the OBD
- * device has more than 100 connected exports.
+ * device has more than 100 connected exports by default.
*
* \param[in] obd OBD device for which grant accounting should be
* verified
*/
void tgt_grant_sanity_check(struct obd_device *obd, const char *func)
{
- struct lu_target *lut = obd->u.obt.obt_lut;
+ struct lu_target *lut = obd2obt(obd)->obt_lut;
struct tg_grants_data *tgd = &lut->lut_tgd;
struct obd_export *exp;
struct tg_export_data *ted;
if (list_empty(&obd->obd_exports))
return;
- /* We don't want to do this for large machines that do lots of
- * mounts or unmounts. It burns... */
- if (obd->obd_num_exports > 100)
+ /*
+ * We don't want to do this for large machines that do lots of
+ * mounts or unmounts. It burns...
+ * Use set_param to change obd_grant_check_threshold, which
+ * is 100 by default, 0 to always check grants
+ */
+ if (obd->obd_num_exports > obd->obd_grant_check_threshold &&
+ obd->obd_grant_check_threshold)
return;
maxsize = tgd->tgd_osfs.os_blocks << tgd->tgd_blockbits;
* \retval negative value on error
*/
int tgt_statfs_internal(const struct lu_env *env, struct lu_target *lut,
- struct obd_statfs *osfs, __u64 max_age, int *from_cache)
+ struct obd_statfs *osfs, time64_t max_age, int *from_cache)
{
struct tg_grants_data *tgd = &lut->lut_tgd;
int rc = 0;
ENTRY;
spin_lock(&tgd->tgd_osfs_lock);
- if (cfs_time_before_64(tgd->tgd_osfs_age, max_age) || max_age == 0) {
+ if (tgd->tgd_osfs_age < max_age || max_age == 0) {
u64 unstable;
/* statfs data are too old, get up-to-date one.
/* finally udpate cached statfs data */
tgd->tgd_osfs = *osfs;
- tgd->tgd_osfs_age = cfs_time_current_64();
+ tgd->tgd_osfs_age = ktime_get_seconds();
tgd->tgd_statfs_inflight--; /* stop tracking */
if (tgd->tgd_statfs_inflight == 0)
int force, int *from_cache)
{
struct obd_device *obd = exp->exp_obd;
- struct lu_target *lut = obd->u.obt.obt_lut;
+ struct lu_target *lut = obd2obt(obd)->obt_lut;
struct tg_grants_data *tgd = &lut->lut_tgd;
struct tgt_thread_info *tti;
struct obd_statfs *osfs;
- __u64 max_age;
- int rc;
+ time64_t max_age;
+ int rc;
if (force)
max_age = 0; /* get fresh statfs data */
else
- max_age = cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS);
+ max_age = ktime_get_seconds() - OBD_STATFS_CACHE_SECONDS;
tti = tgt_th_info(env);
osfs = &tti->tti_u.osfs;
static u64 tgt_grant_space_left(struct obd_export *exp)
{
struct obd_device *obd = exp->exp_obd;
- struct lu_target *lut = obd->u.obt.obt_lut;
+ struct lu_target *lut = obd2obt(obd)->obt_lut;
struct tg_grants_data *tgd = &lut->lut_tgd;
u64 tot_granted;
u64 left;
tot_granted - tgd->tgd_tot_pending) ?
D_ERROR : D_CACHE;
- CDEBUG_LIMIT(mask, "%s: cli %s/%p left %llu < tot_grant "
- "%llu unstable %llu pending %llu "
- "dirty %llu\n",
+ /* the below message is checked in sanityn.sh test_15 */
+ CDEBUG_LIMIT(mask,
+ "%s: cli %s/%p left=%llu < tot_grant=%llu unstable=%llu pending=%llu dirty=%llu\n",
obd->obd_name, exp->exp_client_uuid.uuid, exp,
left, tot_granted, unstable,
tgd->tgd_tot_pending,
/* Align left on block size */
left &= ~((1ULL << tgd->tgd_blockbits) - 1);
- CDEBUG(D_CACHE, "%s: cli %s/%p avail %llu left %llu unstable "
- "%llu tot_grant %llu pending %llu\n", obd->obd_name,
- exp->exp_client_uuid.uuid, exp, avail, left, unstable,
- tot_granted, tgd->tgd_tot_pending);
+ CDEBUG(D_CACHE,
+ "%s: cli %s/%p avail=%llu left=%llu unstable=%llu tot_grant=%llu pending=%llu\n",
+ obd->obd_name, exp->exp_client_uuid.uuid, exp, avail, left,
+ unstable, tot_granted, tgd->tgd_tot_pending);
RETURN(left);
}
{
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;
+ struct tg_grants_data *tgd = &obd2obt(obd)->obt_lut->lut_tgd;
+ long long dirty, dropped;
ENTRY;
assert_spin_locked(&tgd->tgd_grant_lock);
/* 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;
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;
{
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;
+ struct tg_grants_data *tgd = &obd2obt(obd)->obt_lut->lut_tgd;
long grant_shrink;
assert_spin_locked(&tgd->tgd_grant_lock);
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;
{
struct tg_export_data *ted = &exp->exp_target_data;
struct obd_device *obd = exp->exp_obd;
- struct lu_target *lut = obd->u.obt.obt_lut;
+ struct lu_target *lut = obd2obt(obd)->obt_lut;
struct tg_grants_data *tgd = &lut->lut_tgd;
unsigned long ungranted = 0;
unsigned long granted = 0;
* have
* \param[in] left remaining free space with granted space taken
* out
+ * \param[in] chunk grant allocation unit
* \param[in] conservative if set to true, the server should be cautious
* and limit how much space is granted back to the
* client. Otherwise, the server should try hard to
bool conservative)
{
struct obd_device *obd = exp->exp_obd;
- struct tg_grants_data *tgd = &obd->u.obt.obt_lut->lut_tgd;
+ struct tg_grants_data *tgd = &obd2obt(obd)->obt_lut->lut_tgd;
struct tg_export_data *ted = &exp->exp_target_data;
u64 grant;
ENTRY;
+ if (CFS_FAIL_CHECK(OBD_FAIL_TGT_NO_GRANT))
+ RETURN(0);
+
/* When tgd_grant_compat_disable is set, we don't grant any space to
* clients not supporting OBD_CONNECT_GRANT_PARAM.
* Otherwise, space granted to such a client is inflated since it
tgd->tgd_grant_compat_disable) || left == 0 || exp->exp_failed)
RETURN(0);
- if (want > 0x7fffffff) {
- CERROR("%s: client %s/%p requesting > 2GB grant %llu\n",
- obd->obd_name, exp->exp_client_uuid.uuid, exp, want);
+ if (want > OBD_MAX_GRANT) {
+ CERROR("%s: client %s/%p requesting > max (%lu), %llu\n",
+ obd->obd_name, exp->exp_client_uuid.uuid, exp,
+ OBD_MAX_GRANT, want);
RETURN(0);
}
* 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;
tgd->tgd_tot_granted += grant;
ted->ted_grant += grant;
- if (ted->ted_grant < 0) {
+ if (unlikely(ted->ted_grant < 0 || ted->ted_grant > want + chunk)) {
CERROR("%s: cli %s/%p grant %ld want %llu current %llu\n",
obd->obd_name, exp->exp_client_uuid.uuid, exp,
ted->ted_grant, want, curgrant);
- spin_unlock(&tgd->tgd_grant_lock);
- LBUG();
+ if (lbug_on_grant_miscount) {
+ spin_unlock(&tgd->tgd_grant_lock);
+ LBUG();
+ }
}
CDEBUG(D_CACHE,
void tgt_grant_connect(const struct lu_env *env, struct obd_export *exp,
struct obd_connect_data *data, bool new_conn)
{
- struct lu_target *lut = exp->exp_obd->u.obt.obt_lut;
+ struct lu_target *lut = obd2obt(exp->exp_obd)->obt_lut;
struct tg_grants_data *tgd = &lut->lut_tgd;
struct tg_export_data *ted = &exp->exp_target_data;
u64 left = 0;
void tgt_grant_discard(struct obd_export *exp)
{
struct obd_device *obd = exp->exp_obd;
- struct tg_grants_data *tgd = &obd->u.obt.obt_lut->lut_tgd;
+ struct lu_target *lut = class_exp2tgt(exp);
struct tg_export_data *ted = &exp->exp_target_data;
+ struct tg_grants_data *tgd;
+ if (!lut)
+ return;
+
+ tgd = &lut->lut_tgd;
spin_lock(&tgd->tgd_grant_lock);
- LASSERTF(tgd->tgd_tot_granted >= ted->ted_grant,
- "%s: tot_granted %llu cli %s/%p ted_grant %ld\n",
- obd->obd_name, tgd->tgd_tot_granted,
- exp->exp_client_uuid.uuid, exp, ted->ted_grant);
- tgd->tgd_tot_granted -= ted->ted_grant;
+ if (unlikely(tgd->tgd_tot_granted < ted->ted_grant ||
+ tgd->tgd_tot_dirty < ted->ted_dirty)) {
+ struct obd_export *e;
+ u64 ttg = 0;
+ u64 ttd = 0;
+
+ list_for_each_entry(e, &obd->obd_exports, exp_obd_chain) {
+ LASSERT(exp != e);
+ ttg += e->exp_target_data.ted_grant;
+ ttg += e->exp_target_data.ted_pending;
+ ttd += e->exp_target_data.ted_dirty;
+ }
+ if (tgd->tgd_tot_granted < ted->ted_grant)
+ CERROR("%s: cli %s/%p: tot_granted %llu < ted_grant %ld, corrected to %llu",
+ obd->obd_name, exp->exp_client_uuid.uuid, exp,
+ tgd->tgd_tot_granted, ted->ted_grant, ttg);
+ if (tgd->tgd_tot_dirty < ted->ted_dirty)
+ CERROR("%s: cli %s/%p: tot_dirty %llu < ted_dirty %ld, corrected to %llu",
+ obd->obd_name, exp->exp_client_uuid.uuid, exp,
+ tgd->tgd_tot_dirty, ted->ted_dirty, ttd);
+ tgd->tgd_tot_granted = ttg;
+ tgd->tgd_tot_dirty = ttd;
+ } else {
+ tgd->tgd_tot_granted -= ted->ted_grant;
+ tgd->tgd_tot_dirty -= ted->ted_dirty;
+ }
ted->ted_grant = 0;
- LASSERTF(tgd->tgd_tot_pending >= ted->ted_pending,
- "%s: tot_pending %llu cli %s/%p ted_pending %ld\n",
- obd->obd_name, tgd->tgd_tot_pending,
- exp->exp_client_uuid.uuid, exp, ted->ted_pending);
+ ted->ted_dirty = 0;
+
+ if (tgd->tgd_tot_pending < ted->ted_pending) {
+ CERROR("%s: tot_pending %llu < cli %s/%p ted_pending %ld\n",
+ obd->obd_name, tgd->tgd_tot_pending,
+ exp->exp_client_uuid.uuid, exp, ted->ted_pending);
+ }
/* tgd_tot_pending is handled in tgt_grant_commit as bulk
* commmits */
- LASSERTF(tgd->tgd_tot_dirty >= ted->ted_dirty,
- "%s: tot_dirty %llu cli %s/%p ted_dirty %ld\n",
- obd->obd_name, tgd->tgd_tot_dirty,
- exp->exp_client_uuid.uuid, exp, ted->ted_dirty);
- tgd->tgd_tot_dirty -= ted->ted_dirty;
- ted->ted_dirty = 0;
spin_unlock(&tgd->tgd_grant_lock);
}
EXPORT_SYMBOL(tgt_grant_discard);
void tgt_grant_prepare_read(const struct lu_env *env,
struct obd_export *exp, struct obdo *oa)
{
- struct lu_target *lut = exp->exp_obd->u.obt.obt_lut;
+ struct lu_target *lut = obd2obt(exp->exp_obd)->obt_lut;
struct tg_grants_data *tgd = &lut->lut_tgd;
int do_shrink;
u64 left = 0;
struct niobuf_remote *rnb, int niocount)
{
struct obd_device *obd = exp->exp_obd;
- struct lu_target *lut = obd->u.obt.obt_lut;
+ struct lu_target *lut = obd2obt(obd)->obt_lut;
struct tg_grants_data *tgd = &lut->lut_tgd;
u64 left;
int from_cache;
*/
long tgt_grant_create(const struct lu_env *env, struct obd_export *exp, s64 *nr)
{
- struct lu_target *lut = exp->exp_obd->u.obt.obt_lut;
+ struct lu_target *lut = obd2obt(exp->exp_obd)->obt_lut;
struct tg_grants_data *tgd = &lut->lut_tgd;
struct tg_export_data *ted = &exp->exp_target_data;
u64 left = 0;
void tgt_grant_commit(struct obd_export *exp, unsigned long pending,
int rc)
{
- struct tg_grants_data *tgd = &exp->exp_obd->u.obt.obt_lut->lut_tgd;
+ struct tg_grants_data *tgd = &obd2obt(exp->exp_obd)->obt_lut->lut_tgd;
ENTRY;
/**
* 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;
+ tgd = &obd2obt(obd)->obt_lut->lut_tgd;
+ 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;
+ tgd = &obd2obt(obd)->obt_lut->lut_tgd;
+ 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;
+ tgd = &obd2obt(obd)->obt_lut->lut_tgd;
+ 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.
* 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 tg_grants_data *tgd = &obd->u.obt.obt_lut->lut_tgd;
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+ struct tg_grants_data *tgd = &obd2obt(obd)->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.
* 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 tg_grants_data *tgd = &obd->u.obt.obt_lut->lut_tgd;
- __s64 val;
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+ struct tg_grants_data *tgd = &obd2obt(obd)->obt_lut->lut_tgd;
+ bool val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
- if (val < 0)
- return -EINVAL;
-
- tgd->tgd_grant_compat_disable = !!val;
+ tgd->tgd_grant_compat_disable = val;
return count;
}
-EXPORT_SYMBOL(tgt_grant_compat_disable_seq_write);
+EXPORT_SYMBOL(grant_compat_disable_store);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff