From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + mm-page_alloc-dont-re-init-pageset-in-zone_pcp_update.patch added to -mm tree Date: Wed, 12 Jun 2013 14:20:42 -0700 Message-ID: <51b8e62a.hq/OYvEc5sXiKzkE%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:53359 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758074Ab3FLVUn (ORCPT ); Wed, 12 Jun 2013 17:20:43 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org, Valdis.Kletnieks@vt.edu, cody@linux.vnet.ibm.com Subject: + mm-page_alloc-dont-re-init-pageset-in-zone_pcp_update.patch added to -mm tree To: cody@linux.vnet.ibm.com,Valdis.Kletnieks@vt.edu From: akpm@linux-foundation.org Date: Wed, 12 Jun 2013 14:20:42 -0700 The patch titled Subject: mm/page_alloc: don't re-init pageset in zone_pcp_update() has been added to the -mm tree. Its filename is mm-page_alloc-dont-re-init-pageset-in-zone_pcp_update.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Cody P Schafer Subject: mm/page_alloc: don't re-init pageset in zone_pcp_update() Signed-off-by: Cody P Schafer Reported-by: Valdis Kletnieks Signed-off-by: Andrew Morton --- mm/page_alloc.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff -puN mm/page_alloc.c~mm-page_alloc-dont-re-init-pageset-in-zone_pcp_update mm/page_alloc.c --- a/mm/page_alloc.c~mm-page_alloc-dont-re-init-pageset-in-zone_pcp_update +++ a/mm/page_alloc.c @@ -4108,11 +4108,9 @@ static void pageset_set_high(struct per_ pageset_update(&p->pcp, high, batch); } -static void __meminit zone_pageset_init(struct zone *zone, int cpu) +static void __meminit pageset_set_high_and_batch(struct zone *zone, + struct per_cpu_pageset *pcp) { - struct per_cpu_pageset *pcp = per_cpu_ptr(zone->pageset, cpu); - - pageset_init(pcp); if (percpu_pagelist_fraction) pageset_set_high(pcp, (zone->managed_pages / @@ -4121,6 +4119,14 @@ static void __meminit zone_pageset_init( pageset_set_batch(pcp, zone_batchsize(zone)); } +static void __meminit zone_pageset_init(struct zone *zone, int cpu) +{ + struct per_cpu_pageset *pcp = per_cpu_ptr(zone->pageset, cpu); + + pageset_init(pcp); + pageset_set_high_and_batch(zone, pcp); +} + static void __meminit setup_zone_pageset(struct zone *zone) { int cpu; @@ -6189,7 +6195,8 @@ void __meminit zone_pcp_update(struct zo unsigned cpu; mutex_lock(&pcp_batch_high_lock); for_each_possible_cpu(cpu) - zone_pageset_init(zone, cpu); + pageset_set_high_and_batch(zone, + per_cpu_ptr(zone->pageset, cpu)); mutex_unlock(&pcp_batch_high_lock); } #endif _ Patches currently in -mm which might be from cody@linux.vnet.ibm.com are mm-page_alloc-factor-out-setting-of-pcp-high-and-pcp-batch.patch mm-page_alloc-prevent-concurrent-updaters-of-pcp-batch-and-high.patch mm-page_alloc-insert-memory-barriers-to-allow-async-update-of-pcp-batch-and-high.patch mm-page_alloc-protect-pcp-batch-accesses-with-access_once.patch mm-page_alloc-convert-zone_pcp_update-to-rely-on-memory-barriers-instead-of-stop_machine.patch mm-page_alloc-when-handling-percpu_pagelist_fraction-dont-unneedly-recalulate-high.patch mm-page_alloc-factor-setup_pageset-into-pageset_init-and-pageset_set_batch.patch mm-page_alloc-relocate-comment-to-be-directly-above-code-it-refers-to.patch mm-page_alloc-factor-zone_pageset_init-out-of-setup_zone_pageset.patch mm-page_alloc-in-zone_pcp_update-uze-zone_pageset_init.patch mm-page_alloc-rename-setup_pagelist_highmark-to-match-naming-of-pageset_set_batch.patch mm-fix-comment-referring-to-non-existent-size_seqlock-change-to-span_seqlock.patch mmzone-note-that-node_size_lock-should-be-manipulated-via-pgdat_resize_lock.patch memory_hotplug-use-pgdat_resize_lock-in-online_pages.patch memory_hotplug-use-pgdat_resize_lock-in-__offline_pages.patch memory_hotplug-use-pgdat_resize_lock-in-__offline_pages-fix.patch sparsemem-add-build_bug_on-when-sizeof-mem_section-is-non-power-of-2.patch mm-page_alloc-dont-re-init-pageset-in-zone_pcp_update.patch