From: Li Zefan <lizefan@huawei.com>
To: Tejun Heo <tj@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>, cgroups <cgroups@vger.kernel.org>
Subject: [PATCH v2 12/12] cpuset: export effective masks to userspace
Date: Fri, 11 Oct 2013 17:52:05 +0800 [thread overview]
Message-ID: <5257CA45.6000001@huawei.com> (raw)
In-Reply-To: <5257C9A1.1030404@huawei.com>
cpuset.cpus and cpuset.mems are the configured masks, and we need
to export effective masks to userspace, so users know the real
cpus_allowed and mems_allowed that apply to the tasks in a cpuset.
cpuset.effective_cpus and cpuset.effective_mems will be created for
sane_behavior only.
v2:
- export those masks unconditionally, suggested by Tejun.
Signed-off-by: Li Zefan <lizefan@huawei.com>
---
kernel/cpuset.c | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index a98723d..c8ba514 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1614,6 +1614,8 @@ typedef enum {
FILE_MEMORY_MIGRATE,
FILE_CPULIST,
FILE_MEMLIST,
+ FILE_EFFECTIVE_CPULIST,
+ FILE_EFFECTIVE_MEMLIST,
FILE_CPU_EXCLUSIVE,
FILE_MEM_EXCLUSIVE,
FILE_MEM_HARDWALL,
@@ -1762,23 +1764,23 @@ out_unlock:
* across a page fault.
*/
-static size_t cpuset_sprintf_cpulist(char *page, struct cpuset *cs)
+static size_t cpuset_sprintf_cpulist(char *page, struct cpumask *pmask)
{
size_t count;
mutex_lock(&callback_mutex);
- count = cpulist_scnprintf(page, PAGE_SIZE, cs->cpus_allowed);
+ count = cpulist_scnprintf(page, PAGE_SIZE, pmask);
mutex_unlock(&callback_mutex);
return count;
}
-static size_t cpuset_sprintf_memlist(char *page, struct cpuset *cs)
+static size_t cpuset_sprintf_memlist(char *page, nodemask_t mask)
{
size_t count;
mutex_lock(&callback_mutex);
- count = nodelist_scnprintf(page, PAGE_SIZE, cs->mems_allowed);
+ count = nodelist_scnprintf(page, PAGE_SIZE, mask);
mutex_unlock(&callback_mutex);
return count;
@@ -1802,10 +1804,16 @@ static ssize_t cpuset_common_file_read(struct cgroup_subsys_state *css,
switch (type) {
case FILE_CPULIST:
- s += cpuset_sprintf_cpulist(s, cs);
+ s += cpuset_sprintf_cpulist(s, cs->cpus_allowed);
break;
case FILE_MEMLIST:
- s += cpuset_sprintf_memlist(s, cs);
+ s += cpuset_sprintf_memlist(s, cs->mems_allowed);
+ break;
+ case FILE_EFFECTIVE_CPULIST:
+ s += cpuset_sprintf_cpulist(s, cs->effective_cpus);
+ break;
+ case FILE_EFFECTIVE_MEMLIST:
+ s += cpuset_sprintf_memlist(s, cs->effective_mems);
break;
default:
retval = -EINVAL;
@@ -1880,6 +1888,13 @@ static struct cftype files[] = {
},
{
+ .name = "effective_cpus",
+ .read = cpuset_common_file_read,
+ .max_write_len = (100U + 6 * NR_CPUS),
+ .private = FILE_EFFECTIVE_CPULIST,
+ },
+
+ {
.name = "mems",
.read = cpuset_common_file_read,
.write_string = cpuset_write_resmask,
@@ -1888,6 +1903,13 @@ static struct cftype files[] = {
},
{
+ .name = "effective_mems",
+ .read = cpuset_common_file_read,
+ .max_write_len = (100U + 6 * MAX_NUMNODES),
+ .private = FILE_EFFECTIVE_MEMLIST,
+ },
+
+ {
.name = "cpu_exclusive",
.read_u64 = cpuset_read_u64,
.write_u64 = cpuset_write_u64,
--
1.8.0.2
prev parent reply other threads:[~2013-10-11 9:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-11 9:49 [PATCH v2 00/12] cpuset: separate configured masks and effective masks Li Zefan
2013-10-11 9:49 ` [PATCH v2 01/12] cpuset: add cs->effective_cpus and cs->effective_mems Li Zefan
2013-10-11 9:49 ` [PATCH v2 02/12] cpuset: update cpuset->effective_{cpus,mems} at hotplug Li Zefan
2013-10-11 9:50 ` [PATCH v2 03/12] cpuset: update cs->effective_{cpus,mems} when config changes Li Zefan
2013-10-15 15:18 ` Tejun Heo
2013-10-11 9:50 ` [PATCH v2 04/12] cpuset: inherit ancestor's masks if effective_{cpus,mems} becomes empty Li Zefan
2013-10-11 9:50 ` [PATCH v2 05/12] cpuset: use effective cpumask to build sched domains Li Zefan
2013-10-15 15:25 ` Tejun Heo
2013-10-11 9:50 ` [PATCH v2 06/12] cpuset: initialize top_cpuset's configured masks at mount Li Zefan
2013-10-11 9:51 ` [PATCH v2 07/12] cpuset: apply cs->effective_{cpus,mems} Li Zefan
2013-10-11 9:51 ` [PATCH v2 08/12] cpuset: make cs->{cpus,mems}_allowed as user-configured masks Li Zefan
2013-10-11 9:51 ` [PATCH v2 09/12] cpuset: refactor cpuset_hotplug_update_tasks() Li Zefan
2013-10-11 9:51 ` [PATCH v2 10/12] cpuset: enable onlined cpu/node in effective masks Li Zefan
2013-10-11 9:51 ` [PATCH v2 11/12] cpuset: allow writing offlined masks to cpuset.cpus/mems Li Zefan
2013-10-15 15:36 ` Tejun Heo
2013-10-11 9:52 ` Li Zefan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5257CA45.6000001@huawei.com \
--to=lizefan@huawei.com \
--cc=cgroups@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome