3 files changed, 28 insertions, 5 deletions

diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index adc0a55acd95..8b4fdaeefa29 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -61,6 +61,7 @@ static struct {
         char *release;
         bool need_dwarf;
         bool list_events;
+        bool force_add;
         int nr_probe;
         struct probe_point probes[MAX_PROBES];
         struct strlist *dellist;
@@ -192,6 +193,8 @@ static const struct option options[] = {
 #endif
                 "\t\t\tkprobe-tracer argument format.)\n",
                 opt_add_probe_event),
+        OPT_BOOLEAN('f', "force", &session.force_add, "forcibly add events"
+                    " with existing name"),
         OPT_END()
 };
 
@@ -294,7 +297,8 @@ end_dwarf:
         }
 
         /* Settng up probe points */
-        add_trace_kprobe_events(session.probes, session.nr_probe);
+        add_trace_kprobe_events(session.probes, session.nr_probe,
+                                session.force_add);
         return 0;
 }
 
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 3b4cf456165c..b05d532a4e4c 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -482,7 +482,7 @@ static void write_trace_kprobe_event(int fd, const char *buf)
 }
 
 static void get_new_event_name(char *buf, size_t len, const char *base,
-                               struct strlist *namelist)
+                               struct strlist *namelist, bool allow_suffix)
 {
         int i, ret;
 
@@ -493,6 +493,12 @@ static void get_new_event_name(char *buf, size_t len, const char *base,
         if (!strlist__has_entry(namelist, buf))
                 return;
 
+        if (!allow_suffix) {
+                pr_warning("Error: event \"%s\" already exists. "
+                           "(Use -f to force duplicates.)\n", base);
+                die("Can't add new event.");
+        }
+
         /* Try to add suffix */
         for (i = 1; i < MAX_EVENT_INDEX; i++) {
                 ret = e_snprintf(buf, len, "%s_%d", base, i);
@@ -505,13 +511,15 @@ static void get_new_event_name(char *buf, size_t len, const char *base,
                 die("Too many events are on the same function.");
 }
 
-void add_trace_kprobe_events(struct probe_point *probes, int nr_probes)
+void add_trace_kprobe_events(struct probe_point *probes, int nr_probes,
+                             bool force_add)
 {
         int i, j, fd;
         struct probe_point *pp;
         char buf[MAX_CMDLEN];
         char event[64];
         struct strlist *namelist;
+        bool allow_suffix;
 
         fd = open_kprobe_events(O_RDWR, O_APPEND);
         /* Get current event names */
@@ -524,9 +532,12 @@ void add_trace_kprobe_events(struct probe_point *probes, int nr_probes)
                 if (!pp->group)
                         pp->group = strdup(PERFPROBE_GROUP);
                 DIE_IF(!pp->event || !pp->group);
+                /* If force_add is true, suffix search is allowed */
+                allow_suffix = force_add;
                 for (i = 0; i < pp->found; i++) {
                         /* Get an unused new event name */
-                        get_new_event_name(event, 64, pp->event, namelist);
+                        get_new_event_name(event, 64, pp->event, namelist,
+                                           allow_suffix);
                         snprintf(buf, MAX_CMDLEN, "%c:%s/%s %s\n",
                                  pp->retprobe ? 'r' : 'p',
                                  pp->group, event,
@@ -538,6 +549,13 @@ void add_trace_kprobe_events(struct probe_point *probes, int nr_probes)
                         show_perf_probe_event(event, buf, pp);
                         /* Add added event name to namelist */
                         strlist__add(namelist, event);
+                        /*
+                         * Probes after the first probe which comes from same
+                         * user input are always allowed to add suffix, because
+                         * there might be several addresses corresponding to
+                         * one code line.
+                         */
+                        allow_suffix = true;
                 }
         }
         /* Show how to use the event. */
diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h
index 8bb22f5246cc..8fd30525100c 100644
--- a/tools/perf/util/probe-event.h
+++ b/tools/perf/util/probe-event.h
@@ -10,7 +10,8 @@ extern void parse_perf_probe_event(const char *str, struct probe_point *pp,
 extern int synthesize_perf_probe_event(struct probe_point *pp);
 extern void parse_trace_kprobe_event(const char *str, struct probe_point *pp);
 extern int synthesize_trace_kprobe_event(struct probe_point *pp);
-extern void add_trace_kprobe_events(struct probe_point *probes, int nr_probes);
+extern void add_trace_kprobe_events(struct probe_point *probes, int nr_probes,
+                                    bool force_add);
 extern void del_trace_kprobe_events(struct strlist *dellist);
 extern void show_perf_probe_events(void);