From: Wu Fengguang <wfg@mail.ustc.edu.cn>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@osdl.org>,
Christoph Lameter <christoph@lameter.com>,
Rik van Riel <riel@redhat.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Marcelo Tosatti <marcelo.tosatti@cyclades.com>,
Magnus Damm <magnus.damm@gmail.com>,
Nick Piggin <npiggin@suse.de>, Andrea Arcangeli <andrea@suse.de>,
Wu Fengguang <wfg@mail.ustc.edu.cn>
Subject: [PATCH 11/13] mm: fold sc.may_writepage and sc.may_swap into sc.flags
Date: Tue, 06 Dec 2005 21:56:19 +0800 [thread overview]
Message-ID: <20051206135937.407448000@localhost.localdomain> (raw)
In-Reply-To: 20051206135608.860737000@localhost.localdomain
[-- Attachment #1: mm-fold-bool-variables-into-flags-in-scan-control.patch --]
[-- Type: text/plain, Size: 2436 bytes --]
Fold bool values into flags to make struct scan_control more compact.
Signed-off-by: Wu Fengguang <wfg@mail.ustc.edu.cn>
---
mm/vmscan.c | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
--- linux-2.6.15-rc5-mm1.orig/mm/vmscan.c
+++ linux-2.6.15-rc5-mm1/mm/vmscan.c
@@ -72,12 +72,12 @@ struct scan_control {
/* This context's GFP mask */
gfp_t gfp_mask;
- int may_writepage;
-
- /* Can pages be swapped as part of reclaim? */
- int may_swap;
+ unsigned long flags;
};
+#define SC_MAY_WRITEPAGE 0x1
+#define SC_MAY_SWAP 0x2 /* Can pages be swapped as part of reclaim? */
+
#define lru_to_page(_head) (list_entry((_head)->prev, struct page, lru))
#ifdef ARCH_HAS_PREFETCH
@@ -483,7 +483,7 @@ static int shrink_list(struct list_head
* Try to allocate it some swap space here.
*/
if (PageAnon(page) && !PageSwapCache(page)) {
- if (!sc->may_swap)
+ if (!(sc->flags & SC_MAY_SWAP))
goto keep_locked;
if (!add_to_swap(page, GFP_ATOMIC))
goto activate_locked;
@@ -514,7 +514,7 @@ static int shrink_list(struct list_head
goto keep_locked;
if (!may_enter_fs)
goto keep_locked;
- if (laptop_mode && !sc->may_writepage)
+ if (laptop_mode && !(sc->flags & SC_MAY_WRITEPAGE))
goto keep_locked;
/* Page is dirty, try to write it out here */
@@ -1232,8 +1232,7 @@ int try_to_free_pages(struct zone **zone
delay_prefetch();
sc.gfp_mask = gfp_mask;
- sc.may_writepage = 0;
- sc.may_swap = 1;
+ sc.flags = SC_MAY_SWAP;
sc.nr_scanned = 0;
sc.nr_reclaimed = 0;
@@ -1276,7 +1275,7 @@ int try_to_free_pages(struct zone **zone
*/
if (sc.nr_scanned > SWAP_CLUSTER_MAX * 3 / 2) {
wakeup_pdflush(laptop_mode ? 0 : sc.nr_scanned);
- sc.may_writepage = 1;
+ sc.flags |= SC_MAY_WRITEPAGE;
}
/* Take a nap, wait for some writeback to complete */
@@ -1332,8 +1331,7 @@ static int balance_pgdat(pg_data_t *pgda
loop_again:
sc.gfp_mask = GFP_KERNEL;
- sc.may_writepage = 0;
- sc.may_swap = 1;
+ sc.flags = SC_MAY_SWAP;
sc.nr_mapped = read_page_state(nr_mapped);
sc.nr_scanned = 0;
sc.nr_reclaimed = 0;
@@ -1419,7 +1417,7 @@ scan_swspd:
*/
if (sc.nr_scanned > SWAP_CLUSTER_MAX * 2 &&
sc.nr_scanned > sc.nr_reclaimed + sc.nr_reclaimed / 2)
- sc.may_writepage = 1;
+ sc.flags |= SC_MAY_WRITEPAGE;
if (nr_pages && to_free > sc.nr_reclaimed)
continue; /* swsusp: need to do more work */
--
next prev parent reply other threads:[~2005-12-06 13:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-12-06 13:56 [PATCH 00/13] Balancing the scan rate of major caches V2 Wu Fengguang
2005-12-06 13:56 ` [PATCH 01/13] mm: restore sc.nr_to_reclaim Wu Fengguang
2005-12-06 13:56 ` [PATCH 02/13] mm: simplify kswapd reclaim code Wu Fengguang
2005-12-06 13:56 ` [PATCH 03/13] mm: supporting variables and functions for balanced zone aging Wu Fengguang
2005-12-06 13:56 ` [PATCH 04/13] mm: balance zone aging in direct reclaim path Wu Fengguang
2005-12-06 13:56 ` [PATCH 05/13] mm: balance zone aging in kswapd " Wu Fengguang
2005-12-06 14:19 ` Wu Fengguang
2005-12-06 13:56 ` [PATCH 06/13] mm: balance slab aging Wu Fengguang
2005-12-06 13:56 ` [PATCH 07/13] mm: balance active/inactive list scan rates Wu Fengguang
2005-12-06 13:56 ` [PATCH 08/13] mm: remove unnecessary variable and loop Wu Fengguang
2005-12-06 13:56 ` [PATCH 09/13] mm: remove swap_cluster_max from scan_control Wu Fengguang
2005-12-06 13:56 ` [PATCH 10/13] mm: let sc.nr_scanned/sc.nr_reclaimed accumulate Wu Fengguang
2005-12-06 13:56 ` Wu Fengguang [this message]
2005-12-06 13:56 ` [PATCH 12/13] mm: add page reclaim debug traces Wu Fengguang
2005-12-06 13:56 ` [PATCH 13/13] mm: fix minor scan count bugs Wu Fengguang
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=20051206135937.407448000@localhost.localdomain \
--to=wfg@mail.ustc.edu.cn \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@osdl.org \
--cc=andrea@suse.de \
--cc=christoph@lameter.com \
--cc=linux-kernel@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=marcelo.tosatti@cyclades.com \
--cc=npiggin@suse.de \
--cc=riel@redhat.com \
/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