From: Oleg Nesterov <oleg@redhat.com>
To: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Namhyung Kim <namhyung.kim@lge.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@redhat.com>, Jiri Olsa <jolsa@redhat.com>,
linux-kernel@vger.kernel.org,
Rusty Russell <rusty@rustcorp.com.au>
Subject: [RFC PATCH 1/2] tracing: Don't update sc->addr in update_symbol_cache()
Date: Tue, 26 Nov 2013 18:44:23 +0100 [thread overview]
Message-ID: <20131126174423.GC14028@redhat.com> (raw)
In-Reply-To: <20131126174355.GB14028@redhat.com>
Preparation for the next changes. Shift "+= offset" from
update_symbol_cache() to ->fetch[FETCH_MTD_symbol], this
allows to detect the per-cpu symbols.
Also remove the !offset check in traceprobe_split_symbol_offset(),
it is never called with offset == NULL.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/trace/trace_probe.c | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index fce222f..097cc80 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -219,14 +219,9 @@ struct symbol_cache {
unsigned long addr;
};
-static unsigned long update_symbol_cache(struct symbol_cache *sc)
+static void update_symbol_cache(struct symbol_cache *sc)
{
sc->addr = (unsigned long)kallsyms_lookup_name(sc->symbol);
-
- if (sc->addr)
- sc->addr += sc->offset;
-
- return sc->addr;
}
static void free_symbol_cache(struct symbol_cache *sc)
@@ -262,8 +257,9 @@ static __kprobes void FETCH_FUNC_NAME(symbol, type)(struct pt_regs *regs,\
void *data, void *dest) \
{ \
struct symbol_cache *sc = data; \
+ long off = sc->offset; \
if (sc->addr) \
- fetch_memory_##type(regs, (void *)sc->addr, dest); \
+ fetch_memory_##type(regs, (void *)sc->addr + off, dest);\
else \
*(type *)dest = 0; \
}
@@ -485,9 +481,6 @@ int traceprobe_split_symbol_offset(char *symbol, unsigned long *offset)
char *tmp;
int ret;
- if (!offset)
- return -EINVAL;
-
tmp = strchr(symbol, '+');
if (tmp) {
/* skip sign because kstrtoul doesn't accept '+' */
--
1.5.5.1
next prev parent reply other threads:[~2013-11-26 17:43 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-23 20:15 [PATCH 0/1] tracing: Introduce "pseudo registers" for FETCH_MTD_reg Oleg Nesterov
2013-11-23 20:16 ` [PATCH 1/1] " Oleg Nesterov
2013-11-24 7:32 ` Masami Hiramatsu
2013-11-25 8:04 ` Namhyung Kim
2013-11-25 14:35 ` Oleg Nesterov
2013-11-25 17:21 ` [RFC PATCH 0/3] tracing: Teach FETCH_MTD_{symbol,deref} to handle per-cpu data Oleg Nesterov
2013-11-25 17:21 ` [RFC PATCH 1/3] tracing: Don't mangle sc->addr in update_symbol_cache() Oleg Nesterov
2013-11-25 17:21 ` [RFC PATCH 2/3] tracing: introduce {calc,parse}_probe_offset() for FETCH_MTD_{symbol,deref} Oleg Nesterov
2013-11-25 17:22 ` [RFC PATCH 3/3] tracing: Teach FETCH_MTD_{symbol,deref} to handle per-cpu data Oleg Nesterov
2013-11-26 9:34 ` Masami Hiramatsu
2013-11-26 17:43 ` [RFC PATCH 0/2] tracing: Teach FETCH_MTD_symbol " Oleg Nesterov
2013-11-26 17:44 ` Oleg Nesterov [this message]
2013-11-26 17:44 ` [RFC PATCH 2/2] " Oleg Nesterov
2013-11-26 17:50 ` modules, add_kallsyms() && DEFINE_PER_CPU Oleg Nesterov
2013-11-27 2:23 ` Masami Hiramatsu
2013-11-27 8:20 ` Namhyung Kim
2013-11-27 11:22 ` Masami Hiramatsu
2013-11-27 13:35 ` Oleg Nesterov
2013-11-28 2:02 ` Masami Hiramatsu
2013-11-27 11:30 ` [RFC PATCH 2/2] tracing: Teach FETCH_MTD_symbol to handle per-cpu data Masami Hiramatsu
2013-11-27 0:37 ` [RFC PATCH 0/2] " Namhyung Kim
2013-11-27 10:01 ` Masami Hiramatsu
2013-11-27 17:41 ` Oleg Nesterov
2013-11-28 2:55 ` Masami Hiramatsu
2013-11-25 19:29 ` [PATCH 0/2] tracing: Add $cpu and $current probe-vars Oleg Nesterov
2013-11-25 19:29 ` [PATCH 1/2] " Oleg Nesterov
2013-11-26 2:21 ` Masami Hiramatsu
2013-11-26 17:23 ` Oleg Nesterov
2013-11-27 8:22 ` Masami Hiramatsu
2013-11-27 17:05 ` Oleg Nesterov
2013-11-28 2:51 ` Masami Hiramatsu
2013-11-25 19:30 ` [PATCH 2/2] tracing: Kill FETCH_MTD_retval, reimplement $retval via pseudo_reg_retval() Oleg Nesterov
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=20131126174423.GC14028@redhat.com \
--to=oleg@redhat.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@redhat.com \
--cc=namhyung.kim@lge.com \
--cc=rostedt@goodmis.org \
--cc=rusty@rustcorp.com.au \
/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
Powered by JetHome