From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ning Qu Subject: Re: [PATCHv6 10/22] thp, mm: rewrite delete_from_page_cache() to support huge pages Date: Wed, 25 Sep 2013 13:02:36 -0700 Message-ID: References: <1379937950-8411-1-git-send-email-kirill.shutemov@linux.intel.com> <1379937950-8411-11-git-send-email-kirill.shutemov@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: Andrea Arcangeli , Andrew Morton , Al Viro , Hugh Dickins , Wu Fengguang , Jan Kara , Mel Gorman , linux-mm@kvack.org, Andi Kleen , Matthew Wilcox , "Kirill A. Shutemov" , Hillf Danton , Dave Hansen , Alexander Shishkin , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org To: "Kirill A. Shutemov" Return-path: In-Reply-To: <1379937950-8411-11-git-send-email-kirill.shutemov@linux.intel.com> Sender: owner-linux-mm@kvack.org List-Id: linux-fsdevel.vger.kernel.org Best wishes, --=20 Ning Qu (=E6=9B=B2=E5=AE=81) | Software Engineer | quning@google.com | +1-4= 08-418-6066 On Mon, Sep 23, 2013 at 5:05 AM, Kirill A. Shutemov wrote: > > As with add_to_page_cache_locked() we handle HPAGE_CACHE_NR pages a > time. > > Signed-off-by: Kirill A. Shutemov > --- > mm/filemap.c | 20 ++++++++++++++------ > 1 file changed, 14 insertions(+), 6 deletions(-) > > diff --git a/mm/filemap.c b/mm/filemap.c > index d2d6c0ebe9..60478ebeda 100644 > --- a/mm/filemap.c > +++ b/mm/filemap.c > @@ -115,6 +115,7 @@ > void __delete_from_page_cache(struct page *page) > { > struct address_space *mapping =3D page->mapping; > + int i, nr; > > trace_mm_filemap_delete_from_page_cache(page); > /* > @@ -127,13 +128,20 @@ void __delete_from_page_cache(struct page *page) > else > cleancache_invalidate_page(mapping, page); > > - radix_tree_delete(&mapping->page_tree, page->index); > + page->mapping =3D NULL; Seems with this line added, we clear the page->mapping twice? Once here and another one after radix_tree_delete. Is this necessary here? > > + nr =3D hpagecache_nr_pages(page); > + for (i =3D 0; i < nr; i++) > + radix_tree_delete(&mapping->page_tree, page->index + i); > + /* thp */ > + if (nr > 1) > + __dec_zone_page_state(page, NR_FILE_TRANSPARENT_HUGEPAGES= ); > + > page->mapping =3D NULL; > /* Leave page->index set: truncation lookup relies upon it */ > - mapping->nrpages--; > - __dec_zone_page_state(page, NR_FILE_PAGES); > + mapping->nrpages -=3D nr; > + __mod_zone_page_state(page_zone(page), NR_FILE_PAGES, -nr); > if (PageSwapBacked(page)) > - __dec_zone_page_state(page, NR_SHMEM); > + __mod_zone_page_state(page_zone(page), NR_SHMEM, -nr); > BUG_ON(page_mapped(page)); > > /* > @@ -144,8 +152,8 @@ void __delete_from_page_cache(struct page *page) > * having removed the page entirely. > */ > if (PageDirty(page) && mapping_cap_account_dirty(mapping)) { > - dec_zone_page_state(page, NR_FILE_DIRTY); > - dec_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE); > + mod_zone_page_state(page_zone(page), NR_FILE_DIRTY, -nr); > + add_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE, = -nr); > } > } > > -- > 1.8.4.rc3 > -- 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