On Fri, Jul 09, 2021 at 09:08:03PM +0300, Jarkko Sakkinen wrote:
> On Thu, Jul 08, 2021 at 11:14:20AM -0700, Tony Luck wrote:
> > Memory errors can be reported either synchronously as memory is accessed,
> > or asynchronously by speculative access or by a memory controller page
> > scrubber. The life cycle of an EPC page takes it through:
> > dirty -> free -> in-use -> free.
> >
> > Memory errors are reported using physical addresses. It is a simple
> > matter to find which sgx_epc_page structure maps a given address.
> > But then recovery code needs to be able to determine the current use of
> > the page to take the appropriate recovery action. Within the "in-use"
> > phase different actions are needed based on how the page is used in
> > the enclave.
> >
> > Add new flags bits to describe the phase (with an extra bit for the new
> > phase of "poisoned"). Drop pages marked as poisoned instead of adding
> > them to a free list to make sure they are not re-used.
> >
> > Add a type field to struct epc_page for how an in-use page has been
> > allocated. Re-use "enum sgx_page_type" for this type, with a couple
> > of additions for s/w types.
> >
> > Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>
> > ---
> > arch/x86/include/asm/sgx.h | 6 ++++++
> > arch/x86/kernel/cpu/sgx/encl.c | 4 ++--
> > arch/x86/kernel/cpu/sgx/ioctl.c | 4 ++--
> > arch/x86/kernel/cpu/sgx/main.c | 21 +++++++++++++++++++--
> > arch/x86/kernel/cpu/sgx/sgx.h | 14 ++++++++++++--
> > arch/x86/kernel/cpu/sgx/virt.c | 2 +-
> > 6 files changed, 42 insertions(+), 9 deletions(-)
> >
> > diff --git a/arch/x86/include/asm/sgx.h b/arch/x86/include/asm/sgx.h
> > index 9c31e0ebc55b..9619a6d77a83 100644
> > --- a/arch/x86/include/asm/sgx.h
> > +++ b/arch/x86/include/asm/sgx.h
> > @@ -216,6 +216,8 @@ struct sgx_pageinfo {
> > * %SGX_PAGE_TYPE_REG: a regular page
> > * %SGX_PAGE_TYPE_VA: a VA page
> > * %SGX_PAGE_TYPE_TRIM: a page in trimmed state
> > + *
> > + * Also used to track current use of &struct sgx_epc_page
> > */
> > enum sgx_page_type {
> > SGX_PAGE_TYPE_SECS,
> > @@ -223,6 +225,10 @@ enum sgx_page_type {
> > SGX_PAGE_TYPE_REG,
> > SGX_PAGE_TYPE_VA,
> > SGX_PAGE_TYPE_TRIM,
> > +
> > + /* sgx_epc_page.type */
> > + SGX_PAGE_TYPE_FREE = 100,
> > + SGX_PAGE_TYPE_KVM = 101,
> > };
> >
> > #define SGX_NR_PAGE_TYPES 5
> > diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c
> > index 3be203297988..abf6e1a704c0 100644
> > --- a/arch/x86/kernel/cpu/sgx/encl.c
> > +++ b/arch/x86/kernel/cpu/sgx/encl.c
> > @@ -72,7 +72,7 @@ static struct sgx_epc_page *sgx_encl_eldu(struct sgx_encl_page *encl_page,
> > struct sgx_epc_page *epc_page;
> > int ret;
> >
> > - epc_page = sgx_alloc_epc_page(encl_page, false);
> > + epc_page = sgx_alloc_epc_page(encl_page, SGX_PAGE_TYPE_REG, false);
> > if (IS_ERR(epc_page))
> > return epc_page;
> >
> > @@ -679,7 +679,7 @@ struct sgx_epc_page *sgx_alloc_va_page(void)
> > struct sgx_epc_page *epc_page;
> > int ret;
> >
> > - epc_page = sgx_alloc_epc_page(NULL, true);
> > + epc_page = sgx_alloc_epc_page(NULL, SGX_PAGE_TYPE_VA, true);
> > if (IS_ERR(epc_page))
> > return ERR_CAST(epc_page);
> >
> > diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c
> > index 83df20e3e633..a74ae00194cc 100644
> > --- a/arch/x86/kernel/cpu/sgx/ioctl.c
> > +++ b/arch/x86/kernel/cpu/sgx/ioctl.c
> > @@ -83,7 +83,7 @@ static int sgx_encl_create(struct sgx_encl *encl, struct sgx_secs *secs)
> >
> > encl->backing = backing;
> >
> > - secs_epc = sgx_alloc_epc_page(&encl->secs, true);
> > + secs_epc = sgx_alloc_epc_page(&encl->secs, SGX_PAGE_TYPE_SECS, true);
> > if (IS_ERR(secs_epc)) {
> > ret = PTR_ERR(secs_epc);
> > goto err_out_backing;
> > @@ -300,7 +300,7 @@ static int sgx_encl_add_page(struct sgx_encl *encl, unsigned long src,
> > if (IS_ERR(encl_page))
> > return PTR_ERR(encl_page);
> >
> > - epc_page = sgx_alloc_epc_page(encl_page, true);
> > + epc_page = sgx_alloc_epc_page(encl_page, SGX_PAGE_TYPE_REG, true);
> > if (IS_ERR(epc_page)) {
> > kfree(encl_page);
> > return PTR_ERR(epc_page);
> > diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
> > index 63d3de02bbcc..643df87b3e01 100644
> > --- a/arch/x86/kernel/cpu/sgx/main.c
> > +++ b/arch/x86/kernel/cpu/sgx/main.c
> > @@ -401,7 +401,12 @@ static void sgx_reclaim_pages(void)
> > section = &sgx_epc_sections[epc_page->section];
> > node = section->node;
> >
> > + /* drop poison pages instead of adding to free list */
> > + if (epc_page->flags & SGX_EPC_PAGE_POISON)
> > + continue;
> > +
> > spin_lock(&node->lock);
> > + epc_page->flags = SGX_EPC_PAGE_FREE;
> > list_add_tail(&epc_page->list, &node->free_page_list);
> > sgx_nr_free_pages++;
> > spin_unlock(&node->lock);
> > @@ -560,6 +565,7 @@ int sgx_unmark_page_reclaimable(struct sgx_epc_page *page)
> > /**
> > * sgx_alloc_epc_page() - Allocate an EPC page
> > * @owner: the owner of the EPC page
> > + * @type: type of page being allocated
> > * @reclaim: reclaim pages if necessary
> > *
> > * Iterate through EPC sections and borrow a free EPC page to the caller. When a
> > @@ -574,7 +580,7 @@ int sgx_unmark_page_reclaimable(struct sgx_epc_page *page)
> > * an EPC page,
> > * -errno on error
> > */
> > -struct sgx_epc_page *sgx_alloc_epc_page(void *owner, bool reclaim)
> > +struct sgx_epc_page *sgx_alloc_epc_page(void *owner, enum sgx_page_type type, bool reclaim)
> > {
> > struct sgx_epc_page *page;
> >
> > @@ -582,6 +588,8 @@ struct sgx_epc_page *sgx_alloc_epc_page(void *owner, bool reclaim)
> > page = __sgx_alloc_epc_page();
> > if (!IS_ERR(page)) {
> > page->owner = owner;
> > + page->type = type;
> > + page->flags = 0;
> > break;
> > }
> >
> > @@ -616,14 +624,22 @@ struct sgx_epc_page *sgx_alloc_epc_page(void *owner, bool reclaim)
> > * responsibility to make sure that the page is in uninitialized state. In other
> > * words, do EREMOVE, EWB or whatever operation is necessary before calling
> > * this function.
> > + *
> > + * Note that if the page has been tagged as poisoned, it is simply
> > + * dropped on the floor instead of added to the free list to make
> > + * sure we do not re-use it.
> > */
> > void sgx_free_epc_page(struct sgx_epc_page *page)
> > {
> > struct sgx_epc_section *section = &sgx_epc_sections[page->section];
> > struct sgx_numa_node *node = section->node;
> >
> > + if (page->flags & SGX_EPC_PAGE_POISON)
> > + return;
>
> I tend to think that it would be nice to collect them somewhere instead
> purposely leaking. E.g. this gives possibility to examine list with
> debugging tools.
I'm not also sure why free and dirty pages need to be tagged. Why a
poison flag is enough? This could be better explained in the commit
message.
