Commit ae666a6d authored by SeongJae Park's avatar SeongJae Park Committed by Linus Torvalds
Browse files

mm/damon/dbgfs: support watermarks 

This updates DAMON debugfs interface to support the watermarks based
schemes activation.  For this, now 'schemes' file receives five more
values.

Link: https://lkml.kernel.org/r/20211019150731.16699-13-sj@kernel.org


Signed-off-by: default avatarSeongJae Park <sj@kernel.org>
Cc: Amit Shah <amit@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: David Rientjes <rientjes@google.com>
Cc: David Woodhouse <dwmw@amazon.com>
Cc: Greg Thelen <gthelen@google.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Leonard Foerster <foersleo@amazon.de>
Cc: Marco Elver <elver@google.com>
Cc: Markus Boehme <markubo@amazon.de>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ee801b7d

mm/damon/dbgfs.c

+9 −7
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static ssize_t sprint_schemes(struct damon_ctx *c, char *buf, ssize_t len) 


	damon_for_each_scheme(s, c) {

		rc = scnprintf(&buf[written], len - written,

				"%lu %lu %u %u %u %u %d %lu %lu %lu %u %u %u %lu %lu\n",

				"%lu %lu %u %u %u %u %d %lu %lu %lu %u %u %u %d %lu %lu %lu %lu %lu %lu\n",

				s->min_sz_region, s->max_sz_region,

				s->min_nr_accesses, s->max_nr_accesses,

				s->min_age_region, s->max_age_region,
@@ -115,6 +115,8 @@ static ssize_t sprint_schemes(struct damon_ctx *c, char *buf, ssize_t len) 
				s->quota.weight_sz,

				s->quota.weight_nr_accesses,

				s->quota.weight_age,

				s->wmarks.metric, s->wmarks.interval,

				s->wmarks.high, s->wmarks.mid, s->wmarks.low,

				s->stat_count, s->stat_sz);

		if (!rc)

			return -ENOMEM;
@@ -195,18 +197,18 @@ static struct damos **str_to_schemes(const char *str, ssize_t len, 
	*nr_schemes = 0;

	while (pos < len && *nr_schemes < max_nr_schemes) {

		struct damos_quota quota = {};

		struct damos_watermarks wmarks = {

			.metric = DAMOS_WMARK_NONE,

		};

		struct damos_watermarks wmarks;



		ret = sscanf(&str[pos],

				"%lu %lu %u %u %u %u %u %lu %lu %lu %u %u %u%n",

				"%lu %lu %u %u %u %u %u %lu %lu %lu %u %u %u %u %lu %lu %lu %lu%n",

				&min_sz, &max_sz, &min_nr_a, &max_nr_a,

				&min_age, &max_age, &action, &quota.ms,

				&quota.sz, &quota.reset_interval,

				&quota.weight_sz, &quota.weight_nr_accesses,

				&quota.weight_age, &parsed);

		if (ret != 13)

				&quota.weight_age, &wmarks.metric,

				&wmarks.interval, &wmarks.high, &wmarks.mid,

				&wmarks.low, &parsed);

		if (ret != 18)

			break;

		if (!damos_action_valid(action)) {

			pr_err("wrong action %d\n", action);