From patchwork Thu Jan 12 09:58:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 42343 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3797896wrt; Thu, 12 Jan 2023 02:06:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXuaOlJyS2CEHk7bDQzfELX1oSYprJUz2NV9uLMcCvfmceoOBwiqG4ZGiMdHy+N8Qkudv8oZ X-Received: by 2002:a17:902:c643:b0:192:b6ca:200 with SMTP id s3-20020a170902c64300b00192b6ca0200mr40835526pls.3.1673517988142; Thu, 12 Jan 2023 02:06:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673517988; cv=none; d=google.com; s=arc-20160816; b=SeyhXDs6d1rjXkqxtaPLYxGLxHsu6xqzPt1e8ZXfhSwMTZUyONIkBf4dxGLrppxMvA /fkmEwFTmvJNxmLPybaEYCQaL7NaMC12Oauk5YmOuBXI8pba6DpR+kBwxZk31dU8LyPn p7gYar6shg7ss1fN34nBpKQcowctJYXchcMCC5GskJmCOF6MrsUjbj9adScrZc7ym8Nv +dwYtK+2gtZ49eqpPfrPE9OmZLEpa2YRTx5Ze/jzFtYvuxbDQ9OHO4pBvw3yUIfwU7GK kPzIhl2pifPK6zKci4QxHtdHhrVs/i21pFtIG2hpm1qETBBZL2TnAF8J54QzhmKbR9A/ Ysbw== 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=vfv0G4Jy6h452L1fkQkyQl65XUxJ87Rd63IrQyCcMEFU7aUljuPpdlgTYdn0BqWD21 ozUgQVF0uWC0l6hx7R7/AdQ3kbtxHux45Yeweab+1FenLND6jprWBLJRbA4LdenSnCeb Lx+IwkZ6cehFojjVfdfhze1nUdNCzcZ1+YpqXdgJzCrrOOE9PziLVIRJGHkxIP8hPhDa +a351srZKJsBNNWJcSANjvvxddtKhMyAnybjLBJy7U9QQbOvRPpLtsIXPBmBWef9vsUc EnXguwwXdKSUU+tmNlWsvEgY7I7eBxMXG9FPNtQEftVSEAv4iFsCUkOjl9ka9w+3dP1b g8cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iuY6gF2J; 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 p5-20020a63f445000000b0046fc9e82c99si17531801pgk.206.2023.01.12.02.06.15; Thu, 12 Jan 2023 02:06:28 -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=iuY6gF2J; 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 S232957AbjALKCa (ORCPT + 99 others); Thu, 12 Jan 2023 05:02:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbjALKAp (ORCPT ); Thu, 12 Jan 2023 05:00:45 -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 16ACF5FE2; Thu, 12 Jan 2023 01:59:43 -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 A403361FC6; Thu, 12 Jan 2023 09:59:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF675C433F0; Thu, 12 Jan 2023 09:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673517582; bh=ibXELA1fPqv+k0h/D45FA6m8vJh/UThmM0vYia8LTnk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iuY6gF2Jfq9xpHEK7nZD9JnxGSNLP6VuNqLWvjqP8PKVEfruRB9txD2jHHU99+30A 0lR0a/Giw1GXu9SxOmUr3PVrdpnEvFz7eVoMudgPYAKfXrfghwfu+I9AYgq3NJcbWX gLNzRoGCsX0qJHpxp1M2BlyCYzJUEPBAPFS5cvgPfjswR3UcqWi5oCCC6P/YkeRnfp sZFn8dY6aF78Wi3bNtsQBs5RMZjPfDo5h+QQaYG+E0oX3ccJErVUvwOeFExndLfKyR 1XHcy8F1nnx+VVJtSnGRKTG/ayof52G2hwwPOEtOxpYobCltwkFkxYAXTSVyPxo+OR vUI/kd9vvCAEw== 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 V14 5/7] riscv: entry: Remove extra level wrappers of trace_hardirqs_{on,off} Date: Thu, 12 Jan 2023 04:58:46 -0500 Message-Id: <20230112095848.1464404-6-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230112095848.1464404-1-guoren@kernel.org> References: <20230112095848.1464404-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?1754810797797150746?= X-GMAIL-MSGID: =?utf-8?q?1754810797797150746?= 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 */