From patchwork Thu Jan 26 17:25:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 48820 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp396992wrn; Thu, 26 Jan 2023 09:34:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXsVkVFuYp5v2mMQ5RuWMzCU1tBtoho2cA2o+Rmeo9NrOOMYoCl6drBco8IG9p2pUepFy8jm X-Received: by 2002:a05:6402:4496:b0:49e:ca5:244a with SMTP id er22-20020a056402449600b0049e0ca5244amr41851013edb.1.1674754462682; Thu, 26 Jan 2023 09:34:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674754462; cv=none; d=google.com; s=arc-20160816; b=0qE5jXnx27oc7X9jL4xcrgw9TVjiTZ9nhhggUod2Sk/iTRTOnTZrNRCU+BVCo/pCtm oZbF28Zoqs0K8Z6QEhtAtY6+MoBBN9045YuEFl+PPymSzQFemnQDoTVAJ15jJ7wL85ek x63mZXZ/eKxjPxq64df3bZiBnzBYU3/62QzepqGbmvh52QywJgnAuXHFMyxmOAMMmv4k 2Z8srQMYLMTebQ5JuSjn4KYo2mqZWW6t4qzgQ/hUuzk1ZHCs3PROqivbmLJknpCZgR9T oddKtuRyu6iHoT5wN4VAxC6qQ09xSy5s4biHjkWy8O/CA+7JjgsZCGnXORw0IS1ofbpn BotQ== 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=hAjQh/IwQB9GgROmHNHudeafI1uHna+RN3Dzp6erlXSXJioS0v3Mm17pr+TEKcIlpJ H9P0HMPIF6JhT5UJv/RLMlYHCcBi9h7RCA9jyKMowCCzB6VbiO1t8FuX0BUugsB7f6Wh Xp+zd+PhsUev0luqd8CZtjCPm29XIGKYuiP7NiIwSP8QUhSQYzuWS/tWd5f4qJ0qq6wx W1qgB1zZ27Gfl9CEsVvjNrR4SVfGNDWL59QSRh6UWqsD1ib270EmlV9pId6NTqO4JDzv SdDMDc2R82+/JyEGJAJPrjHRbA98y4KEcGHoGyUsuAY9eQ6ZAjOsqJSmtMmKi3stRia7 AylQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ANNvH0kB; 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 g21-20020a056402181500b0046aeb9d6223si2491930edy.158.2023.01.26.09.33.58; Thu, 26 Jan 2023 09:34:22 -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=ANNvH0kB; 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 S232089AbjAZR0h (ORCPT + 99 others); Thu, 26 Jan 2023 12:26:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231830AbjAZR0U (ORCPT ); Thu, 26 Jan 2023 12:26:20 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B545370D55; Thu, 26 Jan 2023 09:26:12 -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 74129B81ECB; Thu, 26 Jan 2023 17:26:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCE66C433AA; Thu, 26 Jan 2023 17:26:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674753970; bh=ibXELA1fPqv+k0h/D45FA6m8vJh/UThmM0vYia8LTnk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ANNvH0kB7VWzqMtCxIWciA7ySljDTXIb6PV0gehy8YfgzL6yCWyxwxaYTul/tw8w6 aixxMk7y33gLOXnL7+CmUN8zk0yTbBb4p4lXOAN34Qj/7CkB1tM5R61KgTnWIzPgdu 3aDCZV2um15lmBNRKB24Yiz3Ro4gF51heLEkl1ouCAsnhnu+zyflUs4ltHjAUUkgop /PvILfpK9vlkwwmhgg3h5ySxH9bCsfag3+hW2jLDFFc+OPzs6NrO5TG2YFhUe+/PTn FlWISBn8y0Q4wEO/E+Zw5Ik5r1V10iI3rUW6RfkQUYTvcJxD0AqKIUoEhAFIqaoKD7 uEDiQPzIwkXww== 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 V15 5/7] riscv: entry: Remove extra level wrappers of trace_hardirqs_{on,off} Date: Thu, 26 Jan 2023 12:25:14 -0500 Message-Id: <20230126172516.1580058-6-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230126172516.1580058-1-guoren@kernel.org> References: <20230126172516.1580058-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?1756107335234455346?= X-GMAIL-MSGID: =?utf-8?q?1756107335234455346?= 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 */