From: "Zhang, Cathy" <cathy.zhang@intel.com>
To: "Hansen, Dave" <dave.hansen@intel.com>,
"linux-sgx@vger.kernel.org" <linux-sgx@vger.kernel.org>,
"x86@kernel.org" <x86@kernel.org>
Cc: "jarkko@kernel.org" <jarkko@kernel.org>,
"Chatre, Reinette" <reinette.chatre@intel.com>,
"Raj, Ashok" <ashok.raj@intel.com>
Subject: RE: [RFC PATCH v3 09/10] x86/cpu: Call ENCLS[EUPDATESVN] procedure in microcode update
Date: Sat, 2 Apr 2022 03:02:14 +0000 [thread overview]
Message-ID: <5c66bcd8e2f143b7996af1c0c25fefa0@intel.com> (raw)
In-Reply-To: <64c85acb-429b-ee40-22e6-d5ba7e4abee1@intel.com>
Hi Dave,
Thanks for your comments and suggestions!
> -----Original Message-----
> From: Hansen, Dave <dave.hansen@intel.com>
> Sent: Friday, April 1, 2022 11:42 PM
> To: Zhang, Cathy <cathy.zhang@intel.com>; linux-sgx@vger.kernel.org;
> x86@kernel.org
> Cc: jarkko@kernel.org; Chatre, Reinette <reinette.chatre@intel.com>; Raj,
> Ashok <ashok.raj@intel.com>
> Subject: Re: [RFC PATCH v3 09/10] x86/cpu: Call ENCLS[EUPDATESVN]
> procedure in microcode update
>
> On 4/1/22 07:24, Cathy Zhang wrote:
> > +#ifndef update_cpusvn_intel
> > +static inline void update_cpusvn_intel(void) {} #endif
> > +
> > #endif /* _ASM_X86_MICROCODE_H */
> > diff --git a/arch/x86/include/asm/sgx.h b/arch/x86/include/asm/sgx.h
> > index 74bcb6841a4b..5867f5a78d13 100644
> > --- a/arch/x86/include/asm/sgx.h
> > +++ b/arch/x86/include/asm/sgx.h
> > @@ -409,4 +409,9 @@ int sgx_virt_einit(void __user *sigstruct, void
> > __user *token, int sgx_set_attribute(unsigned long *allowed_attributes,
> > unsigned int attribute_fd);
> >
> > +#ifdef CONFIG_X86_SGX
> > +void update_cpusvn_intel(void);
> > +#define update_cpusvn_intel update_cpusvn_intel #endif
> > +
> > #endif /* _ASM_X86_SGX_H */
> > diff --git a/arch/x86/kernel/cpu/common.c
> > b/arch/x86/kernel/cpu/common.c index 7b8382c11788..f53fd877ba0d
> 100644
> > --- a/arch/x86/kernel/cpu/common.c
> > +++ b/arch/x86/kernel/cpu/common.c
> > @@ -59,6 +59,7 @@
> > #include <asm/cpu_device_id.h>
> > #include <asm/uv/uv.h>
> > #include <asm/sigframe.h>
> > +#include <asm/sgx.h>
> >
> > #include "cpu.h"
> >
> > @@ -2086,6 +2087,14 @@ void microcode_check(void)
> >
> > perf_check_microcode();
> >
> > + /*
> > + * SGX related microcode update requires EUPDATESVN to update
> CPUSVN, which
> > + * will destroy all enclaves to ensure EPC is not in use. If SGX is
> configured
> > + * and EUPDATESVN is supported, call the EUPDATESVN procecure.
> > + */
> > + if (IS_ENABLED(CONFIG_X86_SGX) && (cpuid_eax(SGX_CPUID) &
> SGX_CPUID_EUPDATESVN))
> > + update_cpusvn_intel();
>
> In addition to what Borislav said, these #ifdefs are not how we do things.
>
> The update_cpusvn_intel() shouldn't be declared in two different headers.
> Just imagine what happens if some code happens to include the microcode
> header *then* the sgx.h header.
>
> Please define both the 'static inline' stub *and* the declaration in sgx.h.
> Then you won't even need the #ifndef trickery. Please also add an "sgx_" to
> its name prefix while you're at it.
Moved to sgx.h and added "sgx_".
>
> That comment is also not great. A reader will likely have *ZERO* idea what
> EUPDATESVN is or what a CPUSVN is. Try to focus on what the code
> *means* rather than just repeat the if() conditions in the comment.
Yes, I see. The update comment is shown in my reply to Boris. Please take a look.
next prev parent reply other threads:[~2022-04-02 3:02 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-01 14:23 [RFC PATCH v3 00/10] Support microcode updates affecting SGX Cathy Zhang
2022-04-01 14:24 ` [RFC PATCH v3 01/10] x86/sgx: Introduce mechanism to prevent new initializations of EPC pages Cathy Zhang
2022-04-03 8:13 ` Jarkko Sakkinen
2022-04-06 3:31 ` Zhang, Cathy
2022-04-01 14:24 ` [RFC PATCH v3 02/10] x86/sgx: Provide VA page non-NULL owner Cathy Zhang
2022-04-03 8:29 ` Jarkko Sakkinen
2022-04-01 14:24 ` [RFC PATCH v3 03/10] x86/sgx: Save enclave pointer for VA page Cathy Zhang
2022-04-03 10:08 ` Jarkko Sakkinen
2022-04-06 3:31 ` Zhang, Cathy
2022-04-06 6:33 ` Jarkko Sakkinen
2022-04-01 14:24 ` [RFC PATCH v3 04/10] x86/sgx: Keep record for SGX VA and Guest page type Cathy Zhang
2022-04-03 10:11 ` Jarkko Sakkinen
2022-04-06 3:38 ` Zhang, Cathy
2022-04-01 14:24 ` [RFC PATCH v3 05/10] x86/sgx: Save the size of each EPC section Cathy Zhang
2022-04-03 10:14 ` Jarkko Sakkinen
2022-04-06 4:00 ` Zhang, Cathy
2022-04-06 6:34 ` Jarkko Sakkinen
2022-04-01 14:24 ` [RFC PATCH v3 06/10] x86/sgx: Forced EPC page zapping for EUPDATESVN Cathy Zhang
2022-04-03 10:20 ` Jarkko Sakkinen
2022-04-06 4:21 ` Zhang, Cathy
2022-04-01 14:24 ` [RFC PATCH v3 07/10] x86/sgx: Define error codes for ENCLS[EUPDATESVN] Cathy Zhang
2022-04-01 14:24 ` [RFC PATCH v3 08/10] x86/sgx: Implement ENCLS[EUPDATESVN] Cathy Zhang
2022-04-01 14:24 ` [RFC PATCH v3 09/10] x86/cpu: Call ENCLS[EUPDATESVN] procedure in microcode update Cathy Zhang
2022-04-01 14:29 ` Borislav Petkov
2022-04-02 2:54 ` Zhang, Cathy
2022-04-01 15:42 ` Dave Hansen
2022-04-02 3:02 ` Zhang, Cathy [this message]
2022-04-01 14:24 ` [RFC PATCH v3 10/10] x86/sgx: Call ENCLS[EUPDATESVN] during SGX initialization Cathy Zhang
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=5c66bcd8e2f143b7996af1c0c25fefa0@intel.com \
--to=cathy.zhang@intel.com \
--cc=ashok.raj@intel.com \
--cc=dave.hansen@intel.com \
--cc=jarkko@kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=reinette.chatre@intel.com \
--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