michaelh/zephyr
1
0
Fork 0
Code Releases Activity

userspace: move KOBJECT/PRIVILEGED_STACK_TEXT_AREA to Kconfig

Browse source 
Instead of hardcoding in linker script, use a Kconfig and deal with
dependencies in Kconfig instead of directly in the linker file.

This patch moves both:
PRIVILEGED_STACK_TEXT_AREA
and
KOBJECT_TEXT_AREA

to arch/Kconfig.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2018-10-07 11:41:18 -04:00
commit eb29978a57
4 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
arch/Kconfig
View file

@ -95,6 +95,22 @@ config PRIVILEGED_STACK_SIZE
this region will be inaccessible from user mode. During system calls, this region will be inaccessible from user mode. During system calls,
this region will be utilized by the system call. this region will be utilized by the system call.
config PRIVILEGED_STACK_TEXT_AREA
int "Privileged stacks text area"
default 256 if (DEBUG || STACK_CANARIES)
default 128
depends on ARCH_HAS_USERSPACE
help
Stack text area size for privileged stacks.
config KOBJECT_TEXT_AREA
int "Size if kobject text area"
default 256 if (!SIZE_OPTIMIZATIONS || STACK_CANARIES || ARC)
default 128
depends on ARCH_HAS_USERSPACE
help
Size of kernel object text area. Used in linker script.
config STACK_GROWS_UP config STACK_GROWS_UP
bool "Stack grows towards higher memory addresses" bool "Stack grows towards higher memory addresses"
help help

2
include/arch/arc/v2/linker.ld
View file

@ -21,8 +21,6 @@
#include <linker/linker-defs.h> #include <linker/linker-defs.h>
#include <linker/linker-tool.h> #include <linker/linker-tool.h>
#define KOBJECT_TEXT_AREA 256
/* physical address of RAM */ /* physical address of RAM */
#ifdef CONFIG_HARVARD #ifdef CONFIG_HARVARD
#define ROMABLE_REGION ICCM #define ROMABLE_REGION ICCM

10
include/linker/kobject-text.ld
View file

@ -1,11 +1,3 @@
#ifndef KOBJECT_TEXT_AREA
#if ! defined(CONFIG_SIZE_OPTIMIZATIONS) || defined(CONFIG_STACK_CANARIES)
#define KOBJECT_TEXT_AREA 256
#else
#define KOBJECT_TEXT_AREA 128
#endif
#endif
#ifdef CONFIG_USERSPACE #ifdef CONFIG_USERSPACE
/* We need to reserve room for the gperf generated hash functions. /* We need to reserve room for the gperf generated hash functions.
* Fortunately, unlike the data tables, the size of the code is * Fortunately, unlike the data tables, the size of the code is
@ -26,6 +18,6 @@
PROVIDE(_k_object_wordlist_foreach = .); PROVIDE(_k_object_wordlist_foreach = .);
#endif #endif
#endif #endif
. += KOBJECT_TEXT_AREA - (_kobject_text_area_end - _kobject_text_area_start); . += CONFIG_KOBJECT_TEXT_AREA - (_kobject_text_area_end - _kobject_text_area_start);
#endif /* CONFIG_USERSPACE */ #endif /* CONFIG_USERSPACE */

10
include/linker/priv_stacks-text.ld
View file

@ -3,14 +3,6 @@
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef PRIV_STACKS_TEXT_AREA
#if defined(CONFIG_DEBUG) || defined(CONFIG_STACK_CANARIES)
#define PRIV_STACKS_TEXT_AREA 256
#else
#define PRIV_STACKS_TEXT_AREA 128
#endif
#endif
#ifdef CONFIG_USERSPACE #ifdef CONFIG_USERSPACE
/* We need to reserve room for the gperf generated hash functions. /* We need to reserve room for the gperf generated hash functions.
* Fortunately, unlike the data tables, the size of the code is * Fortunately, unlike the data tables, the size of the code is
@ -25,6 +17,6 @@
#ifndef LINKER_PASS2 #ifndef LINKER_PASS2
PROVIDE(_k_priv_stack_find = .); PROVIDE(_k_priv_stack_find = .);
#endif #endif
. += PRIV_STACKS_TEXT_AREA - (_priv_stacks_text_area_end - _priv_stacks_text_area_start); . += CONFIG_PRIVILEGED_STACK_TEXT_AREA - (_priv_stacks_text_area_end - _priv_stacks_text_area_start);
#endif /* CONFIG_USERSPACE */ #endif /* CONFIG_USERSPACE */