From patchwork Wed Feb 22 03:30:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 60330 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp366321wrd; Tue, 21 Feb 2023 19:48:14 -0800 (PST) X-Google-Smtp-Source: AK7set8UsN+m/zVifzjiHRxXdzBSYnWut6dgY8qYSge6sAoDmwSkiVXfrX+CbVLfAdTQkh9ubj4U X-Received: by 2002:a17:907:ea2:b0:8ba:f1be:1d6f with SMTP id ho34-20020a1709070ea200b008baf1be1d6fmr20716532ejc.22.1677037694628; Tue, 21 Feb 2023 19:48:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677037694; cv=none; d=google.com; s=arc-20160816; b=zacbkLJtYWkdOGTJm7SpfxGQ1RZgsGWKHw1zeeb7xMIzQ1JXV0QHA9uIG7mfYSR8j7 xCPRYuP51jOemgDmn3XNjrR0NQeO/HdLSuaLRjhhWzGCcmCATgR3RiVZM4zyw6VBR/8+ VRqbM3JtekrP6IIBrn87K+FAwMnbEirDGb6fFgByrjA+KL5pO9YZ7z/r8NWyun8M8ojt Qa95rxPOY3Al7FWh5mkvdlYhaZDl7BnNFoFoo23vKKFToeWu5jS0zF+NY7y9yu1GqXSG RN9BmI9YIHEE6Eu4WB0Jc2ndQshyq88hDFW/tZsMlOOZb0CvWGf3ciZqMeBcpABu41yV lVqQ== 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=Tep4vhYqM/MXyA3qOFsPUwKTPjqanvSToWnKGjNKicFELFZg8VCweqL1ugD3PvGxzE Gs4jCGwbBEjd6U02/ZwSi9HI5l3Q8pBH3jS95xu3VSQczlZ+UcH6+GT/QucGW/2s7Wna sCK+UozLl2MnkE0rpwm4LQ9d3RniNn+QgtMos+GB4D0kDYc23PHuTM9AlMpWsy2Qqee8 76JYFnY/fFeXZBYuDCZnJ3KVXLjQ1ef2FhtGioUhF1kNzNqSil71E3JB4nEubcEToxjM K23oGokwBgFa5BZrcnH/H35eU7RYegj58Q+H1DnF44rEyMBJYODZCHxT3kHNnUb/mf8j Q0NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mpd8vPuP; 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 bp14-20020a170907918e00b008e20382c9bcsi2581238ejb.439.2023.02.21.19.47.46; Tue, 21 Feb 2023 19:48:14 -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=mpd8vPuP; 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 S231178AbjBVDcH (ORCPT + 99 others); Tue, 21 Feb 2023 22:32:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230502AbjBVDcA (ORCPT ); Tue, 21 Feb 2023 22:32:00 -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 F083B34F40; Tue, 21 Feb 2023 19:31:25 -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 60335B811CF; Wed, 22 Feb 2023 03:31:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A31E8C433A7; Wed, 22 Feb 2023 03:31:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677036683; bh=ibXELA1fPqv+k0h/D45FA6m8vJh/UThmM0vYia8LTnk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mpd8vPuP2kNQY7MGDFINcyFS06S0mbaUlzJunre3i5vMxxfstwI0KepZ1+IiNv/qf bpWXnjVXoz9U691vLpaCjFrVdPSn1lTfzWxaLmMSUfp4hH3s8t/TTZ/LYUANQgtBw5 X4AVV2rvvHTmKkrF61I4wVuICV5S7iHoJCfoKG7DNt5x6AiDjSiQxxokYufmgkdcgf T9ikETwgNuiUPZnrMW8GTZcHHAfeSaHYWV+I0fn1s4Az7jL4nHXxMOwzSPfuZ2GToJ d9gekZ8RHgoqFj0zbkEjPEWmI5jbv9OUX7GDxDuybzEyC+/mPP0PA7LoCnXqHt1tHj 4lYpUVRirl00Q== 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, palmer@dabbelt.com Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= Subject: [PATCH -next V17 5/7] riscv: entry: Remove extra level wrappers of trace_hardirqs_{on,off} Date: Tue, 21 Feb 2023 22:30:19 -0500 Message-Id: <20230222033021.983168-6-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230222033021.983168-1-guoren@kernel.org> References: <20230222033021.983168-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1758501477789839610?= X-GMAIL-MSGID: =?utf-8?q?1758501477789839610?= 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 */