lkml.org 
[lkml]   [2010]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
SubjectRe: [PATCH 5/5] cpumask: reduce cpumask_size
Date
> Now we're sure noone is using old cpumask operators, nor *cpumask, we can
> allocate less bits safely. This reduces the memory usage of off-stack
> cpumasks when CONFIG_CPUMASK_OFFSTACK=y but we don't have NR_CPUS actual
> cpus.

I have to say I'm sorry. Probably I broke your assumption.
If this patch applied, we reintroduce exposing nr_cpu_ids issue and
break libnuma again. I think following change is necessary too.

Or, Am I missing something?

==================================================================
diff --git a/kernel/compat.c b/kernel/compat.c
index 5adab05..5fbee3e 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -506,7 +506,8 @@ asmlinkage long compat_sys_sched_getaffinity(compat_pid_t pid, unsigned int len,

ret = sched_getaffinity(pid, mask);
if (ret == 0) {
- size_t retlen = min_t(size_t, len, cpumask_size());
+ size_t retlen = min_t(size_t, len,
+ BITS_TO_LONGS(NR_CPUS) * sizeof(long));

if (compat_put_bitmap(user_mask_ptr, cpumask_bits(mask), retlen * 8))
ret = -EFAULT;
diff --git a/kernel/sched.c b/kernel/sched.c
index 18faf4d..c14acad 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4823,7 +4823,9 @@ SYSCALL_DEFINE3(sched_getaffinity, pid_t, pid, unsigned int, len,

ret = sched_getaffinity(pid, mask);
if (ret == 0) {
- size_t retlen = min_t(size_t, len, cpumask_size());
+ size_t retlen = min_t(size_t, len,
+ BITS_TO_LONGS(NR_CPUS) * sizeof(long));


> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: anton@samba.org
> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
> Cc: Mike Travis <travis@sgi.com>
> ---
> include/linux/cpumask.h | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
> --- a/include/linux/cpumask.h
> +++ b/include/linux/cpumask.h
> @@ -1014,13 +1014,11 @@ static inline int cpulist_parse(const ch
> /**
> * cpumask_size - size to allocate for a 'struct cpumask' in bytes
> *
> - * This will eventually be a runtime variable, depending on nr_cpu_ids.
> + * This can be a runtime variable, depending on nr_cpu_ids.
> */
> static inline size_t cpumask_size(void)
> {
> - /* FIXME: Once all cpumask assignments are eliminated, this
> - * can be nr_cpumask_bits */
> - return BITS_TO_LONGS(NR_CPUS) * sizeof(long);
> + return BITS_TO_LONGS(nr_cpumask_bits) * sizeof(long);
> }
>
> /*
>





\
 
 \ /
  Last update: 2010-06-28 05:15    [W:0.055 / U:1.240 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site