| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <28c262360902120131o10cbed53g697311ff27ec20b8@mail.gmail.com>
Date: Thu, 12 Feb 2009 18:31:50 +0900
From: MinChan Kim <minchan.kim@...il.com>
To: Andrew Morton <akpm@...ux-foundation.org>,
KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>
Cc: linux-mm <linux-mm@...ck.org>, LKML <linux-kernel@...r.kernel.org>,
Johannes Weiner <hannes@...xchg.org>,
"Rafael J. Wysocki" <rjw@...k.pl>, Rik van Riel <riel@...hat.com>
Subject: Re: [PATCH v2] shrink_all_memory() use sc.nr_reclaimed
On Thu, Feb 12, 2009 at 4:33 PM, MinChan Kim <minchan.kim@...il.com> wrote:
>
> Impact: cleanup
>
> Commit a79311c14eae4bb946a97af25f3e1b17d625985d "vmscan: bail out of
> direct reclaim after swap_cluster_max pages" moved the nr_reclaimed
> counter into the scan control to accumulate the number of all
> reclaimed pages in a reclaim invocation.
>
> The shrink_all_memory() can use the same mechanism. it increases code
> consistency and readability.
>
> It's based on mmtom 2009-02-11-17-15.
Andrew, Sorry for confusing.
It's wrong. It's based on 2009-02-11-18-32
> Signed-off-by: MinChan Kim <minchan.kim@...il.com>
> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>
> Cc: Johannes Weiner <hannes@...xchg.org>
> Cc: "Rafael J. Wysocki" <rjw@...k.pl>
> Cc: Rik van Riel <riel@...hat.com>
>
>
> ---
> mm/vmscan.c | 51 ++++++++++++++++++++++++++++++---------------------
> 1 files changed, 30 insertions(+), 21 deletions(-)
>
> diff --git a/mm/vmscan.c b/mm/vmscan.c
> index ae4202b..caa2de5 100644
> --- a/mm/vmscan.c
> +++ b/mm/vmscan.c
> @@ -2055,16 +2055,15 @@ unsigned long global_lru_pages(void)
> #ifdef CONFIG_PM
> /*
> * Helper function for shrink_all_memory(). Tries to reclaim 'nr_pages' pages
> - * from LRU lists system-wide, for given pass and priority, and returns the
> - * number of reclaimed pages
> + * from LRU lists system-wide, for given pass and priority.
> *
> * For pass > 3 we also try to shrink the LRU lists that contain a few pages
> */
> -static unsigned long shrink_all_zones(unsigned long nr_pages, int prio,
> +static void shrink_all_zones(unsigned long nr_pages, int prio,
> int pass, struct scan_control *sc)
> {
> struct zone *zone;
> - unsigned long ret = 0;
> + unsigned long nr_reclaimed = 0;
>
> for_each_populated_zone(zone) {
> enum lru_list l;
> @@ -2087,14 +2086,16 @@ static unsigned long shrink_all_zones(unsigned long nr_pages, int prio,
>
> zone->lru[l].nr_scan = 0;
> nr_to_scan = min(nr_pages, lru_pages);
> - ret += shrink_list(l, nr_to_scan, zone,
> + nr_reclaimed += shrink_list(l, nr_to_scan, zone,
> sc, prio);
> - if (ret >= nr_pages)
> - return ret;
> + if (nr_reclaimed >= nr_pages) {
> + sc->nr_reclaimed = nr_reclaimed;
> + return;
> + }
> }
> }
> }
> - return ret;
> + sc->nr_reclaimed = nr_reclaimed;
> }
>
> /*
> @@ -2126,13 +2127,15 @@ unsigned long shrink_all_memory(unsigned long nr_pages)
> /* If slab caches are huge, it's better to hit them first */
> while (nr_slab >= lru_pages) {
> reclaim_state.reclaimed_slab = 0;
> - shrink_slab(nr_pages, sc.gfp_mask, lru_pages);
> + shrink_slab(sc.swap_cluster_max, sc.gfp_mask, lru_pages);
> if (!reclaim_state.reclaimed_slab)
> break;
>
> - ret += reclaim_state.reclaimed_slab;
> - if (ret >= nr_pages)
> + sc.nr_reclaimed += reclaim_state.reclaimed_slab;
> + if (sc.nr_reclaimed >= sc.swap_cluster_max) {
> + ret = sc.nr_reclaimed;
> goto out;
> + }
>
> nr_slab -= reclaim_state.reclaimed_slab;
> }
> @@ -2153,19 +2156,23 @@ unsigned long shrink_all_memory(unsigned long nr_pages)
> sc.may_unmap = 1;
>
> for (prio = DEF_PRIORITY; prio >= 0; prio--) {
> - unsigned long nr_to_scan = nr_pages - ret;
> + unsigned long nr_to_scan = sc.swap_cluster_max - sc.nr_reclaimed;
>
> sc.nr_scanned = 0;
> - ret += shrink_all_zones(nr_to_scan, prio, pass, &sc);
> - if (ret >= nr_pages)
> + shrink_all_zones(nr_to_scan, prio, pass, &sc);
> + if (sc.nr_reclaimed >= sc.swap_cluster_max) {
> + ret = sc.nr_reclaimed;
> goto out;
> + }
>
> reclaim_state.reclaimed_slab = 0;
> shrink_slab(sc.nr_scanned, sc.gfp_mask,
> global_lru_pages());
> - ret += reclaim_state.reclaimed_slab;
> - if (ret >= nr_pages)
> + sc.nr_reclaimed += reclaim_state.reclaimed_slab;
> + if (sc.nr_reclaimed >= sc.swap_cluster_max) {
> + ret = sc.nr_reclaimed;
> goto out;
> + }
>
> if (sc.nr_scanned && prio < DEF_PRIORITY - 2)
> congestion_wait(WRITE, HZ / 10);
> @@ -2173,17 +2180,19 @@ unsigned long shrink_all_memory(unsigned long nr_pages)
> }
>
> /*
> - * If ret = 0, we could not shrink LRUs, but there may be something
> + * If sc.nr_reclaimed = 0, we could not shrink LRUs, but there may be something
> * in slab caches
> */
> - if (!ret) {
> + if (!sc.nr_reclaimed) {
> do {
> reclaim_state.reclaimed_slab = 0;
> - shrink_slab(nr_pages, sc.gfp_mask, global_lru_pages());
> - ret += reclaim_state.reclaimed_slab;
> - } while (ret < nr_pages && reclaim_state.reclaimed_slab > 0);
> + shrink_slab(sc.swap_cluster_max, sc.gfp_mask, global_lru_pages());
> + sc.nr_reclaimed += reclaim_state.reclaimed_slab;
> + } while (sc.nr_reclaimed < sc.swap_cluster_max && reclaim_state.reclaimed_slab > 0);
> }
>
> + ret = sc.nr_reclaimed;
> +
> out:
> current->reclaim_state = NULL;
>
> --
> 1.5.4.3
>
>
>
> --
> Kinds Regards
> MinChan Kim
>
--
Kinds regards,
MinChan Kim
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists