michaelh/zephyr
1
0
Fork 0
Code Releases Activity

userspace: weak defintions for generated k-object lookup functions

Browse source 
Instead of obscure linker-file hacks providing dummy definitions before
we have the proper generated k-object lookup functions, provide weak
definitions  that will be taken out by the real generated implementations
when they are available.

Signed-off-by: Björn Bergman <bjorn.bergman@iar.com>
This commit is contained in:
Björn Bergman 2025-05-02 11:12:19 +02:00 • committed by Benjamin Cabé
commit 465f6ba73e
3 changed files with 28 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cmake/linker_script/common/kobject-text.cmake
View file

@ -24,25 +24,4 @@ if(CONFIG_USERSPACE)
EXPR EXPR
"(@_kobject_text_area_end@ - @_kobject_text_area_start@)" "(@_kobject_text_area_end@ - @_kobject_text_area_start@)"
) )
if(CONFIG_DYNAMIC_OBJECTS)
zephyr_linker_section_configure(
SECTION
_kobject_text_area
SYMBOLS
z_object_gperf_find
z_object_gperf_wordlist_foreach
PASS NOT LINKER_ZEPHYR_FINAL
)
else()
zephyr_linker_section_configure(
SECTION
_kobject_text_area
SYMBOLS
k_object_find
k_object_wordlist_foreach
PASS NOT LINKER_ZEPHYR_FINAL
)
endif()
endif() endif()

9
include/zephyr/linker/kobject-text.ld
View file

@ -14,15 +14,6 @@
*(".kobject_data.text*") *(".kobject_data.text*")
PLACE_SYMBOL_HERE(_kobject_text_area_end); PLACE_SYMBOL_HERE(_kobject_text_area_end);
_kobject_text_area_used = _kobject_text_area_end - _kobject_text_area_start; _kobject_text_area_used = _kobject_text_area_end - _kobject_text_area_start;
#ifndef LINKER_ZEPHYR_FINAL
#ifdef CONFIG_DYNAMIC_OBJECTS
PROVIDE(z_object_gperf_find = .);
PROVIDE(z_object_gperf_wordlist_foreach = .);
#else
PROVIDE(k_object_find = .);
PROVIDE(k_object_wordlist_foreach = .);
#endif
#endif
/* In a valid build the MAX function will always evaluate to the /* In a valid build the MAX function will always evaluate to the
second argument below, but to give the user a good error message second argument below, but to give the user a good error message

27
kernel/userspace.c
View file

@ -521,6 +521,33 @@ void k_object_wordlist_foreach(_wordlist_cb_func_t func, void *context)
} }
#endif /* CONFIG_DYNAMIC_OBJECTS */ #endif /* CONFIG_DYNAMIC_OBJECTS */
/* In the earlier linker-passes before we have the real generated
* implementation of the lookup functions, we need some weak dummies.
* Being __weak, they will be replaced by the generated implementations in
* the later linker passes.
*/
#ifdef CONFIG_DYNAMIC_OBJECTS
Z_GENERIC_SECTION(.kobject_data.text.dummies)
__weak struct k_object *z_object_gperf_find(const void *obj)
{
return NULL;
}
Z_GENERIC_SECTION(.kobject_data.text.dummies)
__weak void z_object_gperf_wordlist_foreach(_wordlist_cb_func_t func, void *context)
{
}
#else
Z_GENERIC_SECTION(.kobject_data.text.dummies)
__weak struct k_object *k_object_find(const void *obj)
{
return NULL;
}
Z_GENERIC_SECTION(.kobject_data.text.dummies)
__weak void k_object_wordlist_foreach(_wordlist_cb_func_t func, void *context)
{
}
#endif
static unsigned int thread_index_get(struct k_thread *thread) static unsigned int thread_index_get(struct k_thread *thread)
{ {
struct k_object *ko; struct k_object *ko;