diff mbox series

[13/26] x86/sgx: Prepare for multiple LRUs

Message ID	20221111183532.3676646-14-kristen@linux.intel.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Kristen Carlson Accardi <kristen@linux.intel.com> To: jarkko@kernel.org, dave.hansen@linux.kernel.org, tj@kernel.org, linux-kernel@vger.kernel.org, linux-sgx@vger.kernel.org, cgroups@vger.kernel.org, Dave Hansen <dave.hansen@linux.intel.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com> Cc: zhiquan1.li@intel.com, Kristen Carlson Accardi <kristen@linux.intel.com>, Sean Christopherson <seanjc@google.com> Subject: [PATCH 13/26] x86/sgx: Prepare for multiple LRUs Date: Fri, 11 Nov 2022 10:35:18 -0800 Message-Id: <20221111183532.3676646-14-kristen@linux.intel.com> In-Reply-To: <20221111183532.3676646-1-kristen@linux.intel.com> References: <20221111183532.3676646-1-kristen@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Add Cgroup support for SGX EPC memory \| [00/26] Add Cgroup support for SGX EPC memory [01/26] x86/sgx: Call cond_resched() at the end of sgx_reclaim_pages() [02/26] x86/sgx: Store struct sgx_encl when allocating new va pages [03/26] x86/sgx: Add 'struct sgx_epc_lru' to encapsulate lru list(s) [04/26] x86/sgx: Use sgx_epc_lru for existing active page list [05/26] x86/sgx: Track epc pages on reclaimable or unreclaimable lists [06/26] x86/sgx: Introduce RECLAIM_IN_PROGRESS flag for EPC pages [07/26] x86/sgx: Use a list to track to-be-reclaimed pages during reclaim [08/26] x86/sgx: Add EPC page flags to identify type of page [09/26] x86/sgx: Allow reclaiming up to 32 pages, but scan 16 by default [10/26] x86/sgx: Return the number of EPC pages that were successfully reclaimed [11/26] x86/sgx: Add option to ignore age of page during EPC reclaim [12/26] x86/sgx: Add helper to retrieve SGX EPC LRU given an EPC page [13/26] x86/sgx: Prepare for multiple LRUs [14/26] x86/sgx: Expose sgx_reclaim_pages() for use by EPC cgroup [15/26] x86/sgx: Add helper to grab pages from an arbitrary EPC LRU [16/26] x86/sgx: Add EPC OOM path to forcefully reclaim EPC [17/26] cgroup/misc: Add notifier block list support for css events [18/26] cgroup/misc: Expose root_misc [19/26] cgroup/misc: Expose parent_misc() [20/26] cgroup/misc: allow users of misc cgroup to read specific cgroup usage [21/26] cgroup/misc: allow misc cgroup consumers to read the max value [22/26] cgroup/misc: Add private per cgroup data to struct misc_cg [23/26] cgroup/misc: Add tryget functionality for misc controller [24/26] cgroup/misc: Add SGX EPC resource type [25/26] x86/sgx: Add support for misc cgroup controller [26/26] Docs/x86/sgx: Add description for cgroup support

Commit Message

Kristen Carlson Accardi Nov. 11, 2022, 6:35 p.m. UTC

  From: Sean Christopherson <sean.j.christopherson@intel.com>

Add sgx_can_reclaim() wrapper so that in a subsequent patch, multiple LRUs
can be used cleanly.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Kristen Carlson Accardi <kristen@linux.intel.com>
Cc: Sean Christopherson <seanjc@google.com>
---
 arch/x86/kernel/cpu/sgx/main.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index c33966eafab6..b2c050fcc989 100644
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@ -391,10 +391,15 @@  static int sgx_reclaim_pages(int nr_to_scan, bool ignore_age)
 	return ret;
 }
 
+static bool sgx_can_reclaim(void)
+{
+	return !list_empty(&sgx_global_lru.reclaimable);
+}
+
 static bool sgx_should_reclaim(unsigned long watermark)
 {
 	return atomic_long_read(&sgx_nr_free_pages) < watermark &&
-	       !list_empty(&sgx_global_lru.reclaimable);
+		sgx_can_reclaim();
 }
 
 /*
@@ -599,7 +604,7 @@  struct sgx_epc_page *sgx_alloc_epc_page(void *owner, bool reclaim)
 			break;
 		}
 
-		if (list_empty(&sgx_global_lru.reclaimable))
+		if (!sgx_can_reclaim())
 			return ERR_PTR(-ENOMEM);
 
 		if (!reclaim) {