Skip to contentSkip to conversation

SGX release branch.

DISCUSSION Dr. G.W. Wettstein 3 participants 3 messages Sep 26, 2019 – Sep 27, 2019 Intel SGX

lore
Share & tools
lore
#0 lore raw

On Sep 19, 1:00pm, Sean Christopherson wrote:
} Subject: Re: SGX release branch.

Good day to everyone.

Quoted 11 lines · Dr. G.W. Wettstein
Quoted 2 lines

It would be perhaps helpful for everyone if we could have a quick summary of what the remote branches in jarkko-sgx are are targeting.

I recommend ignoring everything except jarkko/master. master isn't necessarily the bleeding edge, but it's the canonical reference with respect to changes that have passed internal review, and for the most part it is stable (there have been a few hiccups).

All other branches in Jarkko's repository are either unrelated to the initial upstreaming and/or are for Jarkko's own development.

Thank you for the clarifications.

Is it just us or is there something up with the history on these branches?

We have a local tracking branch that was created on a previous instance of jarkko-sgx/master that doesn't bear any resemblance to the current state of jarkko-sgx/master. The version that we had branched against had the driver broken into a core and driver component, the driver was in a sub-directory of the core SGX code and could be built as a module.

We created a new tracking branch against the current jarkko-sgx/master and the driver architecture is completely different. Most notably the driver cannot be built as a module and there is no driver sub-directory.

We have also also universally had pull's end up with merge conflicts, even when there have been no changes to the local branch.

I'm assuming now, given the comments above, that moving forward jarkko-sgx/master will be a continuous development history?

Have a good remainder of the week.

Dr. Greg

}-- End of excerpt from Sean Christopherson

As always,
Dr. Greg Wettstein, Ph.D, Worker
IDfusion, LLC SGX secured infrastructure and
4206 N. 19th Ave. autonomously self-defensive platforms.
Fargo, ND 58102
PH: 701-281-1686 EMAIL: [email protected]
------------------------------------------------------------------------------
"Courage is not the absence of fear, but rather the judgement that
something else is more important than fear."
-- Ambrose Redmoon

#1 lore raw
Quoted 2 lines · Dr. G.W. Wettstein

On Sep 19, 1:00pm, Sean Christopherson wrote:
} Subject: Re: SGX release branch.

Shouldn't this be an opening brace? :-)

Quoted 12 lines

Good day to everyone.

Quoted 8 lines · Dr. G.W. Wettstein
Quoted 2 lines

It would be perhaps helpful for everyone if we could have a quick summary of what the remote branches in jarkko-sgx are are targeting.

I recommend ignoring everything except jarkko/master. master isn't necessarily the bleeding edge, but it's the canonical reference with respect to changes that have passed internal review, and for the most part it is stable (there have been a few hiccups).

Quoted 7 lines
Quoted 2 lines

All other branches in Jarkko's repository are either unrelated to the initial upstreaming and/or are for Jarkko's own development.

Thank you for the clarifications.

Is it just us or is there something up with the history on these branches?

Not just you, the branches, including master, are deliberately rebased and rewritten.

Quoted 12 lines

We have a local tracking branch that was created on a previous instance of jarkko-sgx/master that doesn't bear any resemblance to the current state of jarkko-sgx/master. The version that we had branched against had the driver broken into a core and driver component, the driver was in a sub-directory of the core SGX code and could be built as a module.

We created a new tracking branch against the current jarkko-sgx/master and the driver architecture is completely different. Most notably the driver cannot be built as a module and there is no driver sub-directory.

Quoted 5 lines

We have also also universally had pull's end up with merge conflicts, even when there have been no changes to the local branch.

I'm assuming now, given the comments above, that moving forward jarkko-sgx/master will be a continuous development history?

master will become stable when SGX is merged into the mainline kernel. Until then, the reality is that we need rebase on the latest upstream, squash commits, and rewrite history to prep the series for submission.

I agree that a complete history would be convenient, but keeping such a branch perferctly aligned with master would incur a non-trivial amount of overhead, and anything but 100% accuracy would do more harm than good.

Quoted 16 lines

Have a good remainder of the week.

Dr. Greg

}-- End of excerpt from Sean Christopherson

As always,
Dr. Greg Wettstein, Ph.D, Worker
IDfusion, LLC SGX secured infrastructure and
4206 N. 19th Ave. autonomously self-defensive platforms.
Fargo, ND 58102
PH: 701-281-1686 EMAIL: [email protected]
------------------------------------------------------------------------------
"Courage is not the absence of fear, but rather the judgement that
something else is more important than fear."
-- Ambrose Redmoon

#2 lore raw
In reply to Dr. G.W. Wettstein
Quoted 34 lines · Dr. G.W. Wettstein

On Sep 19, 1:00pm, Sean Christopherson wrote:
} Subject: Re: SGX release branch.

Good day to everyone.

Quoted 11 lines · Dr. G.W. Wettstein
Quoted 2 lines

It would be perhaps helpful for everyone if we could have a quick summary of what the remote branches in jarkko-sgx are are targeting.

I recommend ignoring everything except jarkko/master. master isn't necessarily the bleeding edge, but it's the canonical reference with respect to changes that have passed internal review, and for the most part it is stable (there have been a few hiccups).

All other branches in Jarkko's repository are either unrelated to the initial upstreaming and/or are for Jarkko's own development.

Thank you for the clarifications.

Is it just us or is there something up with the history on these branches?

We have a local tracking branch that was created on a previous instance of jarkko-sgx/master that doesn't bear any resemblance to the current state of jarkko-sgx/master. The version that we had branched against had the driver broken into a core and driver component, the driver was in a sub-directory of the core SGX code and could be built as a module.

We created a new tracking branch against the current jarkko-sgx/master and the driver architecture is completely different. Most notably the driver cannot be built as a module and there is no driver sub-directory.

Quoted 5 lines

We have also also universally had pull's end up with merge conflicts, even when there have been no changes to the local branch.

I'm assuming now, given the comments above, that moving forward jarkko-sgx/master will be a continuous development history?

It cannot be because it is a snapshot of the next version of the patch set. Anything can change all the time.

/Jarkko