From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751487AbcFNGnX (ORCPT ); Tue, 14 Jun 2016 02:43:23 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34118 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751221AbcFNGnV (ORCPT ); Tue, 14 Jun 2016 02:43:21 -0400 From: WANG Chao To: Ingo Molnar , Peter Zijlstra Cc: linux-kernel@vger.kernel.org Subject: [PATCH] sched: unlikely corrupted stack end Date: Tue, 14 Jun 2016 14:43:06 +0800 Message-Id: <20160614064306.48035-1-wcwxyz@gmail.com> X-Mailer: git-send-email 2.8.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org unlikely() was dropped in commit ce03e41 ("sched/core: Drop unlikely behind BUG_ON()"), but commit 29d6455 ("sched: panic on corrupted stack end") dropped BUG_ON() and called panic directly. Now we should bring unlikely() back for branch prediction. Signed-off-by: WANG Chao --- kernel/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 017d539..7db442c 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3170,7 +3170,7 @@ static noinline void __schedule_bug(struct task_struct *prev) static inline void schedule_debug(struct task_struct *prev) { #ifdef CONFIG_SCHED_STACK_END_CHECK - if (task_stack_end_corrupted(prev)) + if (unlikely(task_stack_end_corrupted(prev))) panic("corrupted stack end detected inside scheduler\n"); #endif -- 2.8.4