diff --git a/demos/bash/run_bash_demo.sh b/demos/bash/run_bash_demo.sh index 613e080c..c04246e3 100755 --- a/demos/bash/run_bash_demo.sh +++ b/demos/bash/run_bash_demo.sh @@ -16,7 +16,8 @@ pushd occlum_instance rm -rf image copy_bom -f $bomfile --root image --include-dir /opt/occlum/etc/template -new_json="$(jq '.resource_limits.user_space_size = "600MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "600MB" | .resource_limits.kernel_space_stack_size ="2MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/benchmarks/iperf2/build.sh b/demos/benchmarks/iperf2/build.sh index 75fe9e81..951c010d 100755 --- a/demos/benchmarks/iperf2/build.sh +++ b/demos/benchmarks/iperf2/build.sh @@ -25,7 +25,8 @@ function build_occlum_instance() pushd ${name} copy_bom -f ../iperf2.yaml --root image --include-dir /opt/occlum/etc/template - new_json="$(jq '.resource_limits.user_space_size = "1000MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "1000MB" | .resource_limits.max_num_of_threads = 64 ' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/benchmarks/iperf3/build.sh b/demos/benchmarks/iperf3/build.sh index 2de4cef8..12d7f6c7 100755 --- a/demos/benchmarks/iperf3/build.sh +++ b/demos/benchmarks/iperf3/build.sh @@ -26,7 +26,8 @@ function build_occlum_instance() pushd ${name} copy_bom -f ../iperf3.yaml --root image --include-dir /opt/occlum/etc/template - new_json="$(jq '.resource_limits.user_space_size = "1000MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "1000MB" | .resource_limits.max_num_of_threads = 64 ' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/benchmarks/sysbench/prepare_sysbench.sh b/demos/benchmarks/sysbench/prepare_sysbench.sh index c99b3596..648145f6 100755 --- a/demos/benchmarks/sysbench/prepare_sysbench.sh +++ b/demos/benchmarks/sysbench/prepare_sysbench.sh @@ -8,7 +8,8 @@ cd occlum_instance rm -rf image copy_bom -f ../sysbench.yaml --root image --include-dir /opt/occlum/etc/template -new_json="$(jq '.resource_limits.user_space_size = "800MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "800MB" | .resource_limits.max_num_of_threads = 256 ' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/cluster_serving/init-occlum-taskmanager.sh b/demos/cluster_serving/init-occlum-taskmanager.sh index 1e3ad3fd..2e38c95a 100755 --- a/demos/cluster_serving/init-occlum-taskmanager.sh +++ b/demos/cluster_serving/init-occlum-taskmanager.sh @@ -9,8 +9,10 @@ init_instance() { cd flink # Init Occlum instance occlum init - new_json="$(jq '.resource_limits.user_space_size = "7000MB" | - .resource_limits.kernel_space_heap_size="64MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "7000MB" | + .resource_limits.kernel_space_heap_size="1MB" | + .resource_limits.kernel_space_heap_max_size="64MB" | .resource_limits.max_num_of_threads = 72 | .process.default_heap_size = "128MB" | .entry_points = [ "/usr/lib/jvm/java-11-openjdk-amd64/bin" ] | diff --git a/demos/fish/run_fish_test.sh b/demos/fish/run_fish_test.sh index e17a1d93..2e596c46 100755 --- a/demos/fish/run_fish_test.sh +++ b/demos/fish/run_fish_test.sh @@ -8,8 +8,10 @@ rm -rf occlum-instance occlum new occlum-instance cd occlum-instance -new_json="$(jq '.resource_limits.user_space_size = "512MB" | - .resource_limits.kernel_space_heap_size = "64MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "512MB" | + .resource_limits.kernel_space_heap_size = "1MB" | + .resource_limits.kernel_space_heap_max_size = "64MB" | .env.default = [ "OCCLUM=yes", "HOME=/root" ]' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/fish/run_per_process_config_test.sh b/demos/fish/run_per_process_config_test.sh index de266e7c..a0150d66 100755 --- a/demos/fish/run_per_process_config_test.sh +++ b/demos/fish/run_per_process_config_test.sh @@ -10,8 +10,10 @@ rm -rf occlum-test occlum new occlum-test && cd occlum-test # Set process memory space size to very small values and will fail when running target script using default configuration -new_json="$(jq '.resource_limits.user_space_size = "512MB" | - .resource_limits.kernel_space_heap_size= "64MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "512MB" | + .resource_limits.kernel_space_heap_size= "1MB" | + .resource_limits.kernel_space_heap_max_size = "64MB" | .process.default_stack_size = "1MB" | .process.default_heap_size = "1MB" | .env.default = [ "OCCLUM=yes", "HOME=/root" ]' Occlum.json)" && \ diff --git a/demos/flink/run_flink_on_occlum_glibc.sh b/demos/flink/run_flink_on_occlum_glibc.sh index d4d27204..7efd71c6 100755 --- a/demos/flink/run_flink_on_occlum_glibc.sh +++ b/demos/flink/run_flink_on_occlum_glibc.sh @@ -15,10 +15,12 @@ init_instance() { rm -rf occlum_instance_$postfix && mkdir occlum_instance_$postfix cd occlum_instance_$postfix occlum init - new_json="$(jq '.resource_limits.user_space_size = "5500MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "5500MB" | + .resource_limits.kernel_space_heap_size="1MB" | + .resource_limits.kernel_space_heap_max_size="64MB" | .resource_limits.max_num_of_threads = 64 | .process.default_heap_size = "128MB" | - .resource_limits.kernel_space_heap_size="64MB" | .entry_points = [ "/usr/lib/jvm/java-11-openjdk-amd64/bin" ] | .env.default = [ "LD_LIBRARY_PATH=/usr/lib/jvm/java-11-openjdk-amd64/lib/server:/usr/lib/jvm/java-11-openjdk-amd64/lib:/usr/lib/jvm/java-11-openjdk-amd64/../lib:/lib" ]' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/font/font_support_for_java/run_java_font_app_internal.sh b/demos/font/font_support_for_java/run_java_font_app_internal.sh index 93cac346..87ab8268 100755 --- a/demos/font/font_support_for_java/run_java_font_app_internal.sh +++ b/demos/font/font_support_for_java/run_java_font_app_internal.sh @@ -18,8 +18,10 @@ init_instance() { rm -rf occlum_instance && mkdir occlum_instance cd occlum_instance occlum init - new_json="$(jq '.resource_limits.user_space_size = "1400MB" | - .resource_limits.kernel_space_heap_size="64MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "1400MB" | + .resource_limits.kernel_space_heap_size="1MB" | + .resource_limits.kernel_space_heap_max_size="64MB" | .resource_limits.max_num_of_threads = 64 | .process.default_heap_size = "256MB" | .entry_points = [ "/usr/lib/jvm/java-11-alibaba-dragonwell/jre/bin" ] | diff --git a/demos/golang/go_sqlite/run_go_sqlite_demo.sh b/demos/golang/go_sqlite/run_go_sqlite_demo.sh index e03dbdd0..110a571a 100755 --- a/demos/golang/go_sqlite/run_go_sqlite_demo.sh +++ b/demos/golang/go_sqlite/run_go_sqlite_demo.sh @@ -16,8 +16,10 @@ occlum-go build -o simple_demo simple_demo.go rm -rf simple_demo_instance && mkdir simple_demo_instance cd simple_demo_instance occlum init -new_json="$(jq '.resource_limits.user_space_size = "2560MB" | - .resource_limits.kernel_space_heap_size="320MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "2560MB" | + .resource_limits.kernel_space_heap_size="1MB" | + .resource_limits.kernel_space_heap_max_size="320MB" | .resource_limits.kernel_space_stack_size="10MB" | .process.default_stack_size = "40MB" | .process.default_heap_size = "320MB" ' Occlum.json)" && \ diff --git a/demos/golang/grpc_benchmark/run_occlum_bench.sh b/demos/golang/grpc_benchmark/run_occlum_bench.sh index 3649ace4..bf59953a 100755 --- a/demos/golang/grpc_benchmark/run_occlum_bench.sh +++ b/demos/golang/grpc_benchmark/run_occlum_bench.sh @@ -42,7 +42,8 @@ rm -rf occlum_server && mkdir occlum_server rm -rf occlum_client && mkdir occlum_client cd occlum_client occlum init -new_json="$(jq '.resource_limits.user_space_size = "2048MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "2048MB" | .resource_limits.max_num_of_threads = 96 ' Occlum.json)" && \ echo "${new_json}" > Occlum.json @@ -54,7 +55,8 @@ occlum build cd ../occlum_server occlum init -new_json="$(jq '.resource_limits.user_space_size = "2048MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "2048MB" | .resource_limits.max_num_of_threads = 96 ' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/golang/grpc_pingpong/run_ping_on_occlum.sh b/demos/golang/grpc_pingpong/run_ping_on_occlum.sh index 68b202f8..8173a8b8 100755 --- a/demos/golang/grpc_pingpong/run_ping_on_occlum.sh +++ b/demos/golang/grpc_pingpong/run_ping_on_occlum.sh @@ -16,8 +16,10 @@ fi rm -rf occlum_ping_instance && mkdir occlum_ping_instance cd occlum_ping_instance occlum init -new_json="$(jq '.resource_limits.user_space_size = "800MB" | - .resource_limits.kernel_space_heap_size="40MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "800MB" | + .resource_limits.kernel_space_heap_size="1MB" | + .resource_limits.kernel_space_heap_max_size="40MB" | .resource_limits.kernel_space_stack_size="1MB" | .process.default_stack_size = "1MB" | .process.default_heap_size = "20MB" ' Occlum.json)" && \ diff --git a/demos/golang/grpc_pingpong/run_pong_on_occlum.sh b/demos/golang/grpc_pingpong/run_pong_on_occlum.sh index 11d5e2e3..76b447df 100755 --- a/demos/golang/grpc_pingpong/run_pong_on_occlum.sh +++ b/demos/golang/grpc_pingpong/run_pong_on_occlum.sh @@ -16,8 +16,10 @@ fi rm -rf occlum_pong_instance && mkdir occlum_pong_instance cd occlum_pong_instance occlum init -new_json="$(jq '.resource_limits.user_space_size = "800MB" | - .resource_limits.kernel_space_heap_size="40MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "800MB" | + .resource_limits.kernel_space_heap_size="1MB" | + .resource_limits.kernel_space_heap_max_size="40MB" | .resource_limits.kernel_space_stack_size="1MB" | .process.default_stack_size = "1MB" | .process.default_heap_size = "20MB" ' Occlum.json)" && \ diff --git a/demos/golang/vault/run_occlum_vault_server.sh b/demos/golang/vault/run_occlum_vault_server.sh index 1eac486b..c419cd8f 100755 --- a/demos/golang/vault/run_occlum_vault_server.sh +++ b/demos/golang/vault/run_occlum_vault_server.sh @@ -16,9 +16,12 @@ fi rm -rf occlum_instance occlum new occlum_instance cd occlum_instance -new_json="$(jq '.resource_limits.user_space_size = "2560MB" | - .resource_limits.kernel_space_heap_size="320MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "2560MB" | + .resource_limits.kernel_space_heap_size="1MB" | + .resource_limits.kernel_space_heap_max_size="320MB" | .resource_limits.kernel_space_stack_size="10MB" | + .resource_limits.max_num_of_threads=64 | .process.default_stack_size = "40MB" | .process.default_heap_size = "320MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/golang/web_server/run_golang_on_occlum.sh b/demos/golang/web_server/run_golang_on_occlum.sh index c9074f9f..a3f10fbc 100755 --- a/demos/golang/web_server/run_golang_on_occlum.sh +++ b/demos/golang/web_server/run_golang_on_occlum.sh @@ -16,7 +16,8 @@ fi rm -rf occlum_instance && mkdir occlum_instance cd occlum_instance occlum init -new_json="$(jq '.resource_limits.user_space_size = "1000MB" ' Occlum.json)" && \ +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "1000MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json # 2. Copy program into Occlum Workspace and build diff --git a/demos/java/run_java_on_occlum.sh b/demos/java/run_java_on_occlum.sh index 52c260aa..3e8d347e 100755 --- a/demos/java/run_java_on_occlum.sh +++ b/demos/java/run_java_on_occlum.sh @@ -24,8 +24,10 @@ init_instance() { rm -rf occlum_instance && mkdir occlum_instance cd occlum_instance occlum init - new_json="$(jq '.resource_limits.user_space_size = "1680MB" | - .resource_limits.kernel_space_heap_size="64MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "1680MB" | + .resource_limits.kernel_space_heap_size="1MB" | + .resource_limits.kernel_space_heap_max_size="64MB" | .resource_limits.max_num_of_threads = 64 | .process.default_heap_size = "256MB" | .entry_points = [ "/usr/lib/jvm/java-11-alibaba-dragonwell/jre/bin" ] | @@ -85,7 +87,8 @@ build_processBuilder() { rm -rf image copy_bom -f ../process_builder.yaml --root image --include-dir /opt/occlum/etc/template # Need bigger user space size for multiprocess - new_json="$(jq '.resource_limits.user_space_size = "6000MB"' Occlum.json)" && \ + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "6000MB"' Occlum.json)" && \ echo "${new_json}" > Occlum.json occlum build } diff --git a/demos/linux-ltp/prepare_ltp.sh b/demos/linux-ltp/prepare_ltp.sh index f198b1bf..7bf58535 100755 --- a/demos/linux-ltp/prepare_ltp.sh +++ b/demos/linux-ltp/prepare_ltp.sh @@ -8,8 +8,10 @@ cd ltp_instance rm -rf image copy_bom -f ../ltp.yaml --root image --include-dir /opt/occlum/etc/template -new_json="$(jq '.resource_limits.user_space_size = "3000MB" | - .resource_limits.kernel_space_heap_size ="1024MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "3000MB" | + .resource_limits.kernel_space_heap_size ="1MB" | + .resource_limits.kernel_space_heap_max_size ="1024MB" | .resource_limits.kernel_space_stack_size ="4MB" | .resource_limits.max_num_of_threads = 96 | .entry_points = [ "/opt/ltp" ] | diff --git a/demos/mysql/run_mysql_server.sh b/demos/mysql/run_mysql_server.sh index a72f3f29..d3059822 100755 --- a/demos/mysql/run_mysql_server.sh +++ b/demos/mysql/run_mysql_server.sh @@ -14,8 +14,10 @@ MYSQLD=mysqld rm -rf occlum_instance && occlum new occlum_instance pushd occlum_instance -new_json="$(jq '.resource_limits.user_space_size = "8000MB" | - .resource_limits.kernel_space_heap_size ="1000MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "8000MB" | + .resource_limits.kernel_space_heap_size ="1MB" | + .resource_limits.kernel_space_heap_max_size ="1000MB" | .resource_limits.max_num_of_threads = 96' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/netty_ut/run_netty_ut_jdk11.sh b/demos/netty_ut/run_netty_ut_jdk11.sh index 6a25ede2..ac2d0003 100755 --- a/demos/netty_ut/run_netty_ut_jdk11.sh +++ b/demos/netty_ut/run_netty_ut_jdk11.sh @@ -17,8 +17,10 @@ init_instance() { # Init Occlum instance rm -rf occlum_netty_ut_instance && occlum new occlum_netty_ut_instance cd occlum_netty_ut_instance - new_json="$(jq '.resource_limits.user_space_size = "4680MB" | - .resource_limits.kernel_space_heap_size="64MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "4680MB" | + .resource_limits.kernel_space_heap_size="1MB" | + .resource_limits.kernel_space_heap_max_size="64MB" | .resource_limits.max_num_of_threads = 128 | .process.default_heap_size = "512MB" | .entry_points = [ "/usr/lib/jvm/java-11-openjdk-amd64/bin" ] | diff --git a/demos/openvino/run_benchmark_on_occlum.sh b/demos/openvino/run_benchmark_on_occlum.sh index f15285ea..062451f6 100755 --- a/demos/openvino/run_benchmark_on_occlum.sh +++ b/demos/openvino/run_benchmark_on_occlum.sh @@ -18,7 +18,9 @@ cpu_cc=`cat /proc/cpuinfo | grep processor | wc -l` # .process.default_stack_size = "8MB" | # .process.default_heap_size = "32MB" | # .metadata.debuggable = false ' Occlum.json)" && \ -new_json="$(jq '.resource_limits.user_space_size = "320MB"' Occlum.json)" && \ +new_json="$(jq '.resource_limits.max_num_of_threads = 64 | + .resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "600MB"' Occlum.json)" && \ echo "${new_json}" > Occlum.json # 2. Copy files into Occlum Workspace and Build diff --git a/demos/paddlepaddle/run_paddlepaddle_on_occlum.sh b/demos/paddlepaddle/run_paddlepaddle_on_occlum.sh index aa0de2fa..3c00b384 100755 --- a/demos/paddlepaddle/run_paddlepaddle_on_occlum.sh +++ b/demos/paddlepaddle/run_paddlepaddle_on_occlum.sh @@ -15,8 +15,10 @@ if [ ! -d $python_dir ];then exit 1 fi -new_json="$(jq '.resource_limits.user_space_size = "6000MB" | - .resource_limits.kernel_space_heap_size = "256MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "6000MB" | + .resource_limits.kernel_space_heap_size = "1MB" | + .resource_limits.kernel_space_heap_max_size = "256MB" | .resource_limits.max_num_of_threads = 64 | .env.default += ["PYTHONHOME=/opt/python-occlum"]' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/python/flask/build_occlum_instance.sh b/demos/python/flask/build_occlum_instance.sh index 7f0750a2..193d6807 100755 --- a/demos/python/flask/build_occlum_instance.sh +++ b/demos/python/flask/build_occlum_instance.sh @@ -16,8 +16,10 @@ if [ ! -d $python_dir ];then exit 1 fi -new_json="$(jq '.resource_limits.user_space_size = "640MB" | - .resource_limits.kernel_space_heap_size = "256MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "640MB" | + .resource_limits.kernel_space_heap_size = "1MB" | + .resource_limits.kernel_space_heap_max_size = "256MB" | .env.default += ["PYTHONHOME=/opt/python-occlum"]' Occlum.json)" && \ echo "${new_json}" > Occlum.json occlum build diff --git a/demos/python/python_glibc/run_python_on_occlum.sh b/demos/python/python_glibc/run_python_on_occlum.sh index 6426ffc4..a1887f6e 100755 --- a/demos/python/python_glibc/run_python_on_occlum.sh +++ b/demos/python/python_glibc/run_python_on_occlum.sh @@ -17,8 +17,10 @@ if [ ! -d $python_dir ];then exit 1 fi -new_json="$(jq '.resource_limits.user_space_size = "640MB" | - .resource_limits.kernel_space_heap_size = "300MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "640MB" | + .resource_limits.kernel_space_heap_size = "1MB" | + .resource_limits.kernel_space_heap_max_size = "300MB" | .env.default += ["PYTHONHOME=/opt/python-occlum"]' Occlum.json)" && \ echo "${new_json}" > Occlum.json occlum build diff --git a/demos/python/python_musl/run_python_on_occlum.sh b/demos/python/python_musl/run_python_on_occlum.sh index 68188138..81fd71ed 100755 --- a/demos/python/python_musl/run_python_on_occlum.sh +++ b/demos/python/python_musl/run_python_on_occlum.sh @@ -20,8 +20,10 @@ cd occlum_instance if [ ! -d "image/lib/python3.7" ];then rm -rf image copy_bom -f ../python_musl.yaml --root image --include-dir /opt/occlum/etc/template - new_json="$(jq '.resource_limits.user_space_size = "320MB" | - .resource_limits.kernel_space_heap_size = "256MB"' Occlum.json)" && \ + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "320MB" | + .resource_limits.kernel_space_heap_size = "1MB" | + .resource_limits.kernel_space_heap_max_size = "256MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json occlum build fi diff --git a/demos/pytorch/distributed/build_pytorch_occlum_instance.sh b/demos/pytorch/distributed/build_pytorch_occlum_instance.sh index be9a1bf6..6437fa0a 100755 --- a/demos/pytorch/distributed/build_pytorch_occlum_instance.sh +++ b/demos/pytorch/distributed/build_pytorch_occlum_instance.sh @@ -34,8 +34,10 @@ function build_instance() exit 1 fi - new_json="$(jq '.resource_limits.user_space_size = "4000MB" | - .resource_limits.kernel_space_heap_size = "400MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "4000MB" | + .resource_limits.kernel_space_heap_size = "1MB" | + .resource_limits.kernel_space_heap_max_size = "400MB" | .resource_limits.max_num_of_threads = 64 | .env.untrusted += [ "MASTER_ADDR", "MASTER_PORT", "WORLD_SIZE", "RANK", "OMP_NUM_THREADS", "HOME" ] | .env.default += ["GLOO_DEVICE_TRANSPORT=TCP_TLS"] | diff --git a/demos/pytorch/standalone/run_pytorch_on_occlum.sh b/demos/pytorch/standalone/run_pytorch_on_occlum.sh index 7d964704..a1ac7eb5 100755 --- a/demos/pytorch/standalone/run_pytorch_on_occlum.sh +++ b/demos/pytorch/standalone/run_pytorch_on_occlum.sh @@ -15,8 +15,10 @@ if [ ! -d $python_dir ];then exit 1 fi -new_json="$(jq '.resource_limits.user_space_size = "6000MB" | - .resource_limits.kernel_space_heap_size = "256MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "6000MB" | + .resource_limits.kernel_space_heap_size = "1MB" | + .resource_limits.kernel_space_heap_max_size = "256MB" | .resource_limits.max_num_of_threads = 64 | .env.default += ["PYTHONHOME=/opt/python-occlum"]' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/redis/run_occlum_redis.sh b/demos/redis/run_occlum_redis.sh index 5d20fd08..a9efbded 100755 --- a/demos/redis/run_occlum_redis.sh +++ b/demos/redis/run_occlum_redis.sh @@ -8,7 +8,8 @@ bomfile=${SCRIPT_DIR}/redis.yaml rm -rf occlum_instance occlum new occlum_instance cd occlum_instance -new_json="$(jq '.resource_limits.user_space_size = "320MB" ' Occlum.json)" && \ +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "320MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json # 2. Copy files into Occlum Workspace and Build diff --git a/demos/redis/run_occlum_redis_glibc.sh b/demos/redis/run_occlum_redis_glibc.sh index 328fc86b..3fc3e1cc 100755 --- a/demos/redis/run_occlum_redis_glibc.sh +++ b/demos/redis/run_occlum_redis_glibc.sh @@ -8,7 +8,8 @@ bomfile=${SCRIPT_DIR}/redis_glibc.yaml rm -rf occlum_instance occlum new occlum_instance cd occlum_instance -new_json="$(jq '.resource_limits.user_space_size = "320MB" ' Occlum.json)" && \ +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "320MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json rm -rf image diff --git a/demos/remote_attestation/azure_attestation/maa_attestation/build.sh b/demos/remote_attestation/azure_attestation/maa_attestation/build.sh index 02114cc4..d66a5d48 100755 --- a/demos/remote_attestation/azure_attestation/maa_attestation/build.sh +++ b/demos/remote_attestation/azure_attestation/maa_attestation/build.sh @@ -17,8 +17,10 @@ function build() { rm -rf image copy_bom -f $bomfile --root image --include-dir /opt/occlum/etc/template - new_json="$(jq '.resource_limits.user_space_size = "600MB" | - .resource_limits.kernel_space_heap_size = "128MB"' Occlum.json)" && \ + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "600MB" | + .resource_limits.kernel_space_heap_size = "1MB" | + .resource_limits.kernel_space_heap_max_size = "128MB"' Occlum.json)" && \ echo "${new_json}" > Occlum.json occlum build diff --git a/demos/remote_attestation/init_ra_flow/build_content.sh b/demos/remote_attestation/init_ra_flow/build_content.sh index 35d24921..74e69e05 100755 --- a/demos/remote_attestation/init_ra_flow/build_content.sh +++ b/demos/remote_attestation/init_ra_flow/build_content.sh @@ -49,8 +49,10 @@ function build_client_instance() # In our case, client and server use the same sign-key thus also the same mrsigner occlum build - new_json="$(jq '.resource_limits.user_space_size = "600MB" | - .resource_limits.kernel_space_heap_size = "128MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "600MB" | + .resource_limits.kernel_space_heap_size = "1MB" | + .resource_limits.kernel_space_heap_max_size = "128MB" | .resource_limits.max_num_of_threads = 32 | .metadata.debuggable = true | .metadata.enable_kss = true | @@ -102,7 +104,8 @@ function build_server_instance() .sgx_mrs[0].config_svn = 1234 | .sgx_mrs[0].debuggable = true ' ../ra_config_template.json > dynamic_config.json - new_json="$(jq '.resource_limits.user_space_size = "500MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "500MB" | .metadata.debuggable = true ' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/runtime_boot/build_content.sh b/demos/runtime_boot/build_content.sh index e0276ba8..31e44032 100755 --- a/demos/runtime_boot/build_content.sh +++ b/demos/runtime_boot/build_content.sh @@ -18,7 +18,8 @@ function build_bash_demo() rm -rf image copy_bom -f ../bash.yaml --root image --include-dir /opt/occlum/etc/template - new_json="$(jq '.resource_limits.user_space_size = "600MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "600MB" | .resource_limits.kernel_space_stack_size ="2MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json @@ -44,8 +45,10 @@ function build_and_gen_rootfs() rm -rf gen_rootfs_instance && occlum new gen_rootfs_instance pushd gen_rootfs_instance - new_json="$(jq '.resource_limits.user_space_size = "1000MB" | - .resource_limits.kernel_space_heap_size= "512MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "1000MB" | + .resource_limits.kernel_space_heap_size= "1MB" | + .resource_limits.kernel_space_heap_max_size= "512MB" | .resource_limits.kernel_space_stack_size= "16MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json @@ -69,7 +72,8 @@ function build_boot_template() rm -rf boot_instance && occlum new boot_instance pushd boot_instance - new_json="$(jq '.resource_limits.user_space_size = "600MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "600MB" | .resource_limits.kernel_space_stack_size ="2MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/sofaboot/run_sofaboot_on_occlum.sh b/demos/sofaboot/run_sofaboot_on_occlum.sh index 79535f3e..022fd6b2 100755 --- a/demos/sofaboot/run_sofaboot_on_occlum.sh +++ b/demos/sofaboot/run_sofaboot_on_occlum.sh @@ -17,8 +17,10 @@ init_instance() { # Init Occlum instance rm -rf occlum_instance && occlum new occlum_instance cd occlum_instance - new_json="$(jq '.resource_limits.user_space_size = "1680MB" | - .resource_limits.kernel_space_heap_size="64MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "1680MB" | + .resource_limits.kernel_space_heap_size="1MB" | + .resource_limits.kernel_space_heap_max_size="64MB" | .resource_limits.max_num_of_threads = 64 | .process.default_heap_size = "256MB" | .entry_points = [ "/usr/lib/jvm/java-11-alibaba-dragonwell/jre/bin" ] | diff --git a/demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh b/demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh index 9b96c2a9..2581f8c4 100755 --- a/demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh +++ b/demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh @@ -17,8 +17,10 @@ init_instance() { # Init Occlum instance rm -rf occlum_instance && occlum new occlum_instance cd occlum_instance - new_json="$(jq '.resource_limits.user_space_size = "1680MB" | - .resource_limits.kernel_space_heap_size="64MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "1680MB" | + .resource_limits.kernel_space_heap_size="1MB" | + .resource_limits.kernel_space_heap_max_size="64MB" | .resource_limits.max_num_of_threads = 64 | .process.default_heap_size = "256MB" | .entry_points = [ "/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/" ] | diff --git a/demos/tensorflow/tensorflow_serving/run_occlum_tf_serving.sh b/demos/tensorflow/tensorflow_serving/run_occlum_tf_serving.sh index 922c4e6b..54fbf3c8 100755 --- a/demos/tensorflow/tensorflow_serving/run_occlum_tf_serving.sh +++ b/demos/tensorflow/tensorflow_serving/run_occlum_tf_serving.sh @@ -18,8 +18,10 @@ rm -rf occlum_instance mkdir occlum_instance cd occlum_instance occlum init -new_json="$(jq '.resource_limits.user_space_size = "7000MB" | - .resource_limits.kernel_space_heap_size="384MB" | +new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "7000MB" | + .resource_limits.kernel_space_heap_size="1MB" | + .resource_limits.kernel_space_heap_max_size="384MB" | .process.default_heap_size = "128MB" | .resource_limits.max_num_of_threads = 64 | .env.default = [ "OMP_NUM_THREADS=8", "KMP_AFFINITY=verbose,granularity=fine,compact,1,0", "KMP_BLOCKTIME=20", "MKL_NUM_THREADS=8"]' Occlum.json)" && \ diff --git a/demos/tensorflow/tensorflow_training/run_tensorflow_on_occlum.sh b/demos/tensorflow/tensorflow_training/run_tensorflow_on_occlum.sh index 2f8d8fb8..f04ae7e8 100755 --- a/demos/tensorflow/tensorflow_training/run_tensorflow_on_occlum.sh +++ b/demos/tensorflow/tensorflow_training/run_tensorflow_on_occlum.sh @@ -19,8 +19,10 @@ cd occlum_instance if [ ! -L "image/bin/python3" ];then rm -rf image copy_bom -f ../tensorflow_training.yaml --root image --include-dir /opt/occlum/etc/template - new_json="$(jq '.resource_limits.user_space_size = "5400MB" | - .resource_limits.kernel_space_heap_size = "512MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "5400MB" | + .resource_limits.kernel_space_heap_size = "1MB" | + .resource_limits.kernel_space_heap_max_size = "512MB" | .resource_limits.max_num_of_threads = 64 | .env.default += ["PYTHONHOME=/opt/python-occlum", "OMP_NUM_THREADS=1"]' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/example/build_content.sh b/example/build_content.sh index 6d7952e3..0cfa00c5 100755 --- a/example/build_content.sh +++ b/example/build_content.sh @@ -54,8 +54,10 @@ function build_tf_instance() # In our case, client and server use the same sign-key thus also the same mrsigner occlum build - new_json="$(jq '.resource_limits.user_space_size = "7000MB" | - .resource_limits.kernel_space_heap_size="384MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "7000MB" | + .resource_limits.kernel_space_heap_size="1MB" | + .resource_limits.kernel_space_heap_max_size="384MB" | .process.default_heap_size = "128MB" | .resource_limits.max_num_of_threads = 64 | .metadata.debuggable = false | @@ -105,7 +107,8 @@ function build_server_instance() .sgx_mrs[0].mr_signer = ''"'`get_mr tf mrsigner`'" | .sgx_mrs[0].debuggable = false ' ../ra_config_template.json > dynamic_config.json - new_json="$(jq '.resource_limits.user_space_size = "500MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "500MB" | .metadata.debuggable = false ' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/tools/toolchains/grpc_ratls/ra_tls/build_occlum_instance.sh b/tools/toolchains/grpc_ratls/ra_tls/build_occlum_instance.sh index 2b66c86f..dacc7d57 100755 --- a/tools/toolchains/grpc_ratls/ra_tls/build_occlum_instance.sh +++ b/tools/toolchains/grpc_ratls/ra_tls/build_occlum_instance.sh @@ -13,7 +13,8 @@ function build_instance() { mkdir occlum_$postfix pushd occlum_$postfix occlum init - new_json="$(jq '.resource_limits.user_space_size = "500MB" | + new_json="$(jq '.resource_limits.user_space_size = "1MB" | + .resource_limits.user_space_max_size = "500MB" | .metadata.debuggable = false' Occlum.json)" && \ echo "${new_json}" > Occlum.json