Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756528Ab1CRMyu (ORCPT ); Fri, 18 Mar 2011 08:54:50 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:36880 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756502Ab1CRMyn (ORCPT ); Fri, 18 Mar 2011 08:54:43 -0400 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=c36yLQvx1rbkp6jjWwa74fTFmPmeWSBdjMHegudgoMxAWqk7tZ2Nu+A0SG9BTSObWA 6O/6bk+4nSjWPNvyUp5n2O+rqnUy0qOabE9Umo/BoG/ZGGVH90Dh3aUkFmi2R42Twqz4 k3DKKDGbaduLwOQv41DmNqT1WAGTDob6mH03I= From: Namhyung Kim To: Paul Menage , Li Zefan Cc: containers@lists.linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, KAMEZAWA Hiroyuki Subject: [PATCH 3/3] memcg: move page-freeing code outside of lock Date: Fri, 18 Mar 2011 21:54:15 +0900 Message-Id: <1300452855-10194-3-git-send-email-namhyung@gmail.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1300452855-10194-1-git-send-email-namhyung@gmail.com> References: <1300452855-10194-1-git-send-email-namhyung@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1653 Lines: 66 Signed-off-by: Namhyung Kim Cc: KAMEZAWA Hiroyuki --- mm/page_cgroup.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 29951abc852e..17eb5eb95bab 100644 --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c @@ -463,8 +463,8 @@ int swap_cgroup_swapon(int type, unsigned long max_pages) /* memory shortage */ ctrl->map = NULL; ctrl->length = 0; - vfree(array); mutex_unlock(&swap_cgroup_mutex); + vfree(array); goto nomem; } mutex_unlock(&swap_cgroup_mutex); @@ -479,7 +479,8 @@ nomem: void swap_cgroup_swapoff(int type) { - int i; + struct page **map; + unsigned long i, length; struct swap_cgroup_ctrl *ctrl; if (!do_swap_account) @@ -487,17 +488,20 @@ void swap_cgroup_swapoff(int type) mutex_lock(&swap_cgroup_mutex); ctrl = &swap_cgroup_ctrl[type]; - if (ctrl->map) { - for (i = 0; i < ctrl->length; i++) { - struct page *page = ctrl->map[i]; + map = ctrl->map; + length = ctrl->length; + ctrl->map = NULL; + ctrl->length = 0; + mutex_unlock(&swap_cgroup_mutex); + + if (map) { + for (i = 0; i < length; i++) { + struct page *page = map[i]; if (page) __free_page(page); } - vfree(ctrl->map); - ctrl->map = NULL; - ctrl->length = 0; + vfree(map); } - mutex_unlock(&swap_cgroup_mutex); } #endif -- 1.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/