From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755027AbbI3HeO (ORCPT ); Wed, 30 Sep 2015 03:34:14 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:56866 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754648AbbI3Hav (ORCPT ); Wed, 30 Sep 2015 03:30:51 -0400 Message-Id: <20150930072304.760800554@infradead.org> User-Agent: quilt/0.61-1 Date: Wed, 30 Sep 2015 09:10:47 +0200 From: Peter Zijlstra To: mingo@kernel.org Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, fweisbec@gmail.com, oleg@redhat.com, umgwanakikbuti@gmail.com, tglx@linutronix.de, rostedt@goodmis.org, Peter Zijlstra Subject: [PATCH v2 12/12] sched: Add preempt_count invariant check References: <20150930071035.514587432@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-kill-preempt_active-12.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ingo requested I keep my debug check for the preempt_count invariant. Requested-by: Ingo Molnar Signed-off-by: Peter Zijlstra (Intel) --- kernel/sched/core.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2514,6 +2514,10 @@ static struct rq *finish_task_switch(str * * Also, see FORK_PREEMPT_COUNT. */ + if (unlikely(WARN_ONCE(preempt_count() != 2*PREEMPT_DISABLE_OFFSET, + "corrupted preempt_count: %s/%d/0x%x\n", + current->comm, current->pid, preempt_count()))) + preempt_count_set(FORK_PREEMPT_COUNT); rq->prev_mm = NULL;