> On Behalf Of Jarkko Sakkinen
> Sent: Friday, August 23, 2019 19:16
> To: linux-sgx@xxxxxxxxxxxxxxx
> Cc: Christopherson, Sean J <sean.j.christopherson@xxxxxxxxx>; Ayoun,
> Serge <serge.ayoun@xxxxxxxxx>; Katz-zamir, Shay <shay.katz-
> zamir@xxxxxxxxx>; Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx>
> Subject: [PATCH 1/4] x86/sgx: Replace @is_secs_child with @pt in
> sgx_encl_ewb()
>
> Sean complained about boolean parameters so I though that maybe it would
> be good to rework the EWB flow in a way that it operates by a page type and
> here is the result. The contract is and will be that as long as you give the
> correct page type, you will get what you want. That is why I set REG and TCS
> appropriately even though they are treated the same way at this point of
> time.
>
> Cc: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx>
> ---
> arch/x86/kernel/cpu/sgx/reclaim.c | 43 +++++++++++++++++++------------
> 1 file changed, 27 insertions(+), 16 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/sgx/reclaim.c
> b/arch/x86/kernel/cpu/sgx/reclaim.c
> index 00f596c64a2d..3f10a8ff00b7 100644
> --- a/arch/x86/kernel/cpu/sgx/reclaim.c
> +++ b/arch/x86/kernel/cpu/sgx/reclaim.c
> @@ -221,7 +221,7 @@ static void sgx_reclaimer_block(struct sgx_epc_page
> *epc_page)
>
> static int __sgx_encl_ewb(struct sgx_encl *encl, struct sgx_epc_page
> *epc_page,
> struct sgx_va_page *va_page, unsigned int
> va_offset,
> - bool is_secs_child)
> + unsigned int pt)
> {
> struct sgx_encl_page *encl_page = epc_page->owner;
> struct sgx_pageinfo pginfo;
> @@ -232,10 +232,14 @@ static int __sgx_encl_ewb(struct sgx_encl *encl,
> struct sgx_epc_page *epc_page,
> struct page *pcmd;
> int ret;
>
> - if (is_secs_child)
> - page_index = SGX_ENCL_PAGE_INDEX(encl_page);
> - else
> + if (pt != SGX_SECINFO_SECS && pt != SGX_SECINFO_TCS &&
> + pt != SGX_SECINFO_REG)
> + return -EINVAL;
Not sure about this one since this 'if' should never happen, unless there is a bug
Not clear if the caller (sgx_encl_ewb) will handle -EINVAL properly.
Maybe would be better to issue some warning message or BUG_ON
---------------------------------------------------------------------
Intel Israel (74) Limited
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
