x86: cpa: move flush to cpa

The set_memory_* and set_pages_* family of API's currently requires the
callers to do a global tlb flush after the function call; forgetting this is
a very nasty deathtrap. This patch moves the global tlb flush into
each of the callers

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 0 insertions, 14 deletions

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index f7b941c3b2c3..0d3369b900e9 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -752,15 +752,11 @@ void mark_rodata_ro(void)
                 printk("Write protecting the kernel text: %luk\n", size >> 10);
 
 #ifdef CONFIG_CPA_DEBUG
-                global_flush_tlb();
-
                 printk("Testing CPA: Reverting %lx-%lx\n", start, start+size);
                 set_pages_rw(virt_to_page(start), size>>PAGE_SHIFT);
-                global_flush_tlb();
 
                 printk("Testing CPA: write protecting again\n");
                 set_pages_ro(virt_to_page(start), size>>PAGE_SHIFT);
-                global_flush_tlb();
 #endif
         }
 #endif
@@ -770,22 +766,12 @@ void mark_rodata_ro(void)
         printk("Write protecting the kernel read-only data: %luk\n",
                size >> 10);
 
-        /*
-         * set_pages_*() requires a global_flush_tlb() call after it.
-         * We do this after the printk so that if something went wrong in the
-         * change, the printk gets out at least to give a better debug hint
-         * of who is the culprit.
-         */
-        global_flush_tlb();
-
 #ifdef CONFIG_CPA_DEBUG
         printk("Testing CPA: undo %lx-%lx\n", start, start + size);
         set_pages_rw(virt_to_page(start), size >> PAGE_SHIFT);
-        global_flush_tlb();
 
         printk("Testing CPA: write protecting again\n");
         set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
-        global_flush_tlb();
 #endif
 }
 #endif