From: Haitao Huang <haitao.huang@linux.intel.com>
To: linux-sgx@vger.kernel.org, jarkko@kernel.org,
dave.hansen@linux.intel.com, reinette.chatre@intel.com,
vijay.dhanraj@intel.com
Subject: [RFC PATCH v4 4/4] selftests/sgx: Add test for madvise(..., WILLNEED)
Date: Fri, 27 Jan 2023 20:55:29 -0800 [thread overview]
Message-ID: <20230128045529.15749-5-haitao.huang@linux.intel.com> (raw)
In-Reply-To: <20230128045529.15749-4-haitao.huang@linux.intel.com>
Measure and compare run time for EAUG'ing different number
of EPC pages with/without madvise(..., WILLNEED) call.
Signed-off-by: Haitao Huang <haitao.huang@linux.intel.com>
---
tools/testing/selftests/sgx/main.c | 167 +++++++++++++++++++++++++++++
1 file changed, 167 insertions(+)
diff --git a/tools/testing/selftests/sgx/main.c b/tools/testing/selftests/sgx/main.c
index e457f2d35461..e3432e73af69 100644
--- a/tools/testing/selftests/sgx/main.c
+++ b/tools/testing/selftests/sgx/main.c
@@ -10,6 +10,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
+#include <time.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
@@ -1360,6 +1361,172 @@ TEST_F_TIMEOUT(enclave, augment_via_eaccept_long, TIMEOUT_DEFAULT)
munmap(addr, DYNAMIC_HEAP_SIZE);
}
+static int eaccept_range(struct _test_data_enclave *self, void *addr,
+ unsigned long size, uint64_t flags,
+ struct __test_metadata *_metadata)
+{
+ struct encl_op_eaccept eaccept_op;
+
+ self->run.exception_vector = 0;
+ self->run.exception_error_code = 0;
+ self->run.exception_addr = 0;
+
+ /*
+ * Run EACCEPT on every page to trigger the #PF->EAUG->EACCEPT(again
+ * without a #PF). All should be transparent to userspace.
+ */
+ eaccept_op.flags = flags;
+ eaccept_op.ret = 0;
+ eaccept_op.header.type = ENCL_OP_EACCEPT;
+ eaccept_op.len = size;
+ eaccept_op.epc_addr = (uint64_t)(addr);
+
+ EXPECT_EQ(ENCL_CALL(&eaccept_op, &self->run, true), 0);
+
+ EXPECT_EQ(self->run.exception_vector, 0);
+ EXPECT_EQ(self->run.exception_error_code, 0);
+ EXPECT_EQ(self->run.exception_addr, 0);
+ ASSERT_EQ(eaccept_op.ret, 0);
+ ASSERT_EQ(self->run.function, EEXIT);
+
+ return 0;
+}
+
+static int trim_remove_range(struct _test_data_enclave *self, void *addr,
+ unsigned long size, struct __test_metadata *_metadata)
+{
+ int ret, errno_save;
+ struct sgx_enclave_remove_pages remove_ioc;
+ struct sgx_enclave_modify_types modt_ioc;
+ unsigned long offset;
+ unsigned long count;
+
+ if ((uint64_t)addr <= self->encl.encl_base)
+ return -1;
+ offset = (uint64_t)addr - self->encl.encl_base;
+
+ memset(&modt_ioc, 0, sizeof(modt_ioc));
+ modt_ioc.offset = offset;
+ modt_ioc.length = size;
+ modt_ioc.page_type = SGX_PAGE_TYPE_TRIM;
+ count = 0;
+ do {
+ ret = ioctl(self->encl.fd, SGX_IOC_ENCLAVE_MODIFY_TYPES, &modt_ioc);
+
+ errno_save = ret == -1 ? errno : 0;
+ if (errno_save != EAGAIN)
+ break;
+ EXPECT_EQ(modt_ioc.result, 0);
+
+ count += modt_ioc.count;
+ modt_ioc.offset += modt_ioc.count;
+ modt_ioc.length -= modt_ioc.count;
+ modt_ioc.result = 0;
+ modt_ioc.count = 0;
+ } while (modt_ioc.length != 0);
+
+ EXPECT_EQ(ret, 0);
+ EXPECT_EQ(errno_save, 0);
+ EXPECT_EQ(modt_ioc.result, 0);
+ count += modt_ioc.count;
+ EXPECT_EQ(count, size);
+
+ EXPECT_EQ(eaccept_range(self, addr, size,
+ SGX_SECINFO_TRIM | SGX_SECINFO_MODIFIED,
+ _metadata), 0);
+
+ /* Complete page removal. */
+ memset(&remove_ioc, 0, sizeof(remove_ioc));
+ remove_ioc.offset = offset;
+ remove_ioc.length = size;
+ count = 0;
+ do {
+ ret = ioctl(self->encl.fd, SGX_IOC_ENCLAVE_REMOVE_PAGES, &remove_ioc);
+
+ errno_save = ret == -1 ? errno : 0;
+ if (errno_save != EAGAIN)
+ break;
+
+ count += remove_ioc.count;
+ remove_ioc.offset += remove_ioc.count;
+ remove_ioc.length -= remove_ioc.count;
+ remove_ioc.count = 0;
+ } while (remove_ioc.length != 0);
+
+ EXPECT_EQ(ret, 0);
+ EXPECT_EQ(errno_save, 0);
+ count += remove_ioc.count;
+ EXPECT_EQ(count, size);
+
+ return 0;
+}
+
+/*
+ * Compare performance with and without madvise call before EACCEPT'ing
+ * different size of regions.
+ */
+TEST_F_TIMEOUT(enclave, augment_via_madvise, TIMEOUT_DEFAULT)
+{
+ unsigned long advise_size = PAGE_SIZE;
+ unsigned long max_advise_size = get_total_epc_mem() * 3UL;
+ int speed_up_percent;
+ clock_t start;
+ double time_used1, time_used2;
+ size_t total_size = 0;
+ unsigned long i;
+ void *addr;
+
+ if (!sgx2_supported())
+ SKIP(return, "SGX2 not supported");
+
+ ASSERT_TRUE(setup_test_encl_dynamic(ENCL_HEAP_SIZE_DEFAULT,
+ max_advise_size, &self->encl, _metadata));
+
+ memset(&self->run, 0, sizeof(self->run));
+ self->run.tcs = self->encl.encl_base;
+
+ for (i = 0; i < self->encl.nr_segments; i++) {
+ struct encl_segment *seg = &self->encl.segment_tbl[i];
+
+ total_size += seg->size;
+ }
+
+ for (i = 1; i < 52 && advise_size < max_advise_size; i++) {
+ addr = mmap((void *)self->encl.encl_base + total_size, advise_size,
+ PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED,
+ self->encl.fd, 0);
+ EXPECT_NE(addr, MAP_FAILED);
+
+ start = clock();
+ EXPECT_EQ(eaccept_range(self, addr, advise_size,
+ SGX_SECINFO_R | SGX_SECINFO_W
+ | SGX_SECINFO_REG
+ | SGX_SECINFO_PENDING,
+ _metadata), 0);
+ time_used1 = (double)clock() - start;
+
+ EXPECT_EQ(trim_remove_range(self, addr, advise_size, _metadata), 0);
+
+ start = clock();
+ EXPECT_EQ(madvise(addr, advise_size, MADV_WILLNEED), 0);
+ EXPECT_EQ(eaccept_range(self, addr, advise_size,
+ SGX_SECINFO_R | SGX_SECINFO_W
+ | SGX_SECINFO_REG
+ | SGX_SECINFO_PENDING,
+ _metadata), 0);
+ time_used2 = (double)clock() - start;
+
+ speed_up_percent = (int)((time_used1 - time_used2) / time_used1 * 100);
+ TH_LOG("madvise speed up for eaug'ing %10ld pages: %d%%",
+ advise_size / PAGE_SIZE, speed_up_percent);
+ EXPECT_GE(speed_up_percent, 0);
+ EXPECT_EQ(trim_remove_range(self, addr, advise_size, _metadata), 0);
+ munmap(addr, advise_size);
+ advise_size = (advise_size << 1UL);
+ }
+ encl_delete(&self->encl);
+}
+
/*
* SGX2 page type modification test in two phases:
* Phase 1:
--
2.25.1
next prev parent reply other threads:[~2023-01-28 4:55 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-28 4:55 [RFC PATCH v4 0/4] x86/sgx: implement support for MADV_WILLNEED Haitao Huang
2023-01-28 4:55 ` [RFC PATCH v4 1/4] x86/sgx: Export sgx_encl_eaug_page Haitao Huang
2023-01-28 4:55 ` [RFC PATCH v4 2/4] x86/sgx: Implement support for MADV_WILLNEED Haitao Huang
2023-01-28 4:55 ` [RFC PATCH v4 3/4] selftests/sgx: add len field for EACCEPT op Haitao Huang
2023-01-28 4:55 ` Haitao Huang [this message]
2023-02-07 23:30 ` [RFC PATCH v4 4/4] selftests/sgx: Add test for madvise(..., WILLNEED) Jarkko Sakkinen
2023-02-15 2:38 ` Huang, Kai
2023-02-15 4:42 ` Haitao Huang
2023-02-15 8:46 ` Huang, Kai
2023-02-17 22:29 ` jarkko
2023-02-07 23:29 ` [RFC PATCH v4 3/4] selftests/sgx: add len field for EACCEPT op Jarkko Sakkinen
2023-02-07 23:28 ` [RFC PATCH v4 2/4] x86/sgx: Implement support for MADV_WILLNEED Jarkko Sakkinen
2023-02-14 9:47 ` Huang, Kai
2023-02-14 19:18 ` Haitao Huang
2023-02-14 20:54 ` Huang, Kai
2023-02-14 21:42 ` Haitao Huang
2023-02-14 22:36 ` Huang, Kai
2023-02-15 3:59 ` Haitao Huang
2023-02-15 8:51 ` Huang, Kai
2023-02-15 15:42 ` Haitao Huang
2023-02-16 7:53 ` Huang, Kai
2023-02-16 17:12 ` Haitao Huang
2023-02-17 22:32 ` jarkko
2023-02-17 23:03 ` Haitao Huang
2023-02-21 22:10 ` jarkko
2023-02-22 1:37 ` Haitao Huang
2023-03-07 23:32 ` Huang, Kai
2023-03-09 0:50 ` Haitao Huang
2023-03-09 11:31 ` Huang, Kai
2023-03-14 14:54 ` Haitao Huang
2023-03-19 13:26 ` jarkko
2023-03-20 9:36 ` Huang, Kai
2023-03-20 14:04 ` jarkko
2023-05-27 0:32 ` Haitao Huang
2023-06-06 4:11 ` Huang, Kai
2023-06-07 16:59 ` Haitao Huang
2023-06-16 3:49 ` Huang, Kai
2023-06-16 22:05 ` Sean Christopherson
2023-06-19 11:17 ` Huang, Kai
2023-06-22 22:01 ` Sean Christopherson
2023-06-22 23:21 ` Huang, Kai
2023-06-26 22:28 ` Sean Christopherson
2023-06-27 11:43 ` Huang, Kai
2023-06-27 14:50 ` Sean Christopherson
2023-06-28 9:37 ` Huang, Kai
2023-06-28 14:57 ` Sean Christopherson
2023-06-29 3:10 ` Huang, Kai
2023-06-29 14:23 ` Sean Christopherson
2023-06-29 23:29 ` Huang, Kai
2023-06-30 0:14 ` Sean Christopherson
2023-06-30 0:56 ` Huang, Kai
2023-06-30 1:54 ` Jarkko Sakkinen
2023-06-30 1:57 ` Jarkko Sakkinen
2023-06-30 4:26 ` Huang, Kai
2023-06-30 9:35 ` Jarkko Sakkinen
2023-03-12 1:25 ` jarkko
2023-03-12 22:25 ` Huang, Kai
2023-02-17 22:07 ` jarkko
2023-02-17 21:50 ` jarkko
2023-02-07 23:26 ` [RFC PATCH v4 1/4] x86/sgx: Export sgx_encl_eaug_page 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=20230128045529.15749-5-haitao.huang@linux.intel.com \
--to=haitao.huang@linux.intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=jarkko@kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=reinette.chatre@intel.com \
--cc=vijay.dhanraj@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).