From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: linux-sgx@vger.kernel.org
Subject: [PATCH for_v23 8/9] x86/sgx: Don't update free page count if EPC section allocation fails
Date: Thu, 10 Oct 2019 14:43:00 -0700 [thread overview]
Message-ID: <20191010214301.25669-9-sean.j.christopherson@intel.com> (raw)
In-Reply-To: <20191010214301.25669-1-sean.j.christopherson@intel.com>
Update the number of free pages only after an EPC section is fully
initialized, else the free page count will be left in a bogus state if
allocation fails.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
arch/x86/kernel/cpu/sgx/main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index e22cdbb431a3..48a4f37b5b3c 100644
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@ -216,9 +216,10 @@ static bool __init sgx_alloc_epc_section(u64 addr, u64 size,
page->desc = (addr + (i << PAGE_SHIFT)) | index;
list_add_tail(&page->list, §ion->unsanitized_page_list);
- sgx_nr_free_pages++;
}
+ sgx_nr_free_pages += nr_pages;
+
return true;
err_out:
--
2.22.0
next prev parent reply other threads:[~2019-10-10 21:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 21:42 [PATCH for_v23 0/9] x86/sgx: misc page related fixes Sean Christopherson
2019-10-10 21:42 ` [PATCH for_v23 1/9] x86/sgx: WARN once if an enclave is released with unfreed EPC pages Sean Christopherson
2019-10-14 20:31 ` Jarkko Sakkinen
2019-10-14 20:33 ` Jarkko Sakkinen
2019-10-14 23:56 ` Sean Christopherson
2019-10-10 21:42 ` [PATCH for_v23 2/9] x86/sgx: Do not EWB SECS if the enclave is dead Sean Christopherson
2019-10-14 20:58 ` Jarkko Sakkinen
2019-10-10 21:42 ` [PATCH for_v23 3/9] x86/sgx: Fix a memory leak in sgx_encl_destroy() Sean Christopherson
2019-10-10 22:49 ` Sean Christopherson
2019-10-14 21:00 ` Jarkko Sakkinen
2019-10-14 23:57 ` Sean Christopherson
2019-10-10 21:42 ` [PATCH for_v23 4/9] x86/sgx: WARN on any non-zero return from __eremove() Sean Christopherson
2019-10-10 21:42 ` [PATCH for_v23 5/9] x86/sgx: WARN only once if EREMOVE fails Sean Christopherson
2019-10-10 21:42 ` [PATCH for_v23 6/9] x86/sgx: Split second half of sgx_free_page() to a separate helper Sean Christopherson
2019-10-10 21:42 ` [PATCH for_v23 7/9] x86/sgx: Use the post-reclaim variant of __sgx_free_page() Sean Christopherson
2019-10-10 21:43 ` Sean Christopherson [this message]
2019-10-10 21:43 ` [PATCH for_v23 9/9] x86/sgx: Reinstate per EPC section free page counts Sean Christopherson
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=20191010214301.25669-9-sean.j.christopherson@intel.com \
--to=sean.j.christopherson@intel.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-sgx@vger.kernel.org \
/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).