From: Michal Hocko <mhocko@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Johannes Weiner <hannes@cmpxchg.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with Linus' tree
Date: Mon, 5 Dec 2016 06:56:56 +0100 [thread overview]
Message-ID: <20161205055655.GB30758@dhcp22.suse.cz> (raw)
In-Reply-To: <20161205163808.6d3918b6@canb.auug.org.au>
On Mon 05-12-16 16:38:08, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> mm/workingset.c
>
> between commit:
>
> 20ab67a563f5 ("mm: workingset: fix NULL ptr in count_shadow_nodes")
>
> from Linus' tree and commit:
>
> 8b6983cf8ca6 ("mm: workingset: update shadow limit to reflect bigger active list")
>
> from the akpm-current tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned,
FWIW this resolution is correct
> but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Sorry about that, I haven't noticed the conflict.
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc mm/workingset.c
> index fb1f9183d89a,02ab8746abde..000000000000
> --- a/mm/workingset.c
> +++ b/mm/workingset.c
> @@@ -366,16 -394,22 +394,22 @@@ static unsigned long count_shadow_nodes
> *
> * On 64-bit with 7 radix_tree_nodes per page and 64 slots
> * each, this will reclaim shadow entries when they consume
> - * ~2% of available memory:
> + * ~1.8% of available memory:
> *
> - * PAGE_SIZE / radix_tree_nodes / node_entries / PAGE_SIZE
> + * PAGE_SIZE / radix_tree_nodes / node_entries * 8 / PAGE_SIZE
> */
> - max_nodes = pages >> (1 + RADIX_TREE_MAP_SHIFT - 3);
> - if (memcg_kmem_enabled()) {
> ++ if (sc->memcg) {
> + cache = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid,
> + LRU_ALL_FILE);
> + } else {
> + cache = node_page_state(NODE_DATA(sc->nid), NR_ACTIVE_FILE) +
> + node_page_state(NODE_DATA(sc->nid), NR_INACTIVE_FILE);
> + }
> + max_nodes = cache >> (RADIX_TREE_MAP_SHIFT - 3);
>
> - if (shadow_nodes <= max_nodes)
> + if (nodes <= max_nodes)
> return 0;
> -
> - return shadow_nodes - max_nodes;
> + return nodes - max_nodes;
> }
>
> static enum lru_status shadow_lru_isolate(struct list_head *item,
--
Michal Hocko
SUSE Labs
next prev parent reply other threads:[~2016-12-05 5:57 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-05 5:38 linux-next: manual merge of the akpm-current tree with Linus' tree Stephen Rothwell
2016-12-05 5:56 ` Michal Hocko [this message]
2016-12-05 6:08 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-04-11 3:35 Stephen Rothwell
2021-04-06 11:29 Stephen Rothwell
2021-02-08 12:10 Stephen Rothwell
2020-09-08 9:24 Stephen Rothwell
2020-09-08 9:17 Stephen Rothwell
2020-06-03 8:07 Stephen Rothwell
2020-06-03 7:53 Stephen Rothwell
2019-02-18 6:51 Stephen Rothwell
2019-02-20 1:00 ` Stephen Rothwell
2019-01-11 2:51 Stephen Rothwell
2019-01-11 15:08 ` Jerome Glisse
2019-01-07 2:16 Stephen Rothwell
2018-08-15 8:05 Stephen Rothwell
2018-07-23 8:00 Stephen Rothwell
2018-06-14 1:43 Stephen Rothwell
2018-06-14 1:36 Stephen Rothwell
2018-03-16 5:56 Stephen Rothwell
2017-11-02 8:10 Stephen Rothwell
2017-11-02 7:37 Stephen Rothwell
2017-05-08 3:48 Stephen Rothwell
2017-04-24 7:25 Stephen Rothwell
2017-04-24 9:11 ` Mel Gorman
2016-01-18 3:22 Stephen Rothwell
2015-12-18 5:09 Stephen Rothwell
2015-10-06 5:46 Stephen Rothwell
2015-07-20 3:54 Stephen Rothwell
2015-05-19 6:40 Stephen Rothwell
2014-08-08 5:46 Stephen Rothwell
2014-08-07 6:51 Stephen Rothwell
2014-05-29 9:08 Stephen Rothwell
2014-04-29 4:47 Stephen Rothwell
2014-04-24 5:38 Stephen Rothwell
2014-04-07 4:18 Stephen Rothwell
2014-01-29 3:46 Stephen Rothwell
2013-12-23 3:58 Stephen Rothwell
2013-12-03 1:52 Stephen Rothwell
2013-12-03 7:16 ` Richard Weinberger
2013-12-03 7:31 ` Andrew Morton
2013-12-03 7:36 ` Richard Weinberger
2013-02-02 12:55 Stephen Rothwell
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=20161205055655.GB30758@dhcp22.suse.cz \
--to=mhocko@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).