From patchwork Sat Oct 15 11:47:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 2934 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp633825wrs; Sat, 15 Oct 2022 06:09:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM41aPkAQHR0N/Bs/TDGg/OJ0iyJeq3Z4LxVLUEkDckK7zPPsUu8Y2boy2EZc+oCMKDttWby X-Received: by 2002:a50:fc85:0:b0:458:e7c6:1cfa with SMTP id f5-20020a50fc85000000b00458e7c61cfamr2291172edq.256.1665839362063; Sat, 15 Oct 2022 06:09:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665839362; cv=none; d=google.com; s=arc-20160816; b=m9Nnsg0h96HSPApJxAs6iW4MyfWCRMxcJNG7jAH6wU2V3ftuF2yE+1NktuSwyHWu2s fo5LZF0Ullj20eQgKLbAfVgj7SaY3VZmtzf1d6MxSdpYan2HVsAxAMr4r6j3+rBhUqk8 rooe8cdPh/lT4X2bFw+sj3bOysm1dAzlxa+VnA6jX86Zch1nMhRcmafGW9ij3jjjVc+k oWzf1ReIufwAhEtoxhGcAtIMiNXvm9yVsIw7Q0DvNrGCw9owxnQcJyDNbE/OZeXM/Z2H G5wbhV17IqZZJWnzdMMHmKNB07vNB91ho30haiPvhrmX1MOi+2vCXYnVVwEQpzoX4kIn takA== 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=IMb7bZ1TC36Yns4h7s739uKfNmuA+MhSRZRRATyJqW0G3DDmsejcuV9NGL/rigNwZD 0LvMMZuoqp8rz6uDf4JqlQk4MInaP6589gYPA/FJbGLDcs7pEXXuWOANXK1ti8cD4jv0 pXnpM5bdqkufoIQDjgkUjFL+KiKlVT+OX9jA/bpkI11ZgpnTRZ0Pq0wsmK6RVRWwidQZ phinqBSrdo8/g26F1o1o/JlcNc8UutLjrIf1K0ajeGHQkYzDdYoyo2C7d7RtA2+02/8o rEBkjSDUSFKB+MOQhMd6VnvKyyr3zqKShF1MZT5YbVmAhLva/DI20XV+TXKisCo4RUCK 7myQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HzTdACx0; 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 gb22-20020a170907961600b0072fc714c92fsi5169083ejc.902.2022.10.15.06.08.55; Sat, 15 Oct 2022 06:09:22 -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=HzTdACx0; 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 S229802AbiJOLwY (ORCPT + 99 others); Sat, 15 Oct 2022 07:52:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229665AbiJOLvx (ORCPT ); Sat, 15 Oct 2022 07:51:53 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFD2E4B992; Sat, 15 Oct 2022 04:51:28 -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 ams.source.kernel.org (Postfix) with ESMTPS id 85361B80935; Sat, 15 Oct 2022 11:51:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DBAD8C43141; Sat, 15 Oct 2022 11:51:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665834686; bh=5BqmCuQp7sHy6nn4kWXkL6Hp/JjWVQuzCirMthcyLmI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HzTdACx03e7sgaFhlHj/RkBPDO3LyYlvaSHbKUvnJhZmbnRosS04kxqClsiCkT8Do NZWAbrv9/mPEWwmITPSvaLLjqcxVciEoSYyriL4RCTEmIydIGbDj/PvprKj5vl6DPf Hs2R4nwHqPRtggH02lze01IZbmJbl1ZEnELCFa/jn+azHVj9tZHjwhmUkwiq5/2TUy xBsf57J2LJSslxI9v+Kwlp1AssO9cT/iv7YuJO651Bic36N4u2fJkdAeaKcz1OD0u4 5IynUkc+GoLmBFuPr6FlMHL6a0oIsmpjPowjdc2mWEjGfH16JQXvJlfR/RZE1qJOaR FQdRjl9vJxh/w== 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 V7 11/12] riscv: remove extra level wrappers of trace_hardirqs_{on,off} Date: Sat, 15 Oct 2022 07:47:01 -0400 Message-Id: <20221015114702.3489989-12-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221015114702.3489989-1-guoren@kernel.org> References: <20221015114702.3489989-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?1746759175057823361?= X-GMAIL-MSGID: =?utf-8?q?1746759175057823361?= 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 */