Skip to content

Cleanup SGX entry code - #69040

Merged
bors merged 3 commits into
rust-lang:masterfrom
jethrogb:jb/cleanup-sgx-entry
Feb 13, 2020
Merged

Cleanup SGX entry code#69040
bors merged 3 commits into
rust-lang:masterfrom
jethrogb:jb/cleanup-sgx-entry

Conversation

@jethrogb

@jethrogbjethrogb commented Feb 10, 2020

Copy link
Copy Markdown
Contributor

@rust-highfive

rust-highfive commented Feb 10, 2020

Copy link
Copy Markdown
Contributor

r? @kennytm

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

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

jethrogb commented Feb 10, 2020

Copy link
Copy Markdown
ContributorAuthor

r? @alexcrichton

@nagisa

nagisa commented Feb 11, 2020

Copy link
Copy Markdown
Member

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

nagisa
nagisa reviewed Feb 11, 2020
View reviewed changes
Comment threadsrc/libstd/sys/sgx/abi/entry.S

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

@nagisanagisaFeb 11, 2020

Copy link
Copy Markdown
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?

@jethrogbjethrogbFeb 11, 2020

Copy link
Copy Markdown
ContributorAuthor

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

alexcrichton commented Feb 11, 2020

Copy link
Copy Markdown
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

jethrogb commented Feb 11, 2020

Copy link
Copy Markdown
ContributorAuthor

r? @nagisa

@jethrogb

jethrogb commented Feb 11, 2020

Copy link
Copy Markdown
ContributorAuthor

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

@jethrogb

jethrogb commented Feb 11, 2020

Copy link
Copy Markdown
ContributorAuthor

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

@nagisa

nagisa commented Feb 11, 2020

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Feb 11, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 71b9ed4 has been approved by nagisa

@borsbors 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
@jonas-schievinkjonas-schievink mentioned this pull request Feb 11, 2020
Closed
@jethrogb

jethrogb commented Feb 12, 2020

Copy link
Copy Markdown
ContributorAuthor

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
@Dylan-DPC
Rollup merge ofrust-lang#69040- jethrogb:jb/cleanup-sgx-entry, r=na…
a908716
…gisa
Cleanup SGX entry code
cc @aandyl
@Dylan-DPC-zzDylan-DPC-zz mentioned this pull request Feb 12, 2020
Merged
bors added a commit that referenced this pull request Feb 12, 2020
@bors
Auto merge of#69105- Dylan-DPC:rollup-n73lh5h, r=Dylan-DPC
92d8e82
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:masterFeb 13, 2020
@jethrogbjethrogb mentioned this pull request Feb 13, 2020
Merged
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 13, 2020
@Dylan-DPC
Rollup merge ofrust-lang#69125- jethrogb:jb/cleanup-sgx-entry, r=Dy…
8e2772c
…lan-DPC
Add comment to SGX entry code
Meant to force push this to be included in rust-lang#69040, but forgot
r? @nagisa
@YawningYawning mentioned this pull request Feb 17, 2020
Closed
@workingjubileeworkingjubilee added the O-SGX Target: SGX label Jul 30, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nagisanagisanagisa left review comments

Assignees

@nagisanagisa

Labels

O-SGXTarget: SGXS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@jethrogb@rust-highfive@nagisa@alexcrichton@bors@kennytm@workingjubilee@raoulstrackx