x86: fix clflush_page_range logic
[sfrench/cifs-2.6.git] / arch / x86 / mm / pageattr.c
index cbe8e9223bee9fa9d40759a5c3ad02b0e7a08a3c..97ec9e7d29d9ca2b93890163667c443108b9852a 100644 (file)
 #include <linux/slab.h>
 #include <linux/mm.h>
 
-void clflush_cache_range(void *addr, int size)
-{
-       int i;
-
-       for (i = 0; i < size; i += boot_cpu_data.x86_clflush_size)
-               clflush(addr+i);
-}
-
+#include <asm/e820.h>
 #include <asm/processor.h>
 #include <asm/tlbflush.h>
 #include <asm/sections.h>
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 
+static inline int
+within(unsigned long addr, unsigned long start, unsigned long end)
+{
+       return addr >= start && addr < end;
+}
+
 /*
- * We allow the BIOS range to be executable:
+ * Flushing functions
+ */
+
+/**
+ * clflush_cache_range - flush a cache range with clflush
+ * @addr:      virtual start address
+ * @size:      number of bytes to flush
+ *
+ * clflush is an unordered instruction which needs fencing with mfence
+ * to avoid ordering issues.
  */
-#define BIOS_BEGIN             0x000a0000
-#define BIOS_END               0x00100000
+void clflush_cache_range(void *vaddr, unsigned int size)
+{
+       void *vend = vaddr + size - 1;
+
+       mb();
+
+       for (; vaddr < vend; vaddr += boot_cpu_data.x86_clflush_size)
+               clflush(vaddr);
+       /*
+        * Flush any possible final partial cacheline:
+        */
+       clflush(vend);
+
+       mb();
+}
+
+static void __cpa_flush_all(void *arg)
+{
+       /*
+        * Flush all to work around Errata in early athlons regarding
+        * large page flushing.
+        */
+       __flush_tlb_all();
+
+       if (boot_cpu_data.x86_model >= 4)
+               wbinvd();
+}
+
+static void cpa_flush_all(void)
+{
+       BUG_ON(irqs_disabled());
+
+       on_each_cpu(__cpa_flush_all, NULL, 1, 1);
+}
+
+static void __cpa_flush_range(void *arg)
+{
+       /*
+        * We could optimize that further and do individual per page
+        * tlb invalidates for a low number of pages. Caveat: we must
+        * flush the high aliases on 64bit as well.
+        */
+       __flush_tlb_all();
+}
+
+static void cpa_flush_range(unsigned long start, int numpages)
+{
+       unsigned int i, level;
+       unsigned long addr;
 
-static inline pgprot_t check_exec(pgprot_t prot, unsigned long address)
+       BUG_ON(irqs_disabled());
+       WARN_ON(PAGE_ALIGN(start) != start);
+
+       on_each_cpu(__cpa_flush_range, NULL, 1, 1);
+
+       /*
+        * We only need to flush on one CPU,
+        * clflush is a MESI-coherent instruction that
+        * will cause all other CPUs to flush the same
+        * cachelines:
+        */
+       for (i = 0, addr = start; i < numpages; i++, addr += PAGE_SIZE) {
+               pte_t *pte = lookup_address(addr, &level);
+
+               /*
+                * Only flush present addresses:
+                */
+               if (pte && pte_present(*pte))
+                       clflush_cache_range((void *) addr, PAGE_SIZE);
+       }
+}
+
+/*
+ * Certain areas of memory on x86 require very specific protection flags,
+ * for example the BIOS area or kernel text. Callers don't always get this
+ * right (again, ioremap() on BIOS memory is not uncommon) so this function
+ * checks and fixes these known static required protection bits.
+ */
+static inline pgprot_t static_protections(pgprot_t prot, unsigned long address)
 {
-       if (__pa(address) >= BIOS_BEGIN && __pa(address) < BIOS_END)
-               pgprot_val(prot) &= ~_PAGE_NX;
+       pgprot_t forbidden = __pgprot(0);
+
        /*
-        * Better fail early if someone sets the kernel text to NX.
-        * Does not cover __inittext
+        * The BIOS area between 640k and 1Mb needs to be executable for
+        * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
         */
-       BUG_ON(address >= (unsigned long)&_text &&
-               address < (unsigned long)&_etext &&
-              (pgprot_val(prot) & _PAGE_NX));
+       if (within(__pa(address), BIOS_BEGIN, BIOS_END))
+               pgprot_val(forbidden) |= _PAGE_NX;
+
+       /*
+        * The kernel text needs to be executable for obvious reasons
+        * Does not cover __inittext since that is gone later on
+        */
+       if (within(address, (unsigned long)_text, (unsigned long)_etext))
+               pgprot_val(forbidden) |= _PAGE_NX;
+
+#ifdef CONFIG_DEBUG_RODATA
+       /* The .rodata section needs to be read-only */
+       if (within(address, (unsigned long)__start_rodata,
+                               (unsigned long)__end_rodata))
+               pgprot_val(forbidden) |= _PAGE_RW;
+#endif
+
+       prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
 
        return prot;
 }
@@ -169,11 +267,15 @@ repeat:
        BUG_ON(PageLRU(kpte_page));
        BUG_ON(PageCompound(kpte_page));
 
-       prot = check_exec(prot, address);
+       prot = static_protections(prot, address);
 
        if (level == PG_LEVEL_4K) {
+               WARN_ON_ONCE(pgprot_val(prot) & _PAGE_PSE);
                set_pte_atomic(kpte, pfn_pte(pfn, canon_pgprot(prot)));
        } else {
+               /* Clear the PSE bit for the 4k level pages ! */
+               pgprot_val(prot) = pgprot_val(prot) & ~_PAGE_PSE;
+
                err = split_large_page(kpte, address);
                if (!err)
                        goto repeat;
@@ -184,7 +286,6 @@ repeat:
 /**
  * change_page_attr_addr - Change page table attributes in linear mapping
  * @address: Virtual address in linear mapping.
- * @numpages: Number of pages to change
  * @prot:    New page table attribute (PAGE_*)
  *
  * Change page attributes of a page in the direct mapping. This is a variant
@@ -192,11 +293,14 @@ repeat:
  * mem_map entry (pfn_valid() is false).
  *
  * See change_page_attr() documentation for more details.
+ *
+ * Modules and drivers should use the set_memory_* APIs instead.
  */
 
-int change_page_attr_addr(unsigned long address, int numpages, pgprot_t prot)
+static int change_page_attr_addr(unsigned long address, pgprot_t prot)
 {
-       int err = 0, kernel_map = 0, i;
+       int err = 0, kernel_map = 0;
+       unsigned long pfn = __pa(address) >> PAGE_SHIFT;
 
 #ifdef CONFIG_X86_64
        if (address >= __START_KERNEL_map &&
@@ -207,83 +311,212 @@ int change_page_attr_addr(unsigned long address, int numpages, pgprot_t prot)
        }
 #endif
 
-       for (i = 0; i < numpages; i++, address += PAGE_SIZE) {
-               unsigned long pfn = __pa(address) >> PAGE_SHIFT;
+       if (!kernel_map || pte_present(pfn_pte(0, prot))) {
+               err = __change_page_attr(address, pfn, prot);
+               if (err)
+                       return err;
+       }
 
-               if (!kernel_map || pte_present(pfn_pte(0, prot))) {
-                       err = __change_page_attr(address, pfn, prot);
-                       if (err)
-                               break;
-               }
 #ifdef CONFIG_X86_64
-               /*
-                * Handle kernel mapping too which aliases part of
-                * lowmem:
-                */
-               if (__pa(address) < KERNEL_TEXT_SIZE) {
-                       unsigned long addr2;
-                       pgprot_t prot2;
-
-                       addr2 = __START_KERNEL_map + __pa(address);
-                       /* Make sure the kernel mappings stay executable */
-                       prot2 = pte_pgprot(pte_mkexec(pfn_pte(0, prot)));
-                       err = __change_page_attr(addr2, pfn, prot2);
-               }
-#endif
+       /*
+        * Handle kernel mapping too which aliases part of
+        * lowmem:
+        */
+       if (__pa(address) < KERNEL_TEXT_SIZE) {
+               unsigned long addr2;
+               pgprot_t prot2;
+
+               addr2 = __START_KERNEL_map + __pa(address);
+               /* Make sure the kernel mappings stay executable */
+               prot2 = pte_pgprot(pte_mkexec(pfn_pte(0, prot)));
+               err = __change_page_attr(addr2, pfn, prot2);
        }
+#endif
 
        return err;
 }
 
-/**
- * change_page_attr - Change page table attributes in the linear mapping.
- * @page: First page to change
- * @numpages: Number of pages to change
- * @prot: New protection/caching type (PAGE_*)
- *
- * Returns 0 on success, otherwise a negated errno.
- *
- * This should be used when a page is mapped with a different caching policy
- * than write-back somewhere - some CPUs do not like it when mappings with
- * different caching policies exist. This changes the page attributes of the
- * in kernel linear mapping too.
- *
- * Caller must call global_flush_tlb() later to make the changes active.
- *
- * The caller needs to ensure that there are no conflicting mappings elsewhere
- * (e.g. in user space) * This function only deals with the kernel linear map.
- *
- * For MMIO areas without mem_map use change_page_attr_addr() instead.
- */
-int change_page_attr(struct page *page, int numpages, pgprot_t prot)
+static int __change_page_attr_set_clr(unsigned long addr, int numpages,
+                                     pgprot_t mask_set, pgprot_t mask_clr)
 {
-       unsigned long addr = (unsigned long)page_address(page);
+       pgprot_t new_prot;
+       int level;
+       pte_t *pte;
+       int i, ret;
+
+       for (i = 0; i < numpages ; i++) {
+
+               pte = lookup_address(addr, &level);
+               if (!pte)
+                       return -EINVAL;
+
+               new_prot = pte_pgprot(*pte);
+
+               pgprot_val(new_prot) &= ~pgprot_val(mask_clr);
+               pgprot_val(new_prot) |= pgprot_val(mask_set);
+
+               ret = change_page_attr_addr(addr, new_prot);
+               if (ret)
+                       return ret;
+               addr += PAGE_SIZE;
+       }
 
-       return change_page_attr_addr(addr, numpages, prot);
+       return 0;
 }
-EXPORT_SYMBOL(change_page_attr);
 
-static void flush_kernel_map(void *arg)
+static int change_page_attr_set_clr(unsigned long addr, int numpages,
+                                   pgprot_t mask_set, pgprot_t mask_clr)
 {
+       int ret = __change_page_attr_set_clr(addr, numpages, mask_set,
+                                            mask_clr);
+
        /*
-        * Flush all to work around Errata in early athlons regarding
-        * large page flushing.
+        * On success we use clflush, when the CPU supports it to
+        * avoid the wbindv. If the CPU does not support it and in the
+        * error case we fall back to cpa_flush_all (which uses
+        * wbindv):
         */
-       __flush_tlb_all();
+       if (!ret && cpu_has_clflush)
+               cpa_flush_range(addr, numpages);
+       else
+               cpa_flush_all();
 
-       if (boot_cpu_data.x86_model >= 4)
-               wbinvd();
+       return ret;
 }
 
-void global_flush_tlb(void)
+static inline int change_page_attr_set(unsigned long addr, int numpages,
+                                      pgprot_t mask)
 {
-       BUG_ON(irqs_disabled());
+       return change_page_attr_set_clr(addr, numpages, mask, __pgprot(0));
+}
+
+static inline int change_page_attr_clear(unsigned long addr, int numpages,
+                                        pgprot_t mask)
+{
+       return __change_page_attr_set_clr(addr, numpages, __pgprot(0), mask);
+
+}
+
+int set_memory_uc(unsigned long addr, int numpages)
+{
+       return change_page_attr_set(addr, numpages,
+                                   __pgprot(_PAGE_PCD | _PAGE_PWT));
+}
+EXPORT_SYMBOL(set_memory_uc);
+
+int set_memory_wb(unsigned long addr, int numpages)
+{
+       return change_page_attr_clear(addr, numpages,
+                                     __pgprot(_PAGE_PCD | _PAGE_PWT));
+}
+EXPORT_SYMBOL(set_memory_wb);
+
+int set_memory_x(unsigned long addr, int numpages)
+{
+       return change_page_attr_clear(addr, numpages, __pgprot(_PAGE_NX));
+}
+EXPORT_SYMBOL(set_memory_x);
+
+int set_memory_nx(unsigned long addr, int numpages)
+{
+       return change_page_attr_set(addr, numpages, __pgprot(_PAGE_NX));
+}
+EXPORT_SYMBOL(set_memory_nx);
+
+int set_memory_ro(unsigned long addr, int numpages)
+{
+       return change_page_attr_clear(addr, numpages, __pgprot(_PAGE_RW));
+}
+
+int set_memory_rw(unsigned long addr, int numpages)
+{
+       return change_page_attr_set(addr, numpages, __pgprot(_PAGE_RW));
+}
+
+int set_memory_np(unsigned long addr, int numpages)
+{
+       return change_page_attr_clear(addr, numpages, __pgprot(_PAGE_PRESENT));
+}
+
+int set_pages_uc(struct page *page, int numpages)
+{
+       unsigned long addr = (unsigned long)page_address(page);
+
+       return set_memory_uc(addr, numpages);
+}
+EXPORT_SYMBOL(set_pages_uc);
+
+int set_pages_wb(struct page *page, int numpages)
+{
+       unsigned long addr = (unsigned long)page_address(page);
 
-       on_each_cpu(flush_kernel_map, NULL, 1, 1);
+       return set_memory_wb(addr, numpages);
 }
-EXPORT_SYMBOL(global_flush_tlb);
+EXPORT_SYMBOL(set_pages_wb);
+
+int set_pages_x(struct page *page, int numpages)
+{
+       unsigned long addr = (unsigned long)page_address(page);
+
+       return set_memory_x(addr, numpages);
+}
+EXPORT_SYMBOL(set_pages_x);
+
+int set_pages_nx(struct page *page, int numpages)
+{
+       unsigned long addr = (unsigned long)page_address(page);
+
+       return set_memory_nx(addr, numpages);
+}
+EXPORT_SYMBOL(set_pages_nx);
+
+int set_pages_ro(struct page *page, int numpages)
+{
+       unsigned long addr = (unsigned long)page_address(page);
+
+       return set_memory_ro(addr, numpages);
+}
+
+int set_pages_rw(struct page *page, int numpages)
+{
+       unsigned long addr = (unsigned long)page_address(page);
+
+       return set_memory_rw(addr, numpages);
+}
+
+
+#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_CPA_DEBUG)
+static inline int __change_page_attr_set(unsigned long addr, int numpages,
+                                        pgprot_t mask)
+{
+       return __change_page_attr_set_clr(addr, numpages, mask, __pgprot(0));
+}
+
+static inline int __change_page_attr_clear(unsigned long addr, int numpages,
+                                          pgprot_t mask)
+{
+       return __change_page_attr_set_clr(addr, numpages, __pgprot(0), mask);
+}
+#endif
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
+
+static int __set_pages_p(struct page *page, int numpages)
+{
+       unsigned long addr = (unsigned long)page_address(page);
+
+       return __change_page_attr_set(addr, numpages,
+                                     __pgprot(_PAGE_PRESENT | _PAGE_RW));
+}
+
+static int __set_pages_np(struct page *page, int numpages)
+{
+       unsigned long addr = (unsigned long)page_address(page);
+
+       return __change_page_attr_clear(addr, numpages,
+                                       __pgprot(_PAGE_PRESENT));
+}
+
 void kernel_map_pages(struct page *page, int numpages, int enable)
 {
        if (PageHighMem(page))
@@ -303,7 +536,10 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
         * The return value is ignored - the calls cannot fail,
         * large pages are disabled at boot time:
         */
-       change_page_attr(page, numpages, enable ? PAGE_KERNEL : __pgprot(0));
+       if (enable)
+               __set_pages_p(page, numpages);
+       else
+               __set_pages_np(page, numpages);
 
        /*
         * We should perform an IPI and flush all tlbs,
@@ -312,3 +548,11 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
        __flush_tlb_all();
 }
 #endif
+
+/*
+ * The testcases use internal knowledge of the implementation that shouldn't
+ * be exposed to the rest of the kernel. Include these directly here.
+ */
+#ifdef CONFIG_CPA_DEBUG
+#include "pageattr-test.c"
+#endif