On Sat, Feb 11, 2017 at 6:56 PM, Hoeun Ryu <hoeun....@gmail.com> wrote:
>
>> On Feb 11, 2017, at 5:31 PM, Thomas Gleixner <t...@linutronix.de> wrote:
>>
>>> On Sat, 11 Feb 2017, Hoeun Ryu wrote:
>>> #define NR_CACHED_STACKS 2
>>> static DEFINE_PER_CPU(struct vm_struct *, cached_stacks[NR_CACHED_STACKS]);
>>> +
>>> +static int free_vm_stack_cache(unsigned int cpu)
>>> +{
>>> + struct vm_struct **cached_vm_stacks = per_cpu_ptr(cached_stacks, cpu);
>>> + int i;
>>> +
>>> + for (i = 0; i < NR_CACHED_STACKS; i++) {
>>> + struct vm_struct *vm_stack = cached_vm_stacks[i];
>>> +
>>> + if (!vm_stack)
>>> + continue;
>>> +
>>> + vfree(vm_stack->addr);
>>> + cached_vm_stacks[i] = NULL;
>>> + }
>>> +
>>> + return 0;
>>> +}
>>> #endif
>>>
>>> static unsigned long *alloc_thread_stack_node(struct task_struct *tsk, int
>>> node)
>>> @@ -456,6 +474,11 @@ void __init fork_init(void)
>>> for (i = 0; i < UCOUNT_COUNTS; i++) {
>>> init_user_ns.ucount_max[i] = max_threads/2;
>>> }
>>> +
>>> +#ifdef CONFIG_VMAP_STACK
>>> + cpuhp_setup_state(CPUHP_BP_PREPARE_DYN, "fork:vmstack_cache",
>>> + NULL, free_vm_stack_cache);
>>> +#endif
>>
>> If you wrap that in vm_stack_cache_init() and have a stub for !VMAP_STACK
>> (add an #else to the #ifdef VMAP_STACK section above) then you spare the
>> ugly ifdef in fork_init()
>
> OK. I will.
>
I sent v5 patch having those stub, (Kbuild error anyway).
But, I didn't consider THREAD_SIZE >= PAGE_SIZE.
so the blank inlined version of vm_stack_cache_init() should be defined twice,
one for THREAD_SIZE < PAGE_SIZE && !CONFIG_VMAP_STACK, one for
!CONFIG_VMAP_STACK.
Do you really want this?
---
# if THREAD_SIZE >= PAGE_SIZE || defined(CONFIG_VMAP_STACK))
# if CONFIG_VMAP_STACK
int free_vm_stack_cache()
{
...
}
int vm_stack_cache_init()
{
cpuhp_setup_state(free_vm_stack_cache);
}
#else // !CONFIG_VMAP_STACK
inline int vm_stack_cache_init() { return 0; }
#endif
#else // THREAD_SIZE < PAGE_SIZE && !CONFIG_VMAP_STACK
...
...
inline int vm_stack_cache_init() { return 0; }
#endif
>> Thanks,
>>
>> tglx
