From patchwork Thu Nov 3 07:50:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 14729 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp379353wru; Thu, 3 Nov 2022 00:56:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Uz2c8Tad9AHdrCLCzcOtEskUxCmPcuDLLGD1pZvGGjj9XqwnerBRoJxd/O3ztnDO4uPTI X-Received: by 2002:a17:90b:1c8e:b0:205:783b:fe32 with SMTP id oo14-20020a17090b1c8e00b00205783bfe32mr47827889pjb.39.1667462167160; Thu, 03 Nov 2022 00:56:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667462167; cv=none; d=google.com; s=arc-20160816; b=tCo6csATgNdh6Yr7Vs0FZXSwh8TXgdoBjWTTBWlJABgEA6y48IWPGiEmkda7b9Bg8c mWs69Z/yqE/Il/450XrJRfwVHdqU52M731bUQEnpelw7Y7NyHzx8O/Spi+vK4iTbzfwN yLQefldH0kIiHPQ+EYx4Np4w3aEvjpDK5DhI4CKAyz/tsfXXEYHEJCjnXk5isqmMWs3P yjKwBlJ3bjrZEUBH+BCnlML1M3a7o7REEOlsYBF6kFS4WUvHgdoyCu8a8R++wgmCeqfy RRHM6wUIxSLRSSdZUjGRXv5MnbMR3kj4f4RjuAQjiHBoDDeLsHDI51N019ouZkRnI7TB Ysgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=geQlShIttdSOI8VHX6MJnH96EUyPla4ktOZUwHbcAqY=; b=w7oPrRAJ7zASiZxodQxY9U9/bxui8lNL+J8pLAbWv6gl9pgD93XG9qG7qe/GRiJmaR ZN74jdQBQIpBhvWH83GabdpQkW2QhltYIb/a+PnLZJ3NNLToTXvdigY2uh0rHUw0ZWvD psBsfgeNCnKLUlu+fkAOp6f7QREL8DdVYnYJMSjYK9MtaJyFnefh2mOEDo3X8+pqcaXV C8/n/TfM/MWtfIVryKyWiKT8EwAzKRTGijig5qSwQRKSsyuY+jaHvzoaO0XHthpJKHVB we1rIHHwBGJQsWP5hw/1nWmW5b4eYkq5pwwgK87mfWbASFWh2DpvVME0qOS28/EACR1y DqDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PiICmAcq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lw3-20020a17090b180300b002131849ea4esi6381238pjb.140.2022.11.03.00.55.54; Thu, 03 Nov 2022 00:56:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PiICmAcq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231217AbiKCHyy (ORCPT + 99 others); Thu, 3 Nov 2022 03:54:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230214AbiKCHx2 (ORCPT ); Thu, 3 Nov 2022 03:53:28 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA5B16275; Thu, 3 Nov 2022 00:52:59 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9302C61D9C; Thu, 3 Nov 2022 07:52:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86B36C433C1; Thu, 3 Nov 2022 07:52:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667461979; bh=5BqmCuQp7sHy6nn4kWXkL6Hp/JjWVQuzCirMthcyLmI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PiICmAcqboAOiZ8KCDsTKMKyOLD9kp4qL8jgaavdIv6tuOxIrcuuOjpA2pOqClh99 KvK1+a0pK/QyZXB9j2PtqK4Va5F5RJKBMZmGxoZoAo5fAKtYCsHbSzyqRhAt0DxGCm nJlN6TK4nilkScNYDSCBugU4rm34Bo59pkoa4fIqJKbBZ43aZBNq9ZfLH5jruVIc0o EvcZZ/8AjpldvcaF2YNcXvgj9R4VNYGTFMClePtXxIZE07LfHABx/swK1LEkwbj77/ Jj3jIyM6W3XTXH5HJM8FI/0GyBdfhi4FpehaBL4ePVKlM/ZnxAVS15MuE2R7/kJ2ze O3pRKKGVHXQsg== From: guoren@kernel.org To: arnd@arndb.de, guoren@kernel.org, palmer@rivosinc.com, tglx@linutronix.de, peterz@infradead.org, luto@kernel.org, conor.dooley@microchip.com, heiko@sntech.de, jszhang@kernel.org, lazyparser@gmail.com, falcon@tinylab.org, chenhuacai@kernel.org, apatel@ventanamicro.com, atishp@atishpatra.org, palmer@dabbelt.com, paul.walmsley@sifive.com, mark.rutland@arm.com, zouyipeng@huawei.com, bigeasy@linutronix.de, David.Laight@aculab.com, chenzhongjin@huawei.com, greentime.hu@sifive.com, andy.chiu@sifive.com Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH -next V8 12/14] riscv: remove extra level wrappers of trace_hardirqs_{on,off} Date: Thu, 3 Nov 2022 03:50:45 -0400 Message-Id: <20221103075047.1634923-13-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221103075047.1634923-1-guoren@kernel.org> References: <20221103075047.1634923-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748460809300857006?= X-GMAIL-MSGID: =?utf-8?q?1748460809300857006?= From: Jisheng Zhang Since riscv is converted to generic entry, there's no need for the extra wrappers of trace_hardirqs_{on,off}. Tested with llvm + irqsoff. Signed-off-by: Jisheng Zhang Reviewed-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/kernel/Makefile | 2 -- arch/riscv/kernel/trace_irq.c | 27 --------------------------- arch/riscv/kernel/trace_irq.h | 11 ----------- 3 files changed, 40 deletions(-) delete mode 100644 arch/riscv/kernel/trace_irq.c delete mode 100644 arch/riscv/kernel/trace_irq.h diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index ab333cb792fd..d3b7779f774c 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -69,8 +69,6 @@ obj-$(CONFIG_CPU_PM) += suspend_entry.o suspend.o obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o obj-$(CONFIG_DYNAMIC_FTRACE) += mcount-dyn.o -obj-$(CONFIG_TRACE_IRQFLAGS) += trace_irq.o - obj-$(CONFIG_PERF_EVENTS) += perf_callchain.o obj-$(CONFIG_HAVE_PERF_REGS) += perf_regs.o obj-$(CONFIG_RISCV_SBI) += sbi.o diff --git a/arch/riscv/kernel/trace_irq.c b/arch/riscv/kernel/trace_irq.c deleted file mode 100644 index 095ac976d7da..000000000000 --- a/arch/riscv/kernel/trace_irq.c +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2022 Changbin Du - */ - -#include -#include -#include "trace_irq.h" - -/* - * trace_hardirqs_on/off require the caller to setup frame pointer properly. - * Otherwise, CALLER_ADDR1 might trigger an pagging exception in kernel. - * Here we add one extra level so they can be safely called by low - * level entry code which $fp is used for other purpose. - */ - -void __trace_hardirqs_on(void) -{ - trace_hardirqs_on(); -} -NOKPROBE_SYMBOL(__trace_hardirqs_on); - -void __trace_hardirqs_off(void) -{ - trace_hardirqs_off(); -} -NOKPROBE_SYMBOL(__trace_hardirqs_off); diff --git a/arch/riscv/kernel/trace_irq.h b/arch/riscv/kernel/trace_irq.h deleted file mode 100644 index 99fe67377e5e..000000000000 --- a/arch/riscv/kernel/trace_irq.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright (C) 2022 Changbin Du - */ -#ifndef __TRACE_IRQ_H -#define __TRACE_IRQ_H - -void __trace_hardirqs_on(void); -void __trace_hardirqs_off(void); - -#endif /* __TRACE_IRQ_H */