From patchwork Tue Jan 3 03:35:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 38256 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4422274wrt; Mon, 2 Jan 2023 19:38:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXvs+VBWWwZxA1/Ri0eMWZNakWkYzbEXH/EO/E2ncZF5DEpKmLIFPyyYjwuWr2BiP2QmlmIa X-Received: by 2002:a17:907:76ad:b0:7c0:f2cf:23fb with SMTP id jw13-20020a17090776ad00b007c0f2cf23fbmr39208489ejc.52.1672717087404; Mon, 02 Jan 2023 19:38:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672717087; cv=none; d=google.com; s=arc-20160816; b=Vjf44vkovKC63Udc4Nqu6lo4WqiQvFj3yMZPgAKlE8itawvjVZfft7QUjxVCA9pgkC 3+Zam+flx3s0KqkvwUahe0cMEPExTELSj1nAKmO7N14tivM7PmPEyNVoCqfVh/n0coSk OY1Pg1ETT9h7YgZE0yoRdhBsa3ukW2pHcyyJx5+fiNhh0rBqPcVjBQGxEpA/QZlbjAyr NqV1rDiagDoC4iw+CF/bwZZ7Ti6A/thDf48tdxzWkyPeAfhy7HwckEHybsnT2arckgKv tv7w4OiwybVM7r+1WACZNKGyrCdROEa/IztgH6ckNGxs3CtGxEhpRGKtt2BzDkwgsAgV ls3w== 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=aowzs7ypECZIXAF/LCoi8GoVbOXVADDm4nHWytJxvwY=; b=wiMogFs94fzjt5jiTZ8LCoj8DeiCWeFvFMxnIVyQ/EXkiTl/nkYaS0WuDcpijGhSXu ug+HXsGxkzIusiQGGtx4HbrKFbnYrPxK+WbxEMTg+SEDSV5U81po7FB1vN5FiTeqUlNO Q7nZIe61whaiJizjy0+V7TjjNGEjaUD60X4i30RE5UEK/n+l9SddQWlMhgjYmvTlYx0i SJujJdiv8xyOvg+iRVNYnPpeYc3aZeeaczFcclzuEHgmlLNJJEhdRgA+M7rnKFG0ChhH w7w+fPlHc9vKC1GVoqhqWIIcKdwO54GXoTZsurU4JEigdGbgq9Ege/RYtNBKAuvTq2Ss RE/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cGwE4k4b; 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 l10-20020a170906794a00b007826cb6f57csi28751649ejo.407.2023.01.02.19.37.43; Mon, 02 Jan 2023 19:38:07 -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=cGwE4k4b; 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 S236677AbjACDhN (ORCPT + 99 others); Mon, 2 Jan 2023 22:37:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236736AbjACDgu (ORCPT ); Mon, 2 Jan 2023 22:36:50 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3793CE34; Mon, 2 Jan 2023 19:36:36 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 48ADA61196; Tue, 3 Jan 2023 03:36:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BE9FC433F0; Tue, 3 Jan 2023 03:36:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672716995; bh=ibXELA1fPqv+k0h/D45FA6m8vJh/UThmM0vYia8LTnk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cGwE4k4bX3ehsJS9WHMDFSptPFEnr9pqv2yOI0UmPMUr6bnoFZ1bPPOSCuiO8mkHZ 9e3IUI9A0YFxC7KnlpZAIMOmI2EGm83eu9LO6w9wKvZfbjBJNOCswafkI7w6aV1k6F 9z/91cDwz3a1zaWHPAb8hdpH7KBtdH/h06wezL6rTlFYwbcRRmkiPTxLt+Fv57+NIC 4J+QUQPFaW7QZpgt6Zub3a245xklQKwjudE1OqFFazUg4hcHFZHFMcAUuyCT3qg99w zCJlpYaQHsAnY9JEpJkOpXftlAESaGmjcMQTcndBIfAO5aG39jrKPadpwykbfQyxZT w9iJmN9Ly0glg== 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, mark.rutland@arm.com, ben@decadent.org.uk, bjorn@kernel.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= Subject: [PATCH -next V12 5/7] riscv: entry: Remove extra level wrappers of trace_hardirqs_{on,off} Date: Mon, 2 Jan 2023 22:35:29 -0500 Message-Id: <20230103033531.2011112-6-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230103033531.2011112-1-guoren@kernel.org> References: <20230103033531.2011112-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?1753970992606739481?= X-GMAIL-MSGID: =?utf-8?q?1753970992606739481?= From: Jisheng Zhang Since riscv is converted to generic entry, there's no need for the extra wrappers of trace_hardirqs_{on,off}. Signed-off-by: Jisheng Zhang Reviewed-by: Guo Ren Reviewed-by: Björn Töpel 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 4cf303a779ab..392fa6e35d4a 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -68,8 +68,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 */