From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx184.postini.com [74.125.245.184]) by kanga.kvack.org (Postfix) with SMTP id 3F63B6B004A for ; Sun, 18 Mar 2012 23:02:26 -0400 (EDT) Received: from m1.gw.fujitsu.co.jp (unknown [10.0.50.71]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id A1B793EE0BB for ; Mon, 19 Mar 2012 12:02:24 +0900 (JST) Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 863A645DE58 for ; Mon, 19 Mar 2012 12:02:24 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 6BA2E45DE5D for ; Mon, 19 Mar 2012 12:02:24 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 59BD31DB8049 for ; Mon, 19 Mar 2012 12:02:24 +0900 (JST) Received: from m105.s.css.fujitsu.com (m105.s.css.fujitsu.com [10.240.81.145]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 039D11DB804E for ; Mon, 19 Mar 2012 12:02:24 +0900 (JST) Message-ID: <4F66A15B.7070804@jp.fujitsu.com> Date: Mon, 19 Mar 2012 12:00:43 +0900 From: KAMEZAWA Hiroyuki MIME-Version: 1.0 Subject: Re: [PATCH -V4 08/10] hugetlbfs: Add a list for tracking in-use HugeTLB pages References: <1331919570-2264-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <1331919570-2264-9-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1331919570-2264-9-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: "Aneesh Kumar K.V" Cc: linux-mm@kvack.org, mgorman@suse.de, dhillf@gmail.com, aarcange@redhat.com, mhocko@suse.cz, akpm@linux-foundation.org, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org (2012/03/17 2:39), Aneesh Kumar K.V wrote: > From: "Aneesh Kumar K.V" > > hugepage_activelist will be used to track currently used HugeTLB pages. > We need to find the in-use HugeTLB pages to support memcg removal. > On memcg removal we update the page's memory cgroup to point to > parent cgroup. > > Signed-off-by: Aneesh Kumar K.V Reviewed-by: KAMEZAWA Hiroyuki seems ok to me but...why the new list is not per node ? no benefit ? Thanks, -Kame > --- > include/linux/hugetlb.h | 1 + > mm/hugetlb.c | 23 ++++++++++++++++++----- > 2 files changed, 19 insertions(+), 5 deletions(-) > > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index cbd8dc5..6919100 100644 > --- a/include/linux/hugetlb.h > +++ b/include/linux/hugetlb.h > @@ -217,6 +217,7 @@ struct hstate { > unsigned long resv_huge_pages; > unsigned long surplus_huge_pages; > unsigned long nr_overcommit_huge_pages; > + struct list_head hugepage_activelist; > struct list_head hugepage_freelists[MAX_NUMNODES]; > unsigned int nr_huge_pages_node[MAX_NUMNODES]; > unsigned int free_huge_pages_node[MAX_NUMNODES]; > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 684849a..8fd465d 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -433,7 +433,7 @@ void copy_huge_page(struct page *dst, struct page *src) > static void enqueue_huge_page(struct hstate *h, struct page *page) > { > int nid = page_to_nid(page); > - list_add(&page->lru, &h->hugepage_freelists[nid]); > + list_move(&page->lru, &h->hugepage_freelists[nid]); > h->free_huge_pages++; > h->free_huge_pages_node[nid]++; > } > @@ -445,7 +445,7 @@ static struct page *dequeue_huge_page_node(struct hstate *h, int nid) > if (list_empty(&h->hugepage_freelists[nid])) > return NULL; > page = list_entry(h->hugepage_freelists[nid].next, struct page, lru); > - list_del(&page->lru); > + list_move(&page->lru, &h->hugepage_activelist); > set_page_refcounted(page); > h->free_huge_pages--; > h->free_huge_pages_node[nid]--; > @@ -542,13 +542,14 @@ static void free_huge_page(struct page *page) > page->mapping = NULL; > BUG_ON(page_count(page)); > BUG_ON(page_mapcount(page)); > - INIT_LIST_HEAD(&page->lru); > > if (mapping) > mem_cgroup_hugetlb_uncharge_page(hstate_index(h), > pages_per_huge_page(h), page); > spin_lock(&hugetlb_lock); > if (h->surplus_huge_pages_node[nid] && huge_page_order(h) < MAX_ORDER) { > + /* remove the page from active list */ > + list_del(&page->lru); > update_and_free_page(h, page); > h->surplus_huge_pages--; > h->surplus_huge_pages_node[nid]--; > @@ -562,6 +563,7 @@ static void free_huge_page(struct page *page) > > static void prep_new_huge_page(struct hstate *h, struct page *page, int nid) > { > + INIT_LIST_HEAD(&page->lru); > set_compound_page_dtor(page, free_huge_page); > spin_lock(&hugetlb_lock); > h->nr_huge_pages++; > @@ -1861,6 +1863,7 @@ void __init hugetlb_add_hstate(unsigned order) > h->free_huge_pages = 0; > for (i = 0; i < MAX_NUMNODES; ++i) > INIT_LIST_HEAD(&h->hugepage_freelists[i]); > + INIT_LIST_HEAD(&h->hugepage_activelist); > h->next_nid_to_alloc = first_node(node_states[N_HIGH_MEMORY]); > h->next_nid_to_free = first_node(node_states[N_HIGH_MEMORY]); > snprintf(h->name, HSTATE_NAME_LEN, "hugepages-%lukB", > @@ -2319,14 +2322,24 @@ void __unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, > page = pte_page(pte); > if (pte_dirty(pte)) > set_page_dirty(page); > - list_add(&page->lru, &page_list); > + > + spin_lock(&hugetlb_lock); > + list_move(&page->lru, &page_list); > + spin_unlock(&hugetlb_lock); > } > spin_unlock(&mm->page_table_lock); > flush_tlb_range(vma, start, end); > mmu_notifier_invalidate_range_end(mm, start, end); > list_for_each_entry_safe(page, tmp, &page_list, lru) { > page_remove_rmap(page); > - list_del(&page->lru); > + /* > + * We need to move it back huge page active list. If we are > + * holding the last reference, below put_page will move it > + * back to free list. > + */ > + spin_lock(&hugetlb_lock); > + list_move(&page->lru, &h->hugepage_activelist); > + spin_unlock(&hugetlb_lock); > put_page(page); > } > } -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org