From: Rik van Riel <riel@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org,
KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>,
Lee Schermerhorn <Lee.Schermerhorn@hp.com>
Subject: [patch 04/20] free swap space on swap-in/activation
Date: Tue, 04 Mar 2008 17:52:01 -0500 [thread overview]
Message-ID: <20080304225226.998477390@redhat.com> (raw)
In-Reply-To: 20080304225157.573336066@redhat.com
[-- Attachment #1: rvr-00-linux-2.6-swapfree.patch --]
[-- Type: text/plain, Size: 3113 bytes --]
Free swap cache entries when swapping in pages if vm_swap_full()
[swap space > 1/2 used]. Uses new pagevec to reduce pressure
on locks.
Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
Index: linux-2.6.25-rc3-mm1/mm/vmscan.c
===================================================================
--- linux-2.6.25-rc3-mm1.orig/mm/vmscan.c 2008-03-04 15:25:52.000000000 -0500
+++ linux-2.6.25-rc3-mm1/mm/vmscan.c 2008-03-04 15:29:50.000000000 -0500
@@ -632,6 +632,9 @@ free_it:
continue;
activate_locked:
+ /* Not a candidate for swapping, so reclaim swap space. */
+ if (PageSwapCache(page) && vm_swap_full())
+ remove_exclusive_swap_page(page);
SetPageActive(page);
pgactivate++;
keep_locked:
@@ -1216,6 +1219,8 @@ static void shrink_active_list(unsigned
__mod_zone_page_state(zone, NR_ACTIVE, pgmoved);
pgmoved = 0;
spin_unlock_irq(&zone->lru_lock);
+ if (vm_swap_full())
+ pagevec_swap_free(&pvec);
__pagevec_release(&pvec);
spin_lock_irq(&zone->lru_lock);
}
@@ -1225,6 +1230,8 @@ static void shrink_active_list(unsigned
__count_zone_vm_events(PGREFILL, zone, pgscanned);
__count_vm_events(PGDEACTIVATE, pgdeactivate);
spin_unlock_irq(&zone->lru_lock);
+ if (vm_swap_full())
+ pagevec_swap_free(&pvec);
pagevec_release(&pvec);
}
Index: linux-2.6.25-rc3-mm1/mm/swap.c
===================================================================
--- linux-2.6.25-rc3-mm1.orig/mm/swap.c 2008-03-04 15:28:39.000000000 -0500
+++ linux-2.6.25-rc3-mm1/mm/swap.c 2008-03-04 15:29:50.000000000 -0500
@@ -457,6 +457,24 @@ void pagevec_strip(struct pagevec *pvec)
}
}
+/*
+ * Try to free swap space from the pages in a pagevec
+ */
+void pagevec_swap_free(struct pagevec *pvec)
+{
+ int i;
+
+ for (i = 0; i < pagevec_count(pvec); i++) {
+ struct page *page = pvec->pages[i];
+
+ if (PageSwapCache(page) && !TestSetPageLocked(page)) {
+ if (PageSwapCache(page))
+ remove_exclusive_swap_page(page);
+ unlock_page(page);
+ }
+ }
+}
+
/**
* pagevec_lookup - gang pagecache lookup
* @pvec: Where the resulting pages are placed
Index: linux-2.6.25-rc3-mm1/include/linux/pagevec.h
===================================================================
--- linux-2.6.25-rc3-mm1.orig/include/linux/pagevec.h 2008-03-04 15:26:18.000000000 -0500
+++ linux-2.6.25-rc3-mm1/include/linux/pagevec.h 2008-03-04 15:29:50.000000000 -0500
@@ -25,6 +25,7 @@ void __pagevec_release_nonlru(struct pag
void __pagevec_free(struct pagevec *pvec);
void ____pagevec_lru_add(struct pagevec *pvec, enum lru_list lru);
void pagevec_strip(struct pagevec *pvec);
+void pagevec_swap_free(struct pagevec *pvec);
unsigned pagevec_lookup(struct pagevec *pvec, struct address_space *mapping,
pgoff_t start, unsigned nr_pages);
unsigned pagevec_lookup_tag(struct pagevec *pvec,
--
All Rights Reversed
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2008-03-04 22:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-04 22:51 [patch 00/20] VM pageout scalability improvements (V5) Rik van Riel
2008-03-04 22:51 ` [patch 01/20] move isolate_lru_page() to vmscan.c Rik van Riel
2008-03-04 22:51 ` [patch 02/20] Use an indexed array for LRU variables Rik van Riel
2008-03-05 0:31 ` Johannes Weiner
2008-03-04 22:52 ` [patch 03/20] use an array for the LRU pagevecs Rik van Riel
2008-03-04 22:52 ` Rik van Riel [this message]
2008-03-04 22:52 ` [patch 05/20] define page_file_cache() function Rik van Riel
2008-03-04 22:52 ` [patch 06/20] split LRU lists into anon & file sets Rik van Riel
2008-03-04 22:52 ` [patch 07/20] SEQ replacement for anonymous pages Rik van Riel
2008-03-04 22:52 ` [patch 08/20] add some sanity checks to get_scan_ratio Rik van Riel
2008-03-04 22:52 ` [patch 09/20] add newly swapped in pages to the inactive list Rik van Riel
2008-03-04 22:52 ` [patch 10/20] more aggressively use lumpy reclaim Rik van Riel
2008-03-04 22:52 ` [patch 11/20] No Reclaim LRU Infrastructure Rik van Riel
2008-03-05 0:34 ` minchan Kim
2008-03-05 4:21 ` Rik van Riel
2008-03-04 22:52 ` [patch 12/20] Non-reclaimable page statistics Rik van Riel
2008-03-04 22:52 ` [patch 13/20] scan noreclaim list for reclaimable pages Rik van Riel
2008-03-04 22:52 ` [patch 14/20] ramfs pages are non-reclaimable Rik van Riel
2008-03-04 22:52 ` [patch 15/20] SHM_LOCKED pages are nonreclaimable Rik van Riel
2008-03-04 22:52 ` [patch 16/20] non-reclaimable mlocked pages Rik van Riel
2008-03-05 0:28 ` minchan Kim
2008-03-05 4:18 ` Rik van Riel
2008-03-04 22:52 ` [patch 17/20] mlock vma pages under mmap_sem held for read Rik van Riel
2008-03-04 22:52 ` [patch 18/20] handle mlocked pages during map/unmap and truncate Rik van Riel
2008-03-04 22:52 ` [patch 19/20] account mlocked pages Rik van Riel
2008-03-04 22:52 ` [patch 20/20] cull non-reclaimable anon pages from the LRU at fault time Rik van Riel
-- strict thread matches above, loose matches on Subject: below --
2007-12-18 21:15 [patch 00/20] VM pageout scalability improvements Rik van Riel
2007-12-18 21:15 ` [patch 04/20] free swap space on swap-in/activation Rik van Riel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080304225226.998477390@redhat.com \
--to=riel@redhat.com \
--cc=Lee.Schermerhorn@hp.com \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).