Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757645AbYFIRXQ (ORCPT ); Mon, 9 Jun 2008 13:23:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753296AbYFIRXB (ORCPT ); Mon, 9 Jun 2008 13:23:01 -0400 Received: from e28smtp05.in.ibm.com ([59.145.155.5]:38336 "EHLO e28smtp05.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753077AbYFIRXA (ORCPT ); Mon, 9 Jun 2008 13:23:00 -0400 Date: Mon, 9 Jun 2008 22:52:38 +0530 From: Balbir Singh To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: 2.6.26-rc5-mm1 Message-ID: <20080609172238.GA27158@balbir.in.ibm.com> Reply-To: balbir@linux.vnet.ibm.com Mail-Followup-To: Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20080609053908.8021a635.akpm@linux-foundation.org> <484D6671.302@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <484D6671.302@linux.vnet.ibm.com> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2605 Lines: 76 * Balbir Singh [2008-06-09 22:50:49]: > Andrew Morton wrote: > > > > +memrlimit-add-memrlimit-controller-documentation.patch > > +memrlimit-setup-the-memrlimit-controller.patch > > +memrlimit-cgroup-mm-owner-callback-changes-to-add-task-info.patch > > +memrlimit-add-memrlimit-controller-accounting-and-control.patch > > > > New cgroup conrtoller > > Hi, Andrew, There seems to be a merge fuzz, sorry for not catching it when you sent the mm merge email What I sent was @@ -2056,6 +2058,7 @@ void exit_mmap(struct mm_struct *mm) /* Use -1 here to ensure all VMAs in the mm are unmapped */ end = unmap_vmas(&tlb, vma, 0, -1, &nr_accounted, NULL); vm_unacct_memory(nr_accounted); + memrlimit_cgroup_uncharge_as(mm, mm->total_vm); What got merged is @@ -1756,7 +1783,8 @@ static void unmap_region(struct mm_struc update_hiwater_rss(mm); unmap_vmas(&tlb, vma, start, end, &nr_accounted, NULL); vm_unacct_memory(nr_accounted); - free_pgtables(&tlb, vma, prev? prev->vm_end: FIRST_USER_ADDRESS, + memrlimit_cgroup_uncharge_as(mm, mm->total_vm); Here's a patch to fix the problem Signed-off-by: Balbir Singh --- mm/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/memory.c~memrlimit-fix-fuzz-in-merge mm/memory.c diff -puN mm/mmap.c~memrlimit-fix-fuzz-in-merge mm/mmap.c --- linux-2.6.26-rc5/mm/mmap.c~memrlimit-fix-fuzz-in-merge 2008-06-09 22:49:49.000000000 +0530 +++ linux-2.6.26-rc5-balbir/mm/mmap.c 2008-06-09 22:50:13.000000000 +0530 @@ -1783,7 +1783,6 @@ static void unmap_region(struct mm_struc update_hiwater_rss(mm); unmap_vmas(&tlb, vma, start, end, &nr_accounted, NULL); vm_unacct_memory(nr_accounted); - memrlimit_cgroup_uncharge_as(mm, mm->total_vm); free_pgtables(tlb, vma, prev? prev->vm_end: FIRST_USER_ADDRESS, next? next->vm_start: 0); tlb_finish_mmu(tlb, start, end); @@ -2111,6 +2110,7 @@ void exit_mmap(struct mm_struct *mm) /* Use -1 here to ensure all VMAs in the mm are unmapped */ end = unmap_vmas(&tlb, vma, 0, -1, &nr_accounted, NULL); vm_unacct_memory(nr_accounted); + memrlimit_cgroup_uncharge_as(mm, mm->total_vm); free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0); tlb_finish_mmu(tlb, 0, end); _ -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL -- 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/