From nobody Mon Feb 9 07:06:22 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DBB5213245; Wed, 9 Apr 2025 06:59:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744181967; cv=none; b=Licq5r6fQeikQx2mmBFzuBr3/1VuKKRRc0Fjv8jyQky2kliwiQZd6/OswHq5Ne/GSS57n8ynWi9ckX9TP+WVkI/9Nv5P5hTsnIR8jp9ebPF2F+8MMnZ8TOLvupI7+pYe6SYHy2BUqy/lQczalsfVfl6QfQPJ1Mfexq/jjzQQQC8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744181967; c=relaxed/simple; bh=bS8Ebl8McHMwQRP2b9+9bPhRqECSzCU5b02fcngqsqY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tf2WTuFyy0Zx0eRptUSYlsW8jEV3i0jr89Ud12tMkDlsNsNZC3xkiQ68WMblVZIh4EFvE5S2a9YDWW4VPMj3CgVUrGjehNfGb3bbIjw52+hpQczTYuD5hMmdjk2mWfleUJk0l2eM/pWTr7wzja1j9++ecVfsRiyXz6xt33z8WII= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JZ++LZ7a; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JZ++LZ7a" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-224191d92e4so60807035ad.3; Tue, 08 Apr 2025 23:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744181965; x=1744786765; darn=vger.kernel.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=RIfDOjq9qhHckyXryae5MbYL+xPZ6FAVHhgspJGsYWI=; b=JZ++LZ7aTSDrZ/1ggSOGaz7L48YUMqxuBTwPga/dwg+QGXHUUgwCY2s9YL7dJV4XCY yPJDihfiF8GHEObs5+vjRKGne5rR4lvWt/BXscicgLXqBusN3EAKbjDWNZPR0HxlznSu CzjwpKxdKEJ+3WZwIeEcMQXq2E5GdoTVYEiarFnfaujD6XsGXpez/uhyyymm9BQaE84E Gv2NQccT1UtWoZM7A/HLyb/VNpVqe55dvhQhIjnuDypgAyRaBDZ3+30ZOSCopIH/g704 +kCDAGoGK+DzjyGYAjBNUAOLM60qLoZUJoaE4PhKwcKzvaNvTvrlwPTcPOH621Y8HHDj vBiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744181965; x=1744786765; 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=RIfDOjq9qhHckyXryae5MbYL+xPZ6FAVHhgspJGsYWI=; b=tUeFNStu+eyCV0zH4UlU5Jhj4BarXJ5RRLMkVDQhMWNajpeEw3pttdWG+PGf2qjFEw SCm+wvZU/+P18fKzGApV6QMxCF2r8atN3yVdTx5aZkV0+g/NHM2xnkR0ddtuJKKqb5Vn /o0w67x14rlRmdqXbXw6hu1+elyLpI7zkPJaxBW6v9Ipc9UuOO1K+yB90vAUnHxJD3AV m83HXv/z1G8xW0Dz/ABEUR2HbHaLxj4rkOcck7YkB50cDDvQRw0SOrffHO/VqN960lfU QPCZIGml/Gra/FqRjwaJFjYNtGYqzTSwuS0lI+cgblz7MfRoYFHizOFdeTgCgSDyXfX2 jM3A== X-Forwarded-Encrypted: i=1; AJvYcCXUxSIYLya801RuMHKMsvNIHEXp+gxLw5Ag/f1Ewo7gPeeylBHLIcqwKhve9gRUM851jfzrlBc+DHbu+RjLeg==@vger.kernel.org X-Gm-Message-State: AOJu0Yysu9UtDxLRVYoamRI67Jo+d7PuZ4X38htXSJgEKPFjolVPHw40 IX09aUlQ7hJQ1Dfmw5+MDtj0JTzjhcvgdpugOyc/a5AyniPFWPs3k5fXTm62 X-Gm-Gg: ASbGncubB9SBRJWVKC6309zlEj0h/7zY1Wu5HqaBCCVceYVmND6+etnEL/taZFOfVGa T4/fnRJq7COyMp3gMhO8wDOE7y/WpoK7VxBGfSH9G3sZpM8TX5QkP5C5HZCvjgEV6ZcFu6JBzRn xCGz2jfTwKtzCb3dGvSG01do1wFfQXRbBi3DVtLiK7PX+YgyOwCz1zEEthCvmlR+LOi5Lj4B1Kh RMTm2soWKH7dqfjWI+vCD12KwPSRPJyhuSX3OeY+XH3OJdqLnhH4hTbuCpGHSM1+0/c1pG7K5Mz GSN8nvlxiWthU37Ib7R5jPpNh6BGa0nqXJ4w/cpz+ShdPsbAu3usKBWMMAP18l8jGlWuSVHmeeE DS51EdStNHfcMIhq/42rvCe5HupcF X-Google-Smtp-Source: AGHT+IH3bX9bz4NSeffRNUm1cA4jaTwLt7BuSbxQGS6DHGZ0kp+vhH5H4LqkKJt7qc/lkXgGcXJQYg== X-Received: by 2002:a17:903:1c4:b0:224:93e:b5d7 with SMTP id d9443c01a7336-22ac3fefc81mr20504865ad.34.1744181965015; Tue, 08 Apr 2025 23:59:25 -0700 (PDT) Received: from mew.. (p4204131-ipxg22701hodogaya.kanagawa.ocn.ne.jp. [153.160.176.131]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7ccb596sm4407815ad.220.2025.04.08.23.59.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 23:59:24 -0700 (PDT) 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 v5 1/4] x86/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Wed, 9 Apr 2025 15:57:58 +0900 Message-ID: <20250409065802.136971-2-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250409065802.136971-1-fujita.tomonori@gmail.com> References: <20250409065802.136971-1-fujita.tomonori@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 f0e9acf72547..be5aef1aff9e 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -32,45 +32,42 @@ #ifdef CONFIG_GENERIC_BUG =20 #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 =20 #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 =20 #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) =20 -#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, "") =20 #else =20 @@ -92,11 +89,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 =3D 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) =20 --=20 2.43.0 From nobody Mon Feb 9 07:06:22 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56BAD214814; Wed, 9 Apr 2025 06:59:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744181973; cv=none; b=qoMNMxGIpa8teeVPSga2Phpm6INRc712mrZEPt6Sm5wjwvkK0Zop3O6iytX71mR27j6qvQV/yhoRFUFIWSAgyiqqyh7Rd3mD6tCnmFjI7YeGZ35o17veQhZjMTI4UGcA68bPsEv0zJ6D1XQ6kE615f4M1eO3ru++8qTj+pqxv38= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744181973; c=relaxed/simple; bh=+7XITjewWSl80gT0zr6uyJXg8p1d67Yg7lRhbz4DBTY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AMNRhTOR5AHgYwEOzlwvP0yDC9ZTTy0Lrtz7E4vxMdjivmteZb+HMYg9omYYPYVdkine633rILHWprMFr+AHzqaEVUD4p1yr2LMoDdx5/zdOBmwt2x3r1R6eD7cv1sw5bZX0ftI49EKCZDGeWH1IyRYCKhKKN/0FPo9BBK5zjCQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RS1585OA; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RS1585OA" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2264aefc45dso82019595ad.0; Tue, 08 Apr 2025 23:59:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744181971; x=1744786771; darn=vger.kernel.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=qp8W9ben9rFX3CxZ0d32TQyshtC6obDRIzvh0yrVOfk=; b=RS1585OAbzYtHApNpm7Brvx9P8pmJGMXfkg4cpTRviSWosVUWQIeOiCRi03mKyS101 BLOKd84YD4v3TL11QW+u3hZ8FrTHHaWejqD4TzqfCmZrN/5w1moFWhWSU0r4ZSIeOe6q DrKPnb6rMlDcduMhbRwgUCqXxTaQq9VFhqj0qJVgLTsPaY/ui2nZY43OldKX5ZTXs6/k g4rA3bLBwhg/udARX7q+hnt9Xq1OUP6JXwvvSlXQFnyZQz70v1jIV1q4OGoUkML5KRc9 ZZwLxyLpyJcgObHqo74OGYZaZb2K4yDK5bIpXWc/rk+ZVE5RHneOJmV/pvojk8CmaHkV JjXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744181971; x=1744786771; 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=qp8W9ben9rFX3CxZ0d32TQyshtC6obDRIzvh0yrVOfk=; b=STu1HcY31XO2+5b3ebNA/Ym1deqXU2zu0hIQRc6b81CKQH4KHgZV6TkMKtTLaxvVuV SDSYBp8UE3Vtrcnclt5ae9WaLUscLUgA3GN9o4ORRsZK1Pxg0YPOLEsLCHHFJAhNCWYl U0ce7Bo7NGsqgDq0thTHj7/7GgJHVe3hkrTA5cW0xZr8qmbYaqC1s328tYcJBIXvFXVv KfvDhMdZuhLepNV08xhHYzKsxyH/oGYCJXG+ecmeWEcBownBaey9sXX+/Hoi/HM8pFV8 bYn3PLar8uEXaZDvOj1GhmvM1cgNGPrZ+PTia3X8gK3DB+MxKx3C+rTPA4iSDWmDXMNN W9Aw== X-Forwarded-Encrypted: i=1; AJvYcCUwOr5jPohcndl0DNSfTUgOuZXNVagCIXbX2+u28D8YrOAXmQV0591KmawIBHKeLhQk13E2H01wz4eOdCgt1Q==@vger.kernel.org X-Gm-Message-State: AOJu0YxC105/rSrKJNlg9fj6SXwCJOBa2QcVGQIwAuC37uldMiLt7kW5 +8dOMUA+FYNrGKe9NNTgdOMm9TfrV1c2yOsbohr/Szg40xhjSUrPGzhUIF29 X-Gm-Gg: ASbGncuWoPe8DLRBrFZykup0En/KEzs8cxCPrDNGFafqOt9zMsx3E455io17kZmyH18 HcJ78Oo8rJYQ/3mt6cfKVb8Wy0TRafIgA7EG5u1T/Nfb1TfjXug2h0fg9W3fK9vLmaF2xp3WFSz j3ynDPQm0z5vj/PfP5NsW/Wd7M5HZZIr2ZE/S6cdr+cRaL7HyhkzdZgUHyAwTg7mNsJYIq3x2XM PjkcgaqWzXC/uNvNLphLBXk1DpcdU4SWanIu6UTgiMXNQjimLIZCF4p3OzoRPQFDzNYpoeoNJqd wNvUQAn+/0GRx/ciLRyGwXOCnXiQdTRHcqFaA4GaPl/8GGJxxPwfv559hyJnWLAogS1UHzZ2r/G JQS5yeLMIhDvYCyoFvA== X-Google-Smtp-Source: AGHT+IEZwYUbsTySsEIFtv1t72KELbYqxAXDutiQgzwO8B7QSQ1bxP4LPNczP+kdX8pWrESjGbTSiA== X-Received: by 2002:a17:903:2b0c:b0:223:52fc:a15a with SMTP id d9443c01a7336-22ac2a1a9c8mr28742785ad.33.1744181971392; Tue, 08 Apr 2025 23:59:31 -0700 (PDT) Received: from mew.. (p4204131-ipxg22701hodogaya.kanagawa.ocn.ne.jp. [153.160.176.131]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7ccb596sm4407815ad.220.2025.04.08.23.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 23:59:31 -0700 (PDT) From: FUJITA Tomonori To: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org Cc: Alexandre Ghiti , 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 v5 2/4] riscv/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Wed, 9 Apr 2025 15:57:59 +0900 Message-ID: <20250409065802.136971-3-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250409065802.136971-1-fujita.tomonori@gmail.com> References: <20250409065802.136971-1-fujita.tomonori@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add new ARCH_WARN_ASM macro for BUG/WARN assembly code sharing with Rust to avoid the duplication. No functional changes. Acked-by: Alexandre Ghiti 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; =20 #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 =20 #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 =20 #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 { \ =20 #define __WARN_FLAGS(flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags)) =20 +#define ARCH_WARN_REACHABLE + #define HAVE_ARCH_BUG =20 #include --=20 2.43.0 From nobody Mon Feb 9 07:06:22 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 791BD215070; Wed, 9 Apr 2025 06:59:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744181979; cv=none; b=mGZ4m0yHbv4VIwMAmSwRiGKUvqnQ4Qxuexa7QLCLjZJVmLqoIkRM+Z20pWBL8UoMqec6CDBynczak/Sh2qRQZcdkXfstd3sAg9piksJuk4pb8buBsqYWrtwkyARZ4y7eN+m+BKCyk6xFM7QKsycogcTXKbL4tuckUQFtdHBal/w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744181979; c=relaxed/simple; bh=mdMjqDgKLmfSj3Eltmr/eklydzSfhT7tfE+JI7T4puc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bBXzJZpCs9s9M1oHzElNR40R2vrZCPG7VAPGHgJYAKEYSE+h14DttSsEA4JRptfkjQYZWZzUzxAplMPhruOSx6SputT7DBOxGbwcmD9cWWsljSCsyXlNqTl8tjBoZa/g/BdsGKIvsQVMBexdap0v8Mj0+w1wixk/0nyukR9AAjo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OUa8IVVC; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OUa8IVVC" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2241053582dso82190745ad.1; Tue, 08 Apr 2025 23:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744181977; x=1744786777; darn=vger.kernel.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=t/DonzYY8ky0NPr6wCGSqroH7cDtAqrs9o10+/q7fXY=; b=OUa8IVVC0roi0DA7lnx+m9Z9EhaUxp1SIEZwy63LejjfrtmFXC2IHWbhwo9QI1xrYu Px+/7qXLIqpxdMLBHM4AkpKOxyrt4VT50hVJTt6YOEcFd+d42MNf0RyB32H8nQTf2m1O WiVunCdl4mJZm6pXpSrGtMU5vBYNCOTzoUHoQUc6bHu+8SWoU9rOeIjpPkh3ta6YY5PW cO4NJt0vr+TIFYDV894Ee8ExWw3P14BoiBPHizDnR+KuH1IDV4JRV/cRzNz4IvZpchBL itvEooWXl4Xa93iA606Vy3Q99xCIl8yzeVV91L26svmrdCt5X3GwY7V58G+tC/UavhuZ h/Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744181977; x=1744786777; 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=t/DonzYY8ky0NPr6wCGSqroH7cDtAqrs9o10+/q7fXY=; b=tnqT9RNBw6RkLPJbRc/OMl006s0EcAvH20LmBLpcEkz9qivgD03WfW+NKw26wzdqlN C7E05ItYnDKHki/8O6EIRJPtJEZl6ub/dUgr5R7J6BfZ+TjiNVrNPaBt3HyZP36/SJuD bpnjqj5iF2W2M3LamAoxRTXrLCBKeszs8AFf/p7OqkrChy/pkII7d8Tge4JYsGuOl/Oa ZW4UCXwXpKf0Lau57EW91KBi8PMjtp2F/A+MCiwJTgkdFs7A0oRIxs3z1+HYn1OFk0vG dluHRP2Jvy99ujnC2CCeV3xGCsP003tk8waHvO0QtUKXayp7kNfckbAbVUp8aaldWSWA ArDA== X-Forwarded-Encrypted: i=1; AJvYcCXux//WyYo6Apl9hDfch1mWpS+jxy2Sx9DL6coS1RHoCVRM4MO3+6XcvM8jE1qTMco7rVtgey2Bfpvlk3LzyA==@vger.kernel.org X-Gm-Message-State: AOJu0Yw92ADpv4LmjEzgacTryoQ109LS4n+nwFrcVnJQItkVJ6gcnJIl 1xjuA8VJ6mBwlxLwKf5vVUu8t2ukJeFCDZDnt8pv/jOGsC0Um0DMmVf0jL8s X-Gm-Gg: ASbGncunO9KJu2wAYwPysJmyTersJde1oYzg4uoYW5ngHkR9ykb5RDYBO4aXFEkHcGL TqTJVV6qohihh0QKJ5DYoesi28+19OgP4BcW303e0bU85VKNHpw5q6Zc2liibAGvpjVEu/W8btO jILVZavaBCzI2CCvLr/52q4Tt4dknMRZ76z7p2zddctYN/wq8ciJSc8iTJibyzc1fudwp+6nOP8 ITGCe3plzHtRW99EjAqOACl0uf7SEQBNlSWgP4acRXlFl8KQl71W+m1eSVTBfPXrAvnq/LQfv4B Yzewft3tbjZDbM6GId4E2gJWqUBpNK6Yp9TGlyY6CKaSBv1NThsvcGqEzr/Rd/PAsSAMeuS3NZT gYbF1iSyq08X/8D7HPg== X-Google-Smtp-Source: AGHT+IF2Tbyqa8jlbF8mK3RKpXeeOmZUaQjjm5vh3ODXS1zPKWwm1EPLzxRklzhDHZPXhNC/FLbkog== X-Received: by 2002:a17:902:db08:b0:220:be86:a421 with SMTP id d9443c01a7336-22ac3fe6feemr26628755ad.38.1744181977595; Tue, 08 Apr 2025 23:59:37 -0700 (PDT) Received: from mew.. (p4204131-ipxg22701hodogaya.kanagawa.ocn.ne.jp. [153.160.176.131]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7ccb596sm4407815ad.220.2025.04.08.23.59.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 23:59:37 -0700 (PDT) From: FUJITA Tomonori To: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org Cc: Catalin Marinas , 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, 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 v5 3/4] arm64/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Wed, 9 Apr 2025 15:58:00 +0900 Message-ID: <20250409065802.136971-4-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250409065802.136971-1-fujita.tomonori@gmail.com> References: <20250409065802.136971-1-fujita.tomonori@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add new ARCH_WARN_ASM macro for BUG/WARN assembly code sharing with Rust to avoid the duplication. No functional changes. Acked-by: Catalin Marinas 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 =20 #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__) \ =20 #define ASM_BUG() ASM_BUG_FLAGS(0) =20 +#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 */ --=20 2.43.0 From nobody Mon Feb 9 07:06:22 2026 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E955C215792; Wed, 9 Apr 2025 06:59:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744181986; cv=none; b=d+n8kJXlgBZ8SjSBCeA3ghLCeMvKFw60PcUZX25fItwStI4GvbIUcHfD9BTyy20bY+55YFQvSBoz2i9faRGG2zNcmZuHHvOQf+6E1GHeyXkVFDOvECWsrkNYuGn2/NP2nVVmAvwovu1Pj90oQIzuuTssuuBQ3xUFX9jjMW775is= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744181986; c=relaxed/simple; bh=RD0EcDzYAZoxm8jCd4YXUgat4LaEe4RwK0X8uRzREnA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N6NX6mFhy3F8qaxXFBQnRQx4/gp/8KemBinN7OLGk7u/qMn+EqrPKw+8Sqxmacoc4D2CW2HUXrIS59mXS4KMaIpuaDAlDFABcT5iZJ/xa4IVFzloeC703OLhsdHbkh2rp/RDD7XyNx7T9ZQBnM3VnUkwORlb/XhVN9AMRKd4qtI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=U4FEXw9M; arc=none smtp.client-ip=209.85.215.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U4FEXw9M" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-af9a6b3da82so4233910a12.0; Tue, 08 Apr 2025 23:59:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744181984; x=1744786784; darn=vger.kernel.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=F2pbd0UXlj8lTX4R24mljIUMw3V77RSQ2B9I8eYN8Ew=; b=U4FEXw9MnJGYX99zNekbTb+KCSc8LXfAfuHVZJrel8ObfQqSMFS3tv25h7LX6Fb54u 7bhttxVF6O1VzBRYYJlCzzsxm+hqO/naszdwKH9pXmilBDgPsMhJ4QFODEAUzZ/LTZsd 3r/7MnbUYlTpEwfghqj5Bg+4LksrtFyAvgas1Hq74+S1SUffSvkpTQWf4glSAS09ElkP lX0BXE1uZVeyuDgqpoIFhite5V7VZbMAhSCc+R/z6F9wXOGCrWpggeY9dnjGk1LC5IAq dMu2/fncHcMUrTN4/rvR82VEWVk2xgpRZTwQH22G2J1398DlxDn4OhSDfGrKqQROHZU9 bC9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744181984; x=1744786784; 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=F2pbd0UXlj8lTX4R24mljIUMw3V77RSQ2B9I8eYN8Ew=; b=YPijXjYJ/CFDF/bLGZIlwTBuuHbIIk0rHEYOb6lxuvyzThlRerFp8zmQyoh5NxKk6L 43il6Y6RlndjaWkU1kgTBHQPhKbiBIEuxq9NPvfYo8kEGVpjJ1ua6tyh1LxlJHdCE7S5 U/PUWVPd5hzFi2mCAuFkJEzHW+h8lnm8OhF++Xrv+g/GDu9WNlZQF0HuPXfBwe9jDyw3 Nfc7bZKGNlwCiXyHl9pIH+3NX4H+LMAU5OYsIOkKyVLTUYm5vpvbWgeqwQplP6bbxg7F JZrz4jp2Fu3V+4dlzUNhK/Oi81IeZPkPNmjyMYA3scltzaWDH9GflntkjaHXbe3v9A4H WYFg== X-Forwarded-Encrypted: i=1; AJvYcCW8FqHmrZ8yeLyFwiSH+zzREHd8kgjQ+gef9B29a79ERcRZ/IjT7vkiU/wMRTdPu14vYS53gXXOY1iAUmFx1Q==@vger.kernel.org X-Gm-Message-State: AOJu0Yxs+pCqvpy/rir+QyGSRFY468f2oFUTANsDl/5h9re89D39SuPh 8koBqV8W2+XSU+s1M3va4tFshw6T5kou2E4YvGwE4T1L9rvGvT3FxjDlbQYs X-Gm-Gg: ASbGncuZZtmA5Tdg3MiyQ8i9g7ZOuiB4JGhvZvBXqm84Baqie1MdoEdH1oEAbVg2xwt ozT/QeV+HKI3FCi21RMGQfhkkUWS5Fcx+xpKIz5KRr9t7nKzi8CWKJQ+ivNks89uS53OkIWhE+p oSJUPodJ4pvIQS9Ma4Bi7eBHDmtovSltmS5umvRjUkhnVLghpNHLDT4zBISRpxqkp6CeAbZLZqH LQGL80YcDi3Qr7DOgx+bQkSuR+39Bw/tAU51njnpvYObfE/BNbpguDZB4M4C6M5eMXfkCuq61cr UUNrq7+LdWR1viOX1jiHEhJcgTaevV68X3kh7AHUdqBni5bVH52HztAJCQbY3mtwRYpk1vnEX5s 9V8m9DLo6mESA5aBRuHHxS34fa4eD X-Google-Smtp-Source: AGHT+IFL9TT6QHLOFKEcpZF9HUypYUw7Ycu6go8EQ/Dq6j+9vVp6HhyJwtriYGJC2NztmRjbeXt+qw== X-Received: by 2002:a17:903:1c7:b0:223:5ada:88ff with SMTP id d9443c01a7336-22ac29be057mr34017775ad.24.1744181983864; Tue, 08 Apr 2025 23:59:43 -0700 (PDT) Received: from mew.. (p4204131-ipxg22701hodogaya.kanagawa.ocn.ne.jp. [153.160.176.131]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7ccb596sm4407815ad.220.2025.04.08.23.59.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 23:59:43 -0700 (PDT) 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 v5 4/4] rust: Add warn_on macro Date: Wed, 9 Apr 2025 15:58:01 +0900 Message-ID: <20250409065802.136971-5-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250409065802.136971-1-fujita.tomonori@gmail.com> References: <20250409065802.136971-1-fujita.tomonori@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add warn_on macro, uses the BUG/WARN feature (lib/bug.c) via assembly for x86_64/arm64/riscv. The current Rust code simply wraps BUG() macro but doesn't provide the proper debug information. The BUG/WARN feature can only be used from assembly. This uses the assembly code exported by the C side via ARCH_WARN_ASM macro. To avoid duplicating the assembly code, this approach follows the same strategy as the static branch code: it generates the assembly code for Rust using the C preprocessor at compile time. Similarly, ARCH_WARN_REACHABLE is also used at compile time to generate the assembly code; objtool's reachable anotation code. It's used for only architectures that use objtool. For now, Loongarch and arm32 just use a wrapper for WARN macro. UML doesn't use the assembly BUG/WARN feature; just wrapping generic BUG/WARN functions implemented in C works. Signed-off-by: FUJITA Tomonori --- rust/Makefile | 8 ++ rust/helpers/bug.c | 5 + rust/kernel/.gitignore | 2 + rust/kernel/bug.rs | 114 ++++++++++++++++++ rust/kernel/generated_arch_reachable_asm.rs.S | 7 ++ rust/kernel/generated_arch_warn_asm.rs.S | 7 ++ rust/kernel/lib.rs | 1 + 7 files changed, 144 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 fa0eea8a9eca..25f498607d1b 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -34,6 +34,9 @@ obj-$(CONFIG_RUST_KERNEL_DOCTESTS) +=3D doctests_kernel_g= enerated.o obj-$(CONFIG_RUST_KERNEL_DOCTESTS) +=3D doctests_kernel_generated_kunit.o =20 always-$(subst y,$(CONFIG_RUST),$(CONFIG_JUMP_LABEL)) +=3D kernel/generate= d_arch_static_branch_asm.rs +ifndef CONFIG_UML +always-$(subst y,$(CONFIG_RUST),$(CONFIG_BUG)) +=3D kernel/generated_arch_= warn_asm.rs kernel/generated_arch_reachable_asm.rs +endif =20 # Avoids running `$(RUSTC)` when it may not be available. ifdef CONFIG_RUST @@ -536,5 +539,10 @@ $(obj)/kernel.o: $(src)/kernel/lib.rs $(obj)/build_err= or.o $(obj)/pin_init.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/ge= nerated_arch_reachable_asm.rs +endif +endif =20 endif # CONFIG_RUST diff --git a/rust/helpers/bug.c b/rust/helpers/bug.c index e2d13babc737..a62c96f507d1 100644 --- a/rust/helpers/bug.c +++ b/rust/helpers/bug.c @@ -6,3 +6,8 @@ __noreturn void rust_helper_BUG(void) { BUG(); } + +bool rust_helper_WARN_ON(bool cond) +{ + return WARN_ON(cond); +} diff --git a/rust/kernel/.gitignore b/rust/kernel/.gitignore index 6ba39a178f30..f636ad95aaf3 100644 --- a/rust/kernel/.gitignore +++ b/rust/kernel/.gitignore @@ -1,3 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 =20 /generated_arch_static_branch_asm.rs +/generated_arch_warn_asm.rs +/generated_arch_reachable_asm.rs diff --git a/rust/kernel/bug.rs b/rust/kernel/bug.rs new file mode 100644 index 000000000000..761f0c49ae04 --- /dev/null +++ b/rust/kernel/bug.rs @@ -0,0 +1,114 @@ +// SPDX-License-Identifier: GPL-2.0 + +// Copyright (C) 2024, 2025 FUJITA Tomonori + +//! Support for BUG and WARN functionality. +//! +//! C header: [`include/asm-generic/bug.h`](srctree/include/asm-generic/bu= g.h) + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, not(CONFIG_UML), not(CONFIG_LOONGARCH), not(CONFIG_A= RM)))] +#[cfg(CONFIG_DEBUG_BUGVERBOSE)] +macro_rules! warn_flags { + ($flags:expr) =3D> { + const FLAGS: u32 =3D $crate::bindings::BUGFLAG_WARNING | $flags; + const _FILE: &[u8] =3D file!().as_bytes(); + // Plus one for null-terminator. + static FILE: [u8; _FILE.len() + 1] =3D { + let mut bytes =3D [0; _FILE.len() + 1]; + let mut i =3D 0; + while i < _FILE.len() { + bytes[i] =3D _FILE[i]; + i +=3D 1; + } + bytes + }; + // SAFETY: Just an FFI call. + unsafe { + $crate::asm!( + concat!( + "/* {size} */", + include!(concat!(env!("OBJTREE"), "/rust/kernel/genera= ted_arch_warn_asm.rs")), + include!(concat!(env!("OBJTREE"), "/rust/kernel/genera= ted_arch_reachable_asm.rs"))); + file =3D sym FILE, + line =3D const line!(), + flags =3D const FLAGS, + size =3D const ::core::mem::size_of::<$crate::bindings::bu= g_entry>(), + ); + } + } +} + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, not(CONFIG_UML), not(CONFIG_LOONGARCH), not(CONFIG_A= RM)))] +#[cfg(not(CONFIG_DEBUG_BUGVERBOSE))] +macro_rules! warn_flags { + ($flags:expr) =3D> { + const FLAGS: u32 =3D $crate::bindings::BUGFLAG_WARNING | $flags; + // SAFETY: Just an FFI call. + unsafe { + $crate::asm!( + concat!( + "/* {size} */", + include!(concat!(env!("OBJTREE"), "/rust/kernel/genera= ted_arch_warn_asm.rs")), + include!(concat!(env!("OBJTREE"), "/rust/kernel/genera= ted_arch_reachable_asm.rs"))); + flags =3D const FLAGS, + size =3D const ::core::mem::size_of::<$crate::bindings::bu= g_entry>(), + ); + } + } +} + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, CONFIG_UML))] +macro_rules! warn_flags { + ($flags:expr) =3D> { + // SAFETY: Just an FFI call. + unsafe { + $crate::bindings::warn_slowpath_fmt( + $crate::c_str!(::core::file!()).as_ptr() as *const $crate:= :ffi::c_char, + line!() as i32, + $flags as u32, + ::core::ptr::null() as *const $crate::ffi::c_char, + ); + } + }; +} + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, any(CONFIG_LOONGARCH, CONFIG_ARM)))] +macro_rules! warn_flags { + ($flags:expr) =3D> { + // SAFETY: Just an FFI call. + unsafe { $crate::bindings::WARN_ON(true) } + }; +} + +#[macro_export] +#[doc(hidden)] +#[cfg(not(CONFIG_BUG))] +macro_rules! warn_flags { + ($flags:expr) =3D> {}; +} + +#[doc(hidden)] +pub const fn bugflag_taint(value: u32) -> u32 { + value << 8 +} + +/// Report a warning if `cond` is true and return the condition's evaluati= on result. +#[macro_export] +macro_rules! warn_on { + ($cond:expr) =3D> {{ + if $cond { + const WARN_ON_FLAGS: u32 =3D $crate::bug::bugflag_taint($crate= ::bindings::TAINT_WARN); + + $crate::warn_flags!(WARN_ON_FLAGS); + } + $cond + }}; +} diff --git a/rust/kernel/generated_arch_reachable_asm.rs.S b/rust/kernel/ge= nerated_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/generat= ed_arch_warn_asm.rs.S new file mode 100644 index 000000000000..409eb4c2d3a1 --- /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("{file}", "{line}", "{flags}", "= {size}")) diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index de07aadd1ff5..bc13e92bdb1e 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -40,6 +40,7 @@ pub mod alloc; #[cfg(CONFIG_BLOCK)] pub mod block; +pub mod bug; #[doc(hidden)] pub mod build_assert; pub mod cred; --=20 2.43.0