Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

measure_stack_free_internal(): don't try to align end of stack #20723

Merged
merged 2 commits into from
Jun 4, 2024
Merged

measure_stack_free_internal(): don't try to align end of stack #20723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02fe256
core/thread: don't try to align end of stack
benpicco Jun 4, 2024
5b73294
tests/core/thread_stack_alignment: also test for stack usage
benpicco Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions core/thread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,6 @@
uintptr_t *stackp = (uintptr_t *)(uintptr_t)stack;
uintptr_t end = (uintptr_t)stack + size;

/* better be safe than sorry: align end of stack just in case */
end &= (sizeof(uintptr_t) - 1);

/* assume that the stack grows "downwards" */
while (((uintptr_t)stackp < end) && (*stackp == (uintptr_t)stackp)) {
stackp++;
Expand Down Expand Up @@ -243,7 +240,7 @@
stacksize = (char *) thread->tls - stack;

_init_tls(thread->tls);
#endif

Check warning on line 243 in core/thread.c

View workflow job for this annotation

GitHub Actions / static-tests 

Uncrustify proposes the following patch:

--- a/core/thread.c
+++ b/core/thread.c
@@ -236,8 +236,8 @@ kernel_pid_t thread_create(char *stack, int stacksize, uint8_t priority,
      * Make sure the TLS area is aligned as required and that the
      * resulting stack will also be aligned as required
      */
-    thread->tls = (void *) ((uintptr_t) tls & ~ (TLS_ALIGN - 1));
-    stacksize = (char *) thread->tls - stack;
+    thread->tls = (void *)((uintptr_t)tls & ~(TLS_ALIGN - 1));
+    stacksize = (char *)thread->tls - stack;
 
     _init_tls(thread->tls);
 #endif

Check warning on line 243 in core/thread.c

View workflow job for this annotation

GitHub Actions / static-tests 

Uncrustify proposes the following patch:

--- a/core/thread.c
+++ b/core/thread.c
@@ -236,8 +236,8 @@ kernel_pid_t thread_create(char *stack, int stacksize, uint8_t priority,
      * Make sure the TLS area is aligned as required and that the
      * resulting stack will also be aligned as required
      */
-    thread->tls = (void *) ((uintptr_t) tls & ~ (TLS_ALIGN - 1));
-    stacksize = (char *) thread->tls - stack;
+    thread->tls = (void *)((uintptr_t)tls & ~(TLS_ALIGN - 1));
+    stacksize = (char *)thread->tls - stack;
 
     _init_tls(thread->tls);
 #endif

#if defined(DEVELHELP) || defined(SCHED_TEST_STACK) \
|| defined(MODULE_TEST_UTILS_PRINT_STACK_USAGE)
Expand Down
1 change: 1 addition & 0 deletions tests/core/thread_stack_alignment/tests/01-run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def testfunc(child):
child.expect(r"(\{[^\n\r]*\})\r\n")
stats = json.loads(child.match.group(1))["threads"][0]
assert stats["name"] == "test"
assert stats["stack_used"] < stats["stack_size"]
if stack_used_max < stats["stack_used"]:
stack_used_max = stats["stack_used"]
if stack_used_min > stats["stack_used"]:
Expand Down
Loading