Merge tag 'x86_urgent_for_v6.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel...

[people/ms/linux.git] / arch / x86 / kernel / cpu / sgx / main.c

diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index 515e2a5f25bbc8e4519a177106fcd5777dcade55..0aad028f04d40366c5846553cbcfcc4d85f1ec5a 100644 (file)
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@ -49,9 +49,13 @@ static LIST_HEAD(sgx_dirty_page_list);
  * Reset post-kexec EPC pages to the uninitialized state. The pages are removed
  * from the input list, and made available for the page allocator. SECS pages
  * prepending their children in the input list are left intact.
+ *
+ * Return 0 when sanitization was successful or kthread was stopped, and the
+ * number of unsanitized pages otherwise.
  */
-static void __sgx_sanitize_pages(struct list_head *dirty_page_list)
+static unsigned long __sgx_sanitize_pages(struct list_head *dirty_page_list)
 {
+       unsigned long left_dirty = 0;
        struct sgx_epc_page *page;
        LIST_HEAD(dirty);
        int ret;
@@ -59,7 +63,7 @@ static void __sgx_sanitize_pages(struct list_head *dirty_page_list)
        /* dirty_page_list is thread-local, no need for a lock: */
        while (!list_empty(dirty_page_list)) {
                if (kthread_should_stop())
-                       return;
+                       return 0;
 
                page = list_first_entry(dirty_page_list, struct sgx_epc_page, list);
 
@@ -92,12 +96,14 @@ static void __sgx_sanitize_pages(struct list_head *dirty_page_list)
                } else {
                        /* The page is not yet clean - move to the dirty list. */
                        list_move_tail(&page->list, &dirty);
+                       left_dirty++;
                }
 
                cond_resched();
        }
 
        list_splice(&dirty, dirty_page_list);
+       return left_dirty;
 }
 
 static bool sgx_reclaimer_age(struct sgx_epc_page *epc_page)
@@ -395,10 +401,7 @@ static int ksgxd(void *p)
         * required for SECS pages, whose child pages blocked EREMOVE.
         */
        __sgx_sanitize_pages(&sgx_dirty_page_list);
-       __sgx_sanitize_pages(&sgx_dirty_page_list);
-
-       /* sanity check: */
-       WARN_ON(!list_empty(&sgx_dirty_page_list));
+       WARN_ON(__sgx_sanitize_pages(&sgx_dirty_page_list));
 
        while (!kthread_should_stop()) {
                if (try_to_freeze())