linux-kernel - Re: [PATCHv5] mm: Fix calculation of dirtyable memory

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAPz6YkXazpiJgKHnQx=dpr4XOCo8J_PBeffDG7mfPk7rPy2a-g@mail.gmail.com>
Date:	Mon, 19 Nov 2012 10:44:17 -0800
From:	Sonny Rao <sonnyrao@...omium.org>
To:	damien.wyart@...il.com
Cc:	Fengguang Wu <fengguang.wu@...el.com>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Michal Hocko <mhocko@...e.cz>, linux-mm@...ck.org,
	Mandeep Singh Baines <msb@...omium.org>,
	Johannes Weiner <jweiner@...hat.com>,
	Olof Johansson <olofj@...omium.org>,
	Will Drewry <wad@...omium.org>,
	Kees Cook <keescook@...omium.org>,
	Aaron Durbin <adurbin@...omium.org>, stable@...r.kernel.org,
	Sonny Rao <sonnyrao@...omium.org>,
	Puneet Kumar <puneetster@...omium.org>,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCHv5] mm: Fix calculation of dirtyable memory

On Mon, Nov 19, 2012 at 10:41 AM, Sonny Rao <sonnyrao@...omium.org> wrote:
> The system uses global_dirtyable_memory() to calculate
> number of dirtyable pages/pages that can be allocated
> to the page cache.  A bug causes an underflow thus making
> the page count look like a big unsigned number.  This in turn
> confuses the dirty writeback throttling to aggressively write
> back pages as they become dirty (usually 1 page at a time).
> This generally only affects systems with highmem because the
> underflowed count gets subtracted from the global count of
> dirtyable memory.
>
> The problem was introduced with v3.2-4896-gab8fabd
>
> Fix is to ensure we don't get an underflowed total of either highmem
> or global dirtyable memory.
>
> Signed-off-by: Sonny Rao <sonnyrao@...omium.org>
> Signed-off-by: Puneet Kumar <puneetster@...omium.org>
> Acked-by: Johannes Weiner <hannes@...xchg.org>
> CC: stable@...r.kernel.org
> ---
>  v2: added apkm's suggestion to make the highmem calculation better
>  v3: added Fengguang Wu's suggestions fix zone_dirtyable_memory() and
>      (offlist mail) to use max() in global_dirtyable_memory()
>  v4: Added suggestions to description clarifying the role of highmem
>       and the commit which originally caused the problem
>  v5: Fix bug where max() was used instead of min()
>  mm/page-writeback.c |   25 ++++++++++++++++++++-----
>  1 files changed, 20 insertions(+), 5 deletions(-)
>
> diff --git a/mm/page-writeback.c b/mm/page-writeback.c
> index 830893b..f9efbe8 100644
> --- a/mm/page-writeback.c
> +++ b/mm/page-writeback.c
> @@ -201,6 +201,18 @@ static unsigned long highmem_dirtyable_memory(unsigned long total)
>                      zone_reclaimable_pages(z) - z->dirty_balance_reserve;
>         }
>         /*
> +        * Unreclaimable memory (kernel memory or anonymous memory
> +        * without swap) can bring down the dirtyable pages below
> +        * the zone's dirty balance reserve and the above calculation
> +        * will underflow.  However we still want to add in nodes
> +        * which are below threshold (negative values) to get a more
> +        * accurate calculation but make sure that the total never
> +        * underflows.
> +        */
> +       if ((long)x < 0)
> +               x = 0;
> +
> +       /*
>          * Make sure that the number of highmem pages is never larger
>          * than the number of the total dirtyable memory. This can only
>          * occur in very strange VM situations but we want to make sure
> @@ -222,8 +234,8 @@ static unsigned long global_dirtyable_memory(void)
>  {
>         unsigned long x;
>
> -       x = global_page_state(NR_FREE_PAGES) + global_reclaimable_pages() -
> -           dirty_balance_reserve;
> +       x = global_page_state(NR_FREE_PAGES) + global_reclaimable_pages();
> +       x -= min(x, dirty_balance_reserve);
>
>         if (!vm_highmem_is_dirtyable)
>                 x -= highmem_dirtyable_memory(x);
> @@ -290,9 +302,12 @@ static unsigned long zone_dirtyable_memory(struct zone *zone)
>          * highmem zone can hold its share of dirty pages, so we don't
>          * care about vm_highmem_is_dirtyable here.
>          */
> -       return zone_page_state(zone, NR_FREE_PAGES) +
> -              zone_reclaimable_pages(zone) -
> -              zone->dirty_balance_reserve;
> +       unsigned long nr_pages = zone_page_state(zone, NR_FREE_PAGES) +
> +               zone_reclaimable_pages(zone);
> +
> +       /* don't allow this to underflow */
> +       nr_pages -= min(nr_pages, zone->dirty_balance_reserve);
> +       return nr_pages;
>  }
>
>  /**
> --
> 1.7.7.3
>

Damien, thanks for testing and finding that bug.  If you could, please
give this version a try, thanks.
--
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/