From: Viresh Kumar <viresh.kumar@linaro.org>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Robert Richter <rric@kernel.org>, Chris Zankel <chris@zankel.net>,
Max Filippov <jcmvbkbc@gmail.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>,
Vincent Guittot <vincent.guittot@linaro.org>,
Arnd Bergmann <arnd@kernel.org>,
oprofile-list@lists.sf.net, William Cohen <wcohen@redhat.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
anmar.oueja@linaro.org, Christoph Hellwig <hch@infradead.org>,
linux-xtensa@linux-xtensa.org, linux-kernel@vger.kernel.org
Subject: [PATCH 16/18] arch: xtensa: Remove CONFIG_OPROFILE support
Date: Thu, 14 Jan 2021 17:05:29 +0530 [thread overview]
Message-ID: <193f2f177d23eef62b54b48f80e62fb0169c1db9.1610622251.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1610622251.git.viresh.kumar@linaro.org>
The "oprofile" user-space tools don't use the kernel OPROFILE support
any more, and haven't in a long time. User-space has been converted to
the perf interfaces.
Remove the old oprofile's architecture specific support.
Suggested-by: Christoph Hellwig <hch@infradead.org>
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
arch/xtensa/Kconfig | 1 -
arch/xtensa/Makefile | 1 -
arch/xtensa/configs/audio_kc705_defconfig | 1 -
arch/xtensa/configs/generic_kc705_defconfig | 1 -
arch/xtensa/configs/smp_lx200_defconfig | 1 -
arch/xtensa/configs/xip_kc705_defconfig | 1 -
arch/xtensa/kernel/stacktrace.c | 2 +-
arch/xtensa/oprofile/Makefile | 10 --------
arch/xtensa/oprofile/backtrace.c | 27 ---------------------
arch/xtensa/oprofile/init.c | 26 --------------------
10 files changed, 1 insertion(+), 70 deletions(-)
delete mode 100644 arch/xtensa/oprofile/Makefile
delete mode 100644 arch/xtensa/oprofile/backtrace.c
delete mode 100644 arch/xtensa/oprofile/init.c
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 37ce1489364e..9ad6b7b82707 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -32,7 +32,6 @@ config XTENSA
select HAVE_FUTEX_CMPXCHG if !MMU
select HAVE_HW_BREAKPOINT if PERF_EVENTS
select HAVE_IRQ_TIME_ACCOUNTING
- select HAVE_OPROFILE
select HAVE_PCI
select HAVE_PERF_EVENTS
select HAVE_STACKPROTECTOR
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 67a7d151d1e7..cf0940708702 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -83,7 +83,6 @@ core-y += $(buildvar) $(buildplf)
core-y += arch/xtensa/boot/dts/
libs-y += arch/xtensa/lib/ $(LIBGCC)
-drivers-$(CONFIG_OPROFILE) += arch/xtensa/oprofile/
boot := arch/xtensa/boot
diff --git a/arch/xtensa/configs/audio_kc705_defconfig b/arch/xtensa/configs/audio_kc705_defconfig
index eeb4c5383c83..3be62da8089b 100644
--- a/arch/xtensa/configs/audio_kc705_defconfig
+++ b/arch/xtensa/configs/audio_kc705_defconfig
@@ -18,7 +18,6 @@ CONFIG_BLK_DEV_INITRD=y
CONFIG_EXPERT=y
CONFIG_KALLSYMS_ALL=y
CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_XTENSA_VARIANT_CUSTOM=y
diff --git a/arch/xtensa/configs/generic_kc705_defconfig b/arch/xtensa/configs/generic_kc705_defconfig
index 412f611033cc..e9d6b6f6eca1 100644
--- a/arch/xtensa/configs/generic_kc705_defconfig
+++ b/arch/xtensa/configs/generic_kc705_defconfig
@@ -18,7 +18,6 @@ CONFIG_BLK_DEV_INITRD=y
CONFIG_EXPERT=y
CONFIG_KALLSYMS_ALL=y
CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_XTENSA_VARIANT_DC233C=y
diff --git a/arch/xtensa/configs/smp_lx200_defconfig b/arch/xtensa/configs/smp_lx200_defconfig
index 4f1c7998b030..a47c85638ec1 100644
--- a/arch/xtensa/configs/smp_lx200_defconfig
+++ b/arch/xtensa/configs/smp_lx200_defconfig
@@ -18,7 +18,6 @@ CONFIG_BLK_DEV_INITRD=y
CONFIG_EXPERT=y
CONFIG_KALLSYMS_ALL=y
CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_XTENSA_VARIANT_CUSTOM=y
diff --git a/arch/xtensa/configs/xip_kc705_defconfig b/arch/xtensa/configs/xip_kc705_defconfig
index f9e85c082afc..4f1ff9531f6a 100644
--- a/arch/xtensa/configs/xip_kc705_defconfig
+++ b/arch/xtensa/configs/xip_kc705_defconfig
@@ -31,7 +31,6 @@ CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0
CONFIG_USE_OF=y
CONFIG_BUILTIN_DTB_SOURCE="kc705"
# CONFIG_PARSE_BOOTPARAM is not set
-CONFIG_OPROFILE=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_COMPACTION is not set
CONFIG_NET=y
diff --git a/arch/xtensa/kernel/stacktrace.c b/arch/xtensa/kernel/stacktrace.c
index c822abb93d20..7f7755cd28f0 100644
--- a/arch/xtensa/kernel/stacktrace.c
+++ b/arch/xtensa/kernel/stacktrace.c
@@ -16,7 +16,7 @@
#include <asm/traps.h>
#include <linux/uaccess.h>
-#if IS_ENABLED(CONFIG_OPROFILE) || IS_ENABLED(CONFIG_PERF_EVENTS)
+#if IS_ENABLED(CONFIG_PERF_EVENTS)
/* Address of common_exception_return, used to check the
* transition from kernel to user space.
diff --git a/arch/xtensa/oprofile/Makefile b/arch/xtensa/oprofile/Makefile
deleted file mode 100644
index f559b9ffbb3f..000000000000
--- a/arch/xtensa/oprofile/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_OPROFILE) += oprofile.o
-
-DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
- oprof.o cpu_buffer.o buffer_sync.o \
- event_buffer.o oprofile_files.o \
- oprofilefs.o oprofile_stats.o \
- timer_int.o )
-
-oprofile-y := $(DRIVER_OBJS) init.o backtrace.o
diff --git a/arch/xtensa/oprofile/backtrace.c b/arch/xtensa/oprofile/backtrace.c
deleted file mode 100644
index 8f952034e161..000000000000
--- a/arch/xtensa/oprofile/backtrace.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file backtrace.c
- *
- * @remark Copyright 2008 Tensilica Inc.
- * Copyright (C) 2015 Cadence Design Systems Inc.
- * @remark Read the file COPYING
- *
- */
-
-#include <linux/oprofile.h>
-#include <asm/ptrace.h>
-#include <asm/stacktrace.h>
-
-static int xtensa_backtrace_cb(struct stackframe *frame, void *data)
-{
- oprofile_add_trace(frame->pc);
- return 0;
-}
-
-void xtensa_backtrace(struct pt_regs * const regs, unsigned int depth)
-{
- if (user_mode(regs))
- xtensa_backtrace_user(regs, depth, xtensa_backtrace_cb, NULL);
- else
- xtensa_backtrace_kernel(regs, depth, xtensa_backtrace_cb,
- xtensa_backtrace_cb, NULL);
-}
diff --git a/arch/xtensa/oprofile/init.c b/arch/xtensa/oprofile/init.c
deleted file mode 100644
index a67eea379766..000000000000
--- a/arch/xtensa/oprofile/init.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file init.c
- *
- * @remark Copyright 2008 Tensilica Inc.
- * @remark Read the file COPYING
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/oprofile.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-
-
-extern void xtensa_backtrace(struct pt_regs *const regs, unsigned int depth);
-
-int __init oprofile_arch_init(struct oprofile_operations *ops)
-{
- ops->backtrace = xtensa_backtrace;
- return -ENODEV;
-}
-
-
-void oprofile_arch_exit(void)
-{
-}
--
2.25.0.rc1.19.g042ed3e048af
next prev parent reply other threads:[~2021-01-14 11:38 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-14 11:34 [PATCH 00/18] drivers: Remove oprofile and dcookies Viresh Kumar
2021-01-14 11:35 ` [PATCH 01/18] arch: alpha: Remove CONFIG_OPROFILE support Viresh Kumar
2021-01-14 11:35 ` [PATCH 02/18] arch: arm: " Viresh Kumar
2021-01-14 11:35 ` [PATCH 03/18] arch: arc: " Viresh Kumar
2021-01-14 17:51 ` Vineet Gupta
2021-01-15 3:34 ` Viresh Kumar
2021-01-14 11:35 ` [PATCH 04/18] arch: hexagon: Don't select HAVE_OPROFILE Viresh Kumar
2021-01-15 15:30 ` Brian Cain
2021-01-14 11:35 ` [PATCH 05/18] arch: ia64: Remove CONFIG_OPROFILE support Viresh Kumar
2021-01-14 11:35 ` [PATCH 06/18] arch: ia64: Remove rest of perfmon support Viresh Kumar
2021-01-14 11:35 ` [PATCH 07/18] arch: microblaze: Remove CONFIG_OPROFILE support Viresh Kumar
2021-01-14 12:12 ` Michal Simek
2021-01-14 11:35 ` [PATCH 08/18] arch: mips: " Viresh Kumar
2021-01-14 11:35 ` [PATCH 09/18] arch: parisc: " Viresh Kumar
2021-01-14 11:35 ` [PATCH 10/18] arch: powerpc: Stop building and using oprofile Viresh Kumar
2021-01-15 4:13 ` Viresh Kumar
2021-01-18 4:47 ` Viresh Kumar
2021-01-14 11:35 ` [PATCH 11/18] arch: powerpc: Remove oprofile Viresh Kumar
2021-01-14 11:35 ` [PATCH 12/18] arch: s390: Remove CONFIG_OPROFILE support Viresh Kumar
2021-01-15 10:35 ` Heiko Carstens
2021-01-14 11:35 ` [PATCH 13/18] arch: sh: " Viresh Kumar
2021-01-14 11:35 ` [PATCH 14/18] arch: sparc: " Viresh Kumar
2021-01-14 11:35 ` [PATCH 15/18] arch: x86: " Viresh Kumar
2021-01-14 11:35 ` Viresh Kumar [this message]
2021-01-14 20:37 ` [PATCH 16/18] arch: xtensa: " Max Filippov
2021-01-14 11:35 ` [PATCH 17/18] drivers: " Viresh Kumar
2021-01-14 15:06 ` Paul E. McKenney
2021-01-15 17:10 ` Federico Vaga
2021-01-14 11:35 ` [PATCH 18/18] fs: Remove dcookies support Viresh Kumar
2021-01-14 21:50 ` [PATCH 00/18] drivers: Remove oprofile and dcookies Robert Richter
2021-01-15 15:44 ` William Cohen
2021-01-15 4:27 ` Viresh Kumar
[not found] ` <CAHk-=whaPiPCM6erqqe5Q-Ugn7u-jY6w7iA-kEBBc8aB40sBoA@mail.gmail.com>
2021-01-18 6:57 ` Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=193f2f177d23eef62b54b48f80e62fb0169c1db9.1610622251.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=anmar.oueja@linaro.org \
--cc=arnd@kernel.org \
--cc=chris@zankel.net \
--cc=hch@infradead.org \
--cc=jcmvbkbc@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=oprofile-list@lists.sf.net \
--cc=rric@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=vincent.guittot@linaro.org \
--cc=viro@zeniv.linux.org.uk \
--cc=wcohen@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).