From patchwork Fri Mar 14 16:08:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 14017130 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C73BFC282EC for ; Fri, 14 Mar 2025 16:15:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=FrwuML1z2twiI5Q1nEGmeclGfRZJCdzNfx8loT/6B/0=; b=zzE58Fq8znsWUXcNGdYzx5LmbD 6T7to0gd1wwYLSEJSZIkNv8yUrw63JZhe26WyEU03ouwtE1kBZPd2A1WlFqs3aX1k4oi0iNwu1+UD jgBX7W2DzPm1i4xPM0jFZS0vkzGawoGJHRd6S/28CkOnthNnVxZSN0DxK1JEvIXGCscqPQAMQjNRE qPbrxwtO+MCGl8cw6D9YbUz8YqDHWhM+Wajh56SYrOuDzI08gFjTXb8EKcm1T6rnBY92LpP6NjJhL gFdvzQ760X03j/2WEDwcLPuIy2I5Wy5rFeOl62+a/Lnz2JfVzo5mtYHScRP1O/c2qS1OXrBgQCSfx ZmifuqiA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tt7gh-0000000EiBg-0mSG; Fri, 14 Mar 2025 16:15:07 +0000 Received: from galois.linutronix.de ([2a0a:51c0:0:12e:550::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tt7a5-0000000Eg8t-1R61 for linux-arm-kernel@lists.infradead.org; Fri, 14 Mar 2025 16:08:19 +0000 From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1741968495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FrwuML1z2twiI5Q1nEGmeclGfRZJCdzNfx8loT/6B/0=; b=aMFZNY90Z0dXVUWrnA1h5MtmXPZonTKvrxZ26VS6PzBDzM3GopweafZyKULHQUFXVJrwm9 BSq6p46jeOijyzXP2X11epJ+bymVgF/Qzr6f8s0GlO9ZZmkRDz9s78Hpf9xTeh2LNe2Mkz qSP20ur7M9+oq/4dhmc9xPHCJG81LFORMD+4IJ5wcjF9JNiHlD65RfGTfoYJycDIvLjvpp HGdO6tu5RrtSb0QJLyAnFFTSFuHKLnSh7jupe8aAoJch12azCn847CU9kU/OKMvQwaGarQ hdsvD8G3BpycSfQr3sftwWQN9NL/AJXp9Xb4HdxM/d26+R2jYYmaJURljyP/HQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1741968495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FrwuML1z2twiI5Q1nEGmeclGfRZJCdzNfx8loT/6B/0=; b=85Z5yYFKpXEcc7cTMq9arCtQDW4e2BjP5BL83TyQES2bWnCHqGaFuImRqDpM+corO94Gee v07KEql9v+Wd25Bg== To: linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev Cc: Ben Segall , Catalin Marinas , Dietmar Eggemann , Ingo Molnar , Juri Lelli , Mel Gorman , Peter Zijlstra , Shrikanth Hegde , Steven Rostedt , Thomas Gleixner , Valentin Schneider , Vincent Guittot , Will Deacon , Sebastian Andrzej Siewior , linux-arm-kernel@lists.infradead.org, "Russell King (Oracle)" Subject: [PATCH v4 3/9] arm: Rely on generic printing of preemption model. Date: Fri, 14 Mar 2025 17:08:04 +0100 Message-ID: <20250314160810.2373416-4-bigeasy@linutronix.de> In-Reply-To: <20250314160810.2373416-1-bigeasy@linutronix.de> References: <20250314160810.2373416-1-bigeasy@linutronix.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250314_090817_581977_75B17FB7 X-CRM114-Status: UNSURE ( 9.17 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org __die() invokes later __show_regs() -> show_regs_print_info() which prints the current preemption model. Remove it from the initial line. Cc: linux-arm-kernel@lists.infradead.org Reviewed-by: Russell King (Oracle) Signed-off-by: Sebastian Andrzej Siewior --- arch/arm/kernel/traps.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 6ea645939573f..afbd2ebe5c39d 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -258,13 +258,6 @@ void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl) barrier(); } -#ifdef CONFIG_PREEMPT -#define S_PREEMPT " PREEMPT" -#elif defined(CONFIG_PREEMPT_RT) -#define S_PREEMPT " PREEMPT_RT" -#else -#define S_PREEMPT "" -#endif #ifdef CONFIG_SMP #define S_SMP " SMP" #else @@ -282,8 +275,8 @@ static int __die(const char *str, int err, struct pt_regs *regs) static int die_counter; int ret; - pr_emerg("Internal error: %s: %x [#%d]" S_PREEMPT S_SMP S_ISA "\n", - str, err, ++die_counter); + pr_emerg("Internal error: %s: %x [#%d]" S_SMP S_ISA "\n", + str, err, ++die_counter); /* trap and error numbers are mostly meaningless on ARM */ ret = notify_die(DIE_OOPS, str, regs, err, tsk->thread.trap_no, SIGSEGV); From patchwork Fri Mar 14 16:08:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 14017129 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 772FAC282EC for ; Fri, 14 Mar 2025 16:13:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hUmCwmW08CUlGez91ObC9mBwhMIwUpRmBhCO7ubM414=; b=Phs2d6hEKA0kI/Zr1jQGtFBFqz 5wA7IBOZNB/cSspMvXQC9q7oMy+MW+hr8M6GrkAvEv9FIkvG1WOGZr0N9t049gaiegbO4vdqwmBhk mrLbjJcfnc0L9CqKbQlD5oTnHdZowyv5uLQuAZYpuNmxG/y/F6OxfXHgizAiq1pOFWuAR2h7Q2UoT CvkOnILqEEtBilB12rDbJhhfyTftHesUbLV7eOCbujLHYfbtbkMGEStQhybydFtKeQnI/QkAeNXAh Pz941ygB579QyJM3kul4eKebZjgwxt6v7sFyjnQmYN3dVzOjrRUkGsEHmcDtvZ7iR2we/k2uw7ajz lMkEsQQg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tt7f2-0000000Ehnd-1tQh; Fri, 14 Mar 2025 16:13:24 +0000 Received: from galois.linutronix.de ([193.142.43.55]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tt7a5-0000000Eg90-15wP for linux-arm-kernel@lists.infradead.org; Fri, 14 Mar 2025 16:08:19 +0000 From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1741968496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hUmCwmW08CUlGez91ObC9mBwhMIwUpRmBhCO7ubM414=; b=CRDy1lqAGtDW+JG/zhQo2hI2v/UAgh3ORFOgjKP45KwnFP1rT49KzKY/J3crWLpN4yHLxU BTL5F51HQCU7M1YMo9VuWVy5wyJ72MCnfio7/olA/BBM7p65uJ4IUQHDS8d5maX3ck5JgY iVw49MwhAUb2LGq4x5SSThekSLuCUk6Gkqh0/C5l+3ohrpt5ejZU9X8THoEg+YwBosqnx8 1Yj5ntUWibetqA30qK3Nc3248MmUnBqV+BuoZUg4q4Pw81kMJLMbJHEqTffkWlIM7qwFWX j9R7xLusIUUW0QBYwho1ZhCvAynOc7YEEF2nW2hhMjKbqYC1MFGXVG6fto4l+A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1741968496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hUmCwmW08CUlGez91ObC9mBwhMIwUpRmBhCO7ubM414=; b=A/TyYnpxt9kTOXU5xGGtNrsvn3uyfHMkD6NKJsuf0LNWc4Kb0oD+2I0R0xphQWcIqym4xU XdUUWguOXGWBp0BQ== To: linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev Cc: Ben Segall , Catalin Marinas , Dietmar Eggemann , Ingo Molnar , Juri Lelli , Mel Gorman , Peter Zijlstra , Shrikanth Hegde , Steven Rostedt , Thomas Gleixner , Valentin Schneider , Vincent Guittot , Will Deacon , Sebastian Andrzej Siewior , linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 4/9] arm64: Rely on generic printing of preemption model. Date: Fri, 14 Mar 2025 17:08:05 +0100 Message-ID: <20250314160810.2373416-5-bigeasy@linutronix.de> In-Reply-To: <20250314160810.2373416-1-bigeasy@linutronix.de> References: <20250314160810.2373416-1-bigeasy@linutronix.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250314_090817_443641_E006058F X-CRM114-Status: UNSURE ( 9.18 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org __die() invokes later show_regs() -> show_regs_print_info() which prints the current preemption model. Remove it from the initial line. Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Acked-by: Will Deacon Acked-by: Catalin Marinas Signed-off-by: Sebastian Andrzej Siewior --- arch/arm64/kernel/traps.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 4e26bd356a482..529cff825531c 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -172,14 +172,6 @@ static void dump_kernel_instr(const char *lvl, struct pt_regs *regs) printk("%sCode: %s\n", lvl, str); } -#ifdef CONFIG_PREEMPT -#define S_PREEMPT " PREEMPT" -#elif defined(CONFIG_PREEMPT_RT) -#define S_PREEMPT " PREEMPT_RT" -#else -#define S_PREEMPT "" -#endif - #define S_SMP " SMP" static int __die(const char *str, long err, struct pt_regs *regs) @@ -187,7 +179,7 @@ static int __die(const char *str, long err, struct pt_regs *regs) static int die_counter; int ret; - pr_emerg("Internal error: %s: %016lx [#%d]" S_PREEMPT S_SMP "\n", + pr_emerg("Internal error: %s: %016lx [#%d] " S_SMP "\n", str, err, ++die_counter); /* trap and error numbers are mostly meaningless on ARM */