From nobody Thu Dec 18 20:02:26 2025 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 61AE9271263; Thu, 13 Feb 2025 14:00:49 +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=1739455250; cv=none; b=OIfQxp7c9g9W/2CkVW7cl6rfLdK0cHw/RZ6e91hEQx8cyY6Qn/36Mf8T4EDB+aF3kh5L8VvH3e9y7rJShGQjjKbWfK2vfZmcAk9AZepasgo1QtdChu44A1My300wmMQj++mZPLb1q2p6Xi3XKfXKNuM80TVNkdb7H0cPpdcv7sU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739455250; c=relaxed/simple; bh=h/3P2KY8vDMPXX5OJwI4gjMRRH8LzIOf17+FXLQKEXs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rBB1LNBbvZpSgQsOUeNERL7VMIlMJMHlRVXnslcqaRrb6KKS43aOpQtBlqpA/o70dvtohgjqaTeTHvJG+hJ4dDJI8LHjGG+0ouRDyk9Yq2GXPWpAOyJLBq/AHVkXqDDlJKIgtX/n1ItAq2NQ09hpUHk/j8paiFpQ5b7Mj+2C70o= 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=ThNgibgU; 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="ThNgibgU" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21f7f03d856so15746925ad.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=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=gg/V+lwtqWQq5Y/Ly9J/s6hUNho4JthxgdaqasfoAcA=; b=ThNgibgU/ZjJGl5pSGhakIYskdqVOQbWlqIkehdjUex/gxEoTTerVviy71z5AiIqKb ssbL1oyoojIhFI/nHYmJjXbncvPXyngOSd5kwaupJMb8Rv3hbw7BWjvFpVWmJz6Li3eF 8aL85mMKNAQoTMRftNQksEJak6q5oxSpall7UZaJ6S48FQ11qB4awfxaRW7CFdXl5gZL MR68hsmcv7ATR0RNpwjyFM82AOAxopYpgcZkBEYE/azjaWFhWLd0CysU8Ws2jyJGGcsy hSPrgmcGaF3VWTT2FP+m6Xj+aEAeRuqBBI8LL96lXcbwS9iIPF/BjO5XJgXFqvt2LiOc vgPA== 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=El/NyTmWqhbuQlR/Xy3kTTzArQuJdkkaO7L3Ihcj8cr4le4E77Ke5mIM6f/Pt/okeR D/EkGSl4tcDI5JQJ+RYtt0clZ3ZEMxAMTAnuvHAUs8kEM52vtmkGzu9pWQFgod5WpH7z VPoLwGvJAY80IKaON8sycaNamvSUmI1yaCPh7W8jhUBp9syj2l3wrerVwqnWi+Ftsszt Wi0n7qNUT6WDsEsGvRbyummxT4Q0bk6ejD1aqg8mOoCvIpRs4UB5i5gi4DOzcS58w2RF 2wmPYZYYk1Alq4cOjyRecwsIXDMEpAs4mDzQI8Yh8DJLN/qeaS6DyidrRXlvfaXUXvgM 1V1A== X-Forwarded-Encrypted: i=1; AJvYcCVoBuerRqz7eyyEKPRpSoS38a/k+e5I+eTin0Jzyutx9mOmj2BltXM9QarESdvddC52cRpJsEkk3tnZgsOtjw==@vger.kernel.org X-Gm-Message-State: AOJu0Yx+Wrw2H5z/0cE09iPoH39FqjKOpjxXHHjAzJEXIRc8TxlBzpm2 KIPhNmWn4y3XH0SxNZdcOVHMJcb7aDFppYRTGnI5cOlt1pIAq60cyGhR5TeY X-Gm-Gg: ASbGncsgHGJqT0DiJsLptEgY/2IZRK5nnWZLG7LyL73pMUblp7L/RjGaY+QBs25PEVI +lM2lM7h0UqagZ6c8GWqXBC+LG0ioDDLLyBSh6I1dQhdBhA9EEFpsUhHxFLjYRf0spsFmtSCMDo QF5/uYdV8aNlKGxqg3FKUZe1/hnTWQukvCcmJ6YtkmRYh33woygX1pTz/NUMjtgTHgqnC4ObS1E zycdeDG6LELuiymtpVVYhQfUbaOXReavayyuGUP2PP+ybIkYApBn5k8mhBq5v4Yv+mI0K8O1XT0 6sNUniBpuGuY64F83nTRt7+RRzGSiDqwKiaze8BuBTHek3BpEOPeDiajs0VY8lqglhc= 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> 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 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 =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 @@ -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 =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 Thu Dec 18 20:02:26 2025 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 5490B271281; Thu, 13 Feb 2025 14:00:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739455258; cv=none; b=m0gCTUGGShaarxa2quRy0f2GiMMnI07jBrUTXh72P9UXx3q9K2MyHMwONcA3kboBMDZmF0NKZWMZV2FJA2VJS/6mD8XyL5iMgH/oHBNQ2mMczdkADPvsaCNtXOZ5UzhIzRd+vMTm7YEb2uU0Lv6Hnwss0f8EtwCq0OEpwn/BVWw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739455258; c=relaxed/simple; bh=zKjcSUryVoDbQCRZ2x8lBFB/w5Bku/XsU/5WIanvQhE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r1zrgdT61Gr71JlsQ2nWFhRU3fTsAAZUZaib+rOTxwqiMUrpZy7tgYewUOS0dbKkeMqipDdURZ8UuWZSFE7FYtA0GhvtygiH9NiYMajtnlzPQn3pwAQpUIIpoyhh3iS2KO8xA+rD1nRUkGkrm6CS0W1RJ/LAQhureRycr51TcJc= 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=IJr9EAYK; arc=none smtp.client-ip=209.85.214.179 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="IJr9EAYK" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-220c92c857aso14349415ad.0; Thu, 13 Feb 2025 06:00:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739455256; x=1740060056; 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=2+y6Ck4nUrrnZ5J/UDrnc3xAlfWqC0MtemaHjWH6P0w=; b=IJr9EAYKlQ8C49VIlTdchnW4gRyzsff2+c2kyBhYAJMJH1RH7yBZ9HU4pR9Ha5yUN3 iyAg7tPAthjcQh6XgLILTTVAmAgC+6WRdLdE8d6RCKB1n/qGzBBysN22+TnCGBnqcajQ XtxIY2pPTIxbmF7fJA+Iv5y7JQi0rroeqKwF4Q4EpR2/3CAhNfYo60R83vWiVQ3aS/EN aycT+sGHY86fSODeSDDV7hW0A0py2mFDV3Jx3Zb4GXlqG7AtEjWoofszs72q/M573VNM mj8xrQHkH8qZvZFUPzGUj3mRaxmBEqPYRGSjWPcwALHCPfj3Q24HkvNw3KWvfQX9fbBG 9MSw== 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=aw787/UBQNYvN0pcfHNT0JhywJ1ri+ZQlMf4I/XGTYKBNeJfAa6joSqQ6FpPlkbu1d IMEGcxxU1iJBNFwhTR1Fx42Xe4k+W2pO2/w7LY/zak63Py/pr0jwDc4l2SLCrbSAJWj+ Ax+FYt3TKmbUHD+fBlnNvqrjVr2HHMRIwo/TKImiSKIMwXmhrOX2HaH7Z8DITpGO/SSX tznNFtkPTMwCyOA5PBG/eJwo6g7qBM7ZEFeXmOV1JXNdVcCgCcT801T+9Up1WN7kGVL6 8imHFXSyz8bKi2V0ewQfaWM3Evu0Q1E4kgFk0j5zKK5SnEqHaQlJc75qb/cWZkY49p2X X1fg== X-Forwarded-Encrypted: i=1; AJvYcCWWCmphQcf86q0UYzH9/vcBzM2N8pKuKO6tfxV+v5VTRphUtJxEGc16U6Q/ZWTemXcM2Z/Yn4BufT2WxUmW8A==@vger.kernel.org X-Gm-Message-State: AOJu0Yw3q/jrVrB7AsGdpXznpoqlIL1xmDrebZNlJV5s11OecR9xYT/z XEqV0r9B+qdhnk2TvSdFyQMDjjbu227ablYh07EjqsI5+F4nFnBn4BgybG0l X-Gm-Gg: ASbGncuMBsRvKQ4QiO0HZCeMCInWWQXrznukY2msdEWlyghzn9rdeSpvGxLpJj+KHd2 3EN0Kakuqj5ITJtiUwtqvaBOxxq98XLrg2HGhZIYYUcyFRQEjaBxstgOrzKg+54DJXTCsCMb+rH zubSOCjOcTPC3kfIeWqABl4ZpAv4OdVJKLhS4tVYrSZm7rLivgVP3yJ+JuZZb3+Uhidqja3uDQK v4to9JJh3DhVmDNOP3ZzjKfFUeaiaUrBsxLpQioXcp1wIbLZ83y3u4gykErF8rGgnLIocX+0IqP cjpG80TUlv/ClmyqzAYG6Owp5NC/x7ACfPa3PP5Jn8+H2yWy92uJiNhGU/y8dJayvPw= 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> 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. Signed-off-by: FUJITA Tomonori Acked-by: Alexandre Ghiti --- 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 Thu Dec 18 20:02:26 2025 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 3113E274244; Thu, 13 Feb 2025 14:01:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739455266; cv=none; b=CDgref3Wk6sAcSa8ZlUY7rZdSHQbRE8X8VE3Zdiq0wcWZrw8f8N2C2hkaMEUc69Nqn2J0mjp/P1XqQuUrensVNi4638oLJrk6kUP6Un7VjKKQtbJDzx9Iaenad0f4csghDDifJs8osZ89zR73n3YtYKka7DUPL71kwQ0uisyZ5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739455266; c=relaxed/simple; bh=Nn8KuzF9O6nRbRkZEq4R22MVH1XltQW/KfhFXKsiiKA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sscfiPrvDijARzZr6IA5EXrvHXbbP7Ce9kOKHCghvi3y1w9qst0NOT3sDiV6GDHFHvXkXqhe++L0wtOv3GKtK2bTy5sGnbPdnlj4+vbfCGUJI0f5fh68TDw8NizzzZNGxOMnFr3JfYSQQvTK/66lS2xSxYwlll1l2mupIu7ybWE= 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=OmE8Q5hu; arc=none smtp.client-ip=209.85.214.179 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="OmE8Q5hu" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-21f44e7eae4so15296125ad.2; 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=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=6YTck7L/TM6YT4d7fP2I9343oTdjN2yh7jLib0/ivQs=; b=OmE8Q5huspomm3W/DZd4aaiTB3AxD9fakvxGLfb57FTY9tlmnhZMf9wSK3kxsPMzSf Uw2aGIW5JAAyjm4XCKb0Ho7obwbEwxUwMt8QiZu4k/ID7jJjr1N92F04OipE3ouPR2P8 uaZ0HF/MtaRM9+kndjtNYYdBFG68nFqdgaaHWPZN7Jo28fRA6T1DsU7xtyObLTNtLkjD 7Z5UdexchfYo3rvQXFfSJllliEXeb/x1fpjoWlKPwJOMjVrSBIBIzlZGGiY4lzRkfobJ Z6t4Bg+oFkQq0N/PtkWF76CeCtfo6gYNJS/87MXraW4k0j7ABdqbaCVN5S8LnOVrSIry qTmg== 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=DIgx21fN9OsLZDYuSVZcEHpMMFI+oXapQB3radS6ly/cwv8u4Y++YjqCadrfPo8tDV 6d/QCgxYH8Pfl3U20q36gGU4k5i2El5myW6f+M4CZajGlr0lrUo7e+cpH1XKJLv52AAN PiZNA7Do8XMDdPPeSUn3jPwzkscv7hiTnx7vbdggzwXJrC1eSn7+HPbAEHXUlekbTfoL GsjDg6Xs5c2rNPCnYfOQOdi/aStj0CZaFupNLxgacVoJEEFCfDUhuiWyiiZ4TmSjE6NF P/783QjUDtuaOm38bPP3buxFWYpToeJ8uHWMJC/OwOCNJxEdnxxf3cJMcNGmqSTnQEwX 3K0Q== X-Forwarded-Encrypted: i=1; AJvYcCXlNDp8JLoBtZCUjaIChLP9Y8rnYf5BQ/p90PoNwaJ7z/FJ0Fz8nxhiJVfd+V+UFE9E1C/e+h3ZgG/SKtJ3IA==@vger.kernel.org X-Gm-Message-State: AOJu0YxCR8IN9/8b/hzEA3rA3yTa5ABrYqSD9q+2OWtHG+EnwOqBpBar kcj0CFv+e3QafVUszWDX2q7+Lt14v/Iq/0g6EyZX2sXQvLrSoeqnPdf36AhM X-Gm-Gg: ASbGnctdVVPZSiZPBrRu5Q4WAxnBmHLk304jzYxQY2nMs5VpLoqvyvmbE+ouON+FSTD nbJLBvo8X1E8cHofKG34E547KeO7O/Af9TsH7lYyCwyrRoQiQoXyyvkSqbtMdDgpy8WpVxcKqQL oyqOv13NY6ZKgZIQ9hb5/L+go6vpEzRHLGFmc4dN7PHY9amZlPSie9BNy6YYde4gS696Gq/0tDC E+iOfnImpQRGIph7t8kYuv66ZEVWvhdu7KOMneS52s3710efc5PIOOVIiBMrawprCu8ZCxtkzOV GMGF4U1vg+BlMBtIgCfGsIJjVtGI/uGpGduGhOrD1LJ7prd6bmfp8KCFpxBuImUsWiI= 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> 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. Signed-off-by: FUJITA Tomonori Acked-by: Catalin Marinas --- 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 Thu Dec 18 20:02:26 2025 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 556F023A999; Thu, 13 Feb 2025 14:01:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739455274; cv=none; b=aYfLImkKggQDMxfPBnlqmzLpCu2CjnetEz5M+b0qof6lvTa7PbampM92Vvk8hZZAS32OuDAOvfiUWJI1pn/xbx442gbB9106hgrKAxP65Ow1Me40Bm+1WzOCmrlOyiuBbxIhWp4vLILGZWzga9f+Cwl2A7bSgIBHXG1ojMDEFCE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739455274; c=relaxed/simple; bh=Pc3gxOcC/v5C7xqsjNR+BS+knJ4bCgit2eFUJojWgkE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=szNP6tlkvcl8YUiGIO4LCS2tKMGb2YJP365MBQcqWTy3FZ1nQ+9IvhO1D7ARI2UJiwX0PScdswSEN3kO4XnzxPejRVXYJFCO8qIFPrEpxTy3qdXw7nYCDWwx0HqrOvSgyq51BmcKZ4rD84Z3VSOocUA9YL+6LnLBgV78ocSth7c= 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=Gty/lcmo; arc=none smtp.client-ip=209.85.214.170 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="Gty/lcmo" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-21f49837d36so11104245ad.3; Thu, 13 Feb 2025 06:01:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739455272; x=1740060072; 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=HNM9wcMBMuP84PLY2t7KRndWObkL1hWNmjkX5I560RQ=; b=Gty/lcmoztVRlDaEsDnQk5xlxHNXloZTJj1yOEaKf2xg3SVvkNtT7+0lHDZXIJzL0k 0SiCvx5NUfpVtwmd2EPSTDnYxWF/7RHzPXkAd5mNoUdSGO6NJkQECTtthPSAzv8mI92v 3d3oDyT4mBHup1PT8ttrcvto78wgAFJ4v9rx+1V9WiRTlkHbuTyoSBNt1NQTHDg3qHdm QaREipeZF721maPHmxImnTHsEAl/wkagWEPpRkmnqBRVSSUMNmYQICD0mkrwBBLJrj8B uiljzwmwZOVTGUgoR7MVWlKz36ucUzNNnvS9MtypObqJUaZkcfVVhh0WhqypU/O+L0Hj mNxg== 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=Y6PaOTdV4ya6tkeoRKsQizYMVKANyW0FIkGbgL9uMOlUQQaaaF1MN3jLQGekOBkOgf 03x34It9+1eGXoE0gkDJkPxg6ddET+r3ObgtfWMMnlnIHiqEAw/dWGA4TUiS3zeE6kfC yFWeT3ylChF9+EV4EijqJHalfKS0I0Qx/A1P3n3McDT0w11J6Xxr6puybSmOEx+v5UW/ LCpxN81+RqoOm7eQbfH7zsFzWYOi4h+y7zw5bYOK72d1ZQlURnzYO8hA3QlY5yDovS6C Xeu6a5Dnsd6IZpsUOauOO34ZQPpbXHXY5vOfO7Rs1bKh1ppzRJ9ny/OTwQOhkoQIOZU+ eAbQ== X-Forwarded-Encrypted: i=1; AJvYcCVVMrCEHu8dpZBbOzZmY+Th2Sw3Ab+OdlNqLtAhkoy+lgwiy8A/SOtm6TJ0CNi9tzAKqwzQ3vTmVtZsHXhS0A==@vger.kernel.org X-Gm-Message-State: AOJu0Ywoq2UE0spSo0zup0eVnQsl+b7uYwnMP7J0LLBmi4tPN56vsCcr BlFdcmLAdi10ZdHEd2//fJjlQia0zC+KfyotQmFav/a69cznKKgwXedUWw5s X-Gm-Gg: ASbGncvMexgZxwD9FJjwXf4wagjeihhobmnNusEz993+P6llUIxAS5HDOLKXPI/lUCX txbhxwFNwPyhIjT5XKFk34jM8p1nFiNZ36sJ11Rz8g4HX9q4cOkhcExbHmMAd4apXMg3EanLd0s nntndkec6lwFBXraDAgHJYJvKlUACNp5HWmgphgCoKvdWZcpE9GAkToeMjpyPmO56Cl+ZP5Vsa/ kGhLY3qYibag3NXqmVso5oLJM8mSf1zzKtbeBHek4pEA1xmDinjcnLboOQ74kHb4FhU1dPySMqT nq9kF1NhZnN6UYxSgOAXTzafKVHBCmRiOF8HGtT+FjB/wUaPju5K50RQO0saRUEFKR8= 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> 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. 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 =20 #define ASM_BUG_FLAGS(flags) \ @@ -42,10 +49,12 @@ asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags)) \ extra); =20 +#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) =20 @@ -56,6 +65,24 @@ do { \ unreachable(); \ } while (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(break BRK_BUG) ";" + #define HAVE_ARCH_BUG =20 #include --=20 2.43.0 From nobody Thu Dec 18 20:02:26 2025 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 1FAEC245006; Thu, 13 Feb 2025 14:01:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739455282; cv=none; b=u/fxmzLyMegIJbzaZFUxNuTyaVl6Mtdo8eMEmILf3f6LkQ3WeDX3yv1/mbINM10+ZUMfQJwVwhz9cRyWnep3cZdG/+N/ljwAepTOOguRW1RS25IR7J4Cxr3KG+gAeQmhtYVvhXoLkLtDZ1R978I9kfXWI16FLdRLWZN3+3Ol+3A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739455282; c=relaxed/simple; bh=Qm3OOHynsVWNFFeKMcNloBwCd256HD9FBBWaPy+8WqI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pZGqKpIyi4siczY5hhh8ZvDbhEfqiBc+0fjzC0yloaTOSU+vRGqBzZTpSalMAnG87mnryh2w7e1K2L6ST/mhMaLmYvv08Z+tq+QPKOo7wT5gpj9lfzpgQvmY90DRO8ceQPuTAOoY3V+JVoj6TU0+sJS9zEmo3vn9BbMP9yP6P3c= 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=lCodv2/b; arc=none smtp.client-ip=209.85.214.182 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="lCodv2/b" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-220c2a87378so12547205ad.1; Thu, 13 Feb 2025 06:01:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739455280; x=1740060080; 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=wwu/OQkpfuP5TP6urM50yolt8MlR74sxECkYt+Uf2k8=; b=lCodv2/bG4d3rVv8ERNK/ebfTFBU5tk7YV2t57ZWNagNy/7ZTqxAor1wMhfIYpiXpX OW8Fcy3hlRn/F1nEta/AiJ2haaw9TScG7W0pJ7jQP37AFwHmhoiBbp/xMTZJbVALSTQI r6wDAWQ0c3wwshrvxyVenjLrIahTfK6f6YCqADRTWCrsnTLt93JOEKnWtKvbZb6Ikes/ lORU/VosZBNGHcVFSmBbGx7AfIHUH0LooWZd8pz2wGBGac73I/yO5q0oTIa7Fh4L775Q KtO6oCgYQTqHVqlvuXBGZrKiaYZXirGB2Ejr6ClTYqgc7GPDw1YSQrl1/47V2VrRlPSk nD2Q== 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=NMM+Nh+nKbP4wMWA7vlRf/lZ/XMMJ/xZMh4WrztxkhT8+5+tMJgzV4PXs6stI+BNqZ OIUJuzrH5ptXC2RjqPM6Sa35TIR3EMhc7tK/3AaU/ONRsjQs3rHCGGgbVhzCN176gvFi wtwJIkhwnN8AEXTMcvnrO6XCrDBnlqZ2mtV7T9IfEqA9grY3gMRF4+jhAeyVLOuZnIhE Lnt/bM4wDhUaDSVMlIRjcJnGyfPKHlo4P5f3le/zxv+zQSYSYiKEZiBVbsLPV0BHeI0R 8zafGHYdmMLgDkzfW+efFpfsGirIIBV3CEeOgBjJJ6d3B0i6R8+i1mIJ/Uvtf/tIZuIi q+qQ== X-Forwarded-Encrypted: i=1; AJvYcCW7SodJpn+ftYahdY8x/4/p7Zj0DZFMaWPaEYs0iSlVxwRbgNrbC5SG0DRObj0QyhFNCnGu7QbSSJ65GjXaBQ==@vger.kernel.org X-Gm-Message-State: AOJu0Yygiyzr2aiWZZAf3v8W4nqRl9zsFP6jJs2ZFpo/ByAhdRqJgd11 gNwJNhcIv0oDjwWsrbk/1fx6a8TYt1lG/RUY1e1VJL88Ia8Z0i/kAJEWHxtF X-Gm-Gg: ASbGncsqh/SG13jv+Z7y1TFK3NVTQyE4h/rIzEPtxkFynnEgRbQt9FqBAgaZeMVrQOT fZ2bcLFGKPJaYVN3K17hbzz8RIrf4VbSb+RjKPTWTgKlvz0EojIWMwmhiXQ61nveaJJ/Fy0SLJ1 +pad5otts8IOADOb9g0gUCfisvxQp4X6JOyoDdqwyV0Iw+htoKfwILQ6g5fnpLxBLN3AaZewJdc uKgmEkVAic9IxI+gGssPfVT/eOgMt9TyELG4Hw7yw2xJr0hMjgrUrCBIiQ1gJdnfAXY4gZxENa4 Ev7lCr2S9T0O1lsAOUUWTAkrh8aWiZSoOf9JqLhJsppSkGt4VtLoMlwBajYmCg2jsLo= 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> 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 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) +=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 @@ -481,5 +484,10 @@ $(obj)/kernel.o: $(src)/kernel/lib.rs $(obj)/build_err= or.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/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 =20 /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/bu= g.h) + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, not(CONFIG_UML)))] +macro_rules! warn_flags { + ($flags:expr) =3D> { + const FLAGS: u32 =3D $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 =3D const line!(), + flags =3D const FLAGS, + size =3D const ::core::mem::size_of::<$crate::bindings::bug_en= try>(), + ); + } + // 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 =3D const FLAGS, + size =3D const ::core::mem::size_of::<$crate::bindings::bug_en= try>(), + ); + } + } +} + +#[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 ::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) =3D> {}; +} + +#[doc(hidden)] +#[macro_export] +macro_rules! bugflag_taint { + ($taint:expr) =3D> { + $taint << 8 + }; +} + +/// Report a warning only once. +#[macro_export] +macro_rules! warn_on_once { + ($cond:expr) =3D> { + 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) =3D> { + if $cond { + $crate::warn_flags!($crate::bugflag_taint!($crate::bindings::T= AINT_WARN)); + } + $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..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}", "{s= ize}")) 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; --=20 2.43.0