From patchwork Thu Dec 8 02:58:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 31128 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp529818wrr; Wed, 7 Dec 2022 19:01:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Zx66MZJ602AYF2+HWoiUkqElBkqWprXOJkTflNBgfqymbPm6N5b8CSBLwHIm4/rXOpdIs X-Received: by 2002:a17:907:a688:b0:7ba:ba67:f2f with SMTP id vv8-20020a170907a68800b007baba670f2fmr53637355ejc.199.1670468461440; Wed, 07 Dec 2022 19:01:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670468461; cv=none; d=google.com; s=arc-20160816; b=dszgLf3qW7Tt+jLlLOga2YdHbV/h0HWp+dROHLRN80ib/Yaol4E0LUi/+EDvUw1lO7 BRhe93dAgVoesfP5+sQqZWJB6EVgyaZkvNWdMOe3goNHFUoaneT6MueEMe4i4UC/gWSB bQvxWEtmSzUQ+bJPFy/JkStT0+T2BecIuDmpMnGLYbhauefafUIX2pXjLXCd5qjnzdhH MlsKSIfkSXscMRy0dUkcGUc5MR/Qrt2QOKOU6bpFdSSaKhQ3IlcySa5fzBDTpaLzdpN2 DlCRGU4/V9CVMOg73/HPRaZ3Lt6CrG/kLaKlX45MdyHFBaRVZJemuxuUtE6crMmr04lg N2Xw== 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=XbwfNx0n3eiHlHS8+KolgItzOZ0VD3pjUY/e214Rs8w=; b=kxXRggZ9ESF7OckFaYaAijahZIGpmZaPtV9Nszb6PkBE7yOZlnPfgRdL70E9pqZ/8F PwzGACUR4BH7GftZAOlrecbQuOsKTEicWDRh+ta8GGhQdsVhJRG+AJWndKr0QYxDF8nl fHA5xC0jpvDh2KQuUzKBbLGYeQn9xNgFCZp2ExginMp46ph4siX4FBeZcZy5LINurOFt 1x8ESCYC3jHd43Vh8NMUKc23m1Wof2BrN3FnlEYlqqRF1m4iCwjdBhGT4c6ssePXCmHS 14pqBa3vkCooGAgRJ5g/QrXpaDUv1ktlKi922YH+v8+Dyku9RbMj0JwryGKhkaJcq7Ms FqfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kDPsp77X; 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 qa40-20020a17090786a800b007330c08fe49si19520626ejc.206.2022.12.07.19.00.38; Wed, 07 Dec 2022 19:01:01 -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=kDPsp77X; 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 S229936AbiLHC7w (ORCPT + 99 others); Wed, 7 Dec 2022 21:59:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229909AbiLHC7Z (ORCPT ); Wed, 7 Dec 2022 21:59:25 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD9D1950FC; Wed, 7 Dec 2022 18:59:23 -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 75A23B82205; Thu, 8 Dec 2022 02:59:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78424C433C1; Thu, 8 Dec 2022 02:59:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670468361; bh=QDsLvBqaEhK8uPpJxaP7nMuMSfzGSxOc/bZ9S/vHdls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kDPsp77Xd4ki+5aNJfRlMYZHmUFMrRIP5bYvAQQ1EHYn2GTWXkAij0G3k6c9MOrYl DD4KcyHlxfUNfy+46+K6gFwyWU3dWk13JTQUnZtZRw/K7Aq0vIrdun8nRYa2etd2eH vTWnqoAixhy4oX89dmsnfcSTPDfCVHi1q9yWAH9CosUNlDK85kzEVRn8y1sK37KfPh bDHrXew+Byxw4ibuVQEdkM9dUGrsrYbqVWmphc53LEkVLU0VIjvPTL0P6n84C7Rp4j a1UfUT6FXgjdsv5Y7Np03Ys01oN8T2rE3yAmbDcx4Z31ScYuzxnnu3S6eKPHh5LY91 x5JVRNWJeDvzA== 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, bjorn@kernel.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH -next V10 05/10] riscv: entry: Remove extra level wrappers of trace_hardirqs_{on,off} Date: Wed, 7 Dec 2022 21:58:11 -0500 Message-Id: <20221208025816.138712-6-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221208025816.138712-1-guoren@kernel.org> References: <20221208025816.138712-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?1751613137311689656?= X-GMAIL-MSGID: =?utf-8?q?1751613137311689656?= 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 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 */