From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Nathaniel McCallum <npmccallum@redhat.com>,
Cedric Xing <cedric.xing@intel.com>,
Jethro Beekman <jethro@fortanix.com>,
Andy Lutomirski <luto@amacapital.net>,
linux-sgx@vger.kernel.org
Subject: Re: [PATCH for_v37 5/6] selftests/sgx: Sanity check the return value of the vDSO call
Date: Fri, 4 Sep 2020 17:07:53 +0300 [thread overview]
Message-ID: <20200904140753.GN39023@linux.intel.com> (raw)
In-Reply-To: <20200904104437.29555-6-sean.j.christopherson@intel.com>
On Fri, Sep 04, 2020 at 03:44:36AM -0700, Sean Christopherson wrote:
> Assert that the vDSO call returns 0 and that the exit reason is always
> due to EEXIT.
>
> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
> ---
> tools/testing/selftests/sgx/main.c | 35 +++++++++++++++++++++---------
> 1 file changed, 25 insertions(+), 10 deletions(-)
>
> diff --git a/tools/testing/selftests/sgx/main.c b/tools/testing/selftests/sgx/main.c
> index 17f36e590fbd2..158ea9e2b6d3a 100644
> --- a/tools/testing/selftests/sgx/main.c
> +++ b/tools/testing/selftests/sgx/main.c
> @@ -123,6 +123,24 @@ static Elf64_Sym *vdso_symtab_get(struct vdso_symtab *symtab, const char *name)
> return NULL;
> }
>
> +int check_result(struct sgx_enclave_run *run, int ret, uint64_t result,
> + const char *test)
> +{
> + if (ret) {
> + printf("FAIL: %s() returned: %d\n", test, ret);
> + return ret;
> + } else if (run->exit_reason != SGX_SYNCHRONOUS_EXIT) {
> + printf("FAIL: %s() exit reason, expected: %u, got: %u\n",
> + test, SGX_SYNCHRONOUS_EXIT, run->exit_reason);
> + return -EIO;
> + } else if (result != MAGIC) {
> + printf("FAIL: %s(), expected: 0x%lx, got: 0x%lx\n",
> + test, MAGIC, result);
> + return -EIO;
> + }
> + return 0;
> +}
> +
> int main(int argc, char *argv[], char *envp[])
> {
> struct sgx_enclave_run run;
> @@ -132,6 +150,7 @@ int main(int argc, char *argv[], char *envp[])
> struct encl encl;
> unsigned int i;
> void *addr;
> + int ret;
>
> if (!encl_load("test_encl.elf", &encl))
> goto err;
> @@ -172,21 +191,17 @@ int main(int argc, char *argv[], char *envp[])
>
> eenter = addr + eenter_sym->st_value;
>
> - sgx_call_vdso((void *)&MAGIC, &result, 0, EENTER, NULL, NULL, &run);
> - if (result != MAGIC) {
> - printf("FAIL: sgx_call_vdso(), expected: 0x%lx, got: 0x%lx\n",
> - MAGIC, result);
> + ret = sgx_call_vdso((void *)&MAGIC, &result, 0, EENTER, NULL, NULL, &run);
> + if (check_result(&run, ret, result, "sgx_call_vdso"))
> goto err;
> - }
> +
>
> /* Invoke the vDSO directly. */
> result = 0;
> - eenter((unsigned long)&MAGIC, (unsigned long)&result, 0, EENTER, 0, 0, &run);
> - if (result != MAGIC) {
> - printf("FAIL: eenter(), expected: 0x%lx, got: 0x%lx\n",
> - MAGIC, result);
> + ret = eenter((unsigned long)&MAGIC, (unsigned long)&result, 0, EENTER,
> + 0, 0, &run);
> + if (check_result(&run, ret, result, "eenter"))
> goto err;
> - }
>
> printf("SUCCESS\n");
> encl_delete(&encl);
> --
> 2.28.0
>
Acked-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
/Jarkko
next prev parent reply other threads:[~2020-09-04 14:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-04 10:44 [PATCH for_v37 0/6] x86/vdso: x86/sgx: Rework SGX vDSO API Sean Christopherson
2020-09-04 10:44 ` [PATCH for_v37 1/6] x86/vdso: x86/sgx: Explicitly force 8-byte CMP for detecting user handler Sean Christopherson
2020-09-04 10:44 ` [PATCH for_v37 2/6] x86/vdso: x86/sgx: Rework __vdso_sgx_enter_enclave() API Sean Christopherson
2020-09-04 13:46 ` Jarkko Sakkinen
2020-09-04 10:44 ` [PATCH for_v37 3/6] x86/vdso: x86/sgx: Introduce dedicated SGX exit reasons for vDSO Sean Christopherson
2020-09-04 14:06 ` Jarkko Sakkinen
2020-09-04 10:44 ` [PATCH for_v37 4/6] selftests/sgx: Update the SGX selftest to match the reworked vDSO API Sean Christopherson
2020-09-04 14:07 ` Jarkko Sakkinen
2020-09-04 10:44 ` [PATCH for_v37 5/6] selftests/sgx: Sanity check the return value of the vDSO call Sean Christopherson
2020-09-04 14:07 ` Jarkko Sakkinen [this message]
2020-09-04 10:44 ` [PATCH for_v37 6/6] selftests/sgx: Add a smoke test to ensure the user handler is invoked Sean Christopherson
2020-09-04 14:10 ` 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=20200904140753.GN39023@linux.intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=cedric.xing@intel.com \
--cc=jethro@fortanix.com \
--cc=linux-sgx@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=npmccallum@redhat.com \
--cc=sean.j.christopherson@intel.com \
/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).