]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arch: arm: Remove CONFIG_OPROFILE support
authorViresh Kumar <viresh.kumar@linaro.org>
Thu, 14 Jan 2021 11:35:15 +0000 (17:05 +0530)
committerViresh Kumar <viresh.kumar@linaro.org>
Fri, 22 Jan 2021 06:41:54 +0000 (12:11 +0530)
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>
Acked-by: Robert Richter <rric@kernel.org>
Acked-by: William Cohen <wcohen@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
20 files changed:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/configs/bcm2835_defconfig
arch/arm/configs/cns3420vb_defconfig
arch/arm/configs/corgi_defconfig
arch/arm/configs/imx_v4_v5_defconfig
arch/arm/configs/keystone_defconfig
arch/arm/configs/multi_v5_defconfig
arch/arm/configs/mv78xx0_defconfig
arch/arm/configs/mvebu_v5_defconfig
arch/arm/configs/omap1_defconfig
arch/arm/configs/omap2plus_defconfig
arch/arm/configs/orion5x_defconfig
arch/arm/configs/pxa_defconfig
arch/arm/configs/qcom_defconfig
arch/arm/configs/socfpga_defconfig
arch/arm/configs/spitz_defconfig
arch/arm/configs/vexpress_defconfig
arch/arm/oprofile/Makefile [deleted file]
arch/arm/oprofile/common.c [deleted file]

index 138248999df7421e31652c613b5fea65e5de4389..c9d43d415d54606bc473c7dbcb0ae46cc99b0072 100644 (file)
@@ -102,7 +102,6 @@ config ARM
        select HAVE_KRETPROBES if HAVE_KPROBES
        select HAVE_MOD_ARCH_SPECIFIC
        select HAVE_NMI
-       select HAVE_OPROFILE if HAVE_PERF_EVENTS
        select HAVE_OPTPROBES if !THUMB2_KERNEL
        select HAVE_PERF_EVENTS
        select HAVE_PERF_REGS
index 4aaec9599e8ab618b53ecbf422421c8713bca3da..e06fee171ab1a1762a0e2d24d97d92b7c5b7be84 100644 (file)
@@ -266,8 +266,6 @@ core-y                              += $(machdirs) $(platdirs)
 core-                          += $(patsubst %,arch/arm/mach-%/, $(machine-))
 core-                          += $(patsubst %,arch/arm/plat-%/, $(plat-))
 
-drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/
-
 libs-y                         := arch/arm/lib/ $(libs-y)
 
 # Default target when executing plain make
index 44ff9cd88d81612b31d8e052f5332f2e721e31a1..1ef2bc4c7f69d421d37b39da3dfcbdfe44403db4 100644 (file)
@@ -21,7 +21,6 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
 CONFIG_JUMP_LABEL=y
 CONFIG_CC_STACKPROTECTOR_REGULAR=y
 CONFIG_MODULES=y
index 66a80b46038d1e318920ea3fae213dd6c2bdbb13..63fa2eb21b7535f90c3a8598e62baa5aa9524097 100644 (file)
@@ -11,7 +11,6 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_PERF_EVENTS is not set
 CONFIG_SLAB=y
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
index 911e880f06ed8dbb2b77fa126d52e7506643b1e5..15b749f6996d6026a62484d45ce57191ca264655 100644 (file)
@@ -5,7 +5,6 @@ CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EXPERT=y
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
index bb70acc6b52648a61d0459786eb940c41b6ec469..1d9fa77bbafc499cd6eca2ee223c2e13147c8392 100644 (file)
@@ -27,7 +27,6 @@ CONFIG_AEABI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_PM_DEBUG=y
-CONFIG_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
index 84a3b055f2537360b58846c3551750bc1ef1dfca..33c917df7b3298c6769743353fde7c3ff335cd70 100644 (file)
@@ -16,7 +16,6 @@ CONFIG_KALLSYMS_ALL=y
 # CONFIG_BASE_FULL is not set
 CONFIG_EMBEDDED=y
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
index e00be9faa23bfa7e1a28a8b8f8d0bd8ba0c60a2b..5170a1059a11853a104d59471d13150f1b7227a4 100644 (file)
@@ -67,7 +67,6 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_IDLE=y
 CONFIG_ARM_KIRKWOOD_CPUIDLE=y
-CONFIG_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
index b39b1300a459f561c07a79024a33758fcfa2fef4..cd703c15798fff55999f7739d4e9a911bd231829 100644 (file)
@@ -5,7 +5,6 @@ CONFIG_EXPERT=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_SLUB_DEBUG is not set
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
index 226f2e97c6e2ed0e17da0a30e8ca802282ac6a9a..4f16716bfc322b88762d8877aef285c530e70e21 100644 (file)
@@ -4,7 +4,6 @@ CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
index 3b6e7452609ba9010934f7ea8a6bcab9dbdbfa3a..3148567b66b6abb9f4c6417514851b62ff1f7796 100644 (file)
@@ -13,7 +13,6 @@ CONFIG_EXPERT=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 CONFIG_SLOB=y
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
index b515c31f0ab75e9ff718da641d8a6b6ee00d72f6..eb353ece7baca2067de4718029255673f8558e11 100644 (file)
@@ -68,7 +68,6 @@ CONFIG_CRYPTO_AES_ARM=m
 CONFIG_CRYPTO_AES_ARM_BS=m
 CONFIG_CRYPTO_GHASH_ARM_CE=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
-CONFIG_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
index 4bdbb036ac26152d03be2900d239800dfd63f875..b9e3b647e732df059b5fed5d083f54be69059505 100644 (file)
@@ -5,7 +5,6 @@ CONFIG_LOG_BUF_SHIFT=14
 CONFIG_EXPERT=y
 # CONFIG_SLUB_DEBUG is not set
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
index 8654ece1300474201d40034a002c451db3b47885..bd7dd81c9c54414e50f34ef2138c0533172e4327 100644 (file)
@@ -13,7 +13,6 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLOB=y
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
 CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
index d6733e745b80e387f71e3c689d3464ea553c46d0..43e3668f4bf0ec70c03c288f500fb9c5c313f82a 100644 (file)
@@ -10,7 +10,6 @@ CONFIG_EMBEDDED=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
index e73c97b0f5b09b898b69e51d171c9f5d7fcec48d..0c60eb382c806af9fb7df3e509864a65f009e36c 100644 (file)
@@ -18,7 +18,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_VFP=y
 CONFIG_NEON=y
-CONFIG_OPROFILE=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
index 8b2c14424927ace10066eeb8d2e80bf3a6d2cdf7..f42c7a502b6eef9b665d6e61fca2266d46bbbf1c 100644 (file)
@@ -5,7 +5,6 @@ CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EXPERT=y
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
index c01baf7d6e37c228bc8441747d1c8018de1213fc..4479369540f285fd19157976557c3a769eb9538a 100644 (file)
@@ -11,7 +11,6 @@ CONFIG_CPUSETS=y
 # CONFIG_NET_NS is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
diff --git a/arch/arm/oprofile/Makefile b/arch/arm/oprofile/Makefile
deleted file mode 100644 (file)
index 39688dc..0000000
+++ /dev/null
@@ -1,14 +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 )
-
-ifeq ($(CONFIG_HW_PERF_EVENTS),y)
-DRIVER_OBJS += $(addprefix ../../../drivers/oprofile/, oprofile_perf.o)
-endif
-
-oprofile-y                             := $(DRIVER_OBJS) common.o
diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
deleted file mode 100644 (file)
index 7cb3e04..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * @file common.c
- *
- * @remark Copyright 2004 Oprofile Authors
- * @remark Copyright 2010 ARM Ltd.
- * @remark Read the file COPYING
- *
- * @author Zwane Mwaikambo
- * @author Will Deacon [move to perf]
- */
-
-#include <linux/cpumask.h>
-#include <linux/init.h>
-#include <linux/mutex.h>
-#include <linux/oprofile.h>
-#include <linux/perf_event.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <asm/stacktrace.h>
-#include <linux/uaccess.h>
-
-#include <asm/perf_event.h>
-#include <asm/ptrace.h>
-
-#ifdef CONFIG_HW_PERF_EVENTS
-
-/*
- * OProfile has a curious naming scheme for the ARM PMUs, but they are
- * part of the user ABI so we need to map from the perf PMU name for
- * supported PMUs.
- */
-static struct op_perf_name {
-       char *perf_name;
-       char *op_name;
-} op_perf_name_map[] = {
-       { "armv5_xscale1",      "arm/xscale1"   },
-       { "armv5_xscale2",      "arm/xscale2"   },
-       { "armv6_1136",         "arm/armv6"     },
-       { "armv6_1156",         "arm/armv6"     },
-       { "armv6_1176",         "arm/armv6"     },
-       { "armv6_11mpcore",     "arm/mpcore"    },
-       { "armv7_cortex_a8",    "arm/armv7"     },
-       { "armv7_cortex_a9",    "arm/armv7-ca9" },
-};
-
-char *op_name_from_perf_id(void)
-{
-       int i;
-       struct op_perf_name names;
-       const char *perf_name = perf_pmu_name();
-
-       for (i = 0; i < ARRAY_SIZE(op_perf_name_map); ++i) {
-               names = op_perf_name_map[i];
-               if (!strcmp(names.perf_name, perf_name))
-                       return names.op_name;
-       }
-
-       return NULL;
-}
-#endif
-
-static int report_trace(struct stackframe *frame, void *d)
-{
-       unsigned int *depth = d;
-
-       if (*depth) {
-               oprofile_add_trace(frame->pc);
-               (*depth)--;
-       }
-
-       return *depth == 0;
-}
-
-/*
- * The registers we're interested in are at the end of the variable
- * length saved register structure. The fp points at the end of this
- * structure so the address of this struct is:
- * (struct frame_tail *)(xxx->fp)-1
- */
-struct frame_tail {
-       struct frame_tail *fp;
-       unsigned long sp;
-       unsigned long lr;
-} __attribute__((packed));
-
-static struct frame_tail* user_backtrace(struct frame_tail *tail)
-{
-       struct frame_tail buftail[2];
-
-       /* Also check accessibility of one struct frame_tail beyond */
-       if (!access_ok(tail, sizeof(buftail)))
-               return NULL;
-       if (__copy_from_user_inatomic(buftail, tail, sizeof(buftail)))
-               return NULL;
-
-       oprofile_add_trace(buftail[0].lr);
-
-       /* frame pointers should strictly progress back up the stack
-        * (towards higher addresses) */
-       if (tail + 1 >= buftail[0].fp)
-               return NULL;
-
-       return buftail[0].fp-1;
-}
-
-static void arm_backtrace(struct pt_regs * const regs, unsigned int depth)
-{
-       struct frame_tail *tail = ((struct frame_tail *) regs->ARM_fp) - 1;
-
-       if (!user_mode(regs)) {
-               struct stackframe frame;
-               arm_get_current_stackframe(regs, &frame);
-               walk_stackframe(&frame, report_trace, &depth);
-               return;
-       }
-
-       while (depth-- && tail && !((unsigned long) tail & 3))
-               tail = user_backtrace(tail);
-}
-
-int __init oprofile_arch_init(struct oprofile_operations *ops)
-{
-       /* provide backtrace support also in timer mode: */
-       ops->backtrace          = arm_backtrace;
-
-       return oprofile_perf_init(ops);
-}
-
-void oprofile_arch_exit(void)
-{
-       oprofile_perf_exit();
-}