From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755937Ab1ATQR1 (ORCPT ); Thu, 20 Jan 2011 11:17:27 -0500 Received: from mail-px0-f174.google.com ([209.85.212.174]:43317 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751739Ab1ATQRY (ORCPT ); Thu, 20 Jan 2011 11:17:24 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=h8agzsm4NfoG5AtpXvtUWMOVMBcBrasjXxQ+0WXQThzRGZtNf83JlyrTpQ8YQx+ZYy waU/g1kiXMT8fldxM4WJSjQNl0ACUwfvt3MDAdP7LaJyK9ayyUTMoMd/JYTiwIGenJhw gFgDlBnpTKcak0kjE2DMuMBC6VDtnnt6MOpzE= From: Minchan Kim To: Andrew Morton Cc: linux-mm , LKML , Mel Gorman , Minchan Kim , Andrea Arcangeli Subject: [PATCH 2/3] migration: Fix page corruption during hugepage migration Date: Fri, 21 Jan 2011 01:17:06 +0900 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If migrate_huge_page by memory-failure fails , it calls put_page in itself to decrease page reference and caller of migrate_huge_page also calls putback_lru_pages. It can do double free of page so it can make page corruption on page holder. In addtion, clean of pages on caller is consistent behavior with migrate_pages by cf608ac19c95804dc2df43b1f4f9e0. Cc: Andrea Arcangeli Signed-off-by: Minchan Kim --- mm/memory-failure.c | 5 ++++- mm/migrate.c | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 75398b0..237aaa4 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1295,7 +1295,10 @@ static int soft_offline_huge_page(struct page *page, int flags) ret = migrate_huge_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, 0, true); if (ret) { - putback_lru_pages(&pagelist); + struct page *page1, *page2; + list_for_each_entry_safe(page1, page2, &pagelist, lru) + put_page(page1); + pr_debug("soft offline: %#lx: migration failed %d, type %lx\n", pfn, ret, page->flags); if (ret > 0) diff --git a/mm/migrate.c b/mm/migrate.c index 7d34237..3a6d4fd 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -980,10 +980,6 @@ int migrate_huge_pages(struct list_head *from, } rc = 0; out: - - list_for_each_entry_safe(page, page2, from, lru) - put_page(page); - if (rc) return rc; -- 1.7.0.4