Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp5927238pxb; Mon, 14 Feb 2022 10:53:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJxBDRG5KcNsVUxG7DZ4lwo/jLz81PviZJ07Uezu+dNB+VZKkJvZSDzZ/UniiiaGthw0LtyJ X-Received: by 2002:a05:6a00:1c5e:: with SMTP id s30mr18453pfw.43.1644864827120; Mon, 14 Feb 2022 10:53:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644864827; cv=none; d=google.com; s=arc-20160816; b=mi2NxkQ5S1Q4DLKkB1CrcAOtd9Lzhnr4vOQTn2F/E5H+2OjX1Tc4u3qhB8EmF265zW RNt+5m40mp3ZWj9KhTnMfUPUJEZ/yJ8Onpe9w8RlJbnNN2EVjRDcIerPVE1w/+vNVP1I nbKRkXiMEKTrrgcW9kXdWOrGpR9hIgZ+WuFkBwgSE5eddqCxK/m7+h1FkdcMQyr4o9ly w5RyrJuXHGkS54IFkCPB+5M1R0UzTa9eoZEEqFAJLyAY3MxHT5T9LvwN0k+4Cj7nTxXL Le8ik5Rwka0XYrPz6USu9/9CYrrRiT9eCYDTH5x8DPFs6aNxbG1KciTp0p0AHrhNzKFs 8OLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=4IjGek+M99pWkxGiHJWStXsppKZzU9fyxUMOa7nd0zw=; b=GfkozdhVu3puXowLKIFrez7S92GVJhamf0riXhN0lbbEwp9FphPWLFt+oBcoG9d8VI cfARF5ozV3mbe2Cw9qrTdBCUwQwGFSWjuUKLO7loG2wRQi0msjie52zjXh4HJ21rRc6W O2LiyX+jZUQiEP7w+qD+txqXlg9u3TgAN8BrDAOk2VS/amR0vdbt7geHpaoWWXCqpV3q TTdbnY1HC+X4iixx14dxBepd8ElL3BRypvrgGs1voD/30ITwpO9BQKMtlGmuNPA0EOSd E3LgVdhgO3mp0jY/EPxSTCr1wmBa/SszCjbEic5AQP9E9pWWAMOdukUfoZk1IWLtAjOA tl0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id g6si434103pgc.136.2022.02.14.10.53.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 10:53:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E146D99684; Mon, 14 Feb 2022 10:52:49 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234662AbiBMJDy (ORCPT + 99 others); Sun, 13 Feb 2022 04:03:54 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:42776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231843AbiBMJDx (ORCPT ); Sun, 13 Feb 2022 04:03:53 -0500 Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 056775BD38 for ; Sun, 13 Feb 2022 01:03:47 -0800 (PST) Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4JxLxZ11qhz9sT4; Sun, 13 Feb 2022 10:03:46 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tL7WtdoiyCHL; Sun, 13 Feb 2022 10:03:46 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4JxLxZ066Fz9sST; Sun, 13 Feb 2022 10:03:46 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id E3DC78B76C; Sun, 13 Feb 2022 10:03:45 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id FASQjzzXMkR8; Sun, 13 Feb 2022 10:03:45 +0100 (CET) Received: from PO20335.IDSI0.si.c-s.fr (unknown [192.168.6.142]) by messagerie.si.c-s.fr (Postfix) with ESMTP id AAB2F8B763; Sun, 13 Feb 2022 10:03:45 +0100 (CET) Received: from PO20335.IDSI0.si.c-s.fr (localhost [127.0.0.1]) by PO20335.IDSI0.si.c-s.fr (8.17.1/8.16.1) with ESMTPS id 21D92hhA1968772 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Sun, 13 Feb 2022 10:02:43 +0100 Received: (from chleroy@localhost) by PO20335.IDSI0.si.c-s.fr (8.17.1/8.17.1/Submit) id 21D92fbC1968771; Sun, 13 Feb 2022 10:02:41 +0100 X-Authentication-Warning: PO20335.IDSI0.si.c-s.fr: chleroy set sender to christophe.leroy@csgroup.eu using -f From: Christophe Leroy To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH] powerpc: Don't allow the use of EMIT_BUG_ENTRY with BUGFLAG_WARNING Date: Sun, 13 Feb 2022 10:02:41 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1644742960; l=1634; s=20211009; h=from:subject:message-id; bh=dpWeaQ6u0n62dBXZwHulXFq1tC0eufiLLZqZRLGc0ek=; b=0Ewv5XROXR4ZaxZLQbY/7KiWVEQS+oqKLj2kGQIK9ZoufQxpcx5v6M//MyHWdzv6Iuuoaan0fQmh C/MKXmmkDU27Z6ziaYcxSgSQUsTYa/Pq6vr+BqTU09lp2oIxiVTc X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Warnings in assembly must use EMIT_WARN_ENTRY in order to generate the necessary entry in exception table. Check in EMIT_BUG_ENTRY that flags don't include BUGFLAG_WARNING. This change avoids problems like the one fixed by commit fd1eaaaaa686 ("powerpc/64s: Use EMIT_WARN_ENTRY for SRR debug warnings"). Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/bug.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/bug.h b/arch/powerpc/include/asm/bug.h index 02c08d1492f8..ecbae1832de3 100644 --- a/arch/powerpc/include/asm/bug.h +++ b/arch/powerpc/include/asm/bug.h @@ -11,7 +11,7 @@ #ifdef __ASSEMBLY__ #include #ifdef CONFIG_DEBUG_BUGVERBOSE -.macro EMIT_BUG_ENTRY addr,file,line,flags +.macro __EMIT_BUG_ENTRY addr,file,line,flags .section __bug_table,"aw" 5001: .4byte \addr - 5001b, 5002f - 5001b .short \line, \flags @@ -22,7 +22,7 @@ .previous .endm #else -.macro EMIT_BUG_ENTRY addr,file,line,flags +.macro __EMIT_BUG_ENTRY addr,file,line,flags .section __bug_table,"aw" 5001: .4byte \addr - 5001b .short \flags @@ -33,7 +33,14 @@ .macro EMIT_WARN_ENTRY addr,file,line,flags EX_TABLE(\addr,\addr+4) - EMIT_BUG_ENTRY \addr,\file,\line,\flags + __EMIT_BUG_ENTRY \addr,\file,\line,\flags +.endm + +.macro EMIT_BUG_ENTRY addr,file,line,flags + .if \flags & 1 /* BUGFLAG_WARNING */ + .err /* Use EMIT_WARN_ENTRY for warnings */ + .endif + __EMIT_BUG_ENTRY \addr,\file,\line,\flags .endm #else /* !__ASSEMBLY__ */ -- 2.34.1