[Pal] Remove STATIC_SLAB flag

PAL never really worked without STATIC_SLAB. Signed-off-by: Paweł Marczewski <pawel@invisiblethingslab.com>
gramineproject · Sep 28, 2021 · b2e1aab · b2e1aab
1 parent 5ba0769
commit b2e1aab
Show file tree

Hide file tree

Showing 52 changed files with 8 additions and 75 deletions.
diff --git a/Pal/include/pal/pal.h b/Pal/include/pal/pal.h
@@ -52,6 +52,9 @@ typedef bool PAL_BOL;
 /* maximum length of pipe/FIFO name (should be less than Linux sockaddr_un.sun_path = 108) */
 #define PIPE_NAME_MAX 96
 
+/* maximum length of URIs */
+#define URI_MAX 4096
+
 #ifdef IN_PAL
 #include "atomic.h"
 typedef struct atomic_int PAL_REF;

diff --git a/Pal/include/pal_defs.h b/Pal/include/pal_defs.h
diff --git a/Pal/include/pal_internal.h b/Pal/include/pal_internal.h
@@ -15,7 +15,6 @@
 #include "api.h"
 #include "log.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "toml.h"
 
@@ -253,7 +252,7 @@ bool is_elf_object(PAL_HANDLE handle);
 int load_elf_object(const char* uri, enum object_type type);
 int load_elf_object_by_handle(PAL_HANDLE handle, enum object_type type, void** out_loading_base);
 
-void init_slab_mgr(size_t alignment);
+void init_slab_mgr(void);
 void* malloc(size_t size);
 void* malloc_copy(const void* mem, size_t size);
 void* calloc(size_t nmem, size_t size);

diff --git a/Pal/src/db_exception.c b/Pal/src/db_exception.c
@@ -11,7 +11,6 @@
 #include "api.h"
 #include "list.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/db_main.c b/Pal/src/db_main.c
@@ -11,7 +11,6 @@
 #include "api.h"
 #include "elf/elf.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_rtld.h"

diff --git a/Pal/src/db_memory.c b/Pal/src/db_memory.c
@@ -7,7 +7,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/db_misc.c b/Pal/src/db_misc.c
@@ -7,7 +7,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/db_object.c b/Pal/src/db_object.c
@@ -8,7 +8,6 @@
 #include "api.h"
 #include "atomic.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/db_process.c b/Pal/src/db_process.c
@@ -11,7 +11,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/db_rtld.c b/Pal/src/db_rtld.c
@@ -11,7 +11,6 @@
 #include "api.h"
 #include "elf/elf.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_rtld.h"

diff --git a/Pal/src/db_streams.c b/Pal/src/db_streams.c
@@ -7,7 +7,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/db_threading.c b/Pal/src/db_threading.c
@@ -7,7 +7,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/host/Linux-SGX/db_eventfd.c b/Pal/src/host/Linux-SGX/db_eventfd.c
@@ -13,7 +13,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux-SGX/db_exception.c b/Pal/src/host/Linux-SGX/db_exception.c
@@ -14,7 +14,6 @@
 #include "cpu.h"
 #include "ecall_types.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux-SGX/db_files.c b/Pal/src/host/Linux-SGX/db_files.c
@@ -15,7 +15,6 @@
 #include "enclave_pf.h"
 #include "enclave_tf.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_flags_conv.h"
 #include "pal_internal.h"

diff --git a/Pal/src/host/Linux-SGX/db_main.c b/Pal/src/host/Linux-SGX/db_main.c
@@ -22,7 +22,6 @@
 #include "enclave_pf.h"
 #include "enclave_tf.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"
@@ -601,7 +600,7 @@ noreturn void pal_linux_main(char* uptr_libpal_uri, size_t libpal_uri_len, char*
     g_pal_sec.gid = sec_info.gid;
 
     /* set up page allocator and slab manager */
-    init_slab_mgr(g_page_size);
+    init_slab_mgr();
     init_untrusted_slab_mgr();
     init_enclave_pages();
     init_cpuid();

diff --git a/Pal/src/host/Linux-SGX/db_memory.c b/Pal/src/host/Linux-SGX/db_memory.c
@@ -8,7 +8,6 @@
 #include "api.h"
 #include "enclave_pages.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_flags_conv.h"
 #include "pal_internal.h"

diff --git a/Pal/src/host/Linux-SGX/db_misc.c b/Pal/src/host/Linux-SGX/db_misc.c
@@ -16,7 +16,6 @@
 #include "hex.h"
 #include "linux_utils.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux-SGX/db_object.c b/Pal/src/host/Linux-SGX/db_object.c
@@ -11,7 +11,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux-SGX/db_pipes.c b/Pal/src/host/Linux-SGX/db_pipes.c
@@ -15,7 +15,6 @@
 #include "crypto.h"
 #include "linux_utils.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux-SGX/db_process.c b/Pal/src/host/Linux-SGX/db_process.c
@@ -17,7 +17,6 @@
 #include "api.h"
 #include "crypto.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux-SGX/db_sockets.c b/Pal/src/host/Linux-SGX/db_sockets.c
@@ -15,7 +15,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux-SGX/db_streams.c b/Pal/src/host/Linux-SGX/db_streams.c
@@ -21,7 +21,6 @@
 #include "enclave_pages.h"
 #include "enclave_pf.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux-SGX/db_threading.c b/Pal/src/host/Linux-SGX/db_threading.c
@@ -16,7 +16,6 @@
 #include "ecall_types.h"
 #include "list.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux-SGX/pal_linux.h b/Pal/src/host/Linux-SGX/pal_linux.h
@@ -23,7 +23,6 @@
 #include "linux_types.h"
 #include "log.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_internal.h"
 #include "pal_linux_defs.h"
 #include "sgx_api.h"

diff --git a/Pal/src/host/Linux/db_eventfd.c b/Pal/src/host/Linux/db_eventfd.c
@@ -15,7 +15,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux/db_exception.c b/Pal/src/host/Linux/db_exception.c
@@ -12,7 +12,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux/db_files.c b/Pal/src/host/Linux/db_files.c
@@ -9,7 +9,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_flags_conv.h"
 #include "pal_internal.h"

diff --git a/Pal/src/host/Linux/db_main.c b/Pal/src/host/Linux/db_main.c
@@ -15,7 +15,6 @@
 #include "elf/elf.h"
 #include "linux_utils.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"
@@ -216,7 +215,7 @@ noreturn void pal_linux_main(void* initial_rsp, void* fini_callback) {
 
     g_linux_state.host_environ = envp;
 
-    init_slab_mgr(g_page_size);
+    init_slab_mgr();
 
     g_pal_loader_path = get_main_exec_path();
     g_libpal_path = strdup(argv[1]);

diff --git a/Pal/src/host/Linux/db_memory.c b/Pal/src/host/Linux/db_memory.c
@@ -10,7 +10,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_flags_conv.h"
 #include "pal_internal.h"

diff --git a/Pal/src/host/Linux/db_misc.c b/Pal/src/host/Linux/db_misc.c
@@ -11,7 +11,6 @@
 #include "api.h"
 #include "pal.h"
 #include "linux_utils.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux/db_object.c b/Pal/src/host/Linux/db_object.c
@@ -12,7 +12,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux/db_pipes.c b/Pal/src/host/Linux/db_pipes.c
@@ -17,7 +17,6 @@
 #include "api.h"
 #include "linux_utils.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux/db_process.c b/Pal/src/host/Linux/db_process.c
@@ -21,7 +21,6 @@
 #include "api.h"
 #include "linux_utils.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux/db_sockets.c b/Pal/src/host/Linux/db_sockets.c
@@ -19,7 +19,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux/db_streams.c b/Pal/src/host/Linux/db_streams.c
@@ -19,7 +19,6 @@
 #include "api.h"
 #include "linux_utils.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux/db_threading.c b/Pal/src/host/Linux/db_threading.c
@@ -16,7 +16,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 #include "pal_linux.h"

diff --git a/Pal/src/host/Linux/pal_linux.h b/Pal/src/host/Linux/pal_linux.h
@@ -16,7 +16,6 @@
 
 #include "list.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_internal.h"
 #include "pal_linux_defs.h"
 #include "pal_linux_error.h"

diff --git a/Pal/src/host/Skeleton/db_devices.c b/Pal/src/host/Skeleton/db_devices.c
@@ -7,7 +7,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/host/Skeleton/db_eventfd.c b/Pal/src/host/Skeleton/db_eventfd.c
@@ -7,7 +7,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/host/Skeleton/db_exception.c b/Pal/src/host/Skeleton/db_exception.c
@@ -8,7 +8,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/host/Skeleton/db_files.c b/Pal/src/host/Skeleton/db_files.c
@@ -7,7 +7,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/host/Skeleton/db_main.c b/Pal/src/host/Skeleton/db_main.c
@@ -8,7 +8,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/host/Skeleton/db_memory.c b/Pal/src/host/Skeleton/db_memory.c
@@ -7,7 +7,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/host/Skeleton/db_misc.c b/Pal/src/host/Skeleton/db_misc.c
@@ -8,7 +8,6 @@
 #include "api.h"
 #include "assert.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"
 

diff --git a/Pal/src/host/Skeleton/db_object.c b/Pal/src/host/Skeleton/db_object.c
@@ -7,7 +7,6 @@
 
 #include "api.h"
 #include "pal.h"
-#include "pal_defs.h"
 #include "pal_error.h"
 #include "pal_internal.h"