1 // SPDX-License-Identifier: GPL-2.0-or-later <<
2 /* 1 /*
3 * builtin-probe.c 2 * builtin-probe.c
4 * 3 *
5 * Builtin probe command: Set up probe events 4 * Builtin probe command: Set up probe events by C expression
6 * 5 *
7 * Written by Masami Hiramatsu <mhiramat@redha 6 * Written by Masami Hiramatsu <mhiramat@redhat.com>
>> 7 *
>> 8 * This program is free software; you can redistribute it and/or modify
>> 9 * it under the terms of the GNU General Public License as published by
>> 10 * the Free Software Foundation; either version 2 of the License, or
>> 11 * (at your option) any later version.
>> 12 *
>> 13 * This program is distributed in the hope that it will be useful,
>> 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> 16 * GNU General Public License for more details.
>> 17 *
>> 18 * You should have received a copy of the GNU General Public License
>> 19 * along with this program; if not, write to the Free Software
>> 20 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>> 21 *
8 */ 22 */
9 #include <sys/utsname.h> 23 #include <sys/utsname.h>
10 #include <sys/types.h> 24 #include <sys/types.h>
11 #include <sys/stat.h> 25 #include <sys/stat.h>
12 #include <fcntl.h> 26 #include <fcntl.h>
13 #include <errno.h> 27 #include <errno.h>
14 #include <stdio.h> 28 #include <stdio.h>
15 #include <unistd.h> 29 #include <unistd.h>
16 #include <stdlib.h> 30 #include <stdlib.h>
17 #include <string.h> 31 #include <string.h>
18 32
>> 33 #include "perf.h"
19 #include "builtin.h" 34 #include "builtin.h"
20 #include "namespaces.h" !! 35 #include "util/util.h"
21 #include "util/build-id.h" <<
22 #include "util/strlist.h" 36 #include "util/strlist.h"
23 #include "util/strfilter.h" 37 #include "util/strfilter.h"
24 #include "util/symbol.h" 38 #include "util/symbol.h"
25 #include "util/symbol_conf.h" <<
26 #include "util/debug.h" 39 #include "util/debug.h"
27 #include <subcmd/parse-options.h> 40 #include <subcmd/parse-options.h>
28 #include "util/probe-finder.h" 41 #include "util/probe-finder.h"
29 #include "util/probe-event.h" 42 #include "util/probe-event.h"
30 #include "util/probe-file.h" 43 #include "util/probe-file.h"
31 #include <linux/string.h> <<
32 #include <linux/zalloc.h> <<
33 44
34 #define DEFAULT_VAR_FILTER "!__k???tab_* & !__ 45 #define DEFAULT_VAR_FILTER "!__k???tab_* & !__crc_*"
35 #define DEFAULT_FUNC_FILTER "!_* & !*@plt" !! 46 #define DEFAULT_FUNC_FILTER "!_*"
36 #define DEFAULT_LIST_FILTER "*" 47 #define DEFAULT_LIST_FILTER "*"
37 48
38 /* Session management structure */ 49 /* Session management structure */
39 static struct { 50 static struct {
40 int command; /* Command short_name 51 int command; /* Command short_name */
41 bool list_events; 52 bool list_events;
42 bool uprobes; 53 bool uprobes;
>> 54 bool quiet;
43 bool target_used; 55 bool target_used;
44 int nevents; 56 int nevents;
45 struct perf_probe_event events[MAX_PRO 57 struct perf_probe_event events[MAX_PROBES];
46 struct line_range line_range; 58 struct line_range line_range;
47 char *target; 59 char *target;
48 struct strfilter *filter; 60 struct strfilter *filter;
49 struct nsinfo *nsi; !! 61 } params;
50 } *params; <<
51 62
52 /* Parse an event definition. Note that any er 63 /* Parse an event definition. Note that any error must die. */
53 static int parse_probe_event(const char *str) 64 static int parse_probe_event(const char *str)
54 { 65 {
55 struct perf_probe_event *pev = ¶ms !! 66 struct perf_probe_event *pev = ¶ms.events[params.nevents];
56 int ret; 67 int ret;
57 68
58 pr_debug("probe-definition(%d): %s\n", !! 69 pr_debug("probe-definition(%d): %s\n", params.nevents, str);
59 if (++params->nevents == MAX_PROBES) { !! 70 if (++params.nevents == MAX_PROBES) {
60 pr_err("Too many probes (> %d) 71 pr_err("Too many probes (> %d) were specified.", MAX_PROBES);
61 return -1; 72 return -1;
62 } 73 }
63 74
64 pev->uprobes = params->uprobes; !! 75 pev->uprobes = params.uprobes;
65 if (params->target) { !! 76 if (params.target) {
66 pev->target = strdup(params->t !! 77 pev->target = strdup(params.target);
67 if (!pev->target) 78 if (!pev->target)
68 return -ENOMEM; 79 return -ENOMEM;
69 params->target_used = true; !! 80 params.target_used = true;
70 } 81 }
71 82
72 pev->nsi = nsinfo__get(params->nsi); <<
73 <<
74 /* Parse a perf-probe command into eve 83 /* Parse a perf-probe command into event */
75 ret = parse_perf_probe_command(str, pe 84 ret = parse_perf_probe_command(str, pev);
76 pr_debug("%d arguments\n", pev->nargs) 85 pr_debug("%d arguments\n", pev->nargs);
77 86
78 return ret; 87 return ret;
79 } 88 }
80 89
81 static int params_add_filter(const char *str) 90 static int params_add_filter(const char *str)
82 { 91 {
83 const char *err = NULL; 92 const char *err = NULL;
84 int ret = 0; 93 int ret = 0;
85 94
86 pr_debug2("Add filter: %s\n", str); 95 pr_debug2("Add filter: %s\n", str);
87 if (!params->filter) { !! 96 if (!params.filter) {
88 params->filter = strfilter__ne !! 97 params.filter = strfilter__new(str, &err);
89 if (!params->filter) !! 98 if (!params.filter)
90 ret = err ? -EINVAL : 99 ret = err ? -EINVAL : -ENOMEM;
91 } else 100 } else
92 ret = strfilter__or(params->fi !! 101 ret = strfilter__or(params.filter, str, &err);
93 102
94 if (ret == -EINVAL) { 103 if (ret == -EINVAL) {
95 pr_err("Filter parse error at 104 pr_err("Filter parse error at %td.\n", err - str + 1);
96 pr_err("Source: \"%s\"\n", str 105 pr_err("Source: \"%s\"\n", str);
97 pr_err(" %*c\n", (int) 106 pr_err(" %*c\n", (int)(err - str + 1), '^');
98 } 107 }
99 108
100 return ret; 109 return ret;
101 } 110 }
102 111
103 static int set_target(const char *ptr) 112 static int set_target(const char *ptr)
104 { 113 {
105 int found = 0; 114 int found = 0;
106 const char *buf; 115 const char *buf;
107 116
108 /* 117 /*
109 * The first argument after options ca 118 * The first argument after options can be an absolute path
110 * to an executable / library or kerne 119 * to an executable / library or kernel module.
111 * 120 *
112 * TODO: Support relative path, and $P 121 * TODO: Support relative path, and $PATH, $LD_LIBRARY_PATH,
113 * short module name. 122 * short module name.
114 */ 123 */
115 if (!params->target && ptr && *ptr == !! 124 if (!params.target && ptr && *ptr == '/') {
116 params->target = strdup(ptr); !! 125 params.target = strdup(ptr);
117 if (!params->target) !! 126 if (!params.target)
118 return -ENOMEM; 127 return -ENOMEM;
119 params->target_used = false; !! 128 params.target_used = false;
120 129
121 found = 1; 130 found = 1;
122 buf = ptr + (strlen(ptr) - 3); 131 buf = ptr + (strlen(ptr) - 3);
123 132
124 if (strcmp(buf, ".ko")) 133 if (strcmp(buf, ".ko"))
125 params->uprobes = true !! 134 params.uprobes = true;
126 135
127 } 136 }
128 137
129 return found; 138 return found;
130 } 139 }
131 140
132 static int parse_probe_event_argv(int argc, co 141 static int parse_probe_event_argv(int argc, const char **argv)
133 { 142 {
134 int i, len, ret, found_target; 143 int i, len, ret, found_target;
135 char *buf; 144 char *buf;
136 145
137 found_target = set_target(argv[0]); 146 found_target = set_target(argv[0]);
138 if (found_target < 0) 147 if (found_target < 0)
139 return found_target; 148 return found_target;
140 149
141 if (found_target && argc == 1) 150 if (found_target && argc == 1)
142 return 0; 151 return 0;
143 152
144 /* Bind up rest arguments */ 153 /* Bind up rest arguments */
145 len = 0; 154 len = 0;
146 for (i = 0; i < argc; i++) { 155 for (i = 0; i < argc; i++) {
147 if (i == 0 && found_target) 156 if (i == 0 && found_target)
148 continue; 157 continue;
149 158
150 len += strlen(argv[i]) + 1; 159 len += strlen(argv[i]) + 1;
151 } 160 }
152 buf = zalloc(len + 1); 161 buf = zalloc(len + 1);
153 if (buf == NULL) 162 if (buf == NULL)
154 return -ENOMEM; 163 return -ENOMEM;
155 len = 0; 164 len = 0;
156 for (i = 0; i < argc; i++) { 165 for (i = 0; i < argc; i++) {
157 if (i == 0 && found_target) 166 if (i == 0 && found_target)
158 continue; 167 continue;
159 168
160 len += sprintf(&buf[len], "%s 169 len += sprintf(&buf[len], "%s ", argv[i]);
161 } 170 }
162 ret = parse_probe_event(buf); 171 ret = parse_probe_event(buf);
163 free(buf); 172 free(buf);
164 return ret; 173 return ret;
165 } 174 }
166 175
167 static int opt_set_target(const struct option 176 static int opt_set_target(const struct option *opt, const char *str,
168 int unset __maybe_unus 177 int unset __maybe_unused)
169 { 178 {
170 int ret = -ENOENT; 179 int ret = -ENOENT;
171 char *tmp; 180 char *tmp;
172 181
173 if (str) { 182 if (str) {
174 if (!strcmp(opt->long_name, "e 183 if (!strcmp(opt->long_name, "exec"))
175 params->uprobes = true !! 184 params.uprobes = true;
176 else if (!strcmp(opt->long_nam 185 else if (!strcmp(opt->long_name, "module"))
177 params->uprobes = fals !! 186 params.uprobes = false;
178 else 187 else
179 return ret; 188 return ret;
180 189
181 /* Expand given path to absolu 190 /* Expand given path to absolute path, except for modulename */
182 if (params->uprobes || strchr( !! 191 if (params.uprobes || strchr(str, '/')) {
183 tmp = nsinfo__realpath !! 192 tmp = realpath(str, NULL);
184 if (!tmp) { 193 if (!tmp) {
185 pr_warning("Fa 194 pr_warning("Failed to get the absolute path of %s: %m\n", str);
186 return ret; 195 return ret;
187 } 196 }
188 } else { 197 } else {
189 tmp = strdup(str); 198 tmp = strdup(str);
190 if (!tmp) 199 if (!tmp)
191 return -ENOMEM 200 return -ENOMEM;
192 } 201 }
193 free(params->target); !! 202 free(params.target);
194 params->target = tmp; !! 203 params.target = tmp;
195 params->target_used = false; !! 204 params.target_used = false;
196 ret = 0; <<
197 } <<
198 <<
199 return ret; <<
200 } <<
201 <<
202 static int opt_set_target_ns(const struct opti <<
203 const char *str, <<
204 { <<
205 int ret = -ENOENT; <<
206 pid_t ns_pid; <<
207 struct nsinfo *nsip; <<
208 <<
209 if (str) { <<
210 errno = 0; <<
211 ns_pid = (pid_t)strtol(str, NU <<
212 if (errno != 0) { <<
213 ret = -errno; <<
214 pr_warning("Failed to <<
215 strerror(er <<
216 return ret; <<
217 } <<
218 nsip = nsinfo__new(ns_pid); <<
219 if (nsip && nsinfo__need_setns <<
220 params->nsi = nsinfo__ <<
221 nsinfo__put(nsip); <<
222 <<
223 ret = 0; 205 ret = 0;
224 } 206 }
225 207
226 return ret; 208 return ret;
227 } 209 }
228 210
229 <<
230 /* Command option callbacks */ 211 /* Command option callbacks */
231 212
232 #ifdef HAVE_DWARF_SUPPORT 213 #ifdef HAVE_DWARF_SUPPORT
233 static int opt_show_lines(const struct option 214 static int opt_show_lines(const struct option *opt,
234 const char *str, int 215 const char *str, int unset __maybe_unused)
235 { 216 {
236 int ret = 0; 217 int ret = 0;
237 218
238 if (!str) 219 if (!str)
239 return 0; 220 return 0;
240 221
241 if (params->command == 'L') { !! 222 if (params.command == 'L') {
242 pr_warning("Warning: more than 223 pr_warning("Warning: more than one --line options are"
243 " detected. Only th 224 " detected. Only the first one is valid.\n");
244 return 0; 225 return 0;
245 } 226 }
246 227
247 params->command = opt->short_name; !! 228 params.command = opt->short_name;
248 ret = parse_line_range_desc(str, ¶ !! 229 ret = parse_line_range_desc(str, ¶ms.line_range);
249 230
250 return ret; 231 return ret;
251 } 232 }
252 233
253 static int opt_show_vars(const struct option * 234 static int opt_show_vars(const struct option *opt,
254 const char *str, int 235 const char *str, int unset __maybe_unused)
255 { 236 {
256 struct perf_probe_event *pev = ¶ms !! 237 struct perf_probe_event *pev = ¶ms.events[params.nevents];
257 int ret; 238 int ret;
258 239
259 if (!str) 240 if (!str)
260 return 0; 241 return 0;
261 242
262 ret = parse_probe_event(str); 243 ret = parse_probe_event(str);
263 if (!ret && pev->nargs != 0) { 244 if (!ret && pev->nargs != 0) {
264 pr_err(" Error: '--vars' does 245 pr_err(" Error: '--vars' doesn't accept arguments.\n");
265 return -EINVAL; 246 return -EINVAL;
266 } 247 }
267 params->command = opt->short_name; !! 248 params.command = opt->short_name;
268 249
269 return ret; 250 return ret;
270 } 251 }
271 #else 252 #else
272 # define opt_show_lines NULL 253 # define opt_show_lines NULL
273 # define opt_show_vars NULL 254 # define opt_show_vars NULL
274 #endif 255 #endif
275 static int opt_add_probe_event(const struct op 256 static int opt_add_probe_event(const struct option *opt,
276 const char *str, 257 const char *str, int unset __maybe_unused)
277 { 258 {
278 if (str) { 259 if (str) {
279 params->command = opt->short_n !! 260 params.command = opt->short_name;
280 return parse_probe_event(str); 261 return parse_probe_event(str);
281 } 262 }
282 263
283 return 0; 264 return 0;
284 } 265 }
285 266
286 static int opt_set_filter_with_command(const s 267 static int opt_set_filter_with_command(const struct option *opt,
287 const c 268 const char *str, int unset)
288 { 269 {
289 if (!unset) 270 if (!unset)
290 params->command = opt->short_n !! 271 params.command = opt->short_name;
291 272
292 if (str) 273 if (str)
293 return params_add_filter(str); 274 return params_add_filter(str);
294 275
295 return 0; 276 return 0;
296 } 277 }
297 278
298 static int opt_set_filter(const struct option 279 static int opt_set_filter(const struct option *opt __maybe_unused,
299 const char *str, int 280 const char *str, int unset __maybe_unused)
300 { 281 {
301 if (str) 282 if (str)
302 return params_add_filter(str); 283 return params_add_filter(str);
303 284
304 return 0; 285 return 0;
305 } 286 }
306 287
307 static int init_params(void) 288 static int init_params(void)
308 { 289 {
309 int ret; !! 290 return line_range__init(¶ms.line_range);
310 <<
311 params = calloc(1, sizeof(*params)); <<
312 if (!params) <<
313 return -ENOMEM; <<
314 <<
315 ret = line_range__init(¶ms->line_r <<
316 if (ret) <<
317 zfree(¶ms); <<
318 return ret; <<
319 } 291 }
320 292
321 static void cleanup_params(void) 293 static void cleanup_params(void)
322 { 294 {
323 int i; 295 int i;
324 296
325 for (i = 0; i < params->nevents; i++) !! 297 for (i = 0; i < params.nevents; i++)
326 clear_perf_probe_event(params- !! 298 clear_perf_probe_event(params.events + i);
327 line_range__clear(¶ms->line_range) !! 299 line_range__clear(¶ms.line_range);
328 zfree(¶ms->target); !! 300 free(params.target);
329 strfilter__delete(params->filter); !! 301 strfilter__delete(params.filter);
330 nsinfo__put(params->nsi); !! 302 memset(¶ms, 0, sizeof(params));
331 zfree(¶ms); <<
332 } 303 }
333 304
334 static void pr_err_with_code(const char *msg, 305 static void pr_err_with_code(const char *msg, int err)
335 { 306 {
336 char sbuf[STRERR_BUFSIZE]; 307 char sbuf[STRERR_BUFSIZE];
337 308
338 pr_err("%s", msg); 309 pr_err("%s", msg);
339 pr_debug(" Reason: %s (Code: %d)", 310 pr_debug(" Reason: %s (Code: %d)",
340 str_error_r(-err, sbuf, sizeo 311 str_error_r(-err, sbuf, sizeof(sbuf)), err);
341 pr_err("\n"); 312 pr_err("\n");
342 } 313 }
343 314
344 static int perf_add_probe_events(struct perf_p 315 static int perf_add_probe_events(struct perf_probe_event *pevs, int npevs)
345 { 316 {
346 int ret; 317 int ret;
347 int i, k; 318 int i, k;
348 const char *event = NULL, *group = NUL 319 const char *event = NULL, *group = NULL;
349 320
350 ret = init_probe_symbol_maps(pevs->upr 321 ret = init_probe_symbol_maps(pevs->uprobes);
351 if (ret < 0) 322 if (ret < 0)
352 return ret; 323 return ret;
353 324
354 ret = convert_perf_probe_events(pevs, 325 ret = convert_perf_probe_events(pevs, npevs);
355 if (ret < 0) 326 if (ret < 0)
356 goto out_cleanup; 327 goto out_cleanup;
357 328
358 if (params->command == 'D') { /* it !! 329 if (params.command == 'D') { /* it shows definition */
359 if (probe_conf.bootconfig) !! 330 ret = show_probe_trace_events(pevs, npevs);
360 ret = show_bootconfig_ <<
361 else <<
362 ret = show_probe_trace <<
363 goto out_cleanup; 331 goto out_cleanup;
364 } 332 }
365 333
366 ret = apply_perf_probe_events(pevs, np 334 ret = apply_perf_probe_events(pevs, npevs);
367 if (ret < 0) 335 if (ret < 0)
368 goto out_cleanup; 336 goto out_cleanup;
369 337
370 for (i = k = 0; i < npevs; i++) 338 for (i = k = 0; i < npevs; i++)
371 k += pevs[i].ntevs; 339 k += pevs[i].ntevs;
372 340
373 pr_info("Added new event%s\n", (k > 1) 341 pr_info("Added new event%s\n", (k > 1) ? "s:" : ":");
374 for (i = 0; i < npevs; i++) { 342 for (i = 0; i < npevs; i++) {
375 struct perf_probe_event *pev = 343 struct perf_probe_event *pev = &pevs[i];
376 344
377 for (k = 0; k < pev->ntevs; k+ 345 for (k = 0; k < pev->ntevs; k++) {
378 struct probe_trace_eve 346 struct probe_trace_event *tev = &pev->tevs[k];
379 /* Skipped events have <<
380 if (!tev->event) <<
381 continue; <<
382 347
383 /* We use tev's name f 348 /* We use tev's name for showing new events */
384 show_perf_probe_event( 349 show_perf_probe_event(tev->group, tev->event, pev,
385 350 tev->point.module, false);
386 351
387 /* Save the last valid 352 /* Save the last valid name */
388 event = tev->event; 353 event = tev->event;
389 group = tev->group; 354 group = tev->group;
390 } 355 }
391 } 356 }
392 357
393 /* Note that it is possible to skip al 358 /* Note that it is possible to skip all events because of blacklist */
394 if (event) { 359 if (event) {
395 #ifndef HAVE_LIBTRACEEVENT <<
396 pr_info("\nperf is not linked <<
397 pr_info("\tcd /sys/kernel/trac <<
398 pr_info("\techo 1 > events/%s/ <<
399 pr_info("\techo 1 > tracing_on <<
400 pr_info("\tcat trace_pipe\n"); <<
401 pr_info("\tBefore removing the <<
402 #else <<
403 /* Show how to use the event. 360 /* Show how to use the event. */
404 pr_info("\nYou can now use it 361 pr_info("\nYou can now use it in all perf tools, such as:\n\n");
405 pr_info("\tperf record -e %s:% 362 pr_info("\tperf record -e %s:%s -aR sleep 1\n\n", group, event);
406 #endif <<
407 } 363 }
408 364
409 out_cleanup: 365 out_cleanup:
410 cleanup_perf_probe_events(pevs, npevs) 366 cleanup_perf_probe_events(pevs, npevs);
411 exit_probe_symbol_maps(); 367 exit_probe_symbol_maps();
412 return ret; 368 return ret;
413 } 369 }
414 370
415 static int del_perf_probe_caches(struct strfil 371 static int del_perf_probe_caches(struct strfilter *filter)
416 { 372 {
417 struct probe_cache *cache; 373 struct probe_cache *cache;
418 struct strlist *bidlist; 374 struct strlist *bidlist;
419 struct str_node *nd; 375 struct str_node *nd;
420 int ret; 376 int ret;
421 377
422 bidlist = build_id_cache__list_all(fal 378 bidlist = build_id_cache__list_all(false);
423 if (!bidlist) { 379 if (!bidlist) {
424 ret = -errno; 380 ret = -errno;
425 pr_debug("Failed to get buildi 381 pr_debug("Failed to get buildids: %d\n", ret);
426 return ret ?: -ENOMEM; 382 return ret ?: -ENOMEM;
427 } 383 }
428 384
429 strlist__for_each_entry(nd, bidlist) { 385 strlist__for_each_entry(nd, bidlist) {
430 cache = probe_cache__new(nd->s !! 386 cache = probe_cache__new(nd->s);
431 if (!cache) 387 if (!cache)
432 continue; 388 continue;
433 if (probe_cache__filter_purge( 389 if (probe_cache__filter_purge(cache, filter) < 0 ||
434 probe_cache__commit(cache) 390 probe_cache__commit(cache) < 0)
435 pr_warning("Failed to 391 pr_warning("Failed to remove entries for %s\n", nd->s);
436 probe_cache__delete(cache); 392 probe_cache__delete(cache);
437 } 393 }
438 return 0; 394 return 0;
439 } 395 }
440 396
441 static int perf_del_probe_events(struct strfil 397 static int perf_del_probe_events(struct strfilter *filter)
442 { 398 {
443 int ret, ret2, ufd = -1, kfd = -1; 399 int ret, ret2, ufd = -1, kfd = -1;
444 char *str = strfilter__string(filter); 400 char *str = strfilter__string(filter);
445 struct strlist *klist = NULL, *ulist = 401 struct strlist *klist = NULL, *ulist = NULL;
446 struct str_node *ent; 402 struct str_node *ent;
447 403
448 if (!str) 404 if (!str)
449 return -EINVAL; 405 return -EINVAL;
450 406
451 pr_debug("Delete filter: \'%s\'\n", st 407 pr_debug("Delete filter: \'%s\'\n", str);
452 408
453 if (probe_conf.cache) 409 if (probe_conf.cache)
454 return del_perf_probe_caches(f 410 return del_perf_probe_caches(filter);
455 411
456 /* Get current event names */ 412 /* Get current event names */
457 ret = probe_file__open_both(&kfd, &ufd 413 ret = probe_file__open_both(&kfd, &ufd, PF_FL_RW);
458 if (ret < 0) 414 if (ret < 0)
459 goto out; 415 goto out;
460 416
461 klist = strlist__new(NULL, NULL); 417 klist = strlist__new(NULL, NULL);
462 ulist = strlist__new(NULL, NULL); 418 ulist = strlist__new(NULL, NULL);
463 if (!klist || !ulist) { 419 if (!klist || !ulist) {
464 ret = -ENOMEM; 420 ret = -ENOMEM;
465 goto out; 421 goto out;
466 } 422 }
467 423
468 ret = probe_file__get_events(kfd, filt 424 ret = probe_file__get_events(kfd, filter, klist);
469 if (ret == 0) { 425 if (ret == 0) {
470 strlist__for_each_entry(ent, k 426 strlist__for_each_entry(ent, klist)
471 pr_info("Removed event 427 pr_info("Removed event: %s\n", ent->s);
472 428
473 ret = probe_file__del_strlist( 429 ret = probe_file__del_strlist(kfd, klist);
474 if (ret < 0) 430 if (ret < 0)
475 goto error; 431 goto error;
476 } else if (ret == -ENOMEM) !! 432 }
477 goto error; <<
478 433
479 ret2 = probe_file__get_events(ufd, fil 434 ret2 = probe_file__get_events(ufd, filter, ulist);
480 if (ret2 == 0) { 435 if (ret2 == 0) {
481 strlist__for_each_entry(ent, u 436 strlist__for_each_entry(ent, ulist)
482 pr_info("Removed event 437 pr_info("Removed event: %s\n", ent->s);
483 438
484 ret2 = probe_file__del_strlist 439 ret2 = probe_file__del_strlist(ufd, ulist);
485 if (ret2 < 0) 440 if (ret2 < 0)
486 goto error; 441 goto error;
487 } else if (ret2 == -ENOMEM) !! 442 }
488 goto error; <<
489 443
490 if (ret == -ENOENT && ret2 == -ENOENT) 444 if (ret == -ENOENT && ret2 == -ENOENT)
491 pr_warning("\"%s\" does not hi !! 445 pr_debug("\"%s\" does not hit any event.\n", str);
492 else !! 446 /* Note that this is silently ignored */
493 ret = 0; !! 447 ret = 0;
494 448
495 error: 449 error:
496 if (kfd >= 0) 450 if (kfd >= 0)
497 close(kfd); 451 close(kfd);
498 if (ufd >= 0) 452 if (ufd >= 0)
499 close(ufd); 453 close(ufd);
500 out: 454 out:
501 strlist__delete(klist); 455 strlist__delete(klist);
502 strlist__delete(ulist); 456 strlist__delete(ulist);
503 free(str); 457 free(str);
504 458
505 return ret; 459 return ret;
506 } 460 }
507 461
508 #ifdef HAVE_DWARF_SUPPORT 462 #ifdef HAVE_DWARF_SUPPORT
509 #define PROBEDEF_STR \ 463 #define PROBEDEF_STR \
510 "[EVENT=]FUNC[@SRC][+OFF|%return|:RL|; 464 "[EVENT=]FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT [[NAME=]ARG ...]"
511 #else 465 #else
512 #define PROBEDEF_STR "[EVENT=]FUNC[+OFF|%re 466 #define PROBEDEF_STR "[EVENT=]FUNC[+OFF|%return] [[NAME=]ARG ...]"
513 #endif 467 #endif
514 468
515 469
516 static int 470 static int
517 __cmd_probe(int argc, const char **argv) !! 471 __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)
518 { 472 {
519 const char * const probe_usage[] = { 473 const char * const probe_usage[] = {
520 "perf probe [<options>] 'PROBE 474 "perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]",
521 "perf probe [<options>] --add 475 "perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]",
522 "perf probe [<options>] --del 476 "perf probe [<options>] --del '[GROUP:]EVENT' ...",
523 "perf probe --list [GROUP:]EVE 477 "perf probe --list [GROUP:]EVENT ...",
524 #ifdef HAVE_DWARF_SUPPORT 478 #ifdef HAVE_DWARF_SUPPORT
525 "perf probe [<options>] --line 479 "perf probe [<options>] --line 'LINEDESC'",
526 "perf probe [<options>] --vars 480 "perf probe [<options>] --vars 'PROBEPOINT'",
527 #endif 481 #endif
528 "perf probe [<options>] --func 482 "perf probe [<options>] --funcs",
529 NULL 483 NULL
530 }; 484 };
531 struct option options[] = { 485 struct option options[] = {
532 OPT_INCR('v', "verbose", &verbose, 486 OPT_INCR('v', "verbose", &verbose,
533 "be more verbose (show par 487 "be more verbose (show parsed arguments, etc)"),
534 OPT_BOOLEAN('q', "quiet", &quiet, !! 488 OPT_BOOLEAN('q', "quiet", ¶ms.quiet,
535 "be quiet (do not show any !! 489 "be quiet (do not show any mesages)"),
536 OPT_CALLBACK_DEFAULT('l', "list", NULL 490 OPT_CALLBACK_DEFAULT('l', "list", NULL, "[GROUP:]EVENT",
537 "list up probe ev 491 "list up probe events",
538 opt_set_filter_wi 492 opt_set_filter_with_command, DEFAULT_LIST_FILTER),
539 OPT_CALLBACK('d', "del", NULL, "[GROUP 493 OPT_CALLBACK('d', "del", NULL, "[GROUP:]EVENT", "delete a probe event.",
540 opt_set_filter_with_comma 494 opt_set_filter_with_command),
541 OPT_CALLBACK('a', "add", NULL, PROBEDE 495 OPT_CALLBACK('a', "add", NULL, PROBEDEF_STR,
542 "probe point definition, where 496 "probe point definition, where\n"
543 "\t\tGROUP:\tGroup name (optio 497 "\t\tGROUP:\tGroup name (optional)\n"
544 "\t\tEVENT:\tEvent name\n" 498 "\t\tEVENT:\tEvent name\n"
545 "\t\tFUNC:\tFunction name\n" 499 "\t\tFUNC:\tFunction name\n"
546 "\t\tOFF:\tOffset from functio 500 "\t\tOFF:\tOffset from function entry (in byte)\n"
547 "\t\t%return:\tPut the probe a 501 "\t\t%return:\tPut the probe at function return\n"
548 #ifdef HAVE_DWARF_SUPPORT 502 #ifdef HAVE_DWARF_SUPPORT
549 "\t\tSRC:\tSource code path\n" 503 "\t\tSRC:\tSource code path\n"
550 "\t\tRL:\tRelative line number 504 "\t\tRL:\tRelative line number from function entry.\n"
551 "\t\tAL:\tAbsolute line number 505 "\t\tAL:\tAbsolute line number in file.\n"
552 "\t\tPT:\tLazy expression of l 506 "\t\tPT:\tLazy expression of line code.\n"
553 "\t\tARG:\tProbe argument (loc 507 "\t\tARG:\tProbe argument (local variable name or\n"
554 "\t\t\tkprobe-tracer argument 508 "\t\t\tkprobe-tracer argument format.)\n",
555 #else 509 #else
556 "\t\tARG:\tProbe argument (kpr 510 "\t\tARG:\tProbe argument (kprobe-tracer argument format.)\n",
557 #endif 511 #endif
558 opt_add_probe_event), 512 opt_add_probe_event),
559 OPT_CALLBACK('D', "definition", NULL, 513 OPT_CALLBACK('D', "definition", NULL, PROBEDEF_STR,
560 "Show trace event definition o 514 "Show trace event definition of given traceevent for k/uprobe_events.",
561 opt_add_probe_event), 515 opt_add_probe_event),
562 OPT_BOOLEAN('f', "force", &probe_conf. 516 OPT_BOOLEAN('f', "force", &probe_conf.force_add, "forcibly add events"
563 " with existing name"), 517 " with existing name"),
564 OPT_CALLBACK('L', "line", NULL, 518 OPT_CALLBACK('L', "line", NULL,
565 "FUNC[:RLN[+NUM|-RLN2]]|S 519 "FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]",
566 "Show source code lines." 520 "Show source code lines.", opt_show_lines),
567 OPT_CALLBACK('V', "vars", NULL, 521 OPT_CALLBACK('V', "vars", NULL,
568 "FUNC[@SRC][+OFF|%return| 522 "FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT",
569 "Show accessible variable 523 "Show accessible variables on PROBEDEF", opt_show_vars),
570 OPT_BOOLEAN('\0', "externs", &probe_co 524 OPT_BOOLEAN('\0', "externs", &probe_conf.show_ext_vars,
571 "Show external variables t 525 "Show external variables too (with --vars only)"),
572 OPT_BOOLEAN('\0', "range", &probe_conf 526 OPT_BOOLEAN('\0', "range", &probe_conf.show_location_range,
573 "Show variables location range 527 "Show variables location range in scope (with --vars only)"),
574 OPT_STRING('k', "vmlinux", &symbol_con 528 OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
575 "file", "vmlinux pathname") 529 "file", "vmlinux pathname"),
576 OPT_STRING('s', "source", &symbol_conf 530 OPT_STRING('s', "source", &symbol_conf.source_prefix,
577 "directory", "path to kerne 531 "directory", "path to kernel source"),
578 OPT_BOOLEAN('\0', "no-inlines", &probe 532 OPT_BOOLEAN('\0', "no-inlines", &probe_conf.no_inlines,
579 "Don't search inlined function 533 "Don't search inlined functions"),
580 OPT__DRY_RUN(&probe_event_dry_run), 534 OPT__DRY_RUN(&probe_event_dry_run),
581 OPT_INTEGER('\0', "max-probes", &probe 535 OPT_INTEGER('\0', "max-probes", &probe_conf.max_probes,
582 "Set how many probe points ca 536 "Set how many probe points can be found for a probe."),
583 OPT_CALLBACK_DEFAULT('F', "funcs", NUL 537 OPT_CALLBACK_DEFAULT('F', "funcs", NULL, "[FILTER]",
584 "Show potential p 538 "Show potential probe-able functions.",
585 opt_set_filter_wi 539 opt_set_filter_with_command, DEFAULT_FUNC_FILTER),
586 OPT_CALLBACK('\0', "filter", NULL, 540 OPT_CALLBACK('\0', "filter", NULL,
587 "[!]FILTER", "Set a filte 541 "[!]FILTER", "Set a filter (with --vars/funcs only)\n"
588 "\t\t\t(default: \"" DEFA 542 "\t\t\t(default: \"" DEFAULT_VAR_FILTER "\" for --vars,\n"
589 "\t\t\t \"" DEFAULT_FUNC_ 543 "\t\t\t \"" DEFAULT_FUNC_FILTER "\" for --funcs)",
590 opt_set_filter), 544 opt_set_filter),
591 OPT_CALLBACK('x', "exec", NULL, "execu 545 OPT_CALLBACK('x', "exec", NULL, "executable|path",
592 "target executable nam 546 "target executable name or path", opt_set_target),
593 OPT_CALLBACK('m', "module", NULL, "mod 547 OPT_CALLBACK('m', "module", NULL, "modname|path",
594 "target module name (for onlin 548 "target module name (for online) or path (for offline)",
595 opt_set_target), 549 opt_set_target),
596 OPT_BOOLEAN(0, "demangle", &symbol_con 550 OPT_BOOLEAN(0, "demangle", &symbol_conf.demangle,
597 "Enable symbol demangling" 551 "Enable symbol demangling"),
598 OPT_BOOLEAN(0, "demangle-kernel", &sym 552 OPT_BOOLEAN(0, "demangle-kernel", &symbol_conf.demangle_kernel,
599 "Enable kernel symbol dema 553 "Enable kernel symbol demangling"),
600 OPT_BOOLEAN(0, "cache", &probe_conf.ca 554 OPT_BOOLEAN(0, "cache", &probe_conf.cache, "Manipulate probe cache"),
601 OPT_STRING(0, "symfs", &symbol_conf.sy 555 OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
602 "Look for files with symbol 556 "Look for files with symbols relative to this directory"),
603 OPT_CALLBACK(0, "target-ns", NULL, "pi <<
604 "target pid for namespace <<
605 OPT_BOOLEAN(0, "bootconfig", &probe_co <<
606 "Output probe definition w <<
607 OPT_END() 557 OPT_END()
608 }; 558 };
609 int ret; 559 int ret;
610 560
611 set_option_flag(options, 'a', "add", P 561 set_option_flag(options, 'a', "add", PARSE_OPT_EXCLUSIVE);
612 set_option_flag(options, 'd', "del", P 562 set_option_flag(options, 'd', "del", PARSE_OPT_EXCLUSIVE);
613 set_option_flag(options, 'D', "definit 563 set_option_flag(options, 'D', "definition", PARSE_OPT_EXCLUSIVE);
614 set_option_flag(options, 'l', "list", 564 set_option_flag(options, 'l', "list", PARSE_OPT_EXCLUSIVE);
615 #ifdef HAVE_DWARF_SUPPORT 565 #ifdef HAVE_DWARF_SUPPORT
616 set_option_flag(options, 'L', "line", 566 set_option_flag(options, 'L', "line", PARSE_OPT_EXCLUSIVE);
617 set_option_flag(options, 'V', "vars", 567 set_option_flag(options, 'V', "vars", PARSE_OPT_EXCLUSIVE);
618 #else 568 #else
619 # define set_nobuild(s, l, c) set_option_nobui 569 # define set_nobuild(s, l, c) set_option_nobuild(options, s, l, "NO_DWARF=1", c)
620 set_nobuild('L', "line", false); 570 set_nobuild('L', "line", false);
621 set_nobuild('V', "vars", false); 571 set_nobuild('V', "vars", false);
622 set_nobuild('\0', "externs", false); 572 set_nobuild('\0', "externs", false);
623 set_nobuild('\0', "range", false); 573 set_nobuild('\0', "range", false);
624 set_nobuild('k', "vmlinux", true); 574 set_nobuild('k', "vmlinux", true);
625 set_nobuild('s', "source", true); 575 set_nobuild('s', "source", true);
626 set_nobuild('\0', "no-inlines", true); 576 set_nobuild('\0', "no-inlines", true);
627 # undef set_nobuild 577 # undef set_nobuild
628 #endif 578 #endif
629 set_option_flag(options, 'F', "funcs", 579 set_option_flag(options, 'F', "funcs", PARSE_OPT_EXCLUSIVE);
630 580
631 argc = parse_options(argc, argv, optio 581 argc = parse_options(argc, argv, options, probe_usage,
632 PARSE_OPT_STOP_AT 582 PARSE_OPT_STOP_AT_NON_OPTION);
633 <<
634 if (quiet) { <<
635 if (verbose != 0) { <<
636 pr_err(" Error: -v an <<
637 return -EINVAL; <<
638 } <<
639 verbose = -1; <<
640 } <<
641 <<
642 if (argc > 0) { 583 if (argc > 0) {
643 if (strcmp(argv[0], "-") == 0) 584 if (strcmp(argv[0], "-") == 0) {
644 usage_with_options_msg 585 usage_with_options_msg(probe_usage, options,
645 "'-' is not su 586 "'-' is not supported.\n");
646 } 587 }
647 if (params->command && params- !! 588 if (params.command && params.command != 'a') {
648 usage_with_options_msg 589 usage_with_options_msg(probe_usage, options,
649 "another comma 590 "another command except --add is set.\n");
650 } 591 }
651 ret = parse_probe_event_argv(a 592 ret = parse_probe_event_argv(argc, argv);
652 if (ret < 0) { 593 if (ret < 0) {
653 pr_err_with_code(" Er 594 pr_err_with_code(" Error: Command Parse Error.", ret);
654 return ret; 595 return ret;
655 } 596 }
656 params->command = 'a'; !! 597 params.command = 'a';
657 } 598 }
658 599
659 ret = symbol__validate_sym_arguments() !! 600 if (params.quiet) {
660 if (ret) !! 601 if (verbose != 0) {
661 return ret; !! 602 pr_err(" Error: -v and -q are exclusive.\n");
>> 603 return -EINVAL;
>> 604 }
>> 605 verbose = -1;
>> 606 }
662 607
663 if (probe_conf.max_probes == 0) 608 if (probe_conf.max_probes == 0)
664 probe_conf.max_probes = MAX_PR 609 probe_conf.max_probes = MAX_PROBES;
665 610
666 /* 611 /*
667 * Only consider the user's kernel ima 612 * Only consider the user's kernel image path if given.
668 */ 613 */
669 symbol_conf.try_vmlinux_path = (symbol 614 symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name == NULL);
670 615
671 /* 616 /*
672 * Except for --list, --del and --add, 617 * Except for --list, --del and --add, other command doesn't depend
673 * nor change running kernel. So if us 618 * nor change running kernel. So if user gives offline vmlinux,
674 * ignore its buildid. 619 * ignore its buildid.
675 */ 620 */
676 if (!strchr("lda", params->command) && !! 621 if (!strchr("lda", params.command) && symbol_conf.vmlinux_name)
677 symbol_conf.ignore_vmlinux_bui 622 symbol_conf.ignore_vmlinux_buildid = true;
678 623
679 switch (params->command) { !! 624 switch (params.command) {
680 case 'l': 625 case 'l':
681 if (params->uprobes) { !! 626 if (params.uprobes) {
682 pr_err(" Error: Don't 627 pr_err(" Error: Don't use --list with --exec.\n");
683 parse_options_usage(pr 628 parse_options_usage(probe_usage, options, "l", true);
684 parse_options_usage(NU 629 parse_options_usage(NULL, options, "x", true);
685 return -EINVAL; 630 return -EINVAL;
686 } 631 }
687 ret = show_perf_probe_events(p !! 632 ret = show_perf_probe_events(params.filter);
688 if (ret < 0) 633 if (ret < 0)
689 pr_err_with_code(" Er 634 pr_err_with_code(" Error: Failed to show event list.", ret);
690 return ret; 635 return ret;
691 case 'F': 636 case 'F':
692 ret = show_available_funcs(par !! 637 ret = show_available_funcs(params.target, params.filter,
693 par !! 638 params.uprobes);
694 if (ret < 0) 639 if (ret < 0)
695 pr_err_with_code(" Er 640 pr_err_with_code(" Error: Failed to show functions.", ret);
696 return ret; 641 return ret;
697 #ifdef HAVE_DWARF_SUPPORT 642 #ifdef HAVE_DWARF_SUPPORT
698 case 'L': 643 case 'L':
699 ret = show_line_range(¶ms- !! 644 ret = show_line_range(¶ms.line_range, params.target,
700 params-> !! 645 params.uprobes);
701 if (ret < 0) 646 if (ret < 0)
702 pr_err_with_code(" Er 647 pr_err_with_code(" Error: Failed to show lines.", ret);
703 return ret; 648 return ret;
704 case 'V': 649 case 'V':
705 if (!params->filter) !! 650 if (!params.filter)
706 params->filter = strfi !! 651 params.filter = strfilter__new(DEFAULT_VAR_FILTER,
707 652 NULL);
708 653
709 ret = show_available_vars(para !! 654 ret = show_available_vars(params.events, params.nevents,
710 para !! 655 params.filter);
711 if (ret < 0) 656 if (ret < 0)
712 pr_err_with_code(" Er 657 pr_err_with_code(" Error: Failed to show vars.", ret);
713 return ret; 658 return ret;
714 #endif 659 #endif
715 case 'd': 660 case 'd':
716 ret = perf_del_probe_events(pa !! 661 ret = perf_del_probe_events(params.filter);
717 if (ret < 0) { 662 if (ret < 0) {
718 pr_err_with_code(" Er 663 pr_err_with_code(" Error: Failed to delete events.", ret);
719 return ret; 664 return ret;
720 } 665 }
721 break; 666 break;
722 case 'D': 667 case 'D':
723 if (probe_conf.bootconfig && p <<
724 pr_err(" Error: --boo <<
725 return -EINVAL; <<
726 } <<
727 fallthrough; <<
728 case 'a': 668 case 'a':
729 669
730 /* Ensure the last given targe 670 /* Ensure the last given target is used */
731 if (params->target && !params- !! 671 if (params.target && !params.target_used) {
732 pr_err(" Error: -x/-m 672 pr_err(" Error: -x/-m must follow the probe definitions.\n");
733 parse_options_usage(pr 673 parse_options_usage(probe_usage, options, "m", true);
734 parse_options_usage(NU 674 parse_options_usage(NULL, options, "x", true);
735 return -EINVAL; 675 return -EINVAL;
736 } 676 }
737 677
738 ret = perf_add_probe_events(pa !! 678 ret = perf_add_probe_events(params.events, params.nevents);
739 if (ret < 0) { 679 if (ret < 0) {
740 <<
741 /* <<
742 * When perf_add_probe <<
743 * cleanup_perf_probe_ <<
744 * cleanup_perf_probe_ <<
745 * will call clear_per <<
746 * to avoid cleanup_pa <<
747 * on the same pevs. <<
748 */ <<
749 params->nevents = 0; <<
750 pr_err_with_code(" Er 680 pr_err_with_code(" Error: Failed to add events.", ret);
751 return ret; 681 return ret;
752 } 682 }
753 break; 683 break;
754 default: 684 default:
755 usage_with_options(probe_usage 685 usage_with_options(probe_usage, options);
756 } 686 }
757 return 0; 687 return 0;
758 } 688 }
759 689
760 int cmd_probe(int argc, const char **argv) !! 690 int cmd_probe(int argc, const char **argv, const char *prefix)
761 { 691 {
762 int ret; 692 int ret;
763 693
764 ret = init_params(); 694 ret = init_params();
765 if (!ret) { 695 if (!ret) {
766 ret = __cmd_probe(argc, argv); !! 696 ret = __cmd_probe(argc, argv, prefix);
767 cleanup_params(); 697 cleanup_params();
768 } 698 }
769 699
770 return ret < 0 ? ret : 0; 700 return ret < 0 ? ret : 0;
771 } 701 }
772 702
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.