From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751189AbVKKWjv (ORCPT ); Fri, 11 Nov 2005 17:39:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751285AbVKKWjn (ORCPT ); Fri, 11 Nov 2005 17:39:43 -0500 Received: from omx3-ext.sgi.com ([192.48.171.20]:62390 "EHLO omx3.sgi.com") by vger.kernel.org with ESMTP id S1751284AbVKKWhM (ORCPT ); Fri, 11 Nov 2005 17:37:12 -0500 Date: Fri, 11 Nov 2005 14:37:08 -0800 (PST) From: Christoph Lameter To: linux-kernel@vger.kernel.org Cc: Christoph Lameter , lhms-devel@lists.sourceforge.net Message-Id: <20051111223708.21716.92798.sendpatchset@schroedinger.engr.sgi.com> In-Reply-To: <20051111223632.21716.49021.sendpatchset@schroedinger.engr.sgi.com> References: <20051111223632.21716.49021.sendpatchset@schroedinger.engr.sgi.com> Subject: [PATCH 7/8] Direct Migration V3: add_to_swap() with additional gfp_t parameter Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Add gfp_mask to add_to_swap The migration code calls the function with GFP_KERNEL while the swap code calls it with GFP_ATOMIC, because the migration code can ask the swap code to free some pages when we're in a low memory situation. Signed-off-by: Hirokazu Takahashi Signed-off-by: Dave Hansen Signed-off-by: Christoph Lameter Index: linux-2.6.14-mm2/include/linux/swap.h =================================================================== --- linux-2.6.14-mm2.orig/include/linux/swap.h 2005-11-11 14:07:02.000000000 -0800 +++ linux-2.6.14-mm2/include/linux/swap.h 2005-11-11 14:07:04.000000000 -0800 @@ -242,7 +242,7 @@ extern int rw_swap_page_sync(int, swp_en extern struct address_space swapper_space; #define total_swapcache_pages swapper_space.nrpages extern void show_swap_cache_info(void); -extern int add_to_swap(struct page *); +extern int add_to_swap(struct page *, gfp_t); extern void __delete_from_swap_cache(struct page *); extern void delete_from_swap_cache(struct page *); extern int move_to_swap_cache(struct page *, swp_entry_t); Index: linux-2.6.14-mm2/mm/swap_state.c =================================================================== --- linux-2.6.14-mm2.orig/mm/swap_state.c 2005-11-11 14:07:02.000000000 -0800 +++ linux-2.6.14-mm2/mm/swap_state.c 2005-11-11 14:07:04.000000000 -0800 @@ -143,7 +143,7 @@ void __delete_from_swap_cache(struct pag * Allocate swap space for the page and add the page to the * swap cache. Caller needs to hold the page lock. */ -int add_to_swap(struct page * page) +int add_to_swap(struct page * page, gfp_t gfp_mask) { swp_entry_t entry; int err; @@ -171,7 +171,7 @@ int add_to_swap(struct page * page) * Add it to the swap cache and mark it dirty */ err = __add_to_swap_cache(page, entry, - GFP_ATOMIC|__GFP_NOMEMALLOC|__GFP_NOWARN); + gfp_mask|__GFP_NOMEMALLOC|__GFP_NOWARN); switch (err) { case 0: /* Success */ Index: linux-2.6.14-mm2/mm/vmscan.c =================================================================== --- linux-2.6.14-mm2.orig/mm/vmscan.c 2005-11-11 14:07:02.000000000 -0800 +++ linux-2.6.14-mm2/mm/vmscan.c 2005-11-11 14:07:04.000000000 -0800 @@ -456,7 +456,7 @@ static int shrink_list(struct list_head if (PageAnon(page) && !PageSwapCache(page)) { if (!sc->may_swap) goto keep_locked; - if (!add_to_swap(page)) + if (!add_to_swap(page, GFP_ATOMIC)) goto activate_locked; } #endif /* CONFIG_SWAP */ @@ -911,7 +911,7 @@ redo: * preserved. */ if (PageAnon(page) && !PageSwapCache(page)) { - if (!add_to_swap(page)) { + if (!add_to_swap(page, GFP_KERNEL)) { unlock_page(page); list_move(&page->lru, failed); nr_failed++;