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

Cleanup SGX entry code #69040

Merged
merged 3 commits into from
Feb 13, 2020
Merged

Cleanup SGX entry code #69040

merged 3 commits into from
Feb 13, 2020

Conversation

jethrogb
Copy link
Contributor

cc @aandyl

@rust-highfive
Copy link
Collaborator

r? @kennytm

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 10, 2020
@jethrogb
Copy link
Contributor Author

r? @alexcrichton

@nagisa
Copy link
Member

nagisa commented Feb 11, 2020

All of these commits could definitely use some more text on them describing the why.


/* x87 FPU control word initialization value for ABI */
.Lfpucw_init:
.int 0x037f
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is setting one of the reserved bits (6th) to 1?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the default from the Intel SDM, Vol. 1, §8.1.5

@alexcrichton
Copy link
Member

Sorry I'm not on the libs team any more and I'd rather not be on the hook for these sorts of PRs. @nagisa mind taking over review?

@jethrogb
Copy link
Contributor Author

r? @nagisa

@rust-highfive rust-highfive assigned nagisa and unassigned alexcrichton Feb 11, 2020
@jethrogb
Copy link
Contributor Author

See §4 of https://people.cs.kuleuven.be/~jo.vanbulck/ccs19-tale.pdf for the “why”.

@jethrogb
Copy link
Contributor Author

This includes fixes for INTEL-SA-00336/CVE-2020-0561, could this be merged soon?

@nagisa
Copy link
Member

nagisa commented Feb 11, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Feb 11, 2020

📌 Commit 71b9ed4 has been approved by nagisa

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 11, 2020
@jethrogb
Copy link
Contributor Author

Why does bors show this as not mergeable?

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 12, 2020
bors added a commit that referenced this pull request Feb 12, 2020
Rollup of 7 pull requests

Successful merges:

 - #67954 (Support new LLVM pass manager)
 - #68981 ( Account for type params on method without parentheses)
 - #69002 (miri: improve and simplify overflow detection)
 - #69038 (Add initial debug fmt for Backtrace)
 - #69040 (Cleanup SGX entry code)
 - #69086 (Update compiler-builtins to 0.1.25)
 - #69095 (Minified theme check)

Failed merges:

r? @ghost
@bors bors merged commit 71b9ed4 into rust-lang:master Feb 13, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 13, 2020
…lan-DPC

Add comment to SGX entry code

Meant to force push this to be included in rust-lang#69040, but forgot

r? @nagisa
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-SGX Target: SGX S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants