From: Kristen Carlson Accardi <kristen@linux.intel.com> To: jarkko@kernel.org, dave.hansen@linux.intel.com, tj@kernel.org, linux-kernel@vger.kernel.org, linux-sgx@vger.kernel.org, cgroups@vger.kernel.org, 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 v2 08/18] x86/sgx: Allow reclaiming up to 32 pages, but scan 16 by default Date: Fri, 2 Dec 2022 10:36:44 -0800 [thread overview] Message-ID: <20221202183655.3767674-9-kristen@linux.intel.com> (raw) In-Reply-To: <20221202183655.3767674-1-kristen@linux.intel.com> From: Sean Christopherson <sean.j.christopherson@intel.com> Modify sgx_reclaim_pages() to take a parameter that specifies the number of pages to scan for reclaiming. Specify a max value of 32, but scan 16 in the usual case. This allows the number of pages sgx_reclaim_pages() scans to be specified by the caller, and adjusted in future patches. 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 | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index 83aaf5cea7b9..f201ca85212f 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -18,6 +18,8 @@ #include "encl.h" #include "encls.h" +#define SGX_MAX_NR_TO_RECLAIM 32 + struct sgx_epc_section sgx_epc_sections[SGX_MAX_EPC_SECTIONS]; static int sgx_nr_epc_sections; static struct task_struct *ksgxd_tsk; @@ -273,7 +275,10 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page, mutex_unlock(&encl->lock); } -/* +/** + * sgx_reclaim_pages() - Reclaim EPC pages from the consumers + * @nr_to_scan: Number of EPC pages to scan for reclaim + * * Take a fixed number of pages from the head of the active page pool and * reclaim them to the enclave's private shmem files. Skip the pages, which have * been accessed since the last scan. Move those pages to the tail of active @@ -286,9 +291,9 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page, * problematic as it would increase the lock contention too much, which would * halt forward progress. */ -static void __sgx_reclaim_pages(void) +static void __sgx_reclaim_pages(int nr_to_scan) { - struct sgx_backing backing[SGX_NR_TO_SCAN]; + struct sgx_backing backing[SGX_MAX_NR_TO_RECLAIM]; struct sgx_epc_page *epc_page, *tmp; struct sgx_encl_page *encl_page; pgoff_t page_index; @@ -297,7 +302,7 @@ static void __sgx_reclaim_pages(void) int i; spin_lock(&sgx_global_lru.lock); - for (i = 0; i < SGX_NR_TO_SCAN; i++) { + for (i = 0; i < nr_to_scan; i++) { epc_page = sgx_epc_peek_reclaimable(&sgx_global_lru); if (!epc_page) break; @@ -327,7 +332,7 @@ static void __sgx_reclaim_pages(void) list_for_each_entry_safe(epc_page, tmp, &iso, list) { encl_page = epc_page->encl_owner; - if (!sgx_reclaimer_age(epc_page)) + if (i == SGX_MAX_NR_TO_RECLAIM || !sgx_reclaimer_age(epc_page)) goto skip; page_index = PFN_DOWN(encl_page->desc - encl_page->encl->base); @@ -371,9 +376,9 @@ static void __sgx_reclaim_pages(void) } } -static void sgx_reclaim_pages(void) +static void sgx_reclaim_pages(int nr_to_scan) { - __sgx_reclaim_pages(); + __sgx_reclaim_pages(nr_to_scan); cond_resched(); } @@ -393,7 +398,7 @@ static bool sgx_should_reclaim(unsigned long watermark) void sgx_reclaim_direct(void) { if (sgx_should_reclaim(SGX_NR_LOW_PAGES)) - __sgx_reclaim_pages(); + __sgx_reclaim_pages(SGX_NR_TO_SCAN); } static int ksgxd(void *p) @@ -419,7 +424,7 @@ static int ksgxd(void *p) sgx_should_reclaim(SGX_NR_HIGH_PAGES)); if (sgx_should_reclaim(SGX_NR_HIGH_PAGES)) - sgx_reclaim_pages(); + sgx_reclaim_pages(SGX_NR_TO_SCAN); } return 0; @@ -598,7 +603,7 @@ struct sgx_epc_page *sgx_alloc_epc_page(void *owner, bool reclaim) break; } - sgx_reclaim_pages(); + sgx_reclaim_pages(SGX_NR_TO_SCAN); } if (sgx_should_reclaim(SGX_NR_LOW_PAGES)) -- 2.38.1
WARNING: multiple messages have this Message-ID (diff)
From: Kristen Carlson Accardi <kristen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> To: jarkko-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, dave.hansen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-sgx-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>, Ingo Molnar <mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, Borislav Petkov <bp-Gina5bIWoIWzQB+pC5nmwQ@public.gmane.org>, x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, "H. Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org> Cc: zhiquan1.li-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, Kristen Carlson Accardi <kristen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>, Sean Christopherson <seanjc-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> Subject: [PATCH v2 08/18] x86/sgx: Allow reclaiming up to 32 pages, but scan 16 by default Date: Fri, 2 Dec 2022 10:36:44 -0800 [thread overview] Message-ID: <20221202183655.3767674-9-kristen@linux.intel.com> (raw) In-Reply-To: <20221202183655.3767674-1-kristen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> From: Sean Christopherson <sean.j.christopherson-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> Modify sgx_reclaim_pages() to take a parameter that specifies the number of pages to scan for reclaiming. Specify a max value of 32, but scan 16 in the usual case. This allows the number of pages sgx_reclaim_pages() scans to be specified by the caller, and adjusted in future patches. Signed-off-by: Sean Christopherson <sean.j.christopherson-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> Signed-off-by: Kristen Carlson Accardi <kristen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Cc: Sean Christopherson <seanjc-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> --- arch/x86/kernel/cpu/sgx/main.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index 83aaf5cea7b9..f201ca85212f 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -18,6 +18,8 @@ #include "encl.h" #include "encls.h" +#define SGX_MAX_NR_TO_RECLAIM 32 + struct sgx_epc_section sgx_epc_sections[SGX_MAX_EPC_SECTIONS]; static int sgx_nr_epc_sections; static struct task_struct *ksgxd_tsk; @@ -273,7 +275,10 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page, mutex_unlock(&encl->lock); } -/* +/** + * sgx_reclaim_pages() - Reclaim EPC pages from the consumers + * @nr_to_scan: Number of EPC pages to scan for reclaim + * * Take a fixed number of pages from the head of the active page pool and * reclaim them to the enclave's private shmem files. Skip the pages, which have * been accessed since the last scan. Move those pages to the tail of active @@ -286,9 +291,9 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page, * problematic as it would increase the lock contention too much, which would * halt forward progress. */ -static void __sgx_reclaim_pages(void) +static void __sgx_reclaim_pages(int nr_to_scan) { - struct sgx_backing backing[SGX_NR_TO_SCAN]; + struct sgx_backing backing[SGX_MAX_NR_TO_RECLAIM]; struct sgx_epc_page *epc_page, *tmp; struct sgx_encl_page *encl_page; pgoff_t page_index; @@ -297,7 +302,7 @@ static void __sgx_reclaim_pages(void) int i; spin_lock(&sgx_global_lru.lock); - for (i = 0; i < SGX_NR_TO_SCAN; i++) { + for (i = 0; i < nr_to_scan; i++) { epc_page = sgx_epc_peek_reclaimable(&sgx_global_lru); if (!epc_page) break; @@ -327,7 +332,7 @@ static void __sgx_reclaim_pages(void) list_for_each_entry_safe(epc_page, tmp, &iso, list) { encl_page = epc_page->encl_owner; - if (!sgx_reclaimer_age(epc_page)) + if (i == SGX_MAX_NR_TO_RECLAIM || !sgx_reclaimer_age(epc_page)) goto skip; page_index = PFN_DOWN(encl_page->desc - encl_page->encl->base); @@ -371,9 +376,9 @@ static void __sgx_reclaim_pages(void) } } -static void sgx_reclaim_pages(void) +static void sgx_reclaim_pages(int nr_to_scan) { - __sgx_reclaim_pages(); + __sgx_reclaim_pages(nr_to_scan); cond_resched(); } @@ -393,7 +398,7 @@ static bool sgx_should_reclaim(unsigned long watermark) void sgx_reclaim_direct(void) { if (sgx_should_reclaim(SGX_NR_LOW_PAGES)) - __sgx_reclaim_pages(); + __sgx_reclaim_pages(SGX_NR_TO_SCAN); } static int ksgxd(void *p) @@ -419,7 +424,7 @@ static int ksgxd(void *p) sgx_should_reclaim(SGX_NR_HIGH_PAGES)); if (sgx_should_reclaim(SGX_NR_HIGH_PAGES)) - sgx_reclaim_pages(); + sgx_reclaim_pages(SGX_NR_TO_SCAN); } return 0; @@ -598,7 +603,7 @@ struct sgx_epc_page *sgx_alloc_epc_page(void *owner, bool reclaim) break; } - sgx_reclaim_pages(); + sgx_reclaim_pages(SGX_NR_TO_SCAN); } if (sgx_should_reclaim(SGX_NR_LOW_PAGES)) -- 2.38.1
next prev parent reply other threads:[~2022-12-02 18:38 UTC|newest] Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-12-02 18:36 [PATCH v2 00/18] Add Cgroup support for SGX EPC memory Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-02 18:36 ` [PATCH v2 01/18] x86/sgx: Call cond_resched() at the end of sgx_reclaim_pages() Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-02 21:33 ` Dave Hansen 2022-12-02 21:33 ` Dave Hansen 2022-12-02 21:37 ` Kristen Carlson Accardi 2022-12-02 21:37 ` Kristen Carlson Accardi 2022-12-02 21:45 ` Dave Hansen 2022-12-02 21:45 ` Dave Hansen 2022-12-02 22:17 ` Kristen Carlson Accardi 2022-12-02 22:17 ` Kristen Carlson Accardi 2022-12-02 22:37 ` Dave Hansen 2022-12-02 22:37 ` Dave Hansen 2022-12-02 18:36 ` [PATCH v2 02/18] x86/sgx: Store struct sgx_encl when allocating new VA pages Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-02 21:35 ` Dave Hansen 2022-12-02 21:35 ` Dave Hansen 2022-12-02 21:40 ` Kristen Carlson Accardi 2022-12-02 21:40 ` Kristen Carlson Accardi 2022-12-02 21:48 ` Dave Hansen 2022-12-02 21:48 ` Dave Hansen 2022-12-02 22:35 ` Sean Christopherson 2022-12-02 22:35 ` Sean Christopherson 2022-12-02 22:47 ` Dave Hansen 2022-12-02 22:47 ` Dave Hansen 2022-12-02 22:49 ` Sean Christopherson 2022-12-02 22:49 ` Sean Christopherson 2022-12-02 18:36 ` [PATCH v2 03/18] x86/sgx: Add 'struct sgx_epc_lru_lists' to encapsulate lru list(s) Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-02 21:39 ` Dave Hansen 2022-12-02 21:39 ` Dave Hansen 2022-12-08 15:31 ` Jarkko Sakkinen 2022-12-08 15:31 ` Jarkko Sakkinen 2022-12-08 18:03 ` Kristen Carlson Accardi 2022-12-08 18:03 ` Kristen Carlson Accardi 2022-12-02 18:36 ` [PATCH v2 04/18] x86/sgx: Use sgx_epc_lru_lists for existing active page list Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-02 21:43 ` Dave Hansen 2022-12-02 21:43 ` Dave Hansen 2022-12-02 21:51 ` Kristen Carlson Accardi 2022-12-02 21:51 ` Kristen Carlson Accardi 2022-12-02 22:10 ` Dave Hansen 2022-12-02 22:10 ` Dave Hansen 2022-12-02 18:36 ` [PATCH v2 05/18] x86/sgx: Track epc pages on reclaimable or unreclaimable lists Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-02 22:13 ` Dave Hansen 2022-12-02 22:13 ` Dave Hansen 2022-12-02 22:28 ` Sean Christopherson 2022-12-02 22:28 ` Sean Christopherson 2022-12-02 18:36 ` [PATCH v2 06/18] x86/sgx: Introduce RECLAIM_IN_PROGRESS flag for EPC pages Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-02 22:15 ` Dave Hansen 2022-12-02 22:15 ` Dave Hansen 2022-12-08 15:46 ` Jarkko Sakkinen 2022-12-08 15:46 ` Jarkko Sakkinen 2022-12-08 18:13 ` Kristen Carlson Accardi 2022-12-08 18:13 ` Kristen Carlson Accardi 2022-12-02 18:36 ` [PATCH v2 07/18] x86/sgx: Use a list to track to-be-reclaimed pages during reclaim Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-02 22:33 ` Dave Hansen 2022-12-02 22:33 ` Dave Hansen 2022-12-05 16:33 ` Kristen Carlson Accardi 2022-12-05 16:33 ` Kristen Carlson Accardi 2022-12-05 17:03 ` Dave Hansen 2022-12-05 17:03 ` Dave Hansen 2022-12-05 18:25 ` Kristen Carlson Accardi 2022-12-05 18:25 ` Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi [this message] 2022-12-02 18:36 ` [PATCH v2 08/18] x86/sgx: Allow reclaiming up to 32 pages, but scan 16 by default Kristen Carlson Accardi 2022-12-08 9:26 ` Jarkko Sakkinen 2022-12-08 9:26 ` Jarkko Sakkinen 2022-12-08 9:27 ` Jarkko Sakkinen 2022-12-08 9:27 ` Jarkko Sakkinen 2022-12-02 18:36 ` [PATCH v2 09/18] x86/sgx: Return the number of EPC pages that were successfully reclaimed Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-08 9:30 ` Jarkko Sakkinen 2022-12-08 9:30 ` Jarkko Sakkinen 2022-12-02 18:36 ` [PATCH v2 10/18] x86/sgx: Add option to ignore age of page during EPC reclaim Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-08 9:37 ` Jarkko Sakkinen 2022-12-08 9:37 ` Jarkko Sakkinen 2022-12-02 18:36 ` [PATCH v2 11/18] x86/sgx: Prepare for multiple LRUs Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-08 9:42 ` Jarkko Sakkinen 2022-12-08 9:42 ` Jarkko Sakkinen 2022-12-02 18:36 ` [PATCH v2 12/18] x86/sgx: Expose sgx_reclaim_pages() for use by EPC cgroup Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-08 9:46 ` Jarkko Sakkinen 2022-12-08 9:46 ` Jarkko Sakkinen 2022-12-02 18:36 ` [PATCH v2 13/18] x86/sgx: Add helper to grab pages from an arbitrary EPC LRU Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-08 9:56 ` Jarkko Sakkinen 2022-12-02 18:36 ` [PATCH v2 14/18] x86/sgx: Add EPC OOM path to forcefully reclaim EPC Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-08 15:21 ` Jarkko Sakkinen 2022-12-08 15:21 ` Jarkko Sakkinen 2022-12-09 16:05 ` Kristen Carlson Accardi 2022-12-09 16:05 ` Kristen Carlson Accardi 2022-12-09 16:22 ` Dave Hansen 2022-12-09 16:22 ` Dave Hansen 2022-12-12 18:09 ` Sean Christopherson 2022-12-12 18:09 ` Sean Christopherson 2022-12-26 20:43 ` Jarkko Sakkinen 2022-12-26 20:43 ` Jarkko Sakkinen 2022-12-02 18:36 ` [PATCH v2 15/18] cgroup/misc: Add per resource callbacks for css events Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-08 14:53 ` Jarkko Sakkinen 2022-12-08 14:53 ` Jarkko Sakkinen 2022-12-08 15:15 ` Jarkko Sakkinen 2022-12-08 15:15 ` Jarkko Sakkinen 2022-12-02 18:36 ` [PATCH v2 16/18] cgroup/misc: Prepare for SGX usage Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-08 15:23 ` Jarkko Sakkinen 2022-12-08 15:23 ` Jarkko Sakkinen 2022-12-02 18:36 ` [PATCH v2 17/18] x86/sgx: Add support for misc cgroup controller Kristen Carlson Accardi 2022-12-02 18:36 ` Kristen Carlson Accardi 2022-12-08 15:30 ` Jarkko Sakkinen 2022-12-08 15:30 ` Jarkko Sakkinen 2022-12-02 18:36 ` [PATCH v2 18/18] Docs/x86/sgx: Add description for cgroup support Kristen Carlson Accardi 2023-04-03 21:26 ` [EXTERNAL] [PATCH v2 00/18] Add Cgroup support for SGX EPC memory Anand Krishnamoorthi 2023-04-03 21:26 ` Anand Krishnamoorthi 2023-04-13 18:49 ` Anand Krishnamoorthi 2023-04-13 18:49 ` Anand Krishnamoorthi 2023-04-18 16:44 ` Mikko Ylinen 2023-04-27 16:53 ` Anand Krishnamoorthi 2023-04-27 16:53 ` Anand Krishnamoorthi
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=20221202183655.3767674-9-kristen@linux.intel.com \ --to=kristen@linux.intel.com \ --cc=bp@alien8.de \ --cc=cgroups@vger.kernel.org \ --cc=dave.hansen@linux.intel.com \ --cc=hpa@zytor.com \ --cc=jarkko@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sgx@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=seanjc@google.com \ --cc=tglx@linutronix.de \ --cc=tj@kernel.org \ --cc=x86@kernel.org \ --cc=zhiquan1.li@intel.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.