From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756930Ab0LAXoH (ORCPT ); Wed, 1 Dec 2010 18:44:07 -0500 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:59292 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756869Ab0LAXoD (ORCPT ); Wed, 1 Dec 2010 18:44:03 -0500 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 Date: Thu, 2 Dec 2010 08:37:53 +0900 From: KAMEZAWA Hiroyuki To: "Rafael J. Wysocki" Cc: Hugh Dickins , Ondrej Zary , Andrew Morton , KOSAKI Motohiro , Kernel development list , Balbir Singh Subject: Re: 2.6.35.5: hibernation broken... AGAIN Message-Id: <20101202083753.eaed2963.kamezawa.hiroyu@jp.fujitsu.com> In-Reply-To: <201012012323.31311.rjw@sisk.pl> References: <201011171139.33398.linux@rainbow-software.org> <20101201095349.c1f3ac46.kamezawa.hiroyu@jp.fujitsu.com> <201012012225.40329.rjw@sisk.pl> <201012012323.31311.rjw@sisk.pl> Organization: FUJITSU Co. LTD. X-Mailer: Sylpheed 3.0.3 (GTK+ 2.10.14; i686-pc-mingw32) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 1 Dec 2010 23:23:31 +0100 "Rafael J. Wysocki" wrote: > On Wednesday, December 01, 2010, Rafael J. Wysocki wrote: > > On Wednesday, December 01, 2010, KAMEZAWA Hiroyuki wrote: > > > On Wed, 1 Dec 2010 01:38:53 +0100 > > > "Rafael J. Wysocki" wrote: > > > > > > > On Wednesday, December 01, 2010, Rafael J. Wysocki wrote: > > > > > On Tuesday, November 30, 2010, Hugh Dickins wrote: > > > > > > On Sat, 27 Nov 2010, Rafael J. Wysocki wrote: > > > > > > > On Saturday, November 27, 2010, Ondrej Zary wrote: > > > > ... > > > > > > > > > > > > Trivial point, I suppose, but it bothers me that PM is accumulating > > > > > > wrappers around wrappers around gfp_allowed_mask. Looks like > > > > > > clear_gfp_allowed_mask and set_gfp_allowed_mask (oddly asymmetrical) > > > > > > were not really what we need. How about scrapping them, and putting > > > > > > pm_restrict_gfp_mask() and pm_restore_gfp_mask() into page_alloc.c? > > > > > > > > > > Sure, that sounds like a good idea indeed. > > > > > > > > Below is an updated patch in which I tried to address your comments. > > > > > > > > I didn't find it very useful to couple pm_restore_gfp_mask() with the thawing > > > > of tasks, but nevertheless I think all of the spots where it's needed are > > > > covered now. > > > > > > > > The patch has only been compile-tested for now, so caveat emptor. > > > > > > > > > > Hmm, can't we have some error check as > > > > > > > +static gfp_t saved_gfp_mask; > > > > > > atomic_t gfp_mask_save_mode_counter; > > > > > > > + > > > > +void pm_restore_gfp_mask(void) > > > > { > > > > WARN_ON(!mutex_is_locked(&pm_mutex)); > > > > - gfp_allowed_mask = mask; > > > > > > if (atomic_dec_return(&gfp_mask_save_mode_counter)) > > > WARN_ONCE() > > > > > > > + if (saved_gfp_mask) { > > > > + gfp_allowed_mask = saved_gfp_mask; > > > > + saved_gfp_mask = 0; > > > > + } > > > > } > > > > > > > +void pm_restrict_gfp_mask(void) > > > > { > > > > - gfp_t ret = gfp_allowed_mask; > > > > - > > > > WARN_ON(!mutex_is_locked(&pm_mutex)); > > > > - gfp_allowed_mask &= ~mask; > > > > - return ret; > > > > + saved_gfp_mask = gfp_allowed_mask; > > > > + gfp_allowed_mask &= ~GFP_IOFS; > > > > > > if (atomic_inc_return(&gfp_mask_save_mode_counter) > 1) > > > WARN_ONCE() > > > > > > or some ? > > > > What exactly would that be useful for? > > Please note that pm_restore_gfp_mask() can be legitimately called before > pm_restrict_gfp_mask() via the SNAPSHOT_CREATE_IMAGE hibernate ioctl, so the > test you're suggesting wouldn't really work. > Hm, I just wonder some tests not for breaking gfp_allowed_mask by - double call - forget to restore That will be fatal. I'm not very interested in implementation detail Thanks, -Kame