From: Jarkko Sakkinen <jarkko@kernel.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org, linux-sgx@vger.kernel.org,
Jarkko Sakkinen <jarkko@kernel.org>,
Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
Sean Christopherson <seanjc@google.com>
Subject: [PATCH] x86/sgx: Synchronize encl->srcu in sgx_encl_release().
Date: Fri, 11 Dec 2020 13:32:30 +0200 [thread overview]
Message-ID: <20201211113230.28909-1-jarkko@kernel.org> (raw)
Each sgx_mmun_notifier_release() starts a grace period, which means that
one extra synchronize_rcu() in sgx_encl_release(). Add it there.
sgx_release() has the loop that drains the list but with bad luck the
entry is already gone from the list before that loop processes it.
Fixes: 1728ab54b4be ("x86/sgx: Add a page reclaimer")
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Reported-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
arch/x86/kernel/cpu/sgx/encl.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c
index ee50a5010277..48539a6ee315 100644
--- a/arch/x86/kernel/cpu/sgx/encl.c
+++ b/arch/x86/kernel/cpu/sgx/encl.c
@@ -438,6 +438,13 @@ void sgx_encl_release(struct kref *ref)
if (encl->backing)
fput(encl->backing);
+ /*
+ * Each sgx_mmun_notifier_release() starts a grace period. Thus one
+ * "extra" synchronize_rcu() is required here. This can go undetected by
+ * sgx_release() when it drains the mm list.
+ */
+ synchronize_srcu(&encl->srcu);
+
cleanup_srcu_struct(&encl->srcu);
WARN_ON_ONCE(!list_empty(&encl->mm_list));
--
2.27.0
next reply other threads:[~2020-12-11 11:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-11 11:32 Jarkko Sakkinen [this message]
2020-12-14 19:01 ` [PATCH] x86/sgx: Synchronize encl->srcu in sgx_encl_release() Sean Christopherson
2020-12-15 5:55 ` Jarkko Sakkinen
2020-12-15 5:59 ` Jarkko Sakkinen
2020-12-15 17:34 ` Haitao Huang
2020-12-15 21:35 ` Jarkko Sakkinen
2020-12-15 22:04 ` Sean Christopherson
2020-12-16 12:25 ` Jarkko Sakkinen
-- strict thread matches above, loose matches on Subject: below --
2020-12-15 21:40 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=20201211113230.28909-1-jarkko@kernel.org \
--to=jarkko@kernel.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=seanjc@google.com \
--cc=x86@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).