From nobody Thu Dec 18 09:47:20 2025 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.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 C1BE4156885; Wed, 18 Dec 2024 06:21:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734502871; cv=none; b=lGixf9iCK/sRkcc4yxRQEVXQLARfM7yIhStT/bBJ/u5lb5XbAegf+NCT8o0oilVY7N64fRxH2lRNHU3z/NZ8eCNDHppl8U17knxBhvNnkx6v+D+8PQFm9iyLT1/9+fBxaXWDnQTkwNn+Q4uaHIxHx1SqgyLEAIq1AeiP3Bxfvlg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734502871; c=relaxed/simple; bh=Dcj41wgoErpyvv6rMccASWdZmCVr+BwsDARBxcvPC6c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jrYe17KyGLm3rN4nxHSOMlFmsNIfawX2xp/l+AF0gJzCzURkfwHzCbXZCVnpMGzMeij9N1RQiHw4Zuf5ezyLdZLMa+qEHP0BcexcQc963t8fJD0pZgIml+7h3GTrDGj0enQE78eDuF0fFDdoyKjo3DnOe/wtT3GoYG+MpUMG/2k= 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=TwbvkdHq; arc=none smtp.client-ip=209.85.210.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="TwbvkdHq" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-725dac69699so5362306b3a.0; Tue, 17 Dec 2024 22:21:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734502869; x=1735107669; 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=lvYxXwvEnjyqSBQUdMwEVvz9hfO5O8pSiGSR6Ept2V0=; b=TwbvkdHqFjpr3WW3LmGwhbr70uoXV9jjU4vmomqM4WXkazADdE01SrxRSZ/zkdHYgx JBySTBzF3Kz5BSO1NIvZejzBncD1QiH5dYhl31Xv2u/FKGE4KhkEsP/uEfiRpg6x0kGo LiyP5ok5gpuJZacjkdeDw8ArXNl+4XEf/POx1YIZWcpQ63QHyUA0bqKiOxqG6C3Po+ab MN77nfrZxBWjiw4wJlykXKl0PiRJ2A60eZ/aINv90RielHvg2rYG/52IAQeg9V4TwEEh TsqJgY1g2S142Hq5o0NaPZQOHq/JCqVdq0fLUYVHJrfuby7Sey/japzQ3u6xY7T6eTWt ND6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734502869; x=1735107669; 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=lvYxXwvEnjyqSBQUdMwEVvz9hfO5O8pSiGSR6Ept2V0=; b=dsr2Ld8ZUqMCFLA5y2TavDBOMfCce/LIUq5HclnnoiW1kVBlaKuDUkWhGXEeNCfDeZ P9q3bHe5Ejdriko41arUPFhkctm7Vm0DnmzOVKt+Qwltav64B57kJPGuSoB7PeLXb17L ZCuBmp6YCtIn1lbUYncnSr4ti190KsPtfSpeYlJ06vsAwwMlRxAO++sHoeHpkGfPn9B7 zfeoxRhFnmIo2QB3foe7M+jUKw3aHjxU2FKBaJs3PB2jz2nkoulhSNmTiASlKazBaWtY DO7+YhunItH1A4tNTc+Go3h6MY8RozUzB0zgX0mGAzPG2lkyVnYM8+zOwR7GldGNH37W pb5w== X-Forwarded-Encrypted: i=1; AJvYcCWemHrxf+9jRShyOAWr3S+A6PTMSaNFfj3KAwyUN3SocKokKM+6TeLmu4m81367iOFJNejRnLZcuerlNihFag==@vger.kernel.org X-Gm-Message-State: AOJu0YxbsOrRjAcHl1/vI6ZUhfOxLCELBYLw8SKn/JtwjHn4VERfPpcw 2WdhF/xPuLzwe7SRQQxm6OOMcjAnEc2+73aveBB7oNc2nfEAtXngu+wDSsBn X-Gm-Gg: ASbGncscS+2nCNYJhChDUYA31xp9S/wLtlexseftpgwkJSmnb1Nv52iXr8mTmvDGIro u1x1Pi0ovMQB9aKsAMpT7uuXKXOCRCjU6t1+9HijKzzGcmIFKOhe4+M0R1AXVETntLQz4t/mcL9 6pFQcbQCoxziSTX+lQ/+ljQ/suCziAQBZVOdWCdYtLElrpCumDNY6ER3xHWlIzH6LLwaHLl60lg Q9rvEDC35NAzO+scLQcD1vP/ahsFPt5Xm9svtP98MHs9nTEu12ZElrlK42FWNQ7goAMVE+eD30C OAMYvFsMlb0Yi1C43w== X-Google-Smtp-Source: AGHT+IH3lAAsImJoXUaublLviIawcjfOTs7NtBTxEZSyuiwkLzPj5BCveefFa5Kl5C1+gqt2KTHhiQ== X-Received: by 2002:a05:6a00:130e:b0:725:f4c6:6b71 with SMTP id d2e1a72fcca58-72a8d2a0d11mr3266430b3a.20.1734502868748; Tue, 17 Dec 2024 22:21:08 -0800 (PST) Received: from snail23.. (p7659208-ipoefx.ipoe.ocn.ne.jp. [221.188.16.207]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72918ad5bc5sm7987806b3a.69.2024.12.17.22.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 22:21:08 -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 v2 1/5] x86/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Wed, 18 Dec 2024 15:20:05 +0900 Message-ID: <20241218062009.2402650-2-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241218062009.2402650-1-fujita.tomonori@gmail.com> References: <20241218062009.2402650-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: Peter Zijlstra (Intel) --- arch/x86/include/asm/bug.h | 51 ++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index 806649c7f23d..71df68e2a731 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 --=20 2.43.0 From nobody Thu Dec 18 09:47:20 2025 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 EE99415853C; Wed, 18 Dec 2024 06:21:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734502877; cv=none; b=mGRbZ9j1oq4rjiesPcVR8pFii/Thy4HBtIi1nmRdhPvYpEx+QI4LnOaS1PCe2GKG1wYCR1hs+PLgAFdguJj63Fu3xXl6ADX1HDap9HRk+XzoNi9jRfbzmMkNLWlD5r6X7OocI24pya7+UGQypP1QAeFEBucw/Fa2N1p6hlse9gE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734502877; c=relaxed/simple; bh=PphfExRm9WK9LCNvRjMF7+BNzJn3sHB2vfQS0MOjRdk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Yt8pClVMgk9VRl/MBBpjbyGX1m5r5eHWzv5BMpVf0gvP8eAx+KF1VvDU5GNRDYbOsiqI/gJOpfxRjDyj5mljQGsCkUnWJqJ6IY5bgY5c/uJ24jh+wVe+k+gFIFVzwtgZ/KzDx3+muWCCRLkA4y2K0TqpZtonQjOlvyvh7y7jGVo= 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=AU5YytX0; arc=none smtp.client-ip=209.85.210.173 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="AU5YytX0" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-728ec840a8aso6499980b3a.0; Tue, 17 Dec 2024 22:21:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734502875; x=1735107675; 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=uE1ozcM0HS04q9lZpGc37IxiI38s9WgqP3M8QOeasQ4=; b=AU5YytX0iGhfkph91DOH9drWdShthW6GXZXmHuhx68bTJ/Mdqrc0hDk3lyU6gTIyX6 zUlwnXedftTM/tduZutH53RM5h+OXnqN3F/nrRwfPE9EVbH/uxACTmz3tiUiXSxsNIXh rXtvc7n4R7Ukw4I43wGMG2uGfX21bYvEpB6vfgZRINIcR8v/4GPKJM+VLVviOGmxhtG1 IERTW+Hi4mu089aLJlGYFAmi8z498lZoFGgzoFaaAEXzDiFxfoGaspoHLDvqIRlyLZBf MRIG9VhZP6iuSwswMF/q/ax7OLi12nqB+Z1CapEBqUhP5Hr8hZDVgAmPowtrVsUeHxdE EkfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734502875; x=1735107675; 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=uE1ozcM0HS04q9lZpGc37IxiI38s9WgqP3M8QOeasQ4=; b=M0eHiCNOpOr9S4JY31Vez/+8f/rMFmaHXfrK5/IMMoFCE7fJSchshmZAO4+wquwFzW Z04dJD4pop3mj2t/Fd8p1VVjI8jITF+Xx9em7JpUzsgtyTMIvcZxnmTDzuetZUwXHJQf nUqtHskq8w85f57PROx+7R79sgJ2jIjBBAGBdytP79Jnye5JXHvxfeHQMILfC05461BV QzLQPu4AkNV+2ikqVvkYQFrps36oqsqZy/kzJup2Jxa1DDpzqNjNbnP49G1EgudWIica p6bWjXf9c/b5ZPyI68x+Fz4b8VNTns/PQRgqhCffjhjkneXlrn5ULHVdx6hm7UMmRDEB dJsw== X-Forwarded-Encrypted: i=1; AJvYcCWeb8ZOK/iMoFeYlLvvT9KgJ8OviDKFtG2zmZ4ev8a+zgL35IGFcaTHKCTf9dMfeiRMIphPfz+E5Zi7u8rM3A==@vger.kernel.org X-Gm-Message-State: AOJu0Yxg9cileKaPcjTFa/siBTBKodfGhv9ddwXWxnBfrhWOJzD9XesA 7TdA6EF8lcH1v4ZjBasz8rsWGU11emqbBB61XRJ6cu9dJ2H4+4V0JK4Ct3Xk X-Gm-Gg: ASbGncvCJIxqgNCobFErjx+L7xidf8Nzypx6n44V4k6yU5KF/oTLEE43/WHiFVISUBj wtq3aQmU1nwjy78XxAn7KBdBP2UE1I7fDUpjG7qYchTcdxzqm6diqPTr88oDdr2UAjolSQVgQRu fW+Y2NM3umQtleuKg9GsoFA13wmyH4yCzW7X+O3jTyYD02fE18RNV8aRoj6p2/WFJRlahrhqodd aSFAM7EM9Ze7a8cPZBR9nCL6J3PVvrg9WbJcKZogaloiPa125RVXWJLueMe02HEgORcAYlJXdFA sO2cbnaRgmA6LpR8FQ== X-Google-Smtp-Source: AGHT+IE8Ef54dNMtI5iw0XGR0f6dNrZGSBFn2rHI6W1DYE3F710PsI3NNNPfVvjoBn7Wi42XdgnDdw== X-Received: by 2002:a05:6a21:3382:b0:1e1:d22d:bc01 with SMTP id adf61e73a8af0-1e5b48831e7mr2645443637.30.1734502874926; Tue, 17 Dec 2024 22:21:14 -0800 (PST) Received: from snail23.. (p7659208-ipoefx.ipoe.ocn.ne.jp. [221.188.16.207]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72918ad5bc5sm7987806b3a.69.2024.12.17.22.21.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 22:21:14 -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 v2 2/5] riscv/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Wed, 18 Dec 2024 15:20:06 +0900 Message-ID: <20241218062009.2402650-3-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241218062009.2402650-1-fujita.tomonori@gmail.com> References: <20241218062009.2402650-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/riscv/include/asm/bug.h | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/arch/riscv/include/asm/bug.h b/arch/riscv/include/asm/bug.h index 1aaea81fb141..ee6b9b787e46 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"); \ --=20 2.43.0 From nobody Thu Dec 18 09:47:20 2025 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.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 E96EE156678; Wed, 18 Dec 2024 06:21:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734502883; cv=none; b=Hvv8qwDEj5EMSGLrJvJHj7GkmxknJscLkg61NmylDCTvIw6H1sXHktE85hcRIKOiffM2qMzSxfNyc8rspKweCufOYic+ZtMa469emGtciGZ1+Dhhu7vBOZg2gSK/4/VKfGwtSyZ+mVMeWpSS+Q7n2DCJcZ6ohs9MXQgtYh1Ke94= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734502883; c=relaxed/simple; bh=/K4eSvI1Ipf4Aur9iVP05PUVjTwf8ShxKmTB6bwov2M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WsLY/TbsU4fd/arxp/VOISz1wvbh+c7ACiQtSXdda6eYkLgK+zUfuzL6NRw8Nj3Eou0ov3Etqj+wDo7E4+EmnTZ3sHylCA8NOjAB5fuEas5K9D8LlWsGS/Nv+r9b7CXvCNMjrpZvTVq4fFnM6GY6jDCDYcZAD/zGUiZJa9tf/rQ= 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=DRbLC65I; arc=none smtp.client-ip=209.85.210.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="DRbLC65I" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-728f337a921so6352291b3a.3; Tue, 17 Dec 2024 22:21:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734502881; x=1735107681; 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=GaW3Ni06SPvaTbLHs0pbUeHaTTwDPxQuBfccVmzf3vY=; b=DRbLC65IGHr0B2nd5K6XZVcAlANgVoqaZhgNwO5ptv9w8xhp0hGkkVX26SmAamm1h/ 8pFmtRFEhkthzLjIpG6nrls/hZ5Ub3FJHV8Ih/mfB4uNkGK4fvVTGsDTQqBj3ZBedAJL BLEeoYG3QK85SrDKbH6is2r194woU+aqJFIjV4/Wd2aAIVadAP/Rffu8kwsu7NmZozDY ReJYGcpvm1fhIikQr4ZeUUzkultKzQ0eyRWmJE/uGGiRHsltrqnNo/le+Al91q5V1Ctg 5xGU5wC1PVMxwEhkkfHO/ZmymOTIIKRxTVnmb/GHeD1OIEUNHr1kkHELCTndaVo+aMof Q4zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734502881; x=1735107681; 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=GaW3Ni06SPvaTbLHs0pbUeHaTTwDPxQuBfccVmzf3vY=; b=mQ7yigCpdzjakMcDGQrzjGNjFgzMLNkhwkO+XXo+8xulinQ9Q6t1IrjiOUj9RY7Xmy 8UIZCZx1hDS2Vzn/oTzK80PL9+dDTpffvQDvjmf1qCzdFlFq9aji/gDi2PdWP1JYIxIG NA24TfWMqLVybHvrEQ872aQUFOOp2yhVaqf6nLBpKutAsMWJ15UWoU56Kpzgn0EmD9v1 /xIs7TZ3W3rU2KJh2HG2+lDDEXPh7LsyJFE28+w3wn3qQIo5N9q2/Y/F/bZSlOSAnujq ayAYbcxwo9jeF5SvYcwtJTTnGz+aA0H2YumBxQYcdPFgtK+uijPPCqUuNORxgJH8SaI3 z8JA== X-Forwarded-Encrypted: i=1; AJvYcCULCpe0kGM75csX/ZA6VXLZtGmIUc8ZKFrJrGjnXpCfWyvfl3/w1VFxI4dopb5ylyesLUp2Uv0aBC+reHYVNw==@vger.kernel.org X-Gm-Message-State: AOJu0YxvyBSMohmxMda4lR2C68KqziGg6X8QU79VrFKg1G2p+t0ok/ZM zXX1EJSWgVsl7k9e0lkduED3KWLO1gSQY+DGuxXaMU2vb7qifHVYhx5yQWEY X-Gm-Gg: ASbGnctuG/EknQ9IHVwuDerBc9AnO3wsmPs9JR4hYrNgXgO/H7KcIdxwJE+7wWqcL6j AdMHDhJjA90amyKWAi6QIhSC2EP0vJn9xODeX32M6t+/aFaGHXrpIX9t8XPCiB4cAIy+u2r7QUQ OSLhvVLpcuAR42pEDQTepAb4pQ8QnOayDk6N1eDH19svteCTng3qRuu07/Xd4GnjB70oWKmbUr5 ixokOH04b/Dl8KRkVudO/bEs2hWSNB7Oxz5FE1h5U1mdKyeZQbOeBahMM3ghDs92PRylIpO24ZH 2VTbeRUGdBGlkT+aYw== X-Google-Smtp-Source: AGHT+IEuE5RibS/0PE8QGo2Gm9cyN9hV9VQKXrPoGrTJF/gtHBVwLDycc3gJhMqxVgMQzkxuMYzzBg== X-Received: by 2002:a05:6a00:21c6:b0:71e:13ac:d835 with SMTP id d2e1a72fcca58-72a8d26988emr2575186b3a.11.1734502881056; Tue, 17 Dec 2024 22:21:21 -0800 (PST) Received: from snail23.. (p7659208-ipoefx.ipoe.ocn.ne.jp. [221.188.16.207]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72918ad5bc5sm7987806b3a.69.2024.12.17.22.21.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 22:21:20 -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 v2 3/5] arm64/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Wed, 18 Dec 2024 15:20:07 +0900 Message-ID: <20241218062009.2402650-4-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241218062009.2402650-1-fujita.tomonori@gmail.com> References: <20241218062009.2402650-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/arm64/include/asm/asm-bug.h | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/asm-bug.h b/arch/arm64/include/asm/asm-= bug.h index 6e73809f6492..822e9d51d3e9 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,22 @@ _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) + #endif /* __ASM_ASM_BUG_H */ --=20 2.43.0 From nobody Thu Dec 18 09:47:20 2025 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 265D7166F34; Wed, 18 Dec 2024 06:21:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734502889; cv=none; b=sJTONHrahupmJm/97Bi12reYTSfAKedbqjhE60h1S+/ADu54oNpBUhFQy6GuUAaaZhHWEOWuG/bH1XAfXhhwjcJNUSEUQGmTMK74A3reA3c0e0rVlxcxzs0b8DLtNHLBzeuB9ektRL2E2ZxQlK4p/P0E8PYjdQiVARpXNOJ0SIk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734502889; c=relaxed/simple; bh=poPMKuxFCyNN+k+FyvPioVRFCtbD9iybhG3EXgL//Pw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M2atBQimv+4EjSod0TF6Tski3hjTx5aoE7OGpxERx9d76ZcrAcDdugCGGecdAmad/AKjmpRGISAeYK2+VrEp2neFscwcg4pEXv8Vg81TvPujLKqYJIrOwuzqIL6ZSMS7yjQA6hlJAFNDIEFo7d06e9na2PFy10PldDaRZ2GiUGA= 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=ZL8lXwj+; arc=none smtp.client-ip=209.85.210.173 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="ZL8lXwj+" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-725ee27e905so7757952b3a.2; Tue, 17 Dec 2024 22:21:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734502887; x=1735107687; 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=bV4HRBWZxkX47QY6JDDMA6tt+8zgh76SAzdokkmEw1Y=; b=ZL8lXwj+81K1eQvaoNcEMSB9FM1prR6MY81IF4z9FcjA6xkyGdsCQ9CSbqV+Szz0dl G2WbWtfopfBYLVdqoZHO3/9T9Np5Ef5LJSor2J7RqyZUPiTQmzlbmegCq1GNkLmJHBIA 5qgLlTU9x96GiS6UiznhYGaxvq3hog4ZAlokApgHLzMFo3DHVQTuTSMfanSviginRuon 55CtoolBlzShjwnhvslfzPOL3j12hyN2/WHUviox38Nd5FyY/bfhO9+NjW53avBB676R OqVtYn8lbY2MvR+g72+k9hlf8YV3CXKvQg08BEKnArHyR92ThR9C07s7bLhhD4FGcTsN 0E0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734502887; x=1735107687; 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=bV4HRBWZxkX47QY6JDDMA6tt+8zgh76SAzdokkmEw1Y=; b=DRJSB8BlWwJM1wSTXZ6fbcP0LmtE0ZkRAEXnarBtGWCHofn570S5/L/oCTNljngGxh 4RMUyD+qXXA33RQf9KiwLPy2e2Lz20LOUUtCpdZdYWu0V4Y3f0qIhtNRM6TqIcTMv0GT Ixe1ZP7WgnIY2/6cM2adhNHDU/pKCENF2QULzAYGVyn8RZhSOWOFBNTH/oEsZtehlkXz D1iF2t7uvJwfUY0gTC6fxtmV6fltWNBrPV4gxltZuv5K6H2MJ/CS3AVce1AUK3YFH3Rb Dk/xE3dbjvfhv3+sKqIf4VuVaha9NEQyAvnqpi6Vqml4oc+/hoDThYuwZMMP50TYJAk1 /oeg== X-Forwarded-Encrypted: i=1; AJvYcCWd/QlbTR2C9MagQ/Tqx6xb2Mta2G8OgD588ZWHo1+FGqkhu6ji2f7HTyP7p8YSmoOCTxFdzP3uOJuUSMv/MA==@vger.kernel.org X-Gm-Message-State: AOJu0YydxHEJH+QfRwx5t4BeO00YdwbBhVOfl9/7OIPaREwGR0FLPMzO MIOeuRHReQNkUX21kWOUBJPZByoFr78XGU7nRv/F3ZLv0b2wQDk2oaiOrGLa X-Gm-Gg: ASbGncvdLUEPC263pgL26uBYeTP6482YS51QZkKKOHJwWsv/Tl7P7GfbmtYCbhmnlrD RvB6IbghdpQLtMYHSkQ7K43sqmVXw8x0zPDKnVN4JP49ZrWdT63Ta5Q7o00+Cz53DSIgsf+hiJw YCKfIh3ydhazxKZTMv39zH/CtaHMvZsRBj8wPViSzXBOZap4focwTAfz3BKpdN7BuBQdS5VQEF1 Spv6dO0IflXeMW5WHXhiPr5ky1QSVDlMZRNJHYoAgBqra16zuF/OhO8qRYVDnve8UGuHxMWFvuB welYKm00w2WZTg6oTA== X-Google-Smtp-Source: AGHT+IFlF8vY4Xu+YyeQGqBnLgvAT6KCSD+NGgBHnqg25UXCR6Ho2esifXRrWSvDZ1rmidOkpqKkqw== X-Received: by 2002:a05:6a00:2c87:b0:729:597:4fb2 with SMTP id d2e1a72fcca58-72a8cd37353mr3156867b3a.0.1734502887210; Tue, 17 Dec 2024 22:21:27 -0800 (PST) Received: from snail23.. (p7659208-ipoefx.ipoe.ocn.ne.jp. [221.188.16.207]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72918ad5bc5sm7987806b3a.69.2024.12.17.22.21.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 22:21:26 -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 v2 4/5] loongarch/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Wed, 18 Dec 2024 15:20:08 +0900 Message-ID: <20241218062009.2402650-5-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241218062009.2402650-1-fujita.tomonori@gmail.com> References: <20241218062009.2402650-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 | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/include/asm/bug.h b/arch/loongarch/include/asm/= bug.h index 08388876ade4..5cac2d3efd75 100644 --- a/arch/loongarch/include/asm/bug.h +++ b/arch/loongarch/include/asm/bug.h @@ -21,14 +21,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) \ @@ -55,6 +62,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 09:47:20 2025 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 1ECA615746F; Wed, 18 Dec 2024 06:21:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734502896; cv=none; b=C638sm/rRvzAsLmq9XoOnf5VvYAmcpeYG9eE3X8feeCNA5a2MgNwUw37Z/LESfjw7e+99/+JkUXG3+N2g/K80MXo78seKooawx2C5phz5IVI6PG2wUHhiRrwVpHJCYyKtXRC+G3sgg+EwstAvzq+yO6jWqybYA/6rgjPZjzUD/o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734502896; c=relaxed/simple; bh=F+UxQeJn/7V3A50yv7sNNr+lijigleW03jac6dRiBd0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RrE0jdYbzth0jVxpuqANB0umIZbAM3YXdkloRyQie2uYD8UDevjUkLWHDwF+7lHrpt5RpJd6dT9AWsVnQUephyafcVbS368fYl/5xx7DuHBveLq4s1Escd5ydYLsylGRZCu1tbKg1L3ONyvFRsENyckaxMoLYm+Q5YTcbUiPZVk= 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=KIKTuhpF; arc=none smtp.client-ip=209.85.210.175 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="KIKTuhpF" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-728e729562fso5263688b3a.0; Tue, 17 Dec 2024 22:21:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734502893; x=1735107693; 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=iwlBx0jrzaKTcJ0dbZncCuW6nwSfqkNTYDsslGfubt4=; b=KIKTuhpFJEhDMDfOjAcCPJOvVn2RgkznuK863VM5tk5CxhKLyNFngbCChVIkuZ1u66 oQ0oe5ghVEhlvsY28JDGHu5VioEcY0HrqhQESf/HZQm/2P0FIH134yWlfhWZ2X5veq8B 3FFqX2Nv7jRb+VTuRpf1OMwZvvO4p9HghY7Md38e7kOCKmDuKZdXj4JyCeirS6JiM0iu Mcpt/tZV5+2qN0AjJb2Iu9iVewBhmx/MBsa+quNt0H4enpmj5lAVq/7f7kdmybTrAN9M jLhnGzS27mE5xfFtQUpSoEUcdVLYBznpKYGvtJeTJ6LCIMAO5GOJbDG7Y+IC7nrPV4QD Wypw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734502893; x=1735107693; 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=iwlBx0jrzaKTcJ0dbZncCuW6nwSfqkNTYDsslGfubt4=; b=Q5ZEEgbKTgXeZ8wcfzCK4h72FeAf1cVHDdOPYM/aZl12OM4oOrR5/yIfgkdOebjvAt sy4E5/xOUfm8VAo5r9XCrhdF6kELlvtTHPI8qcde80VaZeKp+4Gh2bhTaj0bICvdDjKo mi/+eBPbXtrIWaVVUfJhPq1acZTXP4d6bL7Fx6BBcS+p+JDjWBrTW+o87JZHdquIi/6C MFgXxHB78c/5W6XO5jRAVaLFkVCqNhMi9l8VOs10bcA+Tsm4AyLaAEnYTf6ZcbMLyYC6 XlbeddCNNpVm9ea1MQp1thwqmNbY4jSqfJMmAiklwFZifYXmVgMR0s2PCl2aCZDaa/60 L05w== X-Forwarded-Encrypted: i=1; AJvYcCW7hFwlh8mgBlt01X40fvDnUTAeMpQYVOw7Vv+f7S+eOPYxxTBeFQQ+h7Ul7uLQHpxA/b5AQIYNkTRZNiRWPQ==@vger.kernel.org X-Gm-Message-State: AOJu0YwzGTrs2NRrL/9EoCFRd8sOJUD+NCDM78QCXF+5RHKQVDKCh1+x kUervOeonk24dHtjpAvpOXQe4Pb1Iu39y2STlXf++ttDiH+LjA67n+PpnhME X-Gm-Gg: ASbGnctKbjplL4NGjiwFBt9aonsMdZdX4KV5zXZk5u8hxwd/7yhxpxwT8+Hvy3+H9jb QtIO/xCcP9UFpKUk8ksaoXYdLj3hLmM+qqdAz3kSk9cISozbN+jpZBaSvmFX4FZq/8VBNZZVIR2 4Dw8526G6lPB7b1gOC2NylDy4NHHAHm88k8avbRku5ioajCnK2lOesmeDfm8kD2ajlMAx3Qa0rY Lms1kNkMpRlcIJAHSA6A1/zsyGsUAVT3qHeCCaL/vKv8fmOHAgkOAGKLEIVelc/S8/qdFMD/MER VzyiRvcaMut7PVEvQw== X-Google-Smtp-Source: AGHT+IHQ4m+HWcjLQvuT9XztCDOhnw/Ackcq84+U+25p09X+uuYbWpONGNOHBq0tC1LQs8iHELt5MQ== X-Received: by 2002:a05:6a00:44cb:b0:726:41e:b314 with SMTP id d2e1a72fcca58-72a8d2c3f2cmr2786241b3a.19.1734502893327; Tue, 17 Dec 2024 22:21:33 -0800 (PST) Received: from snail23.. (p7659208-ipoefx.ipoe.ocn.ne.jp. [221.188.16.207]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72918ad5bc5sm7987806b3a.69.2024.12.17.22.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 22:21:33 -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 v2 5/5] rust: Add warn_on and warn_on_once Date: Wed, 18 Dec 2024 15:20:09 +0900 Message-ID: <20241218062009.2402650-6-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241218062009.2402650-1-fujita.tomonori@gmail.com> References: <20241218062009.2402650-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 dynamically 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). ASM_REACHABLE definition works in the same way to get objtool's reachable asm code. The architectures which use objtool (x86 and loongarch) needs 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 a40a3936126d..633b2c28605c 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -37,6 +37,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)` for the sysroot when it may not be available. ifdef CONFIG_RUST @@ -449,5 +452,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..4e65525e4464 --- /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!(ASM_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 e1065a7551a3..913f3a5b2a98 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -32,6 +32,7 @@ pub mod alloc; #[cfg(CONFIG_BLOCK)] pub mod block; +pub mod bug; mod build_assert; pub mod cred; pub mod device; --=20 2.43.0