From patchwork Thu Feb 13 13:57:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 13973375 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 1185BC0219D for ; Thu, 13 Feb 2025 14:34: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: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4L7yH+oSz3zh/yqHuoQx7o2AyOsmmFhtE7jhLVDJj+8=; b=1pfMY4lmTh10vZ ZayeN4Fkov3YAx3xcI/IkeVV3/a7CN9287k1K8igM6y0cuC5G+BsSe5avxy5IsXVFq001PwFSD5+J JlwXcW10N5m7kPdwS44OY948HgumSBz5KYCKLw3c/5b1xajqKjSRf0JESXANoqHJNDqGwfwwSnb81 imapVFyGd/4rTbikCwwJjD2Pcd7nujZexEKODL1jtZ0KvvXXVq1PuO71ZPWfeHIUJbwPNV7rzcnGF mkHugFidTSACWEEEwXvCMNc9xysi9aX0Zdvu85jNdUdAR5/8gsqoxzcWbLVZR/TOvDxSgCP9Xya8D uaiHv/2eCz+4dhyV2f3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tiaID-0000000BKwI-1lsu; Thu, 13 Feb 2025 14:34:17 +0000 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tiZlq-0000000BEqI-3nG9; Thu, 13 Feb 2025 14:00:52 +0000 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-21f7f03d856so15746845ad.1; Thu, 13 Feb 2025 06:00:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739455248; x=1740060048; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gg/V+lwtqWQq5Y/Ly9J/s6hUNho4JthxgdaqasfoAcA=; b=a5V5D3L+PqWyB7x05KuFFOPxt1CeZuR/aZgeTElZwbZVkonzdMomKowUSAieH9z2+D AJkiGHO7Lyu/ygmo36eo+ksrM9P8IxVOwJ23A5lI+nbM8tI7ow+Xeaj0Q6mIIjHgcXSl AeVt21VKPOC9dnCR1tT3IqgM5BDosroiH4HPe7UDAo/fg4hQsKY4lq8wZ37cxsrYzf+U F4lYJSj0QJA5h/yjfLCx4Z2znaP68SCLMjd1rvaNn3qXNjFfcTrsGgZNpf7hHi+KkzIW +5AciM0bCwShIU0yUdd7QUWRQ6ke8u1Qx7QLoJXith0M7WZH0kTeDWvfbDIBzy/UUhsJ 4AOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739455248; x=1740060048; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gg/V+lwtqWQq5Y/Ly9J/s6hUNho4JthxgdaqasfoAcA=; b=XS+rL/UOH3GH8p9qmXhLc6mTjw42PvAuDH+4bz26YoWM3jHeeJtdB/fvw2mkCAaxHJ v34ndiqqxXKa/PulMYXQH5/bRSLp5QVpmD5+LtEAKwsgprmpBNw1IGWoKJX0dR2xRIJo X/BroyZppe8imgeWR0dw8YIDtLY7c6YSDA73h30YPa4xbTgNR0vZla9DlAOwnHuFHLII EKPHIUYnHWYgZoHR50jxq7krsYZZn0jDCh/l8baq1p65flJuaZXBWBDOTGOv8ZfjSIcA NQfpuQuWVu1vq+jxdDyYUdwaozrgrJAkgnDxViXAVLtUMtjID/HIUqxxEPynJa/cMlx7 oDfQ== X-Forwarded-Encrypted: i=1; AJvYcCVGB+//BdTd132FsaL96ZD23DFFquuWgd8kTKXpfd12/4399Xxqn8O7+r2S1lJZPU0nZpftTTKAs5EazUw=@lists.infradead.org, AJvYcCWpTd4z6i+9qNE1UnmzK7RBPafsuPtQ1kxAOQkJTUS/T6gRFdO96jJREj0P85DdRt/zFVATZZtHkUedk8iUkykX@lists.infradead.org X-Gm-Message-State: AOJu0YwGebee9aV+9slYgjZ9eed+hNxJxUkLxep6YhFO2OAXMQWDtZ8s Nvq8gxs5x26rBtHwD0dDQKUnVEnMzVGUWsdh3ZNb1Ivqsr8g8biE X-Gm-Gg: ASbGncviouLYfqxvHyhPqvMRjf/Gddkfz2Om1WyR4gcLXYXPbyt4TPgsPN+uy9TgL5t ikXiUMkyyqydsxoQ6ypBveoJ1eNFBhayVcnTj1IDgQxjEBQtQ5nCs+jdX25Qmrxdg+WPXwcvx2u pxYHJ3lncmzynVYNOAIE+aM0YMTOpcXfThCSMBTqIeO9ryMBgfbLnoT0hHgaIi6ehj/ICTcdfQ6 +qFcoll8srre1QXchiclohqhUNfjTjBtBp43Ds0uK26UMdIEAsl0nz8fU3VpXwvCHRI587195Lc xpxx5GAJKX/IM3CuKHgzATY1bODOkbZrHIEieznlhdHjPVZ5cpZSbSDG3fJJK2YUIbE= X-Google-Smtp-Source: AGHT+IFTuUUy1Wq3iWeeuJp7RF8h8HqcmzEsROtZ3HzF4SlUho3mcp66MzG3aF4wwbARFTyZlT5eFg== X-Received: by 2002:a17:902:d58c:b0:20c:6399:d637 with SMTP id d9443c01a7336-220d2132be5mr57272645ad.40.1739455248450; Thu, 13 Feb 2025 06:00:48 -0800 (PST) Received: from mew.. (p3882177-ipxg22501hodogaya.kanagawa.ocn.ne.jp. [180.15.148.177]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55858d6sm12565225ad.223.2025.02.13.06.00.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 06:00:48 -0800 (PST) From: FUJITA Tomonori To: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org Cc: Peter Zijlstra , x86@kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, catalin.marinas@arm.com, will@kernel.org, chenhuacai@kernel.org, kernel@xen0n.name, tangyouling@loongson.cn, hejinyang@loongson.cn, yangtiezhu@loongson.cn, ojeda@kernel.org, alex.gaynor@gmail.com, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, benno.lossin@proton.me, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Subject: [PATCH v3 1/5] x86/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Thu, 13 Feb 2025 22:57:55 +0900 Message-ID: <20250213135759.190006-2-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250213135759.190006-1-fujita.tomonori@gmail.com> References: <20250213135759.190006-1-fujita.tomonori@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250213_060050_941853_0F536E91 X-CRM114-Status: GOOD ( 10.33 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Add new ARCH_WARN_ASM macro for BUG/WARN assembly code sharing with Rust to avoid the duplication. No functional changes. Acked-by: Peter Zijlstra (Intel) Signed-off-by: FUJITA Tomonori --- arch/x86/include/asm/bug.h | 56 +++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index e85ac0c7c039..61570ec9464c 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -28,45 +28,42 @@ #ifdef CONFIG_GENERIC_BUG #ifdef CONFIG_X86_32 -# define __BUG_REL(val) ".long " __stringify(val) +# define __BUG_REL(val) ".long " val #else -# define __BUG_REL(val) ".long " __stringify(val) " - ." +# define __BUG_REL(val) ".long " val " - ." #endif #ifdef CONFIG_DEBUG_BUGVERBOSE +#define __BUG_ENTRY(file, line, flags) \ + "2:\t" __BUG_REL("1b") "\t# bug_entry::bug_addr\n" \ + "\t" __BUG_REL(file) "\t# bug_entry::file\n" \ + "\t.word " line "\t# bug_entry::line\n" \ + "\t.word " flags "\t# bug_entry::flags\n" +#else +#define __BUG_ENTRY(file, ine, flags) \ + "2:\t" __BUG_REL("1b") "\t# bug_entry::bug_addr\n" \ + "\t.word " flags "\t# bug_entry::flags\n" +#endif + +#define _BUG_FLAGS_ASM(ins, file, line, flags, size, extra) \ + "1:\t" ins "\n" \ + ".pushsection __bug_table,\"aw\"\n" \ + __BUG_ENTRY(file, line, flags) \ + "\t.org 2b + " size "\n" \ + ".popsection\n" \ + extra #define _BUG_FLAGS(ins, flags, extra) \ do { \ - asm_inline volatile("1:\t" ins "\n" \ - ".pushsection __bug_table,\"aw\"\n" \ - "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ - "\t" __BUG_REL(%c0) "\t# bug_entry::file\n" \ - "\t.word %c1" "\t# bug_entry::line\n" \ - "\t.word %c2" "\t# bug_entry::flags\n" \ - "\t.org 2b+%c3\n" \ - ".popsection\n" \ - extra \ + asm_inline volatile(_BUG_FLAGS_ASM(ins, "%c0", \ + "%c1", "%c2", "%c3", extra) \ : : "i" (__FILE__), "i" (__LINE__), \ "i" (flags), \ "i" (sizeof(struct bug_entry))); \ } while (0) -#else /* !CONFIG_DEBUG_BUGVERBOSE */ - -#define _BUG_FLAGS(ins, flags, extra) \ -do { \ - asm_inline volatile("1:\t" ins "\n" \ - ".pushsection __bug_table,\"aw\"\n" \ - "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ - "\t.word %c0" "\t# bug_entry::flags\n" \ - "\t.org 2b+%c1\n" \ - ".popsection\n" \ - extra \ - : : "i" (flags), \ - "i" (sizeof(struct bug_entry))); \ -} while (0) - -#endif /* CONFIG_DEBUG_BUGVERBOSE */ +#define ARCH_WARN_ASM(file, line, flags, size) \ + _BUG_FLAGS_ASM(ASM_UD2, file, line, flags, size, "") #else @@ -88,11 +85,14 @@ do { \ * were to trigger, we'd rather wreck the machine in an attempt to get the * message out than not know about it. */ + +#define ARCH_WARN_REACHABLE ANNOTATE_REACHABLE(1b) + #define __WARN_FLAGS(flags) \ do { \ __auto_type __flags = BUGFLAG_WARNING|(flags); \ instrumentation_begin(); \ - _BUG_FLAGS(ASM_UD2, __flags, ANNOTATE_REACHABLE(1b)); \ + _BUG_FLAGS(ASM_UD2, __flags, ARCH_WARN_REACHABLE); \ instrumentation_end(); \ } while (0) From patchwork Thu Feb 13 13:57:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 13973372 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 43300C021A0 for ; Thu, 13 Feb 2025 14:34:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8bpJXCsRuLjICN7MqcEL3ZHeR60YjjoKRB/DfZ46Lug=; b=Bgbftf2LRag9k4 Y6c8H9yphDjer2w3qxIMyDqzUROeUR8HITtfwwFKU41DwWd5uGheLJvNJe2WEJUo+YcO8i600MvfT XmBXqF2nWrGMLqwpCo8uyCFKkuYePSijcWjt0lBhrE1rhFlCgtmnScvAOOsVaSOmOtHGuK8DBKSNn 9waFIqbEF840bgjmO3Tp4sRk285hoQKQEpVqQL9AQoIQXM3hdqd1jDS6jWzlU4Q1CS543HO/EfRCI 4MWSYvKX0KuxB/N7/xDbTGkiYlfYTozoPsskifoYhkNZ9HR5NK7fLgEBsZInhMgzhYDhe4baOxSLm HFN8S4O87wUPnNPXxVJA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tiaIE-0000000BKx7-2WxE; Thu, 13 Feb 2025 14:34:18 +0000 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tiZlx-0000000BErr-140b; Thu, 13 Feb 2025 14:00:58 +0000 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-21f2339dcfdso13651585ad.1; Thu, 13 Feb 2025 06:00:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739455256; x=1740060056; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2+y6Ck4nUrrnZ5J/UDrnc3xAlfWqC0MtemaHjWH6P0w=; b=F6hKg1hepcsolwrF//h52n0v6WhLO+4yckdloQ2c3qMJgel0a6eoZj36ZVtrDfeenc NsAEGj8hDfgBcT9Ze8WaDspzHQrlBhzY+QWzwhM0GzQLyX0YHZAuys//9auvR0JABSa9 xpKf/hYwvnepfBtKJIvI3PDRuP82TCTjQbusaLnhfpMG5fjOigXmKkulY/tC8GcxF3fG okKPu+2OXLQXRLxxtDnKL0zQvtEJ2ILGdjdAmysxw3M2UAQcs0wkzZzWsGs668Gk0YwT S/kOlmrTAS/jx+PWPv/hRHAMPGFZ3a2MN766cvfyAvD6fBMCsCXhzVMsT8KIo2dfToaC Ngyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739455256; x=1740060056; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2+y6Ck4nUrrnZ5J/UDrnc3xAlfWqC0MtemaHjWH6P0w=; b=drSQ+hbiAnhOyXTKVWVsclAK+cqiXbU+HL62MeE0RW0zw50MFMIhUDu3iEB5+M2l10 wqynW/voHpZ7IoNLtJ+N22RHEuO1yYlpbU3+9EpbMVtIQuX/kWx5KoS9mPWEpEjDgorL PB7nr6OhIN+jkL9B0A3lWQE5ud27if93/uD1ZKoa5EYLqjDhNbkRZiSfU2O3wy3IhTlq tpOy4i3VCY4ayux3WR6GynMQxtGtI6uWlBQiL58b29oEONxwU5GiZSQDFvylcbYStRUV cnXsU5+ct/xZU24IlTYOLrkEJ/7xNIumqLAWmRBf0DNRNgSjXyibfPkkloqnayolWvjD Odlg== X-Forwarded-Encrypted: i=1; AJvYcCWbY+lr7dvqXx/pjvTE5t5XTSaf94virQWDUwgIo+ege2EXr+/Qj7xURT3yq69hF/iM8PXKpdvufX2O8so=@lists.infradead.org, AJvYcCWq9blNFASzFrD+6udLtCQUXiN/yw3HPHg+AB2YDbuqyIwnKcPgxqn7iQLJYiIpp0haWKaVmuu9Mv9bQaQJWo06@lists.infradead.org X-Gm-Message-State: AOJu0YxPEHazqyKgEuX9ra5bm1dgMn0+Ohp9uHuM7UOW+xIqqeLS0XLl wcE9e+YqbBidtdZfiQZA6oFpzXUefZvHCIKQQFZToxsDyTfDHVBE X-Gm-Gg: ASbGncsAZ/o5JNKFmGwZiLLkkQS6Vt18Effcf5V6gkwfybmgpYovVFAnQQEdm9FCY+V 3HfKGm8yfjN10ChuXSGSfbAzSnFEjzX3OKR+8DGs41QU93XG+ZiKXlp8WfAX7nM4BmzkvT8qB+2 RDPtaGe4RjlrYmCFywEoIHptCP2YaHqWE9KOoBO45SFp2hIb2qJuuCN03clxKWIvLjH1RKftMN1 MQznvPCN/L+PDAnKn6OsDXr3MxovWHl8lTfWnUjjTxOuXvxJhJA4+fGKQpKpdNOI/J52okb03PF GqTMCe9Vc/+sDf8/vj5E6XRh7F68r6J6hNO+CUUG8b1/oj15t4JTeYBVfOmV55slFQc= X-Google-Smtp-Source: AGHT+IH1Zqo9tPEvVGN2+sG3MuJAeMqjgEOo7xAq67fk4VjOAgBOooytYfL4WucnOp0CvNreEK3WqQ== X-Received: by 2002:a17:903:94b:b0:220:cfb7:56eb with SMTP id d9443c01a7336-220d376f061mr46259805ad.26.1739455256258; Thu, 13 Feb 2025 06:00:56 -0800 (PST) Received: from mew.. (p3882177-ipxg22501hodogaya.kanagawa.ocn.ne.jp. [180.15.148.177]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55858d6sm12565225ad.223.2025.02.13.06.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 06:00:55 -0800 (PST) From: FUJITA Tomonori To: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org Cc: x86@kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, peterz@infradead.org, hpa@zytor.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, catalin.marinas@arm.com, will@kernel.org, chenhuacai@kernel.org, kernel@xen0n.name, tangyouling@loongson.cn, hejinyang@loongson.cn, yangtiezhu@loongson.cn, ojeda@kernel.org, alex.gaynor@gmail.com, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, benno.lossin@proton.me, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Subject: [PATCH v3 2/5] riscv/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Thu, 13 Feb 2025 22:57:56 +0900 Message-ID: <20250213135759.190006-3-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250213135759.190006-1-fujita.tomonori@gmail.com> References: <20250213135759.190006-1-fujita.tomonori@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250213_060057_301104_7A50A024 X-CRM114-Status: UNSURE ( 8.97 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Add new ARCH_WARN_ASM macro for BUG/WARN assembly code sharing with Rust to avoid the duplication. No functional changes. Signed-off-by: FUJITA Tomonori --- arch/riscv/include/asm/bug.h | 37 +++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/arch/riscv/include/asm/bug.h b/arch/riscv/include/asm/bug.h index 1aaea81fb141..6ab13b56feb0 100644 --- a/arch/riscv/include/asm/bug.h +++ b/arch/riscv/include/asm/bug.h @@ -31,40 +31,45 @@ typedef u32 bug_insn_t; #ifdef CONFIG_GENERIC_BUG_RELATIVE_POINTERS #define __BUG_ENTRY_ADDR RISCV_INT " 1b - ." -#define __BUG_ENTRY_FILE RISCV_INT " %0 - ." +#define __BUG_ENTRY_FILE(file) RISCV_INT " " file " - ." #else #define __BUG_ENTRY_ADDR RISCV_PTR " 1b" -#define __BUG_ENTRY_FILE RISCV_PTR " %0" +#define __BUG_ENTRY_FILE(file) RISCV_PTR " " file #endif #ifdef CONFIG_DEBUG_BUGVERBOSE -#define __BUG_ENTRY \ +#define __BUG_ENTRY(file, line, flags) \ __BUG_ENTRY_ADDR "\n\t" \ - __BUG_ENTRY_FILE "\n\t" \ - RISCV_SHORT " %1\n\t" \ - RISCV_SHORT " %2" + __BUG_ENTRY_FILE(file) "\n\t" \ + RISCV_SHORT " " line "\n\t" \ + RISCV_SHORT " " flags #else -#define __BUG_ENTRY \ - __BUG_ENTRY_ADDR "\n\t" \ - RISCV_SHORT " %2" +#define __BUG_ENTRY(file, line, flags) \ + __BUG_ENTRY_ADDR "\n\t" \ + RISCV_SHORT " " flags #endif #ifdef CONFIG_GENERIC_BUG -#define __BUG_FLAGS(flags) \ -do { \ - __asm__ __volatile__ ( \ + +#define ARCH_WARN_ASM(file, line, flags, size) \ "1:\n\t" \ "ebreak\n" \ ".pushsection __bug_table,\"aw\"\n\t" \ "2:\n\t" \ - __BUG_ENTRY "\n\t" \ - ".org 2b + %3\n\t" \ - ".popsection" \ + __BUG_ENTRY(file, line, flags) "\n\t" \ + ".org 2b + " size "\n\t" \ + ".popsection\n" \ + +#define __BUG_FLAGS(flags) \ +do { \ + __asm__ __volatile__ ( \ + ARCH_WARN_ASM("%0", "%1", "%2", "%3") \ : \ : "i" (__FILE__), "i" (__LINE__), \ "i" (flags), \ "i" (sizeof(struct bug_entry))); \ } while (0) + #else /* CONFIG_GENERIC_BUG */ #define __BUG_FLAGS(flags) do { \ __asm__ __volatile__ ("ebreak\n"); \ @@ -78,6 +83,8 @@ do { \ #define __WARN_FLAGS(flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags)) +#define ARCH_WARN_REACHABLE + #define HAVE_ARCH_BUG #include From patchwork Thu Feb 13 13:57:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 13973371 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 A934AC0219D for ; Thu, 13 Feb 2025 14:34:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xfP8MH3W0rN2yYFkVC4oI52ZJAvK5c3aEN8rFouJG+M=; b=qEI5cTD65Fa/Dw o0bSnG8q0hKlaEUxrtk/wESCTEcMeQjLY8weXdYgtL4tpTXqurO3ldyqK9F8693qQ8Gn2Wgczpp31 0iyXaLHa0f9o9f6CMUEOHEllzasZyXc9pVBx03OdrIqbQPX2YjCQqt4le9TJ9QrH4UzPL/dZ+a3MQ +09ym8Vs1bgjHXw8jaTXiUbKfz8edcSUPnPOUTG087AYRsYlAH1PK66V6JSuZ4Uf0umUK6eAzQdHN m890ow7cptsV/BVSd7cHbMTKliWIjXNefdbtcjRAORUf+ON40HoDibO08TBbTMUOUGweaW3u0smZq hxvLtU1XEwFAD2Jf88uQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tiaIF-0000000BKyK-3dU2; Thu, 13 Feb 2025 14:34:19 +0000 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tiZm5-0000000BEvV-12Wk; Thu, 13 Feb 2025 14:01:07 +0000 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-21f6f18b474so10832165ad.1; Thu, 13 Feb 2025 06:01:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739455264; x=1740060064; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6YTck7L/TM6YT4d7fP2I9343oTdjN2yh7jLib0/ivQs=; b=PzKXcd9v40WGpG+fxKh3Ca1l923TQeI0oiWWmxeccDd4Zkvl52EbRc+c4gbTvI+hjr nRN5kl9UNNaB3Ue1KlGrRpVDCPYmOaVwTIuMo1pGJnnmRIzmsVarrUWL2JWWrqywSHzR sdsU7NVkMuudGfRxiNUXjkcfMVgcUs+RZ1+mS0AIDvtoCtA0y+qlvrH3Khua/taZZ0hW +LtflkvGJoohUuAa3K1llizwsn8ar6iiaMDgCOLnYGJyHp+q8ysisT4eKkEray62F3f0 g7/7Un6R6J48wxFvbcFyDvwSKVtnvU2k70I4VT8IJwLdqtAojtYGavQ8wy2dyPVVQfPF 87HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739455264; x=1740060064; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6YTck7L/TM6YT4d7fP2I9343oTdjN2yh7jLib0/ivQs=; b=eY+Ljs6/A5XHGStcZXZBgri5U/xHIUQmUKaEc6bss+AKCiOYPgK3sHYUdcYFmACmPz kDwteOFOERGoHMQ1l4kLxe1XvnFtO8wcnQlaE8Or+U4f7GdqCm3+MvSIgcjbGzjVMiYb 07DaMU/TNzZC9JLW716aU9Y5EdtZz2yoPZs3Bk18IqEtYOys5094psyXSor/uLSM3F4/ 3EfY7/9JzAFVHfNURCWUqfbXpt7nfgCoycPORng6izQcfKBOFqfGhFoeiqf63wT/0Cf3 QeVgFTVW1MruS8NaDwavB2UJNxS3EKyD+ZdVcp1oOoSfPhJOlG5+o61+a/KlAF86fJCp 6f7Q== X-Forwarded-Encrypted: i=1; AJvYcCV2IpzOX1Yss5Lvy+kJ5a3Z1AYdjRpC6vkgDkKBzHFDRIF7MhY8JPdJhKHsBqQGwcK8WWDeKSvyhhhy9J51qrCI@lists.infradead.org, AJvYcCXhC6IGhC1ix/SwkGyY255JTrKk3EYWSKCNlopVXaJjm+IEsq3uCu+7N4B9iRFr4DiFXLKQ5upKIICz8wU=@lists.infradead.org X-Gm-Message-State: AOJu0YwL0Ibi+dPJtM08X9X73nP07HYCIBGb66dlRXx75bUm5SYJhVu9 IuHphG29Zb36LQlgGidYyyodx6sEc3/2vJd+fe4Ft+pMMcHDEV9Y X-Gm-Gg: ASbGncuLSpGVx/d1LwR6oDbErOSNVgEMLbTBFh/LQICWRN1JuPfcp02GsXR0Nu9875r FDrRVuCN93Mlo8rocU/qgyd0gi5TzO4WA9tKlAlL2EFMYs5D1KqNF7IuDj3eqWeMNNPDauGac5p NnyiaYd81+KxW7hpoBir/xIO6LiFrr8M/hYuYrtlXUluXCyJNeAhowsMa3nELfIwaLx7Fs4aKLW TMFx8zf+uLPaHnhpvY+ebgSaQDpCz/bWEBxFvrbHQj//8uXgko896EGHzuz9VUh3VFFTxJy7trX CM1eOwLSHmBJyri3V3G0ZJfeRqylDrrZXc9ZQAsMfsjk9MUmuu8h3SkD29XwRQcuCtU= X-Google-Smtp-Source: AGHT+IH1x9tK23DwJyRFWv8i5Lca//kx4EQ6K/f/4h09IEIvt0Nq6qmEVopHA91pvULj+H6RHqZ0EQ== X-Received: by 2002:a17:902:e750:b0:220:e392:c73 with SMTP id d9443c01a7336-220e3920eebmr20624875ad.22.1739455264110; Thu, 13 Feb 2025 06:01:04 -0800 (PST) Received: from mew.. (p3882177-ipxg22501hodogaya.kanagawa.ocn.ne.jp. [180.15.148.177]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55858d6sm12565225ad.223.2025.02.13.06.00.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 06:01:03 -0800 (PST) From: FUJITA Tomonori To: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org Cc: x86@kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, peterz@infradead.org, hpa@zytor.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, catalin.marinas@arm.com, will@kernel.org, chenhuacai@kernel.org, kernel@xen0n.name, tangyouling@loongson.cn, hejinyang@loongson.cn, yangtiezhu@loongson.cn, ojeda@kernel.org, alex.gaynor@gmail.com, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, benno.lossin@proton.me, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Subject: [PATCH v3 3/5] arm64/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Thu, 13 Feb 2025 22:57:57 +0900 Message-ID: <20250213135759.190006-4-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250213135759.190006-1-fujita.tomonori@gmail.com> References: <20250213135759.190006-1-fujita.tomonori@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250213_060105_288288_8EB28A55 X-CRM114-Status: UNSURE ( 9.07 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Add new ARCH_WARN_ASM macro for BUG/WARN assembly code sharing with Rust to avoid the duplication. No functional changes. Signed-off-by: FUJITA Tomonori --- arch/arm64/include/asm/asm-bug.h | 33 ++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/asm-bug.h b/arch/arm64/include/asm/asm-bug.h index 6e73809f6492..a5f13801b784 100644 --- a/arch/arm64/include/asm/asm-bug.h +++ b/arch/arm64/include/asm/asm-bug.h @@ -21,16 +21,21 @@ #endif #ifdef CONFIG_GENERIC_BUG - -#define __BUG_ENTRY(flags) \ +#define __BUG_ENTRY_START \ .pushsection __bug_table,"aw"; \ .align 2; \ 14470: .long 14471f - .; \ -_BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ - .short flags; \ + +#define __BUG_ENTRY_END \ .align 2; \ .popsection; \ 14471: + +#define __BUG_ENTRY(flags) \ + __BUG_ENTRY_START \ +_BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ + .short flags; \ + __BUG_ENTRY_END #else #define __BUG_ENTRY(flags) #endif @@ -41,4 +46,24 @@ _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ #define ASM_BUG() ASM_BUG_FLAGS(0) +#ifdef CONFIG_DEBUG_BUGVERBOSE +#define __BUG_LOCATION_STRING(file, line) \ + ".long " file "- .;" \ + ".short " line ";" +#else +#define __BUG_LOCATION_STRING(file, line) +#endif + +#define __BUG_ENTRY_STRING(file, line, flags) \ + __stringify(__BUG_ENTRY_START) \ + __BUG_LOCATION_STRING(file, line) \ + ".short " flags ";" \ + __stringify(__BUG_ENTRY_END) + +#define ARCH_WARN_ASM(file, line, flags, size) \ + __BUG_ENTRY_STRING(file, line, flags) \ + __stringify(brk BUG_BRK_IMM) + +#define ARCH_WARN_REACHABLE + #endif /* __ASM_ASM_BUG_H */ From patchwork Thu Feb 13 13:57:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 13973374 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 980B8C021A0 for ; Thu, 13 Feb 2025 14:34:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=G5Vd0bjjFxq0K5Dt42iv59lxg1CbHAgbBp0VeDw4eo4=; b=wbjFyq/44YaMCQ tQObgNHBjmJ25ndEXSXESz0UeiEe+1ACy8pif7ZNENxpz+xr7DfMhtOR0qMm7hfu/FZbpjFiN1TDE S5khCLA6CdJ3aD2aeeit+ipDb5Pdizbw3morU9e8CKan4ATcc1p0unV0Y3nkz+OBlF0/4Jt3RdUUP kLEo+VWb7Ph7M/dNiCUVVu8nqhgHO8SzDR8mJ/orlOpfbWpTtp03W213lTMwwJpQvc4cMCCygkf3B v5Mc6NHWd68b1ikb4ttFE+Vul1PIsGxJu23zi5MfBkK2/KP45E2ekCX3z0zuO+Lbjw2Z6GrUf6Bjv pI/lzAEfkI5fg4+r5JBA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tiaIH-0000000BKzL-0H4M; Thu, 13 Feb 2025 14:34:21 +0000 Received: from mail-pl1-f171.google.com ([209.85.214.171]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tiZmD-0000000BEyl-1M9D; Thu, 13 Feb 2025 14:01:14 +0000 Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-220d601886fso9445765ad.1; Thu, 13 Feb 2025 06:01:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739455272; x=1740060072; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HNM9wcMBMuP84PLY2t7KRndWObkL1hWNmjkX5I560RQ=; b=bJ+wO13Q5L5JwyxDTvoDEGblmeGC0FqCOCa8TfN2YtPhi7VdgWTcsuRPmWSNEyeJBq HBzI7B6K/2wwMA1DQ22mxxbXw2VMPl4d7+wdHQKlk3I8TGcVw+iooLdr81Kfic+xKkkS iheF/YOB5aGP4NI9LDhfaqwE+IhQ/kOCity67j0ShyG5OwDaiOMkhn8LTmHStfjC6DL/ 9+81413b1S0di/VaCYS3bgLqTLmjgNLAKR6yG3Lc33WntC37wZrMWddAjeRc/lfZJiiy xBJ+4+m0Q2lkVSyuEer+fHtTDk53qvO7R+IY5qfhHBKSr6oXqo/Sv6rgcd/TeCc4bANt qw8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739455272; x=1740060072; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HNM9wcMBMuP84PLY2t7KRndWObkL1hWNmjkX5I560RQ=; b=KIuzp52cQIqCj2o/+iNmDwaZfTrolOC44be7hvy+koGu3SNCbXbEwqd1iPE5uhgAlf GaYfd4DOtd4ZW6FD4EepjTYDTm9CTfPsldbh62AJSMbeVIiunDEuAOvCKD3nBPcXbT/f Uc5t/11W83cx5nvU0fRQlY2MOXE+ME7dJfTnJN8lkIxT/U6bscBVJPqVZ6UfqSq5dnZ/ BdZXwEw3o+h6mlZxAtLUqt+1B1pcB0cXsAaNkMQZ/ahbWf55lhNMHxXB7pVusy9hWn8K s5scNU2rdSehaxw73T1mhTqtS8P0HrFomZwPUDDyvmLFKV9lVT7sdYehQR/Ke4ZueqDT HsPw== X-Forwarded-Encrypted: i=1; AJvYcCULImAm/JY//UbXxuxonOU9CQCSPdKYxTjPHG5CXC8DYue8rSezU/FHM7w1uiaYQ+W0CNBQcYXvxnOr6nYWV3h9@lists.infradead.org, AJvYcCXljCGQR5XjUags0rUoYiDa3xFLmO1/qRE4U6g5uIerbtBj9h1VKaAlC3/b3QlD2rQHX+S/ER4OZHMluI4=@lists.infradead.org X-Gm-Message-State: AOJu0Yzx5rFqe+6dV41WOtV8RYOXGCr6D7ueu4R/ZXridp/KDBt/Fxwa +r/hCPdn0H9TsSvapN4M+8JaHIee4rU7JnvsD5lWD1SK7aQZdMCG X-Gm-Gg: ASbGncsd79KCN4GZOQaAQ19OROga9IQ3RTzNAV9o1mNMmN1tMhx20Ol8GZROxi8TrDB KFusyfTy1+IFR/+9f9d6tRH4lXq7bjAWcX9FyC5Hx0Kx5H4ZwJASBDFPquokT3sataZN70VQoGC fr477Y0ByaZY7p8lfo/JDykhgOSuAFdIpUateQw0BpOUcqFOzqkEG4PBgwNRGFmQ52V9T4WZnTg cLe3YFETIFnAxfsrkYdjwUMXstqPN0xaVcbjt4Z6gPL2PHrMuZnjcs8ysN2faCNn7Rnd9BW9+p+ YLJ4f0fjSlsRJj5EYx+2OdQQ0YABVxalPhEH9BHIn46t/2loCSfjgSEKrEvcw16B1uk= X-Google-Smtp-Source: AGHT+IFfgCF1ArRZmNz2DsvrIgfU+ShH60hN/cRDjxK0gXLSiUzxtydzUB1xCTWoBREuB6sO6ZsxDg== X-Received: by 2002:a17:902:f706:b0:21b:d2b6:ca7f with SMTP id d9443c01a7336-220d2110efcmr56668855ad.32.1739455271912; Thu, 13 Feb 2025 06:01:11 -0800 (PST) Received: from mew.. (p3882177-ipxg22501hodogaya.kanagawa.ocn.ne.jp. [180.15.148.177]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55858d6sm12565225ad.223.2025.02.13.06.01.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 06:01:11 -0800 (PST) From: FUJITA Tomonori To: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org Cc: x86@kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, peterz@infradead.org, hpa@zytor.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, catalin.marinas@arm.com, will@kernel.org, chenhuacai@kernel.org, kernel@xen0n.name, tangyouling@loongson.cn, hejinyang@loongson.cn, yangtiezhu@loongson.cn, ojeda@kernel.org, alex.gaynor@gmail.com, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, benno.lossin@proton.me, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Subject: [PATCH v3 4/5] loongarch/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Thu, 13 Feb 2025 22:57:58 +0900 Message-ID: <20250213135759.190006-5-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250213135759.190006-1-fujita.tomonori@gmail.com> References: <20250213135759.190006-1-fujita.tomonori@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250213_060113_356077_DFCFD86A X-CRM114-Status: UNSURE ( 8.76 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Add new ARCH_WARN_ASM macro for BUG/WARN assembly code sharing with Rust to avoid the duplication. No functional changes. Signed-off-by: FUJITA Tomonori --- arch/loongarch/include/asm/bug.h | 35 ++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/arch/loongarch/include/asm/bug.h b/arch/loongarch/include/asm/bug.h index f6f254f2c5db..06903aef1101 100644 --- a/arch/loongarch/include/asm/bug.h +++ b/arch/loongarch/include/asm/bug.h @@ -22,14 +22,21 @@ #ifndef CONFIG_GENERIC_BUG #define __BUG_ENTRY(flags) #else -#define __BUG_ENTRY(flags) \ + +#define __BUG_ENTRY_START \ .pushsection __bug_table, "aw"; \ .align 2; \ 10000: .long 10001f - .; \ - _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ - .short flags; \ + +#define __BUG_ENTRY_END \ .popsection; \ 10001: + +#define __BUG_ENTRY(flags) \ + __BUG_ENTRY_START \ + _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ + .short flags; \ + __BUG_ENTRY_END #endif #define ASM_BUG_FLAGS(flags) \ @@ -42,10 +49,12 @@ asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags)) \ extra); +#define ARCH_WARN_REACHABLE ANNOTATE_REACHABLE(10001b) + #define __WARN_FLAGS(flags) \ do { \ instrumentation_begin(); \ - __BUG_FLAGS(BUGFLAG_WARNING|(flags), ANNOTATE_REACHABLE(10001b));\ + __BUG_FLAGS(BUGFLAG_WARNING|(flags), ARCH_WARN_REACHABLE);\ instrumentation_end(); \ } while (0) @@ -56,6 +65,24 @@ do { \ unreachable(); \ } while (0) +#ifdef CONFIG_DEBUG_BUGVERBOSE +#define __BUG_LOCATION_STRING(file, line) \ + ".long " file "- .;" \ + ".short " line ";" +#else +#define __BUG_LOCATION_STRING(file, line) +#endif + +#define __BUG_ENTRY_STRING(file, line, flags) \ + __stringify(__BUG_ENTRY_START) \ + __BUG_LOCATION_STRING(file, line) \ + ".short " flags ";" \ + __stringify(__BUG_ENTRY_END) + +#define ARCH_WARN_ASM(file, line, flags, size) \ + __BUG_ENTRY_STRING(file, line, flags) \ + __stringify(break BRK_BUG) ";" + #define HAVE_ARCH_BUG #include From patchwork Thu Feb 13 13:57:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 13973373 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 012FCC0219D for ; Thu, 13 Feb 2025 14:34:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lLOfS8z0SZ0fKe0nXKIemm+ETLc4JazEGapqGG1nIOY=; b=WGI1HXlIdVAoEN n54KZQB3DK89YdOofojN5LpHm5oZ0UQik1vEirlmx9kUkb8RvgXjg/PENAdHJLD1qlNeMgdc9B2A8 WPIWw7mhPt6+Q4Xo9IRxy1oNPNqI29l5tt09r0ACCepRLZmS+cgMMwjAN7S+v1k7xjrPWZVKVgECq OGAjsy9cqtibWxWSELpCAh6+vBw4ibJCbMI0okqcCplmo4ikntdMQ6Wv7vidUwmVtyv7fOZEcePPY bX2HvVJs5PmD0JassUneF1jFwJNmi3F4a9QR76zHrrGaMtASPs4BHJgRi2sALsWK4rTe+UsQ0InJF jmKqhRN76zmUcvk335bQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tiaII-0000000BL0f-1QLU; Thu, 13 Feb 2025 14:34:22 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tiZmP-0000000BF3n-2Uew; Thu, 13 Feb 2025 14:01:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=wwu/OQkpfuP5TP6urM50yolt8MlR74sxECkYt+Uf2k8=; b=OZvlToGa3Gjb5PHLfnoc6Wx6Qd UY4QmgLraCkMwnkQK9IBuFaylPHWmvVFYok4Sg10dTBL0OYaWkSofUg1kJ1jhiKOwU8K1c7YbiUY+ BDhy+QhPVFTKy7PoT3PTgQfmedS4JGhybrACVNvop6uRUooMmYT07ArsILJzFOLFI2HjrV0zWbWNh lp5+L2E5TyaOFaA1d9cHvc682oX/eeBWerGwovJhqvbp6lTGLA9ID6eDlNH+Lq6Dl4W6IA48zysW/ bcxQWaDZV3l/p6+7VJS+vqvcms98D9lqaX4+J7g/J+yJOpLnTFu2QVbV78mK8FHyT0ESO764+P2FY U4nSMt3w==; Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tiZmM-000000010vr-2s17; Thu, 13 Feb 2025 14:01:24 +0000 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-21f48ebaadfso17280925ad.2; Thu, 13 Feb 2025 06:01:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739455280; x=1740060080; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wwu/OQkpfuP5TP6urM50yolt8MlR74sxECkYt+Uf2k8=; b=AeGVt+hVtU7YiyDk4U8NvqzNj4wKDHVBGBzQWaqwM4aAyd/laEVK56WqxXkVE0f7Yb UL2JLn1Ef5EMQWtCULsuxtu0w8Sftfp27uwriWVQa6A7cqb2C8PmZeZSx+SQPAixCePy 4+U6tKO98jMjGoBLm8oI6JIFTE7LxaF+H8lWTBkTjzo91sDn+5FFXchvlGU/n57BrXlI sbaiRW5o2FkVfl8StLeLDOI5qhwk1lkMi+rm5D1CsBafSWQL7sBmlaVDECU/IaW/G974 Ddj/8KMCDSUN9KInkS0nI6qPv2o7BJLIKyvuRmRgAZxtprd0i1+qI/zqrTtPlDG6p7qD mr5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739455280; x=1740060080; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wwu/OQkpfuP5TP6urM50yolt8MlR74sxECkYt+Uf2k8=; b=WskT/E0HPpG/S+SaG+nX2cMf9x0svMxlO0yY/XNe6V6qJZd2mWrUBaqGpCWZ+Wv3nX QpfiYBraeS4hAVcR5CE3zxQBsJ22YRjTS4sdCm/zt68E0gNr0aJHuY+geqxECPX+nZTy f/D6IBtRSNnIPmBEUWogt1ChjqmxgmH9xJ2UpEFzjN+lddASWIxLFg+kWr2OPi/3QRVK OoAqSoETZnQkQj9PfmNgpJeB5uLOYVufHEqrPD8j4vWy04hw5+6G+NgSxI1+SWj5tCf7 FBmnUKbwk122tDlLk7jdMXQgn/SabIKy0ot4prgRZ2BEvKYerJTW71KsIwhIYggCptU+ j5zQ== X-Forwarded-Encrypted: i=1; AJvYcCUIEKfQvn/xP4KTVFr2h3OLWy2ql3VHXgFCnwLRkwFy3yMvjZQ87/omDX22pubLLYcIlVwpXqJBF6Z5R+zs3997@lists.infradead.org, AJvYcCUx+NNMCp/CRzWL5M1tpIYdOuABuJaFBpYNyD4w7NkInf373GuX0zbY60LGUNr6t7nMcEyf6yf8cKZYPxM=@lists.infradead.org X-Gm-Message-State: AOJu0Yz4rWco9mSVLaEr5QaHIqqZiVRJoafou7zSpGDWtI9QFxUN/Jrz AQoDSr+PzgDHs+AbaEc6+4hMZs7ezJsQTC911pjyr8G22AsmNc9E X-Gm-Gg: ASbGncuYxUmQVQlMpfrDXQVHYEa29xyI8YfzYQiiVmM80Y3D8JbPKHL1Cnindfb1yR1 osmp7k3/LBjy+nx4m2qzuNx9KjWBVaezH+oC2zPbQNr43ZZJlQulUF6N9IUtnudgibhm94GL1P1 29BFLAIXWU/4/J4wMj3yqw+N301Iwyx3v3/CIS206QdCqjpVZKhmWH+6Hb6dYaMG1WUnPah5bAc cESYknRU0ilWbB0Oj0+6Dp7GagE37/4ohKbGje3bU3o0bHJ5PlumPF/rv4B+1LscZmDzuFRqUKf mdJKPxRsMSzrBKYXeyti5IJRg3u/0F9ZSWP938WyAqf92z+94OHNpkC93xwMIrghI1w= X-Google-Smtp-Source: AGHT+IFMceABDyWeSunss8UJzVYDb4BU4OkU0X8Hc7JUBpiklvsTg2hC46hEV4uH5kHdO2o6dh/F8A== X-Received: by 2002:a17:902:eb8d:b0:220:c813:dfd1 with SMTP id d9443c01a7336-220c813e56amr81532275ad.36.1739455279808; Thu, 13 Feb 2025 06:01:19 -0800 (PST) Received: from mew.. (p3882177-ipxg22501hodogaya.kanagawa.ocn.ne.jp. [180.15.148.177]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55858d6sm12565225ad.223.2025.02.13.06.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 06:01:19 -0800 (PST) From: FUJITA Tomonori To: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org Cc: x86@kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, peterz@infradead.org, hpa@zytor.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, catalin.marinas@arm.com, will@kernel.org, chenhuacai@kernel.org, kernel@xen0n.name, tangyouling@loongson.cn, hejinyang@loongson.cn, yangtiezhu@loongson.cn, ojeda@kernel.org, alex.gaynor@gmail.com, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, benno.lossin@proton.me, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Subject: [PATCH v3 5/5] rust: Add warn_on and warn_on_once Date: Thu, 13 Feb 2025 22:57:59 +0900 Message-ID: <20250213135759.190006-6-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250213135759.190006-1-fujita.tomonori@gmail.com> References: <20250213135759.190006-1-fujita.tomonori@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250213_140122_856192_EA589563 X-CRM114-Status: GOOD ( 17.60 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Add warn_on and warn_on_once macros. Wrapping the C's WARN_* and BUG_* macros doesn't work so this uses the assembly code exported by the C side via ARCH_WARN_ASM macro. Like the static branch code, this generates the assembly code for rust at compile time by using the C preprocessor. file()! macro doesn't work for the Rust inline assembly in the same way as __FILE__ for the C inline assembly. So the code to handle a file name is different from the C assembly code (similar to the arm64/loongarch assembly). Similarly, ARCH_WARN_REACHABLE is also used at compile time to generate the assembly code; objtool's reachable anotation code. Only architectures that use objtool (x86 and loongarch) need it. Signed-off-by: FUJITA Tomonori --- rust/Makefile | 8 ++ rust/kernel/.gitignore | 2 + rust/kernel/bug.rs | 100 ++++++++++++++++++ rust/kernel/generated_arch_reachable_asm.rs.S | 7 ++ rust/kernel/generated_arch_warn_asm.rs.S | 7 ++ rust/kernel/lib.rs | 1 + 6 files changed, 125 insertions(+) create mode 100644 rust/kernel/bug.rs create mode 100644 rust/kernel/generated_arch_reachable_asm.rs.S create mode 100644 rust/kernel/generated_arch_warn_asm.rs.S diff --git a/rust/Makefile b/rust/Makefile index 8fcfd60447bc..a295b65c43f3 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -34,6 +34,9 @@ obj-$(CONFIG_RUST_KERNEL_DOCTESTS) += doctests_kernel_generated.o obj-$(CONFIG_RUST_KERNEL_DOCTESTS) += doctests_kernel_generated_kunit.o always-$(subst y,$(CONFIG_RUST),$(CONFIG_JUMP_LABEL)) += kernel/generated_arch_static_branch_asm.rs +ifndef CONFIG_UML +always-$(subst y,$(CONFIG_RUST),$(CONFIG_BUG)) += kernel/generated_arch_warn_asm.rs kernel/generated_arch_reachable_asm.rs +endif # Avoids running `$(RUSTC)` when it may not be available. ifdef CONFIG_RUST @@ -481,5 +484,10 @@ $(obj)/kernel.o: $(src)/kernel/lib.rs $(obj)/build_error.o \ ifdef CONFIG_JUMP_LABEL $(obj)/kernel.o: $(obj)/kernel/generated_arch_static_branch_asm.rs endif +ifndef CONFIG_UML +ifdef CONFIG_BUG +$(obj)/kernel.o: $(obj)/kernel/generated_arch_warn_asm.rs $(obj)/kernel/generated_arch_reachable_asm.rs +endif +endif endif # CONFIG_RUST diff --git a/rust/kernel/.gitignore b/rust/kernel/.gitignore index 6ba39a178f30..f1d7f4225332 100644 --- a/rust/kernel/.gitignore +++ b/rust/kernel/.gitignore @@ -1,3 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 /generated_arch_static_branch_asm.rs +/generated_arch_warn_asm.rs +/generated_arch_reachable_asm.rs \ No newline at end of file diff --git a/rust/kernel/bug.rs b/rust/kernel/bug.rs new file mode 100644 index 000000000000..7ffd9cb1ad75 --- /dev/null +++ b/rust/kernel/bug.rs @@ -0,0 +1,100 @@ +// SPDX-License-Identifier: GPL-2.0 + +// Copyright (C) 2024 FUJITA Tomonori + +//! Support for BUG_* and WARN_* functionality. +//! +//! C header: [`include/asm-generic/bug.h`](srctree/include/asm-generic/bug.h) + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, not(CONFIG_UML)))] +macro_rules! warn_flags { + ($flags:expr) => { + const FLAGS: u32 = $crate::bindings::BUGFLAG_WARNING | $flags; + // SAFETY: Just an FFI call. + #[cfg(CONFIG_DEBUG_BUGVERBOSE)] + unsafe { + $crate::asm!(concat!( + "/* {size} */", + ".pushsection .rodata.str1.1, \"aMS\",@progbits, 1\n", + "111:\t .string ", "\"", file!(), "\"\n", + ".popsection\n", + include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_arch_warn_asm.rs")), + include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_arch_reachable_asm.rs"))); + line = const line!(), + flags = const FLAGS, + size = const ::core::mem::size_of::<$crate::bindings::bug_entry>(), + ); + } + // SAFETY: Just an FFI call. + #[cfg(not(CONFIG_DEBUG_BUGVERBOSE))] + unsafe { + $crate::asm!( + concat!( + "/* {size} */", + include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_arch_warn_asm.rs")), + include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_arch_reachable_asm.rs"))); + flags = const FLAGS, + size = const ::core::mem::size_of::<$crate::bindings::bug_entry>(), + ); + } + } +} + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, CONFIG_UML))] +macro_rules! warn_flags { + ($flags:expr) => { + // SAFETY: Just an FFI call. + unsafe { + $crate::bindings::warn_slowpath_fmt( + $crate::c_str!(::core::file!()).as_ptr() as *const ::core::ffi::c_char, + line!() as i32, + $flags as u32, + ::core::ptr::null() as *const ::core::ffi::c_char, + ); + } + }; +} + +#[macro_export] +#[doc(hidden)] +#[cfg(not(CONFIG_BUG))] +macro_rules! warn_flags { + ($flags:expr) => {}; +} + +#[doc(hidden)] +#[macro_export] +macro_rules! bugflag_taint { + ($taint:expr) => { + $taint << 8 + }; +} + +/// Report a warning only once. +#[macro_export] +macro_rules! warn_on_once { + ($cond:expr) => { + if $cond { + $crate::warn_flags!( + $crate::bindings::BUGFLAG_ONCE + | $crate::bugflag_taint!($crate::bindings::TAINT_WARN) + ); + } + $cond + }; +} + +/// Report a warning. +#[macro_export] +macro_rules! warn_on { + ($cond:expr) => { + if $cond { + $crate::warn_flags!($crate::bugflag_taint!($crate::bindings::TAINT_WARN)); + } + $cond + }; +} diff --git a/rust/kernel/generated_arch_reachable_asm.rs.S b/rust/kernel/generated_arch_reachable_asm.rs.S new file mode 100644 index 000000000000..3886a9ad3a99 --- /dev/null +++ b/rust/kernel/generated_arch_reachable_asm.rs.S @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include + +// Cut here. + +::kernel::concat_literals!(ARCH_WARN_REACHABLE) diff --git a/rust/kernel/generated_arch_warn_asm.rs.S b/rust/kernel/generated_arch_warn_asm.rs.S new file mode 100644 index 000000000000..8f239b431aa4 --- /dev/null +++ b/rust/kernel/generated_arch_warn_asm.rs.S @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include + +// Cut here. + +::kernel::concat_literals!(ARCH_WARN_ASM("111b", "{line}", "{flags}", "{size}")) diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index 496ed32b0911..c0720846b249 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -38,6 +38,7 @@ pub mod alloc; #[cfg(CONFIG_BLOCK)] pub mod block; +pub mod bug; #[doc(hidden)] pub mod build_assert; pub mod cred;