s390/mm: use memset64 instead of clear_table

Use memset64 instead of the (now) open-coded variant clear_table.
Performance wise there is no difference.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/pgalloc.h b/arch/s390/include/asm/pgalloc.h
index a0d9167519b19b51b401880d8f5b504c588044c0..6b341126bebbb8e2b0f27b1f9a69ddd09cd08c0a 100644 (file)
--- a/arch/s390/include/asm/pgalloc.h
+++ b/arch/s390/include/asm/pgalloc.h
@@ -12,6 +12,7 @@
 #define _S390_PGALLOC_H
 
 #include <linux/threads.h>
+#include <linux/string.h>
 #include <linux/gfp.h>
 #include <linux/mm.h>
 
@@ -27,24 +28,9 @@ void page_table_free_rcu(struct mmu_gather *, unsigned long *, unsigned long);
 void page_table_free_pgste(struct page *page);
 extern int page_table_allocate_pgste;
 
-static inline void clear_table(unsigned long *s, unsigned long val, size_t n)
-{
-       struct addrtype { char _[256]; };
-       int i;
-
-       for (i = 0; i < n; i += 256) {
-               *s = val;
-               asm volatile(
-                       "mvc    8(248,%[s]),0(%[s])\n"
-                       : "+m" (*(struct addrtype *) s)
-                       : [s] "a" (s));
-               s += 256 / sizeof(long);
-       }
-}
-
 static inline void crst_table_init(unsigned long *crst, unsigned long entry)
 {
-       clear_table(crst, entry, _CRST_TABLE_SIZE);
+       memset64((u64 *)crst, entry, _CRST_ENTRIES);
 }
 
 static inline unsigned long pgd_entry_type(struct mm_struct *mm)

diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
index eacda05b45d7e0ac81b8b60f632a43fc0c268b6c..aaf8f77a636e57cdaa2d2458d51ef215b9761861 100644 (file)
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
@@ -166,10 +166,8 @@ int vdso_alloc_per_cpu(struct lowcore *lowcore)
        vd->node_id = cpu_to_node(vd->cpu_nr);
 
        /* Set up access register mode page table */
-       clear_table((unsigned long *) segment_table, _SEGMENT_ENTRY_EMPTY,
-                   PAGE_SIZE << SEGMENT_ORDER);
-       clear_table((unsigned long *) page_table, _PAGE_INVALID,
-                   256*sizeof(unsigned long));
+       memset64((u64 *)segment_table, _SEGMENT_ENTRY_EMPTY, _CRST_ENTRIES);
+       memset64((u64 *)page_table, _PAGE_INVALID, PTRS_PER_PTE);
 
        *(unsigned long *) segment_table = _SEGMENT_ENTRY + page_table;
        *(unsigned long *) page_table = _PAGE_PROTECT + page_frame;

diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c
index 05f1f27e6708f31642b9297013109702127c73b2..ffd87628a6371e08a82bdf29d034b436f7df9cbc 100644 (file)
--- a/arch/s390/mm/pgalloc.c
+++ b/arch/s390/mm/pgalloc.c
@@ -158,13 +158,13 @@ static inline unsigned int atomic_xor_bits(atomic_t *v, unsigned int bits)
 struct page *page_table_alloc_pgste(struct mm_struct *mm)
 {
        struct page *page;
-       unsigned long *table;
+       u64 *table;
 
        page = alloc_page(GFP_KERNEL);
        if (page) {
-               table = (unsigned long *) page_to_phys(page);
-               clear_table(table, _PAGE_INVALID, PAGE_SIZE/2);
-               clear_table(table + PTRS_PER_PTE, 0, PAGE_SIZE/2);
+               table = (u64 *)page_to_phys(page);
+               memset64(table, _PAGE_INVALID, PTRS_PER_PTE);
+               memset64(table + PTRS_PER_PTE, 0, PTRS_PER_PTE);
        }
        return page;
 }
@@ -221,12 +221,12 @@ unsigned long *page_table_alloc(struct mm_struct *mm)
        if (mm_alloc_pgste(mm)) {
                /* Return 4K page table with PGSTEs */
                atomic_set(&page->_mapcount, 3);
-               clear_table(table, _PAGE_INVALID, PAGE_SIZE/2);
-               clear_table(table + PTRS_PER_PTE, 0, PAGE_SIZE/2);
+               memset64((u64 *)table, _PAGE_INVALID, PTRS_PER_PTE);
+               memset64((u64 *)table + PTRS_PER_PTE, 0, PTRS_PER_PTE);
        } else {
                /* Return the first 2K fragment of the page */
                atomic_set(&page->_mapcount, 1);
-               clear_table(table, _PAGE_INVALID, PAGE_SIZE);
+               memset64((u64 *)table, _PAGE_INVALID, 2 * PTRS_PER_PTE);
                spin_lock_bh(&mm->context.lock);
                list_add(&page->lru, &mm->context.pgtable_list);
                spin_unlock_bh(&mm->context.lock);

diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index c0af0d7b6e5feeb348f8c7bfd2e107a3ff4ab295..2e84977796a2afd4b0a103fe04edbb82de31ff14 100644 (file)
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -59,7 +59,7 @@ pte_t __ref *vmem_pte_alloc(void)
                pte = (pte_t *) memblock_alloc(size, size);
        if (!pte)
                return NULL;
-       clear_table((unsigned long *) pte, _PAGE_INVALID, size);
+       memset64((u64 *)pte, _PAGE_INVALID, PTRS_PER_PTE);
        return pte;
 }