Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754028AbaF3D6Y (ORCPT ); Sun, 29 Jun 2014 23:58:24 -0400 Received: from hqemgate14.nvidia.com ([216.228.121.143]:4403 "EHLO hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751286AbaF3D6X (ORCPT ); Sun, 29 Jun 2014 23:58:23 -0400 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Sun, 29 Jun 2014 20:48:13 -0700 Date: Sun, 29 Jun 2014 20:58:17 -0700 From: John Hubbard To: =?ISO-8859-15?Q?J=E9r=F4me_Glisse?= CC: , , , , , , , , , , Mark Hairgrove , Jatin Kumar , Subhash Gutti , Lucien Dunning , Cameron Buschardt , Arvind Gopalakrishnan , Sherry Cheung , Duncan Poole , Oded Gabbay , Alexander Deucher , Andrew Lewycky , =?ISO-8859-15?Q?J=E9r=F4me_Glisse?= Subject: Re: [PATCH 2/6] mm: differentiate unmap for vmscan from other unmap. In-Reply-To: <1403920822-14488-3-git-send-email-j.glisse@gmail.com> Message-ID: References: <1403920822-14488-1-git-send-email-j.glisse@gmail.com> <1403920822-14488-3-git-send-email-j.glisse@gmail.com> User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="279739828-1357833611-1404100702=:21595" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --279739828-1357833611-1404100702=:21595 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT On Fri, 27 Jun 2014, Jérôme Glisse wrote: > From: Jérôme Glisse > > New code will need to be able to differentiate between a regular unmap and > an unmap trigger by vmscan in which case we want to be as quick as possible. > > Signed-off-by: Jérôme Glisse > --- > include/linux/rmap.h | 15 ++++++++------- > mm/memory-failure.c | 2 +- > mm/vmscan.c | 4 ++-- > 3 files changed, 11 insertions(+), 10 deletions(-) > > diff --git a/include/linux/rmap.h b/include/linux/rmap.h > index be57450..eddbc07 100644 > --- a/include/linux/rmap.h > +++ b/include/linux/rmap.h > @@ -72,13 +72,14 @@ struct anon_vma_chain { > }; > > enum ttu_flags { > - TTU_UNMAP = 1, /* unmap mode */ > - TTU_MIGRATION = 2, /* migration mode */ > - TTU_MUNLOCK = 4, /* munlock mode */ > - > - TTU_IGNORE_MLOCK = (1 << 8), /* ignore mlock */ > - TTU_IGNORE_ACCESS = (1 << 9), /* don't age */ > - TTU_IGNORE_HWPOISON = (1 << 10),/* corrupted page is recoverable */ > + TTU_VMSCAN = 1, /* unmap for vmscan */ > + TTU_POISON = 2, /* unmap for poison */ > + TTU_MIGRATION = 4, /* migration mode */ > + TTU_MUNLOCK = 8, /* munlock mode */ > + > + TTU_IGNORE_MLOCK = (1 << 9), /* ignore mlock */ > + TTU_IGNORE_ACCESS = (1 << 10), /* don't age */ > + TTU_IGNORE_HWPOISON = (1 << 11),/* corrupted page is recoverable */ Unless there is a deeper purpose that I am overlooking, I think it would be better to leave the _MLOCK, _ACCESS, and _HWPOISON at their original values. I just can't quite see why they would need to start at bit 9 instead of bit 8... > }; > > #ifdef CONFIG_MMU > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > index a7a89eb..ba176c4 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -887,7 +887,7 @@ static int page_action(struct page_state *ps, struct page *p, > static int hwpoison_user_mappings(struct page *p, unsigned long pfn, > int trapno, int flags, struct page **hpagep) > { > - enum ttu_flags ttu = TTU_UNMAP | TTU_IGNORE_MLOCK | TTU_IGNORE_ACCESS; > + enum ttu_flags ttu = TTU_POISON | TTU_IGNORE_MLOCK | TTU_IGNORE_ACCESS; > struct address_space *mapping; > LIST_HEAD(tokill); > int ret; > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 6d24fd6..5a7d286 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -1163,7 +1163,7 @@ unsigned long reclaim_clean_pages_from_list(struct zone *zone, > } > > ret = shrink_page_list(&clean_pages, zone, &sc, > - TTU_UNMAP|TTU_IGNORE_ACCESS, > + TTU_VMSCAN|TTU_IGNORE_ACCESS, > &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, true); > list_splice(&clean_pages, page_list); > mod_zone_page_state(zone, NR_ISOLATED_FILE, -ret); > @@ -1518,7 +1518,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec, > if (nr_taken == 0) > return 0; > > - nr_reclaimed = shrink_page_list(&page_list, zone, sc, TTU_UNMAP, > + nr_reclaimed = shrink_page_list(&page_list, zone, sc, TTU_VMSCAN, > &nr_dirty, &nr_unqueued_dirty, &nr_congested, > &nr_writeback, &nr_immediate, > false); > -- > 1.9.0 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@kvack.org. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: email@kvack.org > Other than that, looks good. Reviewed-by: John Hubbard thanks, John H. --279739828-1357833611-1404100702=:21595-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/