From patchwork Wed Nov 30 03:40:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 27586 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp711404wrr; Tue, 29 Nov 2022 19:46:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf7Yn6kqX0wjqFF11wgv3tSui16aJ7u/zaMosZWrX+aeE2p5i0LcUOW4V9/4SZbAsjGu42n7 X-Received: by 2002:a65:458e:0:b0:477:e813:1795 with SMTP id o14-20020a65458e000000b00477e8131795mr21146870pgq.54.1669779997442; Tue, 29 Nov 2022 19:46:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669779997; cv=none; d=google.com; s=arc-20160816; b=JLdQWA5dWIfb8Z3ZISYHvehi9rjaQvryiJDtE0g9JowlaVzs/EYp526OYEQbFbLRAi 9rYvF+VJ4mu+ZPJGrlXW1LchI8UE+7mCDoaoAVqS3GSBU3zO0u+24FYK1r6p/HajjnRt yn5veKOzMKdyyHW6o1Zo3Z1P/x+nuqrF3fDLX4ILlxVFTl0qk4aJ+E1cqIGUx0MH2IAq 5LT9vqZ6IPoicQIb07TRufaPP3aFx0/SsrghcC0+eWqJRv2mJfyTCg+dfyXnaXLGG3uh YKoHBfOylTT0K9/S8exGd4Ga+/loZuBa4gZW5n4cMtYjFnJ1EgLhBVtKfoGh/QsC1FaB vLmw== 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=N4c2PFSXPf1RSISQwY58epZT7WHeS5s9/4oDgRuNRk8=; b=jhsLnlD5VrRiTpTq/xBVdWbmoooyHiRrG5+G6DjgYKSeIZIymFM4lnodqR235RIjZk fEm/PrQvfFtuC+HlpkeIfymepst3unnFgQNCrMHB/ezAkFrPkZNyaHWYnG778q5Ngytx AK2S3d2Jv9CIR+s8sHXyHmu6+CYYTBlp3zUqYHZVK2atKJrpikX0mxpslOt0kMKGfzEv Wbaz0KJ8px4Z0XSP/EYk1l7OOPCkhZp8UMpVcl+bcL4C8O14e6GuONhv8hWvCQqElZuy pM/pWbFMbgLOA1cmW2AROIBeHh9YWxau3LKvkUyEIYF6O+x2gJrVRYblxJ3bjtZ5Z34S avvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Hw9dzSoY; 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 u62-20020a638541000000b0047831a7f660si213893pgd.228.2022.11.29.19.46.24; Tue, 29 Nov 2022 19:46:37 -0800 (PST) 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=Hw9dzSoY; 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 S233117AbiK3DpB (ORCPT + 99 others); Tue, 29 Nov 2022 22:45:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233158AbiK3DoP (ORCPT ); Tue, 29 Nov 2022 22:44:15 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1AB91F9; Tue, 29 Nov 2022 19:43:38 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id 8DA52B819FC; Wed, 30 Nov 2022 03:43:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3AF4CC43144; Wed, 30 Nov 2022 03:43:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669779816; bh=inDVdeT+ApeWD+kZ8zmtn7/x7HfuwyxUYXSgh89qx40=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hw9dzSoYXan7tBBKjH/jMIyD6MJfG+La81RhVxyJThw8hErpoJrwssMNxll3vD6k+ /kxJrSbo7Dn3JTIKz/q72Xsa1LB2RQkiBQvOUSwgD2VsGAfpLdMrG3Symfcm2jehai CVPPfItzilXALtrs3VbLqN6LpgOP1w4W4KAekRLXKN3n/GfzqtziAV1Qezt6BXWcxY LzC3FnhOnPvwtbzLuhL1eYDFAh5BcaE5TM8P7o8ZlvB6xqohAuzFMyDsnRn5WeCNRQ 3Y7usFGD3Lmv5YymJr+4+4EqNaf1dv5x3GyIzrOw9Q29llB6v7C+pKop2BSIjhr9Dz z9HBoo3kos4Fw== 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, ben@decadent.org.uk Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH -next V9 12/14] riscv: remove extra level wrappers of trace_hardirqs_{on,off} Date: Tue, 29 Nov 2022 22:40:57 -0500 Message-Id: <20221130034059.826599-13-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221130034059.826599-1-guoren@kernel.org> References: <20221130034059.826599-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.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?1750891230343786683?= X-GMAIL-MSGID: =?utf-8?q?1750891230343786683?= 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 Tested-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 */