Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261939AbUK3CLT (ORCPT ); Mon, 29 Nov 2004 21:11:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261932AbUK3CJJ (ORCPT ); Mon, 29 Nov 2004 21:09:09 -0500 Received: from mta1.cl.cam.ac.uk ([128.232.0.15]:29912 "EHLO mta1.cl.cam.ac.uk") by vger.kernel.org with ESMTP id S261941AbUK3CHn (ORCPT ); Mon, 29 Nov 2004 21:07:43 -0500 To: Ian Pratt cc: linux-kernel@vger.kernel.org, Steven.Hand@cl.cam.ac.uk, Christian.Limpach@cl.cam.ac.uk, Keir.Fraser@cl.cam.ac.uk, akpm@osdl.org, Ian.Pratt@cl.cam.ac.uk Subject: [2/7] Xen VMM #3: return code for arch_free_page In-reply-to: Your message of "Tue, 30 Nov 2004 02:03:45 GMT." Date: Tue, 30 Nov 2004 02:07:41 +0000 From: Ian Pratt Message-Id: Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3417 Lines: 84 This patch adds a return value to the existing arch_free_page function that indicates whether the normal free routine still has work to do. The only architecture that currently uses arch_free_page is arch 'um'. arch xen needs this for 'foreign pages' - pages that don't belong to the page allocator but are instead managed by custom allocators. Such pages are marked using PG_arch_1. Signed-off-by: ian.pratt@cl.cam.ac.uk --- diff -Nurp pristine-linux-2.6.10-rc2/include/linux/gfp.h tmp-linux-2.6.10-rc2-xen.patch/include/linux/gfp.h --- pristine-linux-2.6.10-rc2/include/linux/gfp.h 2004-10-18 22:53:44.000000000 +0100 +++ tmp-linux-2.6.10-rc2-xen.patch/include/linux/gfp.h 2004-11-30 00:41:24.000000000 +0000 @@ -74,8 +74,12 @@ struct vm_area_struct; * optimized to &contig_page_data at compile-time. */ +/* + * If arch_free_page returns non-zero then the generic free_page code can + * immediately bail: the arch-specific function has done all the work. + */ #ifndef HAVE_ARCH_FREE_PAGE -static inline void arch_free_page(struct page *page, int order) { } +#define arch_free_page(page, order) 0 #endif extern struct page * diff -Nurp pristine-linux-2.6.10-rc2/mm/page_alloc.c tmp-linux-2.6.10-rc2-xen.patch/mm/page_alloc.c --- pristine-linux-2.6.10-rc2/mm/page_alloc.c 2004-11-30 01:20:25.000000000 +0000 +++ tmp-linux-2.6.10-rc2-xen.patch/mm/page_alloc.c 2004-11-30 00:41:24.000000000 +0000 @@ -278,7 +278,8 @@ void __free_pages_ok(struct page *page, LIST_HEAD(list); int i; - arch_free_page(page, order); + if (arch_free_page(page, order)) + return; mod_page_state(pgfree, 1 << order); for (i = 0 ; i < (1 << order) ; ++i) @@ -508,7 +509,8 @@ static void fastcall free_hot_cold_page( struct per_cpu_pages *pcp; unsigned long flags; - arch_free_page(page, 0); + if (arch_free_page(page, 0)) + return; kernel_map_pages(page, 1, 0); inc_page_state(pgfree); diff -Nurp pristine-linux-2.6.10-rc2/arch/um/kernel/physmem.c tmp-linux-2.6.10-rc2-xen.patch/arch/um/kernel/physmem.c --- pristine-linux-2.6.10-rc2/arch/um/kernel/physmem.c 2004-11-19 20:04:30.000000000 +0000 +++ tmp-linux-2.6.10-rc2-xen.patch/arch/um/kernel/physmem.c 2004-11-19 20:05:33.000000000 +0000 @@ -225,7 +225,7 @@ EXPORT_SYMBOL(physmem_forget_descriptor) EXPORT_SYMBOL(physmem_remove_mapping); EXPORT_SYMBOL(physmem_subst_mapping); -void arch_free_page(struct page *page, int order) +void __arch_free_page(struct page *page, int order) { void *virt; int i; diff -Nurp pristine-linux-2.6.10-rc2/include/asm-um/page.h tmp-linux-2.6.10-rc2-xen.patch/include/asm-um/page.h --- pristine-linux-2.6.10-rc2/include/asm-um/page.h 2004-11-19 20:04:52.000000000 +0000 +++ tmp-linux-2.6.10-rc2-xen.patch/include/asm-um/page.h 2004-11-19 20:05:33.000000000 +0000 @@ -46,7 +46,8 @@ extern void *to_virt(unsigned long phys) extern struct page *arch_validate(struct page *page, int mask, int order); #define HAVE_ARCH_VALIDATE -extern void arch_free_page(struct page *page, int order); +extern void __arch_free_page(struct page *page, int order); +#define arch_free_page(page, order) (__arch_free_page((page), (order)), 0) #define HAVE_ARCH_FREE_PAGE #endif - 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/