-
Notifications
You must be signed in to change notification settings - Fork 92
Dynamic App Loader Helper #387
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.
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
base: master
Are you sure you want to change the base?
Conversation
examples/tests/app_loader/main.c
Outdated
uint32_t app_size = 0; // variable to store app size | ||
|
||
// Tock Application Binary to be flashed. | ||
const uint8_t app_binary[] = {0x2, 0x0, 0x34, 0x0, 0x0, 0x8, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD7, 0x75, 0x50, 0x6E, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This application can build for any architecture. How does this data then work?
examples/tests/app_loader/main.c
Outdated
} | ||
|
||
for (uint32_t offset = 0; offset < write_count; offset++) { | ||
memcpy(write_buffer, &app_binary[FLASH_BUFFER_SIZE * offset], FLASH_BUFFER_SIZE); // copy binary to write buffer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What if app_binary
isn't a multiple of FLASH_BUFFER_SIZE
?
42b0c51
to
f653234
Compare
Can you rebase this on master and
|
I believe the repo was already rebased on master last time i pushed it.
Done. I also renamed the functions to start with libtock_ to keep in line with the other the new libtock format.
Done |
@@ -0,0 +1,1304 @@ | |||
#include <examples/tests/app_loader/button-press-loading/app_binaries.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#include <examples/tests/app_loader/button-press-loading/app_binaries.h> | |
#include "app_binaries.h" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Move these to libtock/kernel
// #include "libtock/tock.h" | ||
|
||
// bool libtock_app_loader_exists(void) { | ||
// syscall_return_t res = command(DRIVER_NUM_APP_LOADER, 0, 0, 0); | ||
// return tock_command_return_novalue_to_returncode(res); | ||
// } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
// #include "libtock/tock.h" | |
// bool libtock_app_loader_exists(void) { | |
// syscall_return_t res = command(DRIVER_NUM_APP_LOADER, 0, 0, 0); | |
// return tock_command_return_novalue_to_returncode(res); | |
// } |
lvgl/lvgl
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Revert this change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i did not touch this though?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nvm i see it now
this app sends the tab file of an app that needs to be flashed to the capsule. once the app binary is written to flash, the userland app requests kernel to load the app.
… in internal/binaries.c. cleaned up and formatted removed old code removed userspace code from a previous implementation that was giving rise to confusion. added comments to app_loader.h added binaries headers and updated code added binaries in external files to make the app file more readable. Added a new subscribe and callback to support the async setup update readme
added tock-dpl-hello and tock-welcomes-dpl. The first app is a simple c_hello analog that prints a message and terminates on boot. The second app is a helper app that installs tock-dpl-hello on the board during runtime. These apps were made to test the dynamic process loading using hw-ci.
…hon tool to tests.
…s alarm upcall panic issue.
ok, given the kernel part is now merged, i will leave this comment here: I am all for removing |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should have one interactive app meant for trying out DPL, eg button-press-loading. The others should be more friendly for CI (ie not require user input). I think the abort test should be able to run and test abort without requiring a user to get the button timing right.
I also think we should come up with a folder and more general structure for storing the .tbf binaries. We should also make it clear the binaries are cortex-m4 binaries. They should match what tockloader generates.
libtock/kernel/app_loader.h
Outdated
* This function takes in the function that will be executed | ||
* when the callback is triggered. | ||
*/ | ||
returncode_t libtock_app_loader_set_setup_upcall(subscribe_upcall cb, void* userdata); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These need to be updated to match https://github.com/tock/libtock-c/blob/3ff91f69e51ee305ab37e0878c88ba8a3a2b4ac2/doc/guide.md
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this app for? It seems the same as c_hello.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the app that's compiled and fed to tock-welcomes-dpl
.
Okay, I agree with that |
Okay, so I gave it some thought and the way I have it working right now is to move the binaries to a different directory and create a symlink so the The structure looks like this right now:
|
…ls to match naming conventions
These pushes only address the directory structure changes and not the ci-ease concern that was raised. That will come with a separate commit |
The current directory structure looks like this:
The binaries match the ones generated by tockloader. I pulled from the examples in the repo for For the abort-test, the user can press the button whenever, and it'll still abort. I've tested it multiple times, the NonvolatileStorage driver is just fast. However, I've changed the interface so that the app is listening for a console command instead of a button press. Essentially, the characters '0', '1', or '2' load a different app based on the command. This should eliminate those pesky debounce issues and whatnot. Plus it is easy to expand this anyway regardless of the board button support capabilities, while introducing the undefined behavior when multiple apps are listening however. I have absolutely no idea why the ci-format failed on print statements labeled error only in |
I wonder, should I get rid of the other two apps and just have it run the adc + abort alone? While still requiring console input to make sure it does not just trigger on boot. |
Why does the abort test need to be interactive at all? It is simpler and easier to run if all you have to do is install it and see if it prints success or not. You could add a timer (potentially with some random delay) if you want to not run immediately at boot or randomize when the abort signal happens. |
Why can't we just include in the makefile which binary apps to include? |
I don't remember exactly why but the compiler kept complaining when I included the binaries in the make file. Something about a path issue. So I ended up making symlinks. I can try again. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Very cool.
@bradjc @viswajith-g Do you think it would make sense to also have some higher-level, reusable interface for process loading, such as the write_app
function of the button-press-loading
example available to all apps?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you maybe rename this directory to something other than tool
? That doesn't really suggest much of what it does.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to check in those binaries? This seems like something that'll go out of sync with the rest of the repository quickly. It would be nice if, instead, these could be automatically generated upon compilation of the DPL tests.
Also, using symlinks to reference these files makes me skittish; I don't think that typically interacts well with C include paths, no? It might be better to modify the Makefile to add these files into the include path (or, if you're generating them on the fly as part of compiling the DPL binaries, you could simply place them in the build/
output path).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They aren't generated on the fly. We have a complementary tockloader command that helps convert a .tab
file into a struct whose contents can be copied over. I do think symlinks may cause issues with pathings across OSes.
These binaries are essentially c arrays that are passed as references to whatever app is loading them, they don't come from the original binaries in the example/tests directories.
I'm having some troubles with getting the makefile to recognize the path to these files because of the way it builds. I haven't fully delved into it yet.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately, I'm no C toolchain expert so probably not the best person to ask about this. But I do think that adjusting the include paths is better than using symlinks.
They aren't generated on the fly. We have a complementary tockloader command that helps convert a .tab file into a struct whose contents can be copied over. I do think symlinks may cause issues with pathings across OSes.
I thought this was the job of the "tool" included in this PR?
My point is that I don't see a reason why they shouldn't be generated on the fly, as part of building the DPL example applications themselves. You should be able to simply run another make
command in the respective application directories as part of the Makefiles of the DPL example applications themselves.
Pinging @bradjc and @ppannuto who know more about the Makefile magic here and how this could be supported most elegantly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The tool here is a predecessor to the tockloader command.
My point is that I don't see a reason why they shouldn't be generated on the fly, as part of building the DPL example applications themselves. You should be able to simply run another make command in the respective application directories as part of the Makefiles of the DPL example applications themselves.
And I think that is what Brad got at in his last comment. But I too am no makefile expert haha 😅. Help would be appreciated.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think there is something elegant about having the binaries be generated on the fly, and it would be cool to have that. But, given we want tutorial participants to be able to use this, and to add their own binaries for flashing (with things like different signatures), I think we need this to be simple like what is here now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, so I was starting down the road of making this more ergonomic / automatic with make stuff [which I can still do] — oorrrrrr, we can bump the Configuration.mk
to C23 and use the #embed
directive.
For N=1 apps, switching from -gnu11
to -gnu23
worked no-problem (and out-of-the-box on the compiler that happened to be on this machine (arm-none-eabi-gcc (GCC) 14.2.0
, not the most new by any means). I'm testing this a bit more thoroughly now and will make a separate PR to libtock-c in a moment if everything is smooth.
Hmm. I think there is merit in introducing an interface for the whole subsystem (setup + flash + load). That might reduce the implementation repeat. Another option, and something I am heavily leaning towards is to use a standalone |
I don't think these are mutually exclusive: you could have a high-level interface, and an IPC service that can perform app loading for other applications. However, I think that given the current state of IPC (both concerning problems with the interface, and the app loader application not being able to reliably determine whether the IPC client is a trustworth app), having this be a reusable function that you can embed in your own app seems more attractive. This app can then be verified by the kernel as a whole, before being given permission to manage applications on the board. |
This PR introduces the helper app to validate the kernel's dynamic process loading functionality (tock/tock#3941). The helper app triggers the dynamic process loading with a button press.
This application is located in
/examples/tests/app_loader
and was tested on the nRF52840DK. A previous version of the dynamic process loader was tested with the same application on an Imix board as well.