Assorted userspace cleanups

CMakeLists.txt

@@ -351,9 +351,6 @@ endif()
 if(CONFIG_USERSPACE)
   set(APP_SMEM_ALIGNED_DEP app_smem_aligned_linker)
   set(APP_SMEM_UNALIGNED_DEP app_smem_unaligned_linker)
-  if(CONFIG_ARM)
-    set(PRIV_STACK_DEP priv_stacks_prebuilt)
-  endif()
 endif()
 
 get_property(TOPT GLOBAL PROPERTY TOPT)
@@ -706,7 +703,6 @@ endif() # CONFIG_CODE_DATA_RELOCATION
 configure_linker_script(
   linker.cmd
   ""
-  ${PRIV_STACK_DEP}
   ${APP_SMEM_ALIGNED_DEP}
   ${CODE_RELOCATION_DEP}
   zephyr_generated_headers
@@ -786,147 +782,7 @@ if(CONFIG_USERSPACE)
 
   get_property(compile_definitions_interface TARGET zephyr_interface
     PROPERTY INTERFACE_COMPILE_DEFINITIONS)
-endif()
-
-
-# Warning most of this gperf code is duplicated below for
-# gen_kobject_list.py / output_lib
-if(CONFIG_ARM AND CONFIG_USERSPACE)
-  set(GEN_PRIV_STACKS $ENV{ZEPHYR_BASE}/scripts/gen_priv_stacks.py)
-  set(PROCESS_PRIV_STACKS_GPERF $ENV{ZEPHYR_BASE}/scripts/process_gperf.py)
-
-  set(PRIV_STACKS                    priv_stacks_hash.gperf)
-  set(PRIV_STACKS_OUTPUT_SRC_PRE     priv_stacks_hash_preprocessed.c)
-  set(PRIV_STACKS_OUTPUT_SRC         priv_stacks_hash.c)
-  set(PRIV_STACKS_OUTPUT_OBJ         priv_stacks_hash.c.obj)
-  set(PRIV_STACKS_OUTPUT_OBJ_RENAMED priv_stacks_hash_renamed.o)
-
-  # Essentially what we are doing here is extracting some information
-  # out of the nearly finished elf file, generating the source code
-  # for a hash table based on that information, and then compiling and
-  # linking the hash table back into a now even more nearly finished
-  # elf file.
-
-  # Use the script GEN_PRIV_STACKS to scan the kernel binary's
-  # (${ZEPHYR_PREBUILT_EXECUTABLE}) DWARF information to produce a table of kernel
-  # objects (PRIV_STACKS) which we will then pass to gperf
-  add_custom_command(
-    OUTPUT ${PRIV_STACKS}
-    COMMAND
-    ${PYTHON_EXECUTABLE}
-    ${GEN_PRIV_STACKS}
-    --kernel $<TARGET_FILE:priv_stacks_prebuilt>
-    --output ${PRIV_STACKS}
-    $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
-    DEPENDS priv_stacks_prebuilt
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    )
-  add_custom_target(priv_stacks DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${PRIV_STACKS})
-
-  if(${GPERF} STREQUAL GPERF-NOTFOUND)
-    message(FATAL_ERROR "Unable to find gperf")
-  endif()
-
-  # Use gperf to generate C code (PRIV_STACKS_OUTPUT_SRC_PRE) which implements a
-  # perfect hashtable based on PRIV_STACKS
-  add_custom_command(
-    OUTPUT ${PRIV_STACKS_OUTPUT_SRC_PRE}
-    COMMAND
-    ${GPERF} -C
-    --output-file ${PRIV_STACKS_OUTPUT_SRC_PRE}
-    ${PRIV_STACKS}
-    DEPENDS priv_stacks ${PRIV_STACKS}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    )
-  add_custom_target(priv_stacks_output_src_pre DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${PRIV_STACKS_OUTPUT_SRC_PRE})
-
-  # For our purposes the code/data generated by gperf is not optimal.
-  #
-  # The script PROCESS_GPERF creates a new c file OUTPUT_SRC based on
-  # OUTPUT_SRC_PRE to greatly reduce the amount of code/data generated
-  # since we know we are always working with pointer values
-  add_custom_command(
-    OUTPUT ${PRIV_STACKS_OUTPUT_SRC}
-    COMMAND
-    ${PYTHON_EXECUTABLE}
-    ${PROCESS_PRIV_STACKS_GPERF}
-    -i ${PRIV_STACKS_OUTPUT_SRC_PRE}
-    -o ${PRIV_STACKS_OUTPUT_SRC}
-    -p "struct _k_priv_stack_map"
-    $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
-    DEPENDS priv_stacks_output_src_pre ${PRIV_STACKS_OUTPUT_SRC_PRE}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    )
-  add_custom_target(priv_stacks_output_src DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${PRIV_STACKS_OUTPUT_SRC})
-
-  set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${PRIV_STACKS_OUTPUT_SRC}
-    PROPERTIES COMPILE_DEFINITIONS "${compile_definitions_interface}")
-
-  set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${PRIV_STACKS_OUTPUT_SRC}
-    PROPERTIES COMPILE_FLAGS
-    "${NO_COVERAGE_FLAGS} -fno-function-sections -fno-data-sections ")
-
-  # We need precise control of where generated text/data ends up in the final
-  # kernel image. Disable function/data sections and use objcopy to move
-  # generated data into special section names
-  add_library(priv_stacks_output_lib STATIC
-    ${CMAKE_CURRENT_BINARY_DIR}/${PRIV_STACKS_OUTPUT_SRC}
-    )
-
-  # Turn off -ffunction-sections, etc.
-  # NB: Using a library instead of target_compile_options(priv_stacks_output_lib
-  # [...]) because a library's options have precedence
-  add_library(priv_stacks_output_lib_interface INTERFACE)
-  foreach(incl ${include_dir_in_interface})
-    target_include_directories(priv_stacks_output_lib_interface INTERFACE ${incl})
-  endforeach()
 
-  foreach(incl ${sys_include_dir_in_interface})
-    target_include_directories(priv_stacks_output_lib_interface SYSTEM INTERFACE ${incl})
-  endforeach()
-
-  target_link_libraries(priv_stacks_output_lib priv_stacks_output_lib_interface)
-
-  set(PRIV_STACKS_OUTPUT_OBJ_PATH ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/priv_stacks_output_lib.dir/${PRIV_STACKS_OUTPUT_OBJ})
-
-  set(obj_copy_cmd "")
-  set(obj_copy_sections_rename
-    .bss=.priv_stacks.noinit
-    .data=.priv_stacks.data
-    .text=.priv_stacks.text
-    .rodata=.priv_stacks.rodata
-    )
-  bintools_objcopy(
-    RESULT_CMD_LIST obj_copy_cmd
-    SECTION_RENAME  ${obj_copy_sections_rename}
-    FILE_INPUT      ${PRIV_STACKS_OUTPUT_OBJ_PATH}
-    FILE_OUTPUT     ${PRIV_STACKS_OUTPUT_OBJ_RENAMED}
-    )
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PRIV_STACKS_OUTPUT_OBJ_RENAMED}
-    ${obj_copy_cmd}
-    DEPENDS priv_stacks_output_lib
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    )
-  add_custom_target(priv_stacks_output_obj_renamed DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${PRIV_STACKS_OUTPUT_OBJ_RENAMED})
-
-  add_library(priv_stacks_output_obj_renamed_lib STATIC IMPORTED GLOBAL)
-  set_property(
-    TARGET priv_stacks_output_obj_renamed_lib
-    PROPERTY
-    IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${PRIV_STACKS_OUTPUT_OBJ_RENAMED}
-    )
-  add_dependencies(
-    priv_stacks_output_obj_renamed_lib
-    priv_stacks_output_obj_renamed
-    )
-
-  set_property(GLOBAL APPEND PROPERTY GENERATED_KERNEL_OBJECT_FILES priv_stacks_output_obj_renamed_lib)
-endif()
-
-# Warning: most of this gperf code is duplicated above for
-# gen_priv_stacks.py / priv_stacks_output_lib
-if(CONFIG_USERSPACE)
   set(GEN_KOBJ_LIST ${ZEPHYR_BASE}/scripts/gen_kobject_list.py)
   set(PROCESS_GPERF ${ZEPHYR_BASE}/scripts/process_gperf.py)
 
@@ -986,7 +842,7 @@ if(CONFIG_USERSPACE)
     ${PROCESS_GPERF}
     -i ${OUTPUT_SRC_PRE}
     -o ${OUTPUT_SRC}
-    -p "struct _k_object"
+    -p "struct z_object"
     $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
     DEPENDS output_src_pre ${OUTPUT_SRC_PRE}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -1168,54 +1024,17 @@ if(CONFIG_USERSPACE)
     )
 endif()
 
-if(CONFIG_USERSPACE AND CONFIG_ARM)
-  configure_linker_script(
-    linker_priv_stacks.cmd
-    ""
-    ${CODE_RELOCATION_DEP}
-    ${APP_SMEM_ALIGNED_DEP}
-    ${APP_SMEM_ALIGNED_LD}
-    zephyr_generated_headers
-    )
-
-  add_custom_target(
-    linker_priv_stacks_script
-    DEPENDS
-    linker_priv_stacks.cmd
-    )
-
-  set_property(TARGET
-    linker_priv_stacks_script
-    PROPERTY INCLUDE_DIRECTORIES
-    ${ZEPHYR_INCLUDE_DIRS}
-    )
-
-  set(PRIV_STACK_LIB priv_stacks_output_obj_renamed_lib)
-  add_executable(       priv_stacks_prebuilt misc/empty_file.c)
-  toolchain_ld_link_elf(
-    TARGET_ELF            priv_stacks_prebuilt
-    OUTPUT_MAP            ${PROJECT_BINARY_DIR}/priv_stacks_prebuilt.map
-    LIBRARIES_PRE_SCRIPT  ""
-    LINKER_SCRIPT         ${PROJECT_BINARY_DIR}/linker_priv_stacks.cmd
-    LIBRARIES_POST_SCRIPT ""
-    DEPENDENCIES          ${CODE_RELOCATION_DEP}
-  )
-  set_property(TARGET   priv_stacks_prebuilt PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/linker_priv_stacks.cmd)
-  add_dependencies(     priv_stacks_prebuilt linker_priv_stacks_script ${OFFSETS_LIB})
-endif()
-
 # FIXME: Is there any way to get rid of empty_file.c?
 add_executable(       ${ZEPHYR_PREBUILT_EXECUTABLE} misc/empty_file.c)
 toolchain_ld_link_elf(
   TARGET_ELF            ${ZEPHYR_PREBUILT_EXECUTABLE}
   OUTPUT_MAP            ${PROJECT_BINARY_DIR}/${ZEPHYR_PREBUILT_EXECUTABLE}.map
   LIBRARIES_PRE_SCRIPT  ""
   LINKER_SCRIPT         ${PROJECT_BINARY_DIR}/linker.cmd
-  LIBRARIES_POST_SCRIPT ${PRIV_STACK_LIB}
   DEPENDENCIES          ${CODE_RELOCATION_DEP}
 )
 set_property(TARGET   ${ZEPHYR_PREBUILT_EXECUTABLE} PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/linker.cmd)
-add_dependencies(     ${ZEPHYR_PREBUILT_EXECUTABLE} ${PRIV_STACK_DEP} ${LINKER_SCRIPT_TARGET} ${OFFSETS_LIB})
+add_dependencies(     ${ZEPHYR_PREBUILT_EXECUTABLE} ${LINKER_SCRIPT_TARGET} ${OFFSETS_LIB})
 
 
 set(generated_kernel_files ${GKSF} ${GKOF})
@@ -1230,7 +1049,6 @@ else()
   configure_linker_script(
     linker_pass_final.cmd
     "-DLINKER_PASS2"
-    ${PRIV_STACK_DEP}
     ${CODE_RELOCATION_DEP}
     ${ZEPHYR_PREBUILT_EXECUTABLE}
     zephyr_generated_headers
@@ -1258,7 +1076,7 @@ else()
     DEPENDENCIES          ${CODE_RELOCATION_DEP}
   )
   set_property(TARGET   ${ZEPHYR_FINAL_EXECUTABLE} PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/linker_pass_final.cmd)
-  add_dependencies(     ${ZEPHYR_FINAL_EXECUTABLE} ${PRIV_STACK_DEP} ${LINKER_PASS_FINAL_SCRIPT_TARGET})
+  add_dependencies(     ${ZEPHYR_FINAL_EXECUTABLE} ${LINKER_PASS_FINAL_SCRIPT_TARGET})
 
   # Use the pass2 elf as the final elf
   set(logical_target_for_zephyr_elf ${ZEPHYR_FINAL_EXECUTABLE})

CODEOWNERS

@@ -375,15 +375,13 @@
 /scripts/coccicheck                       @himanshujha199640 @JuliaLawall
 /scripts/coccinelle/                      @himanshujha199640 @JuliaLawall
 /scripts/kconfig/                         @ulfalizer
-/scripts/elf_helper.py                    @andrewboie
 /scripts/sanity_chk/expr_parser.py        @nashif
 /scripts/gen_app_partitions.py            @andrewboie
 /scripts/dts/                             @ulfalizer @galak
 /scripts/release/                         @nashif
 /arch/x86/gen_gdt.py                      @andrewboie
 /arch/x86/gen_idt.py                      @andrewboie
 /scripts/gen_kobject_list.py              @andrewboie
-/scripts/gen_priv_stacks.py               @andrewboie @agross-oss @ioannisg
 /scripts/gen_syscalls.py                  @andrewboie
 /scripts/net/                             @jukkar @pfl
 /scripts/process_gperf.py                 @andrewboie

arch/Kconfig

@@ -27,6 +27,9 @@ config ARM
 	bool
 	select ARCH_IS_SET
 	select HAS_DTS
+	# FIXME: current state of the code for all ARM requires this, but
+	# is really only necessary for Cortex-M with ARM MPU!
+	select GEN_PRIV_STACKS
 	help
 	  ARM architecture
 
@@ -218,15 +221,8 @@ config PRIVILEGED_STACK_SIZE
 	  This option sets the privileged stack region size that will be used
 	  in addition to the user mode thread stack.  During normal execution,
 	  this region will be inaccessible from user mode.  During system calls,
-	  this region will be utilized by the system call.
-
-config PRIVILEGED_STACK_TEXT_AREA
-	int "Privileged stacks text area"
-	default 512 if COVERAGE_GCOV
-	default 256
-	depends on ARCH_HAS_USERSPACE
-	help
-	  Stack text area size for privileged stacks.
+	  this region will be utilized by the system call. This value must be
+	  a multiple of the minimum stack alignment.
 
 config KOBJECT_TEXT_AREA
 	int "Size if kobject text area"
@@ -237,6 +233,17 @@ config KOBJECT_TEXT_AREA
 	help
 	  Size of kernel object text area. Used in linker script.
 
+config GEN_PRIV_STACKS
+	bool
+	help
+	  Selected if the architecture requires that privilege elevation stacks
+	  be allocated in a separate memory area. This is typical of arches
+	  whose MPUs require regions to be power-of-two aligned/sized.
+
+	  FIXME: This should be removed and replaced with checks against
+	  CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT, but both ARM and ARC
+	  changes will be necessary for this.
+
 config STACK_GROWS_UP
 	bool "Stack grows towards higher memory addresses"
 	help

arch/arm/core/aarch32/thread.c

@@ -16,10 +16,6 @@
 #include <ksched.h>
 #include <wait_q.h>
 
-#ifdef CONFIG_USERSPACE
-extern u8_t *z_priv_stack_find(void *obj);
-#endif
-
 /* An initial context, to be "restored" by z_arm_pendsv(), is put at the other
  * end of the stack, and thus reusable by the stack when not needed anymore.
  *

doc/guides/build/index.rst

@@ -230,15 +230,6 @@ The following is a detailed description of the scripts used during the build pro
    :start-after: """
    :end-before: """
 
-.. _gen_priv_stacks.py:
-
-:zephyr_file:`scripts/gen_priv_stacks.py`
-==========================================
-
-.. include:: ../../../scripts/gen_priv_stacks.py
-   :start-after: """
-   :end-before: """
-
 .. _gen_idt.py:
 
 :zephyr_file:`arch/x86/gen_idt.py`

doc/guides/documentation/index.rst

@@ -396,7 +396,7 @@ For example::
 
    .. code-block:: c
 
-      struct _k_object {
+      struct z_object {
          char *name;
          u8_t perms[CONFIG_MAX_THREAD_BYTES];
          u8_t type;
@@ -412,7 +412,7 @@ This would be rendered as:
 
    .. code-block:: c
 
-      struct _k_object {
+      struct z_object {
          char *name;
          u8_t perms[CONFIG_MAX_THREAD_BYTES];
          u8_t type;