From patchwork Thu Aug 30 18:18:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 11045 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 41A7923EFE for ; Thu, 30 Aug 2012 18:19:34 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0DF91A182A9 for ; Thu, 30 Aug 2012 18:18:57 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so996735iea.11 for ; Thu, 30 Aug 2012 11:19:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-content-scanned:x-cbid:x-gm-message-state; bh=a8ApIByVXHpo+Gz1mU3tp92Rw5FPIoNldw1HVfL9AFc=; b=WWhEPj7TbPLtbdTy2sFrhZKLRkn3B02xJfKzDcApgjXddJsSZzi7KiLFYwdYa7Xemh wJE1gHNoRvPcHZsJasZ9iCNyXV0Qcc+SzsjeEy2nugLwU7Hh8GpL+Qq8CKNkfpQL25+5 RI2tfLiPj0Fkr+Ex/th/krpt/sGPN9iIFDLC2VP4zuJlcQbtr6TgY9UzQ+kaFAstbY6M yZsJF6XYEDq3zUaE/zVTG5oWTdCBrymJX0CPMglgzoplOlNIgqKa2eix5Or+Eir3+Dkt e7lZ8XfHUHFVfa/JSlTMXCOeEEB0ibZl5wvlJu1h1Jrmw3i56u4hjavck5R+0ma0t3/f HDog== Received: by 10.50.10.201 with SMTP id k9mr1808560igb.28.1346350773541; Thu, 30 Aug 2012 11:19:33 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp24719igc; Thu, 30 Aug 2012 11:19:33 -0700 (PDT) Received: by 10.50.94.138 with SMTP id dc10mr1407049igb.39.1346350773248; Thu, 30 Aug 2012 11:19:33 -0700 (PDT) Received: from e7.ny.us.ibm.com (e7.ny.us.ibm.com. [32.97.182.137]) by mx.google.com with ESMTPS id m4si3933477icy.48.2012.08.30.11.19.33 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 30 Aug 2012 11:19:33 -0700 (PDT) Received-SPF: pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.182.137 as permitted sender) client-ip=32.97.182.137; Authentication-Results: mx.google.com; spf=pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.182.137 as permitted sender) smtp.mail=paulmck@linux.vnet.ibm.com Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 30 Aug 2012 14:19:31 -0400 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 30 Aug 2012 14:19:22 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 6BBAB6E803A for ; Thu, 30 Aug 2012 14:19:21 -0400 (EDT) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7UIJKhb150670 for ; Thu, 30 Aug 2012 14:19:21 -0400 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7UIIjOQ019146 for ; Thu, 30 Aug 2012 12:18:52 -0600 Received: from paulmck-ThinkPad-W500 (sig-9-77-132-62.mts.ibm.com [9.77.132.62]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q7UIIhHc018868; Thu, 30 Aug 2012 12:18:44 -0600 Received: by paulmck-ThinkPad-W500 (Postfix, from userid 1000) id E83A1EA839; Thu, 30 Aug 2012 11:18:40 -0700 (PDT) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org Cc: mingo@elte.hu, laijs@cn.fujitsu.com, dipankar@in.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@polymtl.ca, josh@joshtriplett.org, niv@us.ibm.com, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, Valdis.Kletnieks@vt.edu, dhowells@redhat.com, eric.dumazet@gmail.com, darren@dvhart.com, fweisbec@gmail.com, sbw@mit.edu, patches@linaro.org, "Paul E. McKenney" Subject: [PATCH tip/core/rcu 19/23] rcu: Adjust for unconditional ->completed assignment Date: Thu, 30 Aug 2012 11:18:34 -0700 Message-Id: <1346350718-30937-19-git-send-email-paulmck@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.8 In-Reply-To: <1346350718-30937-1-git-send-email-paulmck@linux.vnet.ibm.com> References: <20120830181811.GA29154@linux.vnet.ibm.com> <1346350718-30937-1-git-send-email-paulmck@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12083018-5806-0000-0000-000018FC3D14 X-Gm-Message-State: ALoCoQnT2TmTPAN0xPS9GcrP9g2nFAZZPJchi0tUcouanOuTrqzyQ93cHg+OM6GXWMgtV6OmdHlt From: "Paul E. McKenney" Now that the rcu_node structures' ->completed fields are unconditionally assigned at grace-period cleanup time, they should already have the correct value for the new grace period at grace-period initialization time. This commit therefore inserts a WARN_ON_ONCE() to verify this invariant. Signed-off-by: Paul E. McKenney Reviewed-by: Josh Triplett --- kernel/rcutree.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/kernel/rcutree.c b/kernel/rcutree.c index 1373388..86903df 100644 --- a/kernel/rcutree.c +++ b/kernel/rcutree.c @@ -1098,6 +1098,7 @@ static int rcu_gp_init(struct rcu_state *rsp) rcu_preempt_check_blocked_tasks(rnp); rnp->qsmask = rnp->qsmaskinit; rnp->gpnum = rsp->gpnum; + WARN_ON_ONCE(rnp->completed != rsp->completed); rnp->completed = rsp->completed; if (rnp == rdp->mynode) rcu_start_gp_per_cpu(rsp, rnp, rdp); @@ -2795,7 +2796,8 @@ static void __init rcu_init_one(struct rcu_state *rsp, raw_spin_lock_init(&rnp->fqslock); lockdep_set_class_and_name(&rnp->fqslock, &rcu_fqs_class[i], fqs[i]); - rnp->gpnum = 0; + rnp->gpnum = rsp->gpnum; + rnp->completed = rsp->completed; rnp->qsmask = 0; rnp->qsmaskinit = 0; rnp->grplo = j * cpustride;