From: Ganesh Mahendran <opensource.ganesh@gmail.com>
To: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Cc: gregkh@linuxfoundation.org, arve@android.com,
riandrews@android.com,
Ganesh Mahendran <opensource.ganesh@gmail.com>
Subject: [PATCH 2/3] staging: lowmemorykiller: count anon pages only when we have swap devices
Date: Tue, 21 Jun 2016 13:30:17 +0800 [thread overview]
Message-ID: <1466487018-5410-2-git-send-email-opensource.ganesh@gmail.com> (raw)
In-Reply-To: <1466487018-5410-1-git-send-email-opensource.ganesh@gmail.com>
lowmem_count() should only count anon pages when we have swap device.
Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
---
drivers/staging/android/lowmemorykiller.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 6da9260..1d8de47 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -73,10 +73,14 @@ static unsigned long lowmem_deathpending_timeout;
static unsigned long lowmem_count(struct shrinker *s,
struct shrink_control *sc)
{
- return global_page_state(NR_ACTIVE_ANON) +
- global_page_state(NR_ACTIVE_FILE) +
- global_page_state(NR_INACTIVE_ANON) +
- global_page_state(NR_INACTIVE_FILE);
+ unsigned long freeable = global_page_state(NR_ACTIVE_FILE) +
+ global_page_state(NR_INACTIVE_FILE);
+
+ if (get_nr_swap_pages() > 0)
+ freeable += global_page_state(NR_ACTIVE_ANON) +
+ global_page_state(NR_INACTIVE_ANON);
+
+ return freeable;
}
static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
--
1.9.1
next prev parent reply other threads:[~2016-06-21 5:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-21 5:30 [PATCH 1/3] staging: lowmemorykiller: change lowmem_adj to lowmem_score_adj Ganesh Mahendran
2016-06-21 5:30 ` Ganesh Mahendran [this message]
2016-06-21 20:22 ` [PATCH 2/3] staging: lowmemorykiller: count anon pages only when we have swap devices David Rientjes
2016-06-22 3:27 ` Ganesh Mahendran
2016-06-23 8:42 ` Sergey Senozhatsky
2016-07-01 2:02 ` Ganesh Mahendran
2016-06-21 5:30 ` [PATCH 3/3] staging: lowmemorykiller: select the task with maximum rss to kill Ganesh Mahendran
2016-06-21 20:14 ` David Rientjes
2016-06-22 4:44 ` Ganesh Mahendran
2016-06-21 20:27 ` [PATCH 1/3] staging: lowmemorykiller: change lowmem_adj to lowmem_score_adj David Rientjes
2016-06-22 3:10 ` Ganesh Mahendran
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=1466487018-5410-2-git-send-email-opensource.ganesh@gmail.com \
--to=opensource.ganesh@gmail.com \
--cc=arve@android.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=riandrews@android.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
Powered by JetHome