From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Borislav Petkov <bp@alien8.de>,
linux-kernel@vger.kernel.org, x86@kernel.org,
linux-sgx@vger.kernel.org, akpm@linux-foundation.org,
dave.hansen@intel.com, nhorman@redhat.com, npmccallum@redhat.com,
haitao.huang@intel.com, andriy.shevchenko@linux.intel.com,
tglx@linutronix.de, kai.svahn@intel.com, josh@joshtriplett.org,
luto@kernel.org, kai.huang@intel.com, rientjes@google.com,
cedric.xing@intel.com, puiterwijk@redhat.com,
Serge Ayoun <serge.ayoun@intel.com>,
Jethro Beekman <jethro@fortanix.com>
Subject: Re: [PATCH v30 07/20] x86/sgx: Enumerate and track EPC sections
Date: Thu, 28 May 2020 08:35:15 +0300 [thread overview]
Message-ID: <20200528053515.GA64796@linux.intel.com> (raw)
In-Reply-To: <20200528052532.GA63435@linux.intel.com>
On Thu, May 28, 2020 at 08:25:43AM +0300, Jarkko Sakkinen wrote:
> On Tue, May 26, 2020 at 08:56:14PM -0700, Sean Christopherson wrote:
> > On Mon, May 25, 2020 at 11:23:04AM +0200, Borislav Petkov wrote:
> > > On Fri, May 15, 2020 at 03:43:57AM +0300, Jarkko Sakkinen wrote:
> > > > +struct sgx_epc_section sgx_epc_sections[SGX_MAX_EPC_SECTIONS];
> > > > +int sgx_nr_epc_sections;
> > >
> > > We have become very averse against global stuff. What is going to use
> > > those, only sgx code I assume...?
> >
> > Yes, only SGX code. The reclaim/swap code needs access to the sections,
> > and that code is in a different file, reclaim.c. I don't have a super
> > strong objection to sucking reclaim.c into main.c, but I'm somewhat
> > indifferent on code organization as a whole. Jarkko likely has a stronger
> > opinion.
>
> I'll change it.
>
> It's not quite as easy as just "sucking the file in". All the commits
> that touch the file need to be reworked:
>
> $ git --no-pager log --format="%H %s" arch/x86/kernel/cpu/sgx/reclaim.c
> 5aeca6dabf767e9350ee3188ba25ceb21f3162b4 x86/sgx: Add a page reclaimer
> de9b1088959f36ffdaf43a49bfea1c7f9f81cac7 x86/sgx: Linux Enclave Driver
> 08d8fcb74fe268059ee58fcc2a0833b244e1f22a x86/sgx: Enumerate and track EPC sections
Not that I haven't done this a lot last few years. A proven approach
is to do it in two "git rebase -i mainline/master" sweeps:
1. For each commit, remove reclaim.c entry from the Makefile and import
reclaim.c contents to main.c.
2. For each commit, delete reclaim.c.
I've tried quite a few different angles and this what I've converged
into. Very hard to hit messy into messy merge conflicts.
/Jarkko
next prev parent reply other threads:[~2020-05-28 5:35 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 0:43 [PATCH v30 00/20] Intel SGX foundations Jarkko Sakkinen
2020-05-15 0:43 ` [PATCH v30 01/20] x86/cpufeatures: x86/msr: Add Intel SGX hardware bits Jarkko Sakkinen
2020-05-20 12:16 ` Borislav Petkov
2020-05-20 14:00 ` Jarkko Sakkinen
2020-05-15 0:43 ` [PATCH v30 02/20] x86/cpufeatures: x86/msr: Intel SGX Launch Control " Jarkko Sakkinen
2020-05-20 12:23 ` Borislav Petkov
2020-05-20 14:04 ` Jarkko Sakkinen
2020-05-15 0:43 ` [PATCH v30 03/20] x86/mm: x86/sgx: Signal SIGSEGV with PF_SGX Jarkko Sakkinen
2020-05-15 0:43 ` [PATCH v30 04/20] x86/sgx: Add SGX microarchitectural data structures Jarkko Sakkinen
2020-05-20 18:47 ` Borislav Petkov
2020-05-20 21:04 ` Sean Christopherson
2020-05-22 15:54 ` Jarkko Sakkinen
2020-05-22 16:13 ` Sean Christopherson
2020-05-22 19:50 ` Jarkko Sakkinen
2020-05-25 8:20 ` Borislav Petkov
2020-05-27 19:43 ` Jarkko Sakkinen
2020-05-15 0:43 ` [PATCH v30 05/20] x86/sgx: Add wrappers for ENCLS leaf functions Jarkko Sakkinen
2020-05-15 0:43 ` [PATCH v30 06/20] x86/cpu/intel: Detect SGX support Jarkko Sakkinen
2020-05-15 0:43 ` [PATCH v30 07/20] x86/sgx: Enumerate and track EPC sections Jarkko Sakkinen
2020-05-25 9:23 ` Borislav Petkov
2020-05-27 3:56 ` Sean Christopherson
2020-05-27 20:35 ` Borislav Petkov
2020-05-28 7:36 ` Jarkko Sakkinen
2020-05-28 5:25 ` Jarkko Sakkinen
2020-05-28 5:35 ` Jarkko Sakkinen [this message]
2020-05-28 6:14 ` Jarkko Sakkinen
2020-05-28 6:16 ` Jarkko Sakkinen
2020-05-28 5:13 ` Jarkko Sakkinen
2020-05-15 0:43 ` [PATCH v30 08/20] x86/sgx: Add functions to allocate and free EPC pages Jarkko Sakkinen
2020-05-26 12:52 ` Borislav Petkov
2020-05-27 4:21 ` Sean Christopherson
2020-05-27 20:46 ` Borislav Petkov
2020-05-28 0:52 ` Sean Christopherson
2020-05-28 6:51 ` Jarkko Sakkinen
2020-05-28 1:23 ` Jarkko Sakkinen
2020-05-28 1:36 ` Sean Christopherson
2020-05-28 6:52 ` Jarkko Sakkinen
2020-05-28 17:16 ` Borislav Petkov
2020-05-28 17:19 ` Sean Christopherson
2020-05-28 17:27 ` Borislav Petkov
2020-05-28 17:34 ` Sean Christopherson
2020-05-28 19:07 ` Jarkko Sakkinen
2020-05-28 19:59 ` Sean Christopherson
2020-05-29 3:28 ` Jarkko Sakkinen
2020-05-29 3:37 ` Sean Christopherson
2020-05-29 5:07 ` Jarkko Sakkinen
2020-05-29 8:12 ` Jarkko Sakkinen
2020-05-29 8:13 ` Jarkko Sakkinen
2020-05-29 3:38 ` Jarkko Sakkinen
2020-05-15 0:43 ` [PATCH v30 09/20] mm: Introduce vm_ops->may_mprotect() Jarkko Sakkinen
2020-05-29 12:10 ` Borislav Petkov
2020-05-29 18:18 ` Jarkko Sakkinen
2020-05-29 18:28 ` Dave Hansen
2020-05-31 23:12 ` Jarkko Sakkinen
2020-05-15 0:44 ` [PATCH v30 10/20] x86/sgx: Linux Enclave Driver Jarkko Sakkinen
2020-05-21 19:12 ` Sean Christopherson
2020-05-22 19:26 ` Jarkko Sakkinen
2020-05-22 19:39 ` Jarkko Sakkinen
2020-05-22 3:33 ` Sean Christopherson
2020-05-15 0:44 ` [PATCH v30 11/20] x86/sgx: Add provisioning Jarkko Sakkinen
2020-05-15 0:44 ` [PATCH v30 12/20] x86/sgx: Add a page reclaimer Jarkko Sakkinen
2020-05-22 6:58 ` Sean Christopherson
2020-05-22 19:57 ` Jarkko Sakkinen
2020-05-22 21:52 ` Sean Christopherson
2020-05-22 7:15 ` Sean Christopherson
2020-05-22 19:47 ` Jarkko Sakkinen
2020-05-15 0:44 ` [PATCH v30 13/20] x86/sgx: ptrace() support for the SGX driver Jarkko Sakkinen
2020-05-15 0:44 ` [PATCH v30 14/20] x86/vdso: Add support for exception fixup in vDSO functions Jarkko Sakkinen
2020-05-15 0:44 ` [PATCH v30 15/20] x86/fault: Add helper function to sanitize error code Jarkko Sakkinen
2020-05-15 0:44 ` [PATCH v30 16/20] x86/traps: Attempt to fixup exceptions in vDSO before signaling Jarkko Sakkinen
2020-05-15 0:44 ` [PATCH v30 17/20] x86/vdso: Implement a vDSO for Intel SGX enclave call Jarkko Sakkinen
2020-05-15 0:44 ` [PATCH v30 18/20] selftests/x86: Add a selftest for SGX Jarkko Sakkinen
2020-05-15 0:44 ` [PATCH v30 19/20] docs: x86/sgx: Document SGX micro architecture and kernel internals Jarkko Sakkinen
2020-05-15 0:44 ` [PATCH v30 20/20] x86/sgx: Update MAINTAINERS Jarkko Sakkinen
2020-05-16 8:57 ` [PATCH] x86/cpu/intel: Add nosgx kernel parameter Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200528053515.GA64796@linux.intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bp@alien8.de \
--cc=cedric.xing@intel.com \
--cc=dave.hansen@intel.com \
--cc=haitao.huang@intel.com \
--cc=jethro@fortanix.com \
--cc=josh@joshtriplett.org \
--cc=kai.huang@intel.com \
--cc=kai.svahn@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=luto@kernel.org \
--cc=nhorman@redhat.com \
--cc=npmccallum@redhat.com \
--cc=puiterwijk@redhat.com \
--cc=rientjes@google.com \
--cc=sean.j.christopherson@intel.com \
--cc=serge.ayoun@intel.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).