evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: kernel: cgroup: cpuset: Add missing allocation of cpus_requested in alloc_trial_cpuset

Browse source 
alloc_trial_cpuset missed allocation of the alloc_trial_cpuset
field which caused it to be shared from the base cs provided.

Once update_cpumask parsed buf into cpus_requested and updated
cpus_allowed, the result were never written to cs because
cs and trialcs shared the same pointer to cpus_requested and
cpus_requested always matched to itself and no updates were
written. This caused cpus_requested to be non-empty and
cpus_allowed empty.

This issue occurs only with CONFIG_CPUMASK_OFFSTACK enabled
(e.g. via CONFIG_MAXSMP).

Bug: 134051784
Bug: 120444281
Fixes: 4803def4e0b2 ("ANDROID: cpuset: Make cpusets restore on hotplug")
Test: enable CONFIG_CPUSETS, boot and check logcat that
Test: libprocessgroup does not fail with something similar to
Test: AddTidToCgroup failed to write '2354'; fd=93: No space left on device
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I866836b5c0acfde8349c250a510ee89d8d37cb8e
This commit is contained in:
Roman Kiryanov 2019-06-19 11:10:09 -07:00
parent 9c4ab57299
commit f1adac4c22
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/cpuset.c
View file

@ -419,14 +419,19 @@ static struct cpuset *alloc_trial_cpuset(struct cpuset *cs)
if (!alloc_cpumask_var(&trial->cpus_allowed, GFP_KERNEL)) if (!alloc_cpumask_var(&trial->cpus_allowed, GFP_KERNEL))
goto free_cs; goto free_cs;
if (!alloc_cpumask_var(&trial->cpus_requested, GFP_KERNEL))
goto free_allowed;
if (!alloc_cpumask_var(&trial->effective_cpus, GFP_KERNEL)) if (!alloc_cpumask_var(&trial->effective_cpus, GFP_KERNEL))
goto free_cpus; goto free_cpus;
cpumask_copy(trial->cpus_allowed, cs->cpus_allowed); cpumask_copy(trial->cpus_allowed, cs->cpus_allowed);
cpumask_copy(trial->cpus_requested, cs->cpus_requested);
cpumask_copy(trial->effective_cpus, cs->effective_cpus); cpumask_copy(trial->effective_cpus, cs->effective_cpus);
return trial; return trial;
free_cpus: free_cpus:
free_cpumask_var(trial->cpus_requested);
free_allowed:
free_cpumask_var(trial->cpus_allowed); free_cpumask_var(trial->cpus_allowed);
free_cs: free_cs:
kfree(trial); kfree(trial);
@ -440,6 +445,7 @@ free_cs:
static void free_trial_cpuset(struct cpuset *trial) static void free_trial_cpuset(struct cpuset *trial)
{ {
free_cpumask_var(trial->effective_cpus); free_cpumask_var(trial->effective_cpus);
free_cpumask_var(trial->cpus_requested);
free_cpumask_var(trial->cpus_allowed); free_cpumask_var(trial->cpus_allowed);
kfree(trial); kfree(trial);
} }