From patchwork Thu Jan 9 12:05:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 308694 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id B85232C00BB for ; Thu, 9 Jan 2014 23:06:59 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1W1ENz-0005Pc-DZ; Thu, 09 Jan 2014 12:06:55 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1W1EMr-0004oN-Ax for kernel-team@lists.ubuntu.com; Thu, 09 Jan 2014 12:05:45 +0000 Received: from bl20-130-143.dsl.telepac.pt ([2.81.130.143] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1W1EMr-0001dR-19; Thu, 09 Jan 2014 12:05:45 +0000 From: Luis Henriques To: Mel Gorman Subject: [3.11.y.z extended stable] Patch "mm: numa: avoid unnecessary work on the failure path" has been added to staging queue Date: Thu, 9 Jan 2014 12:05:43 +0000 Message-Id: <1389269143-700-1-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 1.8.3.2 X-Extended-Stable: 3.11 Cc: Rik van Riel , kernel-team@lists.ubuntu.com, Alex Thorlton , Linus Torvalds , Andrew Morton X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This is a note to let you know that I have just added a patch titled mm: numa: avoid unnecessary work on the failure path to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.11.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Luis ------ From 135bd3968d5cf1a3c1c51aeb00e0c4dcf7b058c9 Mon Sep 17 00:00:00 2001 From: Mel Gorman Date: Tue, 7 Jan 2014 14:00:42 +0000 Subject: mm: numa: avoid unnecessary work on the failure path commit eb4489f69f224356193364dc2762aa009738ca7f upstream. If a PMD changes during a THP migration then migration aborts but the failure path is doing more work than is necessary. Signed-off-by: Mel Gorman Reviewed-by: Rik van Riel Cc: Alex Thorlton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Luis Henriques --- mm/migrate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 1.8.3.2 diff --git a/mm/migrate.c b/mm/migrate.c index 65bbca5..cde4b34 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1723,7 +1723,8 @@ fail_putback: putback_lru_page(page); mod_zone_page_state(page_zone(page), NR_ISOLATED_ANON + page_lru, -HPAGE_PMD_NR); - goto out_fail; + + goto out_unlock; } /* @@ -1797,6 +1798,7 @@ out_dropref: } spin_unlock(&mm->page_table_lock); +out_unlock: unlock_page(page); put_page(page); return 0;