From patchwork Mon Aug 29 14:04:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 1108212 Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7TEAIOe009637 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Mon, 29 Aug 2011 14:10:38 GMT Received: from daredevil.linux-foundation.org (localhost [127.0.0.1]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p7TE7VGe015359; Mon, 29 Aug 2011 07:08:01 -0700 Received: from mail-fx0-f47.google.com (mail-fx0-f47.google.com [209.85.161.47]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p7TE4Rq0015073 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=FAIL); Mon, 29 Aug 2011 07:04:29 -0700 Received: by fxg11 with SMTP id 11so4605036fxg.6 for ; Mon, 29 Aug 2011 07:04:26 -0700 (PDT) Received: by 10.223.88.66 with SMTP id z2mr2535009fal.47.1314626666550; Mon, 29 Aug 2011 07:04:26 -0700 (PDT) Received: from mtj.dyndns.org ([89.204.138.129]) by mx.google.com with ESMTPS id c7sm3781945fac.36.2011.08.29.07.04.24 (version=SSLv3 cipher=OTHER); Mon, 29 Aug 2011 07:04:25 -0700 (PDT) Date: Mon, 29 Aug 2011 16:04:18 +0200 From: Tejun Heo To: "Rafael J. Wysocki" , Oleg Nesterov , Paul Menage Message-ID: <20110829140418.GB18871@mtj.dyndns.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Received-SPF: pass (localhost is always allowed.) X-Spam-Status: No, hits=-4.361 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SPF_PASS, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21 Cc: containers@lists.linux-foundation.org, linux-pm@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [linux-pm] [PATCH pm-freezer 1/4] cgroup_freezer: fix freezer->state setting bug in freezer_change_state() X-BeenThere: linux-pm@lists.linux-foundation.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux power management List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 29 Aug 2011 14:10:38 +0000 (UTC) d02f52811d0e "cgroup_freezer: prepare for removal of TIF_FREEZE" moved setting of freezer->state into freezer_change_state(); unfortunately, while doing so, when it's beginning to freeze tasks, it sets the state to CGROUP_FROZEN instead of CGROUP_FREEZING ending up skipping the whole freezing state. Fix it. Signed-off-by: Tejun Heo Reported-by: Oleg Nesterov Cc: Paul Menage Cc: "Rafael J. Wysocki" --- Rafael, these four patches fix the issues spotted by Oleg during review of the freezer patchset. Please apply them on pm-freezer once Oleg acks them. Thanks. kernel/cgroup_freezer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: work/kernel/cgroup_freezer.c =================================================================== --- work.orig/kernel/cgroup_freezer.c +++ work/kernel/cgroup_freezer.c @@ -311,14 +311,14 @@ static int freezer_change_state(struct c if (goal_state == freezer->state) goto out; - freezer->state = goal_state; - switch (goal_state) { case CGROUP_THAWED: + freezer->state = CGROUP_THAWED; atomic_dec(&system_freezing_cnt); unfreeze_cgroup(cgroup, freezer); break; case CGROUP_FROZEN: + freezer->state = CGROUP_FREEZING; atomic_inc(&system_freezing_cnt); retval = try_to_freeze_cgroup(cgroup, freezer); break;