Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261333AbVAKR7O (ORCPT ); Tue, 11 Jan 2005 12:59:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261949AbVAKR6R (ORCPT ); Tue, 11 Jan 2005 12:58:17 -0500 Received: from omx1-ext.sgi.com ([192.48.179.11]:20404 "EHLO omx1.americas.sgi.com") by vger.kernel.org with ESMTP id S261333AbVAKRno (ORCPT ); Tue, 11 Jan 2005 12:43:44 -0500 Date: Tue, 11 Jan 2005 09:43:30 -0800 (PST) From: Christoph Lameter X-X-Sender: clameter@schroedinger.engr.sgi.com To: torvalds@osdl.org, Andi Kleen cc: Hugh Dickins , akpm@osdl.org, Nick Piggin , linux-mm@kvack.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org Subject: page table lock patch V15 [6/7]: s390 atomic pte operations In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2922 Lines: 88 Changelog * Provide atomic pte operations for s390 Signed-off-by: Christoph Lameter Index: linux-2.6.10/include/asm-s390/pgtable.h =================================================================== --- linux-2.6.10.orig/include/asm-s390/pgtable.h 2005-01-10 16:31:56.000000000 -0800 +++ linux-2.6.10/include/asm-s390/pgtable.h 2005-01-10 16:41:07.000000000 -0800 @@ -577,6 +577,15 @@ return pte; } +#define ptep_xchg_flush(__vma, __address, __ptep, __pteval) \ +({ \ + struct mm_struct *__mm = __vma->vm_mm; \ + pte_t __pte; \ + __pte = ptep_clear_flush(__vma, __address, __ptep); \ + set_pte(__ptep, __pteval); \ + __pte; \ +}) + static inline void ptep_set_wrprotect(pte_t *ptep) { pte_t old_pte = *ptep; @@ -788,6 +797,14 @@ #define kern_addr_valid(addr) (1) +/* Atomic PTE operations */ +#define __HAVE_ARCH_ATOMIC_TABLE_OPS + +static inline int ptep_cmpxchg (struct vm_area_struct *vma, unsigned long address, pte_t *ptep, pte_t oldval, pte_t newval) +{ + return cmpxchg(ptep, pte_val(oldval), pte_val(newval)) == pte_val(oldval); +} + /* * No page table caches to initialise */ @@ -801,6 +818,7 @@ #define __HAVE_ARCH_PTEP_CLEAR_DIRTY_FLUSH #define __HAVE_ARCH_PTEP_GET_AND_CLEAR #define __HAVE_ARCH_PTEP_CLEAR_FLUSH +#define __HAVE_ARCH_PTEP_XCHG_FLUSH #define __HAVE_ARCH_PTEP_SET_WRPROTECT #define __HAVE_ARCH_PTEP_MKDIRTY #define __HAVE_ARCH_PTE_SAME Index: linux-2.6.10/include/asm-s390/pgalloc.h =================================================================== --- linux-2.6.10.orig/include/asm-s390/pgalloc.h 2004-12-24 13:35:00.000000000 -0800 +++ linux-2.6.10/include/asm-s390/pgalloc.h 2005-01-10 16:41:07.000000000 -0800 @@ -97,6 +97,10 @@ pgd_val(*pgd) = _PGD_ENTRY | __pa(pmd); } +static inline int pgd_test_and_populate(struct mm_struct *mm, pdg_t *pgd, pmd_t *pmd) +{ + return cmpxchg(pgd, _PAGE_TABLE_INV, _PGD_ENTRY | __pa(pmd)) == _PAGE_TABLE_INV; +} #endif /* __s390x__ */ static inline void @@ -119,6 +123,18 @@ pmd_populate_kernel(mm, pmd, (pte_t *)((page-mem_map) << PAGE_SHIFT)); } +static inline int +pmd_test_and_populate(struct mm_struct *mm, pmd_t *pmd, struct page *page) +{ + int rc; + spin_lock(&mm->page_table_lock); + + rc=pte_same(*pmd, _PAGE_INVALID_EMPTY); + if (rc) pmd_populate(mm, pmd, page); + spin_unlock(&mm->page_table_lock); + return rc; +} + /* * page table entry allocation/free routines. */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/