Skip to content

sdk: rebase patches to v2.30.1 - #108

Open
Hayao0819 wants to merge 1 commit into
jovanbulck:masterfrom
Hayao0819:sdk-rebase-v2.30.1
Open

Hayao0819 wants to merge 1 commit into
jovanbulck:masterfrom
Hayao0819:sdk-rebase-v2.30.1

Conversation

@Hayao0819

Copy link
Copy Markdown
Contributor

Rebase the Intel SDK patches onto upstream tag sgx_2.30.1.

v2.30 split the monolithic linux-sgx tree, which is what makes this more than a straight rebase. The untrusted runtime (uRTS) moved out of psw/ into a new sdk submodule (intel/confidential-computing.sgx.sdk) and is now built into sdk/build/linuxLOAD/, so the files the AEP/TCS patch touches moved with it: psw/urts/linux/{urts.cpp,enter_enclave.S,urts.lds} are now under enclave_runtime/urts/linux/, and common/inc/sgx_urts.h and sdk/simulation/urtssim/urts_deploy.c live in the sdk submodule as well. 0001-reconfigure-AEP-TCS-ebase.patch is regenerated against the new paths, and patch_sdk.sh applies it inside the nested linux-sgx/sdk submodule. (The 32-bit 0000-…patch is not rebased; 32-bit builds remain unsupported on v2.30.)

The install script and app Makefiles needed matching changes. install_SGX_SDK.sh now fetches submodules recursively, and since v2.30 removed the legacy PSW .bin installer (make psw_install_pkg) it builds the patched uRTS with make psw; the sample apps link it from linux-sgx/sdk/build/linuxLOAD rather than linux-sgx/psw/urts/linux. I also dropped the service aesmd status line from CI: v2.30 no longer installs the PSW system-wide (its replacement is the much larger deb_psw_aesm_pkg aggregate), and the SGX-Step sample enclaves run with Flexible Launch Control in debug mode, which does not need aesmd.

Verification

Built the patched SDK + uRTS with the updated install_SGX_SDK.sh on a Gemini Lake machine (Debian 12, kernel 6.1) and confirmed the hooks are exported:

$ nm -D linux-sgx/sdk/build/linuxLOAD/libsgx_urts.so | grep -E "sgx_(get|set)_aep|sgx_get_tcs"
0000000000071400 T sgx_get_aep
0000000000071410 T sgx_get_tcs
0000000000071420 T sgx_set_aep

app/bench links against the patched runtime and single-steps a NOP slide.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant