History

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull more perf updates from Thomas Gleixner: "A rather large set of perf updates: Kernel: - Fix various initialization issues - Prevent creating [ku]probes for not CAP_SYS_ADMIN users Tooling: - Show only failing syscalls with 'perf trace --failure' (Arnaldo Carvalho de Melo) e.g: See what 'openat' syscalls are failing: # perf trace --failure -e openat 762.323 ( 0.007 ms): VideoCapture/4566 openat(dfd: CWD, filename: /dev/video2) = -1 ENOENT No such file or directory <SNIP N /dev/videoN open attempts... sigh, where is that improvised camera lid?!? > 790.228 ( 0.008 ms): VideoCapture/4566 openat(dfd: CWD, filename: /dev/video63) = -1 ENOENT No such file or directory ^C# - Show information about the event (freq, nr_samples, total period/nr_events) in the annotate --tui and --stdio2 'perf annotate' output, similar to the first line in the 'perf report --tui', but just for the samples for a the annotated symbol (Arnaldo Carvalho de Melo) - Introduce 'perf version --build-options' to show what features were linked, aliased as well as a shorter 'perf -vv' (Jin Yao) - Add a "dso_size" sort order (Kim Phillips) - Remove redundant ')' in the tracepoint output in 'perf trace' (Changbin Du) - Synchronize x86's cpufeatures.h, no effect on toolss (Arnaldo Carvalho de Melo) - Show group details on the title line in the annotate browser and 'perf annotate --stdio2' output, so that the per-event columns can have headers (Arnaldo Carvalho de Melo) - Fixup vertical line separating metrics from instructions and cleaning unused lines at the bottom, both in the annotate TUI browser (Arnaldo Carvalho de Melo) - Remove duplicated 'samples' in lost samples warning in 'perf report' (Arnaldo Carvalho de Melo) - Synchronize i915_drm.h, silencing the perf build process, automagically adding support for the new DRM_I915_QUERY ioctl (Arnaldo Carvalho de Melo) - Make auxtrace_queues__add_buffer() allocate struct buffer, from a patchkit already applied (Adrian Hunter) - Fix the --stdio2/TUI annotate output to include group details, be it for a recorded '{a,b,f}' explicit event group or when forcing group display using 'perf report --group' for a set of events not recorded as a group (Arnaldo Carvalho de Melo) - Fix display artifacts in the ui browser (base class for the annotate and main report/top TUI browser) related to the extra title lines work (Arnaldo Carvalho de Melo) - perf auxtrace refactorings, leftovers from a previously partially processed patchset (Adrian Hunter) - Fix the builtin clang build (Sandipan Das, Arnaldo Carvalho de Melo) - Synchronize i915_drm.h, silencing a perf build warning and in the process automagically adding support for a new ioctl command (Arnaldo Carvalho de Melo) - Fix a strncpy issue in uprobe tracing" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (36 commits) perf/core: Need CAP_SYS_ADMIN to create k/uprobe with perf_event_open() tracing/uprobe_event: Fix strncpy corner case perf/core: Fix perf_uprobe_init() perf/core: Fix perf_kprobe_init() perf/core: Fix use-after-free in uprobe_perf_close() perf tests clang: Fix function name for clang IR test perf clang: Add support for recent clang versions perf tools: Fix perf builds with clang support perf tools: No need to include namespaces.h in util.h perf hists browser: Remove leftover from row returned from refresh perf hists browser: Show extra_title_lines in the 'D' debug hotkey perf auxtrace: Make auxtrace_queues__add_buffer() do CPU filtering tools headers uapi: Synchronize i915_drm.h perf report: Remove duplicated 'samples' in lost samples warning perf ui browser: Fixup cleaning unused lines at the bottom perf annotate browser: Fixup vertical line separating metrics from instructions perf annotate: Show group details on the title line perf auxtrace: Make auxtrace_queues__add_buffer() allocate struct buffer perf/x86/intel: Move regs->flags EXACT bit init perf trace: Remove redundant ')' ...

Linus Torvalds committed 8 years ago

Commit 174e7192 parents 19ca90d 32e6e9633 files · +629 −187Browse files

Showing the changes to kernel (3 of 33 files). Show all

Unified · Split

3 files
  1. kernel/events/core.c +14 −0
  2. kernel/trace/trace_event_perf.c +4 −0
  3. kernel/trace/trace_uprobe.c +2 −0
kernel/events/core.c+14−0
@@ -4447,6 +4447,9 @@ static void _free_event(struct perf_event *event) · 4446 unmodified lines
44474447 if (event->ctx)
44484448 put_ctx(event->ctx);
44494449
4450+ if (event->hw.target)
4451+ put_task_struct(event->hw.target);
4452+
44504453 exclusive_event_destroy(event);
44514454 module_put(event->pmu->module);
44524455
@@ -8397,6 +8400,10 @@ static int perf_kprobe_event_init(struct perf_event *event) · 3944 unmodified lines
83978400
83988401 if (event->attr.type != perf_kprobe.type)
83998402 return -ENOENT;
8403+
8404+ if (!capable(CAP_SYS_ADMIN))
8405+ return -EACCES;
8406+
84008407 /*
84018408 * no branch sampling for probe events
84028409 */
@@ -8434,6 +8441,10 @@ static int perf_uprobe_event_init(struct perf_event *event) · 31 unmodified lines
84348441
84358442 if (event->attr.type != perf_uprobe.type)
84368443 return -ENOENT;
8444+
8445+ if (!capable(CAP_SYS_ADMIN))
8446+ return -EACCES;
8447+
84378448 /*
84388449 * no branch sampling for probe events
84398450 */
@@ -9955,6 +9966,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu, · 1515 unmodified lines
99559966 * and we cannot use the ctx information because we need the
99569967 * pmu before we get a ctx.
99579968 */
9969+ get_task_struct(task);
99589970 event->hw.target = task;
99599971 }
99609972
@@ -10070,6 +10082,8 @@ err_ns: · 109 unmodified lines
1007010082 perf_detach_cgroup(event);
1007110083 if (event->ns)
1007210084 put_pid_ns(event->ns);
10085+ if (event->hw.target)
10086+ put_task_struct(event->hw.target);
1007310087 kfree(event);
1007410088
1007510089 return ERR_PTR(err);
kernel/trace/trace_event_perf.c+4−0
@@ -252,6 +252,8 @@ int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe) · 251 unmodified lines
252252 ret = strncpy_from_user(
253253 func, u64_to_user_ptr(p_event->attr.kprobe_func),
254254 KSYM_NAME_LEN);
255+ if (ret == KSYM_NAME_LEN)
256+ ret = -E2BIG;
255257 if (ret < 0)
256258 goto out;
257259
@@ -300,6 +302,8 @@ int perf_uprobe_init(struct perf_event *p_event, bool is_retprobe) · 42 unmodified lines
300302 return -ENOMEM;
301303 ret = strncpy_from_user(
302304 path, u64_to_user_ptr(p_event->attr.uprobe_path), PATH_MAX);
305+ if (ret == PATH_MAX)
306+ return -E2BIG;
303307 if (ret < 0)
304308 goto out;
305309 if (path[0] == '\0') {
kernel/trace/trace_uprobe.c+2−0
@@ -151,6 +151,8 @@ static void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs, · 150 unmodified lines
151151 return;
152152
153153 ret = strncpy_from_user(dst, src, maxlen);
154+ if (ret == maxlen)
155+ dst[--ret] = '\0';
154156
155157 if (ret < 0) { /* Failed to fetch string */
156158 ((u8 *)get_rloc_data(dest))[0] = '\0';

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t