From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + swap-delay-accounting-include-lock_page-delays.patch added to -mm tree Date: Wed, 31 Oct 2007 14:46:34 -0700 Message-ID: <200710312146.l9VLkYtq030357@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp2.linux-foundation.org ([207.189.120.14]:56989 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754809AbXJaVqh (ORCPT ); Wed, 31 Oct 2007 17:46:37 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: balbir@linux.vnet.ibm.com, nickpiggin@yahoo.com.au The patch titled Swap delay accounting, include lock_page() delays has been added to the -mm tree. Its filename is swap-delay-accounting-include-lock_page-delays.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Swap delay accounting, include lock_page() delays From: Balbir Singh The delay incurred in lock_page() should also be accounted in swap delay accounting Reported-by: Nick Piggin Signed-off-by: Balbir Singh Signed-off-by: Andrew Morton --- mm/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/memory.c~swap-delay-accounting-include-lock_page-delays mm/memory.c --- a/mm/memory.c~swap-delay-accounting-include-lock_page-delays +++ a/mm/memory.c @@ -2084,9 +2084,9 @@ static int do_swap_page(struct mm_struct count_vm_event(PGMAJFAULT); } - delayacct_clear_flag(DELAYACCT_PF_SWAPIN); mark_page_accessed(page); lock_page(page); + delayacct_clear_flag(DELAYACCT_PF_SWAPIN); /* * Back out if somebody else already faulted in this pte. _ Patches currently in -mm which might be from balbir@linux.vnet.ibm.com are origin.patch swap-delay-accounting-include-lock_page-delays.patch maps4-add-proportional-set-size-accounting-in-smaps.patch memory-controller-add-documentation.patch memory-controller-resource-counters-v7.patch memory-controller-containers-setup-v7.patch memory-controller-accounting-setup-v7.patch memory-controller-memory-accounting-v7.patch memory-controller-task-migration-v7.patch memory-controller-add-per-container-lru-and-reclaim-v7.patch memory-controller-improve-user-interface.patch memory-controller-oom-handling-v7.patch memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7.patch memory-controller-make-page_referenced-container-aware-v7.patch memory-controller-make-charging-gfp-mask-aware.patch memory-controller-make-charging-gfp-mask-aware-fix.patch memory-controller-bug_on.patch memcontrol-move-mm_cgroup-to-header-file.patch memcontrol-move-oom-task-exclusion-to-tasklist.patch oom-add-sysctl-to-enable-task-memory-dump.patch bugfix-for-memory-cgroup-controller-fix-error-handling-path-in-mem_charge_cgroup.patch bugfix-for-memory-controller-add-helper-function-for-assigning-cgroup-to-page.patch bugfix-for-memory-cgroup-controller-avoid-pagelru-page-in-mem_cgroup_isolate_pages.patch bugfix-for-memory-cgroup-controller-avoid-pagelru-page-in-mem_cgroup_isolate_pages-fix.patch bugfix-for-memory-cgroup-controller-migration-under-memory-controller-fix.patch