christoph/wamr
1
Fork 0
Code Releases Activity

Implement Berkeley Socket API for Intel SGX (#1061)

Browse Source 
Implement Berkeley Socket API for Intel SGX
- bring Berkeley socket API in Intel SGX enclaves,
- adapt the documentation of the socket API to mention Intel SGX enclaves,
- adapt _iwasm_ in the mini-product _linux-sgx_ to support the same option as the one for _linux_,
- tested on the socket sample as provided by WAMR (the TCP client/server).
This commit is contained in:
Jämes Ménétrey
2022-03-25 10:46:29 +01:00
committed by GitHub
parent 5264ce4118
commit 106974d915
7 changed files with 543 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
product-mini/platforms/linux-sgx/enclave-sample/App/App.cpp
View File

@ -227,6 +227,10 @@ print_help()
printf(" --dir=<dir> Grant wasi access to the given host directories\n");
printf(" to the program, for example:\n");
printf(" --dir=<dir1> --dir=<dir2>\n");
printf(" --addr-pool= Grant wasi access to the given network addresses in\n");
printf(" CIRD notation to the program, seperated with ',',\n");
printf(" for example:\n");
printf(" --addr-pool=1.2.3.4/15,2.3.4.5/16\n");
printf(" --max-threads=n Set maximum thread number per cluster, default is 4\n");
return 1;
}
@ -550,9 +554,10 @@ app_instance_func(void *wasm_module_inst, const char *func_name, int app_argc,
static bool
set_wasi_args(void *wasm_module, const char **dir_list, uint32_t dir_list_size,
const char **env_list, uint32_t env_list_size, int stdinfd,
int stdoutfd, int stderrfd, char **argv, uint32_t argc)
int stdoutfd, int stderrfd, char **argv, uint32_t argc,
const char **addr_pool, uint32_t addr_pool_size)
{
uint64_t ecall_args[10];
uint64_t ecall_args[12];
ecall_args[0] = (uint64_t)(uintptr_t)wasm_module;
ecall_args[1] = (uint64_t)(uintptr_t)dir_list;
@ -564,9 +569,11 @@ set_wasi_args(void *wasm_module, const char **dir_list, uint32_t dir_list_size,
ecall_args[7] = stderrfd;
ecall_args[8] = (uint64_t)(uintptr_t)argv;
ecall_args[9] = argc;
ecall_args[10] = (uint64_t)(uintptr_t)addr_pool;
ecall_args[11] = addr_pool_size;
if (SGX_SUCCESS
!= ecall_handle_command(g_eid, CMD_SET_WASI_ARGS, (uint8_t *)ecall_args,
sizeof(uint64_t) * 10)) {
sizeof(uint64_t) * 12)) {
printf("Call ecall_handle_command() failed.\n");
}
@ -590,6 +597,8 @@ main(int argc, char *argv[])
uint32_t dir_list_size = 0;
const char *env_list[8] = { NULL };
uint32_t env_list_size = 0;
const char *addr_pool[8] = { NULL };
uint32_t addr_pool_size = 0;
uint32_t max_thread_num = 4;
if (enclave_init(&g_eid) < 0) {
@ -666,6 +675,26 @@ main(int argc, char *argv[])
return print_help();
}
}
/* TODO: parse the configuration file via --addr-pool-file */
else if (!strncmp(argv[0], "--addr-pool=", strlen("--addr-pool="))) {
/* like: --addr-pool=100.200.244.255/30 */
char *token = NULL;
if ('\0' == argv[0][12])
return print_help();
token = strtok(argv[0] + strlen("--addr-pool="), ",");
while (token) {
if (addr_pool_size >= sizeof(addr_pool) / sizeof(char *)) {
printf("Only allow max address number %d\n",
(int)(sizeof(addr_pool) / sizeof(char *)));
return -1;
}
addr_pool[addr_pool_size++] = token;
token = strtok(NULL, ";");
}
}
else if (!strncmp(argv[0], "--max-threads=", 14)) {
if (argv[0][14] == '\0')
return print_help();
@ -705,7 +734,8 @@ main(int argc, char *argv[])
/* Set wasi arguments */
if (!set_wasi_args(wasm_module, dir_list, dir_list_size, env_list,
env_list_size, 0, 1, 2, argv, argc)) {
env_list_size, 0, 1, 2, argv, argc, addr_pool,
addr_pool_size)) {
printf("%s\n", "set wasi arguments failed.\n");
goto fail3;
}
@ -771,6 +801,8 @@ wamr_pal_create_process(struct wamr_pal_create_process_args *args)
uint32_t dir_list_size = 0;
const char *env_list[8] = { NULL };
uint32_t env_list_size = 0;
const char *addr_pool[8] = { NULL };
uint32_t addr_pool_size = 0;
uint32_t max_thread_num = 4;
char *wasm_files[16];
void *wasm_module_inst[16];
@ -845,7 +877,7 @@ wamr_pal_create_process(struct wamr_pal_create_process_args *args)
/* Set wasi arguments */
if (!set_wasi_args(wasm_module, dir_list, dir_list_size, env_list,
env_list_size, stdinfd, stdoutfd, stderrfd, argv,
argc)) {
argc, addr_pool, addr_pool_size)) {
printf("%s\n", "set wasi arguments failed.\n");
unload_module(wasm_module);
free(wasm_file_buf);

28
product-mini/platforms/linux-sgx/enclave-sample/Enclave/Enclave.cpp
View File

@ -50,6 +50,8 @@ typedef struct EnclaveModule {
uint32 wasi_dir_list_size;
char **wasi_env_list;
uint32 wasi_env_list_size;
char **wasi_addr_pool_list;
uint32 wasi_addr_pool_list_size;
char **wasi_argv;
uint32 wasi_argc;
bool is_xip_file;
@ -407,6 +409,8 @@ handle_cmd_set_wasi_args(uint64 *args, int32 argc)
char **wasi_argv = *(char ***)args++;
char *p, *p1;
uint32 wasi_argc = *(uint32 *)args++;
char **addr_pool_list = *(char ***)args++;
uint32 addr_pool_list_size = *(uint32 *)args++;
uint64 total_size = 0;
int32 i, str_len;
@ -414,6 +418,7 @@ handle_cmd_set_wasi_args(uint64 *args, int32 argc)
total_size += sizeof(char *) * (uint64)dir_list_size
+ sizeof(char *) * (uint64)env_list_size
+ sizeof(char *) * (uint64)addr_pool_list_size
+ sizeof(char *) * (uint64)wasi_argc;
for (i = 0; i < dir_list_size; i++) {
@ -424,6 +429,10 @@ handle_cmd_set_wasi_args(uint64 *args, int32 argc)
total_size += strlen(env_list[i]) + 1;
}
for (i = 0; i < addr_pool_list_size; i++) {
total_size += strlen(addr_pool_list[i]) + 1;
}
for (i = 0; i < wasi_argc; i++) {
total_size += strlen(wasi_argv[i]) + 1;
}
@ -436,7 +445,7 @@ handle_cmd_set_wasi_args(uint64 *args, int32 argc)
}
p1 = p + sizeof(char *) * dir_list_size + sizeof(char *) * env_list_size
+ sizeof(char *) * wasi_argc;
+ sizeof(char *) * addr_pool_list_size + sizeof(char *) * wasi_argc;
if (dir_list_size > 0) {
enclave_module->wasi_dir_list = (char **)p;
@ -462,6 +471,18 @@ handle_cmd_set_wasi_args(uint64 *args, int32 argc)
p += sizeof(char *) * env_list_size;
}
if (addr_pool_list_size > 0) {
enclave_module->wasi_addr_pool_list = (char **)p;
enclave_module->wasi_addr_pool_list_size = addr_pool_list_size;
for (i = 0; i < addr_pool_list_size; i++) {
enclave_module->wasi_addr_pool_list[i] = p1;
str_len = strlen(addr_pool_list[i]);
bh_memcpy_s(p1, str_len + 1, addr_pool_list[i], str_len + 1);
p1 += str_len + 1;
}
p += sizeof(char *) * addr_pool_list_size;
}
if (wasi_argc > 0) {
enclave_module->wasi_argv = (char **)p;
enclave_module->wasi_argc = wasi_argc;
@ -481,6 +502,11 @@ handle_cmd_set_wasi_args(uint64 *args, int32 argc)
(stdinfd != -1) ? stdinfd : 0, (stdoutfd != -1) ? stdoutfd : 1,
(stderrfd != -1) ? stderrfd : 2);
wasm_runtime_set_wasi_addr_pool(
enclave_module->module,
(const char **)enclave_module->wasi_addr_pool_list,
addr_pool_list_size);
*args_org = true;
}
#else