mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-22 01:10:28 +00:00
/proc/module: use the same logic as /proc/kallsyms for address exposure
The (alleged) users of the module addresses are the same: kernel profiling. So just expose the same helper and format macros, and unify the logic. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
277642dcca
commit
516fb7f2e7
@ -14,6 +14,14 @@
|
||||
#define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s]") + (KSYM_NAME_LEN - 1) + \
|
||||
2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + 1)
|
||||
|
||||
/* How and when do we show kallsyms values? */
|
||||
extern int kallsyms_show_value(void);
|
||||
#ifndef CONFIG_64BIT
|
||||
# define KALLSYM_FMT "%08lx"
|
||||
#else
|
||||
# define KALLSYM_FMT "%016lx"
|
||||
#endif
|
||||
|
||||
struct module;
|
||||
|
||||
#ifdef CONFIG_KALLSYMS
|
||||
|
@ -581,12 +581,6 @@ static void s_stop(struct seq_file *m, void *p)
|
||||
{
|
||||
}
|
||||
|
||||
#ifndef CONFIG_64BIT
|
||||
# define KALLSYM_FMT "%08lx"
|
||||
#else
|
||||
# define KALLSYM_FMT "%016lx"
|
||||
#endif
|
||||
|
||||
static int s_show(struct seq_file *m, void *p)
|
||||
{
|
||||
unsigned long value;
|
||||
@ -640,7 +634,7 @@ static inline int kallsyms_for_perf(void)
|
||||
* Otherwise, require CAP_SYSLOG (assuming kptr_restrict isn't set to
|
||||
* block even that).
|
||||
*/
|
||||
static int kallsyms_show_value(void)
|
||||
int kallsyms_show_value(void)
|
||||
{
|
||||
switch (kptr_restrict) {
|
||||
case 0:
|
||||
|
@ -4147,6 +4147,7 @@ static int m_show(struct seq_file *m, void *p)
|
||||
{
|
||||
struct module *mod = list_entry(p, struct module, list);
|
||||
char buf[MODULE_FLAGS_BUF_SIZE];
|
||||
unsigned long value;
|
||||
|
||||
/* We always ignore unformed modules. */
|
||||
if (mod->state == MODULE_STATE_UNFORMED)
|
||||
@ -4162,7 +4163,8 @@ static int m_show(struct seq_file *m, void *p)
|
||||
mod->state == MODULE_STATE_COMING ? "Loading" :
|
||||
"Live");
|
||||
/* Used by oprofile and other similar tools. */
|
||||
seq_printf(m, " 0x%pK", mod->core_layout.base);
|
||||
value = m->private ? 0 : (unsigned long)mod->core_layout.base;
|
||||
seq_printf(m, " 0x" KALLSYM_FMT, value);
|
||||
|
||||
/* Taints info */
|
||||
if (mod->taints)
|
||||
@ -4184,9 +4186,23 @@ static const struct seq_operations modules_op = {
|
||||
.show = m_show
|
||||
};
|
||||
|
||||
/*
|
||||
* This also sets the "private" pointer to non-NULL if the
|
||||
* kernel pointers should be hidden (so you can just test
|
||||
* "m->private" to see if you should keep the values private).
|
||||
*
|
||||
* We use the same logic as for /proc/kallsyms.
|
||||
*/
|
||||
static int modules_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return seq_open(file, &modules_op);
|
||||
int err = seq_open(file, &modules_op);
|
||||
|
||||
if (!err) {
|
||||
struct seq_file *m = file->private_data;
|
||||
m->private = kallsyms_show_value() ? NULL : (void *)8ul;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct file_operations proc_modules_operations = {
|
||||
|
Loading…
Reference in New Issue
Block a user