From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756296Ab3GCPdu (ORCPT ); Wed, 3 Jul 2013 11:33:50 -0400 Received: from cantor2.suse.de ([195.135.220.15]:38583 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752970Ab3GCPdt (ORCPT ); Wed, 3 Jul 2013 11:33:49 -0400 Date: Wed, 3 Jul 2013 16:33:46 +0100 From: Mel Gorman To: Peter Zijlstra , Srikar Dronamraju Cc: Ingo Molnar , Andrea Arcangeli , Johannes Weiner , Linux-MM , LKML Subject: Re: [PATCH 11/13] sched: Check current->mm before allocating NUMA faults Message-ID: <20130703153346.GH1875@suse.de> References: <1372861300-9973-1-git-send-email-mgorman@suse.de> <1372861300-9973-12-git-send-email-mgorman@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <1372861300-9973-12-git-send-email-mgorman@suse.de> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 03, 2013 at 03:21:38PM +0100, Mel Gorman wrote: > @@ -1072,16 +1076,18 @@ void task_numa_work(struct callback_head *work) > end = ALIGN(start + (pages << PAGE_SHIFT), HPAGE_SIZE); > end = min(end, vma->vm_end); > nr_pte_updates += change_prot_numa(vma, start, end); > - pages -= (end - start) >> PAGE_SHIFT; > - > - start = end; > > /* > * Scan sysctl_numa_balancing_scan_size but ensure that > - * least one PTE is updated so that unused virtual > - * address space is quickly skipped > + * at least one PTE is updated so that unused virtual > + * address space is quickly skipped. > */ > - if (pages <= 0 && nr_pte_updates) > + if (nr_pte_updates) > + pages -= (end - start) >> PAGE_SHIFT; > + > + start = end; > + > + if (pages <= 0) > goto out; > } while (end != vma->vm_end); This hunk is a rebasing error that should have been in the previous patch. Fixed now. -- Mel Gorman SUSE Labs