Skip to contentSkip to conversation

x86/sgx: Reclaim bug fix and cleanup

PATCH In review Sean Christopherson 2 participants 6 messages Dec 21, 2019 – Jan 2, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover x86/sgx: Reclaim bug fix and cleanup

One bug fix in the SECS reclaim path and loosely related cleanup.

Sean Christopherson (4):
x86/sgx: Put SECS backing iff retrieving the backing succeeds x86/sgx: Use goto to handle sgx_encl_get_backing() failure in SECS
flows
x86/sgx: Drop unused @encl parameter from __sgx_encl_ewb() x86/sgx: Pre-calculate VA slot virtual address in sgx_encl_ewb()

 arch/x86/kernel/cpu/sgx/reclaim.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)
Signature · 1 line
2.24.1
#1 lore raw

PATCH 1/4 x86/sgx: Put SECS backing iff retrieving the backing succeeds

Put the SECS backing if and only if retrieving the backing succeeded, otherwise sgx_encl_put_backing() will consume uninitialized pointers.

---
 arch/x86/kernel/cpu/sgx/reclaim.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/sgx/reclaim.c +2 -2
index 21fbfe2ed9c4..67bda5528625 100644
@@ -361,9 +361,9 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page,
 
 				sgx_free_page(encl->secs.epc_page);
 				encl->secs.epc_page = NULL;
+
+				sgx_encl_put_backing(&secs_backing, true);
 			}
-
-			sgx_encl_put_backing(&secs_backing, true);
 		}
 	}
 
Signature · 1 line
2.24.1
#2 lore raw

PATCH 2/4 x86/sgx: Use goto to handle sgx_encl_get_backing() failure in SECS flows

In reply to Sean Christopherson

Use a goto for the SECS backing error path in sgx_reclaimer_write() so that the happy path is a straight shot, e.g. to make it obvious that the backing is not being leaked. Reducing the indentation also eliminates a line wrap.

No functional change intended.

---

I could go either way on this patch, included it in case you have a preference.

 arch/x86/kernel/cpu/sgx/reclaim.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/sgx/reclaim.c +8 -7
index 67bda5528625..c5c0ba92ab63 100644
@@ -355,18 +355,19 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page,
 		} else if (atomic_read(&encl->flags) & SGX_ENCL_INITIALIZED) {
 			ret = sgx_encl_get_backing(encl, PFN_DOWN(encl->size),
 						   &secs_backing);
-			if (!ret) {
-				sgx_encl_ewb(encl->secs.epc_page,
-					     &secs_backing);
+			if (ret)
+				goto out;
 
-				sgx_free_page(encl->secs.epc_page);
-				encl->secs.epc_page = NULL;
+			sgx_encl_ewb(encl->secs.epc_page, &secs_backing);
 
-				sgx_encl_put_backing(&secs_backing, true);
-			}
+			sgx_free_page(encl->secs.epc_page);
+			encl->secs.epc_page = NULL;
+
+			sgx_encl_put_backing(&secs_backing, true);
 		}
 	}
 
+out:
 	mutex_unlock(&encl->lock);
 }
 
Signature · 1 line
2.24.1
#3 lore raw

PATCH 3/4 x86/sgx: Drop unused @encl parameter from __sgx_encl_ewb()

In reply to Sean Christopherson

Remove the unused @encl parameter from __sgx_encl_ewb() to help shorten the line lengths of its call sites.

---
 arch/x86/kernel/cpu/sgx/reclaim.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/sgx/reclaim.c +5 -6
index c5c0ba92ab63..030b1c24da07 100644
@@ -223,7 +223,7 @@ static void sgx_reclaimer_block(struct sgx_epc_page *epc_page)
 	mutex_unlock(&encl->lock);
 }
 
-static int __sgx_encl_ewb(struct sgx_encl *encl, struct sgx_epc_page *epc_page,
+static int __sgx_encl_ewb(struct sgx_epc_page *epc_page,
 			  struct sgx_va_page *va_page, unsigned int va_offset,
 			  struct sgx_backing *backing)
 {
@@ -292,7 +292,7 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page,
 	if (sgx_va_page_full(va_page))
 		list_move_tail(&va_page->list, &encl->va_pages);
 
-	ret = __sgx_encl_ewb(encl, epc_page, va_page, va_offset, backing);
+	ret = __sgx_encl_ewb(epc_page, va_page, va_offset, backing);
 	if (ret == SGX_NOT_TRACKED) {
 		ret = __etrack(sgx_epc_addr(encl->secs.epc_page));
 		if (ret) {
@@ -300,8 +300,7 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page,
 				ENCLS_WARN(ret, "ETRACK");
 		}
 
-		ret = __sgx_encl_ewb(encl, epc_page, va_page, va_offset,
-				     backing);
+		ret = __sgx_encl_ewb(epc_page, va_page, va_offset, backing);
 		if (ret == SGX_NOT_TRACKED) {
 			/*
 			 * Slow path, send IPIs to kick cpus out of the
@@ -312,8 +311,8 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page,
 			 */
 			on_each_cpu_mask(sgx_encl_ewb_cpumask(encl),
 					 sgx_ipi_cb, NULL, 1);
-			ret = __sgx_encl_ewb(encl, epc_page, va_page,
-					     va_offset, backing);
+			ret = __sgx_encl_ewb(epc_page, va_page, va_offset,
+					     backing);
 		}
 	}
 
Signature · 1 line
2.24.1
#4 lore raw

PATCH 4/4 x86/sgx: Pre-calculate VA slot virtual address in sgx_encl_ewb()

In reply to Sean Christopherson

Now that sgx_epc_addr() is purely a calculation, calculate the VA slot in sgx_encl_ewb() and pass it to __sgx_encl_ewb() to reduce line lengths and avoid re-calculating the address on every EWB attempt.

---
 arch/x86/kernel/cpu/sgx/reclaim.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
arch/x86/kernel/cpu/sgx/reclaim.c +7 -8
index 030b1c24da07..a33f1c45477a 100644
@@ -223,8 +223,7 @@ static void sgx_reclaimer_block(struct sgx_epc_page *epc_page)
 	mutex_unlock(&encl->lock);
 }
 
-static int __sgx_encl_ewb(struct sgx_epc_page *epc_page,
-			  struct sgx_va_page *va_page, unsigned int va_offset,
+static int __sgx_encl_ewb(struct sgx_epc_page *epc_page, void *va_slot,
 			  struct sgx_backing *backing)
 {
 	struct sgx_pageinfo pginfo;
@@ -237,8 +236,7 @@ static int __sgx_encl_ewb(struct sgx_epc_page *epc_page,
 	pginfo.metadata = (unsigned long)kmap_atomic(backing->pcmd) +
 			  backing->pcmd_offset;
 
-	ret = __ewb(&pginfo, sgx_epc_addr(epc_page),
-		    sgx_epc_addr(va_page->epc_page) + va_offset);
+	ret = __ewb(&pginfo, sgx_epc_addr(epc_page), va_slot);
 
 	kunmap_atomic((void *)(unsigned long)(pginfo.metadata -
 					      backing->pcmd_offset));
@@ -282,6 +280,7 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page,
 	struct sgx_encl *encl = encl_page->encl;
 	struct sgx_va_page *va_page;
 	unsigned int va_offset;
+	void *va_slot;
 	int ret;
 
 	encl_page->desc &= ~SGX_ENCL_PAGE_RECLAIMED;
@@ -289,10 +288,11 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page,
 	va_page = list_first_entry(&encl->va_pages, struct sgx_va_page,
 				   list);
 	va_offset = sgx_alloc_va_slot(va_page);
+	va_slot = sgx_epc_addr(va_page->epc_page) + va_offset;
 	if (sgx_va_page_full(va_page))
 		list_move_tail(&va_page->list, &encl->va_pages);
 
-	ret = __sgx_encl_ewb(epc_page, va_page, va_offset, backing);
+	ret = __sgx_encl_ewb(epc_page, va_slot, backing);
 	if (ret == SGX_NOT_TRACKED) {
 		ret = __etrack(sgx_epc_addr(encl->secs.epc_page));
 		if (ret) {
@@ -300,7 +300,7 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page,
 				ENCLS_WARN(ret, "ETRACK");
 		}
 
-		ret = __sgx_encl_ewb(epc_page, va_page, va_offset, backing);
+		ret = __sgx_encl_ewb(epc_page, va_slot, backing);
 		if (ret == SGX_NOT_TRACKED) {
 			/*
 			 * Slow path, send IPIs to kick cpus out of the
@@ -311,8 +311,7 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page,
 			 */
 			on_each_cpu_mask(sgx_encl_ewb_cpumask(encl),
 					 sgx_ipi_cb, NULL, 1);
-			ret = __sgx_encl_ewb(epc_page, va_page, va_offset,
-					     backing);
+			ret = __sgx_encl_ewb(epc_page, va_slot, backing);
 		}
 	}
 
Signature · 1 line
2.24.1
#5 lore raw
In reply to Sean Christopherson
Quoted 9 lines · Sean Christopherson

One bug fix in the SECS reclaim path and loosely related cleanup.

Sean Christopherson (4):
x86/sgx: Put SECS backing iff retrieving the backing succeeds x86/sgx: Use goto to handle sgx_encl_get_backing() failure in SECS
flows
x86/sgx: Drop unused @encl parameter from __sgx_encl_ewb() x86/sgx: Pre-calculate VA slot virtual address in sgx_encl_ewb()

Quoted 6 lines
 arch/x86/kernel/cpu/sgx/reclaim.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)
Signature · 1 line
2.24.1

Thank you. I merged these and added a changelog entry describing the bug that was fixed.

/Jarkko