LU-12142 readahead: limit over reservation

[fs/lustre-release.git] / lustre / llite / lproc_llite.c

diff --git a/lustre/llite/lproc_llite.c b/lustre/llite/lproc_llite.c
index bd13eed..23b67d4 100644 (file)
--- a/lustre/llite/lproc_llite.c
+++ b/lustre/llite/lproc_llite.c
@@ -458,6 +458,7 @@ static int ll_max_cached_mb_seq_show(struct seq_file *m, void *v)
        struct super_block     *sb    = m->private;
        struct ll_sb_info      *sbi   = ll_s2sbi(sb);
        struct cl_client_cache *cache = sbi->ll_cache;
+       struct ll_ra_info *ra = &sbi->ll_ra_info;
        long max_cached_mb;
        long unused_mb;
 
@@ -465,16 +466,21 @@ static int ll_max_cached_mb_seq_show(struct seq_file *m, void *v)
        max_cached_mb = PAGES_TO_MiB(cache->ccc_lru_max);
        unused_mb = PAGES_TO_MiB(atomic_long_read(&cache->ccc_lru_left));
        mutex_unlock(&cache->ccc_max_cache_mb_lock);
+
        seq_printf(m, "users: %d\n"
                      "max_cached_mb: %ld\n"
                      "used_mb: %ld\n"
                      "unused_mb: %ld\n"
-                     "reclaim_count: %u\n",
+                     "reclaim_count: %u\n"
+                     "max_read_ahead_mb: %lu\n"
+                     "used_read_ahead_mb: %d\n",
                   atomic_read(&cache->ccc_users),
                   max_cached_mb,
                   max_cached_mb - unused_mb,
                   unused_mb,
-                  cache->ccc_lru_shrinkers);
+                  cache->ccc_lru_shrinkers,
+                  PAGES_TO_MiB(ra->ra_max_pages),
+                  PAGES_TO_MiB(atomic_read(&ra->ra_cur_pages)));
        return 0;
 }
 
@@ -723,7 +729,7 @@ static ssize_t statahead_running_max_show(struct kobject *kobj,
        struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
                                              ll_kset.kobj);
 
-       return snprintf(buf, 16, "%u\n", sbi->ll_sa_running_max);
+       return scnprintf(buf, PAGE_SIZE, "%u\n", sbi->ll_sa_running_max);
 }
 
 static ssize_t statahead_running_max_store(struct kobject *kobj,
@@ -874,7 +880,7 @@ static ssize_t statfs_max_age_show(struct kobject *kobj, struct attribute *attr,
        struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
                                              ll_kset.kobj);
 
-       return snprintf(buf, PAGE_SIZE, "%u\n", sbi->ll_statfs_max_age);
+       return scnprintf(buf, PAGE_SIZE, "%u\n", sbi->ll_statfs_max_age);
 }
 
 static ssize_t statfs_max_age_store(struct kobject *kobj,
@@ -912,8 +918,8 @@ static ssize_t max_easize_show(struct kobject *kobj,
                return rc;
 
        /* Limit xattr size returned to userspace based on kernel maximum */
-       return snprintf(buf, PAGE_SIZE, "%u\n",
-                       ealen > XATTR_SIZE_MAX ? XATTR_SIZE_MAX : ealen);
+       return scnprintf(buf, PAGE_SIZE, "%u\n",
+                        ealen > XATTR_SIZE_MAX ? XATTR_SIZE_MAX : ealen);
 }
 LUSTRE_RO_ATTR(max_easize);
 
@@ -942,8 +948,8 @@ static ssize_t default_easize_show(struct kobject *kobj,
                return rc;
 
        /* Limit xattr size returned to userspace based on kernel maximum */
-       return snprintf(buf, PAGE_SIZE, "%u\n",
-                       ealen > XATTR_SIZE_MAX ? XATTR_SIZE_MAX : ealen);
+       return scnprintf(buf, PAGE_SIZE, "%u\n",
+                        ealen > XATTR_SIZE_MAX ? XATTR_SIZE_MAX : ealen);
 }
 
 /**
@@ -989,7 +995,7 @@ LUSTRE_RW_ATTR(default_easize);
 
 static int ll_sbi_flags_seq_show(struct seq_file *m, void *v)
 {
-       const char *str[] = LL_SBI_FLAGS;
+       const char *const str[] = LL_SBI_FLAGS;
        struct super_block *sb = m->private;
        int flags = ll_s2sbi(sb)->ll_flags;
        int i = 0;
@@ -1088,8 +1094,8 @@ static ssize_t max_read_ahead_async_active_show(struct kobject *kobj,
        struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
                                              ll_kset.kobj);
 
-       return snprintf(buf, PAGE_SIZE, "%u\n",
-                       sbi->ll_ra_info.ra_async_max_active);
+       return scnprintf(buf, PAGE_SIZE, "%u\n",
+                        sbi->ll_ra_info.ra_async_max_active);
 }
 
 static ssize_t max_read_ahead_async_active_store(struct kobject *kobj,
@@ -1133,8 +1139,8 @@ static ssize_t read_ahead_async_file_threshold_mb_show(struct kobject *kobj,
        struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
                                              ll_kset.kobj);
 
-       return snprintf(buf, PAGE_SIZE, "%lu\n",
-            PAGES_TO_MiB(sbi->ll_ra_info.ra_async_pages_per_file_threshold));
+       return scnprintf(buf, PAGE_SIZE, "%lu\n", PAGES_TO_MiB(
+                        sbi->ll_ra_info.ra_async_pages_per_file_threshold));
 }
 
 static ssize_t
@@ -1254,8 +1260,8 @@ static ssize_t file_heat_show(struct kobject *kobj,
        struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
                                              ll_kset.kobj);
 
-       return snprintf(buf, PAGE_SIZE, "%u\n",
-                       !!(sbi->ll_flags & LL_SBI_FILE_HEAT));
+       return scnprintf(buf, PAGE_SIZE, "%u\n",
+                        !!(sbi->ll_flags & LL_SBI_FILE_HEAT));
 }
 
 static ssize_t file_heat_store(struct kobject *kobj,
@@ -1290,8 +1296,8 @@ static ssize_t heat_decay_percentage_show(struct kobject *kobj,
        struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
                                              ll_kset.kobj);
 
-       return snprintf(buf, PAGE_SIZE, "%u\n",
-                      (sbi->ll_heat_decay_weight * 100 + 128) / 256);
+       return scnprintf(buf, PAGE_SIZE, "%u\n",
+                        (sbi->ll_heat_decay_weight * 100 + 128) / 256);
 }
 
 static ssize_t heat_decay_percentage_store(struct kobject *kobj,
@@ -1324,7 +1330,7 @@ static ssize_t heat_period_second_show(struct kobject *kobj,
        struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
                                              ll_kset.kobj);
 
-       return snprintf(buf, PAGE_SIZE, "%u\n", sbi->ll_heat_period_second);
+       return scnprintf(buf, PAGE_SIZE, "%u\n", sbi->ll_heat_period_second);
 }
 
 static ssize_t heat_period_second_store(struct kobject *kobj,
@@ -1647,7 +1653,7 @@ void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, long count)
 }
 EXPORT_SYMBOL(ll_stats_ops_tally);
 
-static const char *ra_stat_string[] = {
+static const char *const ra_stat_string[] = {
        [RA_STAT_HIT] = "hits",
        [RA_STAT_MISS] = "misses",
        [RA_STAT_DISTANT_READPAGE] = "readpage not consecutive",