Skip to content
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

Add CLI argument for SNP context directory #5686

Merged
merged 9 commits into from
Sep 26, 2023

Conversation

eddyashton
Copy link
Member

#5384.

Deprecates config field attestation.security_context_directory, replaces with CLI --snp-security-context-dir-var. Includes default value UVM_SECURITY_CONTEXT_DIR, so this should never be a required arg.

Also reshuffled which fields of the config are required - I thought that with the previous PR (#5665) we no longer needed the .enclave config entry at all, but in fact the type and platform fields are required (always used), so I've updated the schema to require them.

@eddyashton eddyashton added auto-backport Automatically backport this PR to LTS branch 4.x-todo PRs which should be backported to 4.x labels Sep 25, 2023
@eddyashton eddyashton requested a review from a team September 25, 2023 13:32
@eddyashton eddyashton changed the title Add CLI argument for SNP context directory. Add CLI argument for SNP context directory Sep 25, 2023
@ghost
Copy link

ghost commented Sep 25, 2023

sec_ctxt_dir_env_var_cli@76430 aka 20230926.7 vs main ewma over 20 builds from 76076 to 76422

Click to see table

main

build_id build_number pi_basic_mt_sgx_cft^ pi_basic_mt_sgx_cft_mem pi_basic_mt_virtual_cft^ Commit latency factor tpcc_virtual_cft^ ls_virtual_cft^ tpcc_sgx_cft^ tpcc_sgx_cft_mem pi_ls_virtual_cft^ pi_basic_virtual_cft^ pi_basic_js_virtual_cft^ ls_jwt_virtual_cft^ pi_ls_jwt_virtual_cft^ ls_js_virtual_cft^ ls_sgx_cft^ ls_sgx_cft_mem pi_ls_sgx_cft^ pi_ls_sgx_cft_mem ls_full_js_virtual_cft^ pi_basic_sgx_cft^ pi_basic_sgx_cft_mem ls_js_jwt_virtual_cft^ pi_basic_js_sgx_cft^ pi_basic_js_sgx_cft_mem ls_jwt_sgx_cft^ ls_jwt_sgx_cft_mem hist_sgx_cft^ pi_ls_jwt_sgx_cft^ pi_ls_jwt_sgx_cft_mem ls_js_sgx_cft^ ls_js_sgx_cft_mem ls_full_js_sgx_cft^ ls_full_js_sgx_cft_mem ls_js_jwt_sgx_cft^ ls_js_jwt_sgx_cft_mem RB put (/s)^ CHAMP put (/s)^ RB get (/s)^ CHAMP get (/s)^
76076 20230919.46 27742.6 2.51822e+07 78567.6 0.841856 17381.2 45544.3 5535.46 8.59996e+07 47874.6 53078.7 4492.4 17214.5 16564.8 17135.5 13972.3 1.88908e+07 14006.2 1.05021e+07 14642.9 15504.1 1.46964e+07 9786.58 1431.1 1.25993e+07 6868.27 1.88908e+07 44362.7 6991 6.30784e+06 5792.24 1.67936e+07 5488.53 1.67936e+07 3984.22 1.67936e+07 835522 1.18649e+06 8.15306e+06 3.0439e+07
76097 20230920.1 28027 2.30851e+07 86385.1 0.771017 17317 45477.1 5650.74 8.59996e+07 48221.6 55062.5 4480.6 17201.5 19641.3 17217 14031.1 1.67936e+07 14131.3 1.05021e+07 14623.7 15471.1 1.46964e+07 9757.69 1446.5 1.25993e+07 6850.31 1.67936e+07 36337.8 6988.2 6.30784e+06 5784.34 1.67936e+07 5750.9 1.67936e+07 3973.75 1.67936e+07 833307 1.18308e+06 8.15264e+06 3.09295e+07
76165 20230921.3 27623 2.30851e+07 77456.4 0.768436 17168.2 45677.4 5585.9 8.59996e+07 48197.9 55130.8 4354.8 17117.4 19846 17049.8 14067.6 1.67936e+07 14121.5 1.05021e+07 16843.7 15674.5 1.25993e+07 9885.87 1441.9 1.25993e+07 6846.38 1.67936e+07 45264.8 7088.4 6.30784e+06 5774.38 1.67936e+07 5777.07 1.67936e+07 3994.62 1.67936e+07 841894 1.18293e+06 8.17154e+06 3.14395e+07
76171 20230921.6 28181.5 2.51822e+07 90391.4 0.835403 17444 45885 5590.06 8.59996e+07 49813.7 55693 4397.5 17248.2 19556.1 17048.7 14063.7 1.88908e+07 14139.1 1.05021e+07 14393.6 15638.1 1.46964e+07 9900.28 1438.5 1.25993e+07 7263.82 1.67936e+07 47592.5 6934.8 6.30784e+06 5777.83 1.67936e+07 5739.47 1.67936e+07 3979.61 1.67936e+07 835535 1.18048e+06 8.14991e+06 3.10731e+07
76203 20230921.17 28117.4 2.51822e+07 91230.3 0.786125 17331.8 45471.5 5590.41 8.59996e+07 48425.7 55265.4 4445 17069.4 19840.5 17208.3 14046.3 1.88908e+07 14136.2 1.05021e+07 16828.2 15702.1 1.25993e+07 9850.06 1451.3 1.25993e+07 7265.93 1.67936e+07 41833.5 6938.8 6.30784e+06 5812.78 1.67936e+07 5731.91 1.88908e+07 4003.75 1.67936e+07 828314 1.18182e+06 8.15189e+06 3.14873e+07
76211 20230921.19 28190 2.51822e+07 83281 0.768321 17227.8 45812.6 5540.05 8.59996e+07 48471.5 54793.9 4423.3 16980.2 19036 17505.3 13915.4 1.88908e+07 14037.6 1.05021e+07 14920.8 15443.2 1.46964e+07 10061.9 1427 1.25993e+07 7200.01 1.88908e+07 42595.5 6829.3 6.30784e+06 5793.08 1.67936e+07 5714.67 1.88908e+07 4002.62 1.67936e+07 836057 1.18019e+06 8.15267e+06 3.07739e+07
76229 20230921.26 28059.6 2.51822e+07 66135.4 0.829414 17401.8 43704.7 5652.51 8.59996e+07 47600.2 53570.9 4439.6 16987.8 19431.4 17595.1 14090.4 1.67936e+07 14190.5 1.05021e+07 14848.4 15600 1.46964e+07 10010.4 1447.9 1.25993e+07 7298.28 1.67936e+07 42758.2 6978.2 6.30784e+06 5830.7 1.67936e+07 5721.21 1.67936e+07 4004.1 1.67936e+07 832626 1.17831e+06 8.13609e+06 3.08452e+07
76246 20230921.32 28040.6 2.51822e+07 90083.2 0.813443 17276.3 46143 5560.83 8.59996e+07 48647.1 55120.7 4455 17322 19312.1 16895.7 13924 1.88908e+07 14031.5 1.05021e+07 14660.4 15320.5 1.46964e+07 9783.22 1428.1 1.25993e+07 6841.82 1.67936e+07 44774.6 6915.5 6.30784e+06 5775.95 1.67936e+07 5741.57 1.88908e+07 4016.26 1.67936e+07 836067 1.18217e+06 8.15348e+06 3.24647e+07
76264 20230921.38 28078 2.30851e+07 77135.1 0.780894 17230 45759.3 5498.22 8.59996e+07 46429.6 54858.2 4451.4 17199.9 19967.7 17029.2 13944.9 1.67936e+07 14014.4 1.05021e+07 15131.4 15418.7 1.46964e+07 9808.43 1429.9 1.25993e+07 6816.34 1.88908e+07 44676.9 6879.8 6.30784e+06 5792 1.67936e+07 5484.27 1.88908e+07 3997.38 1.67936e+07 836500 1.18323e+06 8.15426e+06 3.14101e+07
76275 20230921.42 27675.3 2.51822e+07 61293.6 0.799728 17284.6 45985.5 5516.85 8.59996e+07 48663.5 54864.7 4484.2 17338.3 19110.6 17422.8 13833 1.88908e+07 13994.3 1.05021e+07 14799.1 15323 1.46964e+07 9983.03 1428.6 1.25993e+07 6814.88 1.88908e+07 43972 6957 6.30784e+06 5792.76 1.67936e+07 5477.97 1.67936e+07 3976.18 1.67936e+07 834967 1.1818e+06 8.15572e+06 3.13308e+07
76284 20230922.1 27961.4 2.30851e+07 87501.2 0.795209 17301 45670.3 5633.54 8.59996e+07 48224.4 54547.6 4451.7 17379.9 19636.7 15047.1 14010.7 1.67936e+07 14106.8 1.05021e+07 14992.1 15551.8 1.25993e+07 9793.49 1446.7 1.25993e+07 6827.79 1.88908e+07 42409.1 6927.2 6.30784e+06 5776.51 1.67936e+07 5763.08 1.67936e+07 4000.17 1.67936e+07 824925 1.18035e+06 8.1735e+06 3.1513e+07
76298 20230922.7 27722.6 2.30851e+07 74808.3 0.800525 17323.7 45640.5 5594.3 8.59996e+07 41875.2 54379 4437.9 17134.8 19126.7 17461.3 14004.8 1.67936e+07 14048.4 1.05021e+07 14816.7 15518.1 1.25993e+07 9779.41 1428.6 1.25993e+07 6899.81 1.88908e+07 44172.3 7081.9 6.30784e+06 5779.93 1.67936e+07 5468 1.67936e+07 3981.43 1.67936e+07 825413 1.17652e+06 8.15043e+06 3.07277e+07
76315 20230922.13 27876.9 2.30851e+07 69448.7 0.80863 17303.6 45826.4 5538.6 8.59996e+07 48277 54985.6 4473.6 17227.3 19660.3 17271 13943 1.67936e+07 14077.1 1.05021e+07 14960 15400.6 1.25993e+07 9777.67 1435.8 1.25993e+07 6800.32 1.88908e+07 42190.1 6885.7 6.30784e+06 5765.87 1.67936e+07 5441.2 1.67936e+07 3999.43 1.67936e+07 832221 1.17806e+06 8.15602e+06 3.16548e+07
76330 20230922.19 28049.9 2.30851e+07 89163.8 0.858037 17306.3 43745.9 5615.85 8.59996e+07 48548.6 54489 4421.3 16991.2 19476.1 17415.7 14027.7 1.67936e+07 14054.2 1.05021e+07 15098.1 15590.5 1.25993e+07 9979.65 1442.4 1.25993e+07 6816.46 1.88908e+07 40339.6 6925.9 6.30784e+06 5810.87 1.67936e+07 5790.79 1.67936e+07 4004.39 1.67936e+07 828854 1.18105e+06 8.17118e+06 3.07715e+07
76345 20230925.1 28121 2.30851e+07 71294.3 0.797862 17379.9 45613 5580.25 8.59996e+07 48236.5 54857.8 4423.1 17220.9 19323.7 17336.5 13980.5 1.88908e+07 14091.4 1.05021e+07 15000.3 15590.5 1.25993e+07 9841.31 1438 1.25993e+07 6912.6 1.88908e+07 44686.4 6932.1 6.30784e+06 5804.88 1.67936e+07 5769.73 1.67936e+07 4001.2 1.67936e+07 840036 1.17118e+06 8.13205e+06 3.07304e+07
76354 20230925.5 27781.6 2.30851e+07 66649 0.777537 17275 45840.2 5658.2 8.59996e+07 47774.9 55252.5 4454.5 16896 19510.3 17301.6 14047.8 1.88908e+07 14132 1.05021e+07 14893.3 15677.6 1.25993e+07 9953.05 1448.6 1.25993e+07 6864.84 1.88908e+07 44715.7 7153.1 6.30784e+06 5772.5 1.67936e+07 5787.49 1.67936e+07 3983.73 1.67936e+07 829194 1.17874e+06 8.13641e+06 3.2025e+07
76364 20230925.8 27926.4 2.30851e+07 66865.4 0.794293 17152.3 45670.8 5660.35 8.59996e+07 47631.7 55394.6 4444.5 17025.6 19263.4 17562.5 14006.7 1.88908e+07 14101.4 1.05021e+07 14890 15631 1.46964e+07 10304 1441.2 1.25993e+07 6848.56 1.88908e+07 36232.5 6926.3 6.30784e+06 5813.72 1.67936e+07 5762.48 1.67936e+07 3997.44 1.67936e+07 831674 1.18443e+06 8.1528e+06 3.20571e+07
76401 20230925.21 28098.9 2.30851e+07 90296.9 0.778057 17284.6 45791.4 5618.43 8.59996e+07 48390.8 55563.4 4425.9 17183.4 19213 17522.5 14012.6 1.88908e+07 14100.3 1.05021e+07 15052.4 15619.1 1.46964e+07 9862.43 1437.8 1.25993e+07 6854.04 1.88908e+07 46217.4 7073.1 6.30784e+06 5762.99 1.67936e+07 5777.3 1.67936e+07 3997.84 1.67936e+07 815297 1.18394e+06 8.13712e+06 3.11029e+07
76413 20230926.1 27525.8 2.51822e+07 74534.1 0.809525 17088.7 43810.5 5615.12 8.59996e+07 47540.7 54719.5 4400.7 17075.2 19481 17178.2 14001.8 1.67936e+07 14121.4 1.05021e+07 14729.2 15666.9 1.25993e+07 10266.5 1439.4 1.25993e+07 6880.56 1.88908e+07 44374.2 6945 6.30784e+06 5807.19 1.67936e+07 5735.29 1.88908e+07 4005.07 1.67936e+07 830904 1.18316e+06 8.1553e+06 3.0742e+07
76422 20230926.5 28064.8 2.51822e+07 72164.4 0.79564 17377.5 43901.8 5613.41 8.59996e+07 48144.5 54917.7 4422.7 17099.4 19656.8 16945.3 14068.8 1.88908e+07 14153.7 1.05021e+07 16940.7 15715.8 1.25993e+07 9833.1 1449 1.25993e+07 6867.21 1.88908e+07 43158.3 6970.9 6.30784e+06 5808.85 1.67936e+07 5786.28 1.67936e+07 4006.72 1.67936e+07 830821 1.17914e+06 8.15517e+06 3.07102e+07

sec_ctxt_dir_env_var_cli

build_id build_number Commit latency factor tpcc_sgx_cft^ tpcc_sgx_cft_mem ls_sgx_cft^ ls_sgx_cft_mem pi_ls_sgx_cft^ pi_ls_sgx_cft_mem pi_basic_mt_sgx_cft^ pi_basic_mt_sgx_cft_mem pi_basic_sgx_cft^ pi_basic_sgx_cft_mem tpcc_virtual_cft^ pi_basic_js_sgx_cft^ pi_basic_js_sgx_cft_mem pi_basic_mt_virtual_cft^ ls_virtual_cft^ ls_jwt_sgx_cft^ ls_jwt_sgx_cft_mem pi_ls_virtual_cft^ pi_ls_jwt_sgx_cft^ pi_ls_jwt_sgx_cft_mem pi_basic_virtual_cft^ pi_basic_js_virtual_cft^ ls_js_sgx_cft^ ls_js_sgx_cft_mem ls_jwt_virtual_cft^ pi_ls_jwt_virtual_cft^ ls_full_js_sgx_cft^ ls_full_js_sgx_cft_mem ls_js_virtual_cft^ ls_full_js_virtual_cft^ ls_js_jwt_sgx_cft^ ls_js_jwt_sgx_cft_mem ls_js_jwt_virtual_cft^ hist_sgx_cft^ RB put (/s)^ CHAMP put (/s)^ RB get (/s)^ CHAMP get (/s)^
76384 20230925.16 0.823612 5617.66 8.59996e+07 13967.3 1.88908e+07 14032.9 1.05021e+07 28083 2.72794e+07 15576.8 1.25993e+07 17238.7 1434.2 1.05021e+07 64471.5 45842 6851.18 1.88908e+07 47858.3 6935.1 6.30784e+06 55676.2 4456.3 5778.96 1.67936e+07 17509.9 19737.9 5497.36 1.67936e+07 17543.4 15008.2 4000.17 1.67936e+07 9899.44 43844.2 829089 1.17932e+06 8.15579e+06 3.13889e+07
76408 20230925.23 0.776373 5631.97 8.59996e+07 14012.9 1.88908e+07 14121.7 1.05021e+07 28048.5 2.51822e+07 15739.6 1.25993e+07 17202.4 1445.7 1.25993e+07 75709.4 43958.9 7247.5 1.67936e+07 48031.2 7000.7 6.30784e+06 55234.9 4437.9 5806.76 1.67936e+07 17273.6 19730.5 5743.26 1.67936e+07 15025.1 15023.3 4003.53 1.67936e+07 9859.81 40986.1 829028 1.18626e+06 8.15582e+06 3.07424e+07
76430 20230926.7 0.815784 5617.78 8.59996e+07 13987.1 1.88908e+07 14142.5 1.05021e+07 28007.1 2.51822e+07 15535 1.46964e+07 17320.6 1433.3 1.25993e+07 88879.3 45624.5 6837.52 1.67936e+07 48281.9 6934.9 6.30784e+06 53750.2 4449.2 5809.39 1.67936e+07 17415.2 19246.7 5739.83 1.67936e+07 17110.8 16975.2 4011.63 1.67936e+07 9806.13 42676.7 829783 1.18396e+06 8.15163e+06 3.0638e+07

images

CHANGELOG.md Outdated Show resolved Hide resolved
@achamayou achamayou enabled auto-merge (squash) September 26, 2023 07:54
@achamayou achamayou disabled auto-merge September 26, 2023 10:40
@achamayou achamayou merged commit a5f3b4c into microsoft:main Sep 26, 2023
6 of 10 checks passed
@ghost
Copy link

ghost commented Sep 26, 2023

💔 All backports failed

Status Branch Result
release/4.x Backport failed because of merge conflicts

You might need to backport the following PRs to release/4.x:
- Pass enclave path as CLI argument rather than in configuration (#5665)

Manual backport

To create the backport manually run:

backport --pr 5686

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

eddyashton added a commit to eddyashton/CCF that referenced this pull request Oct 17, 2023
(cherry picked from commit a5f3b4c)

# Conflicts:
#	CHANGELOG.md
#	doc/operations/platforms/snp.rst
#	tests/infra/remote.py
@eddyashton eddyashton added the backported This PR was successfully backported to LTS branch label Oct 17, 2023
eddyashton added a commit that referenced this pull request Oct 17, 2023
…#5686) (#5738)

Co-authored-by: Amaury Chamayou <amchamay@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4.x-todo PRs which should be backported to 4.x auto-backport Automatically backport this PR to LTS branch backported This PR was successfully backported to LTS branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants