[rt] Update to 4.14.15-rt13

This commit is contained in:
Salvatore Bonaccorso 2018-01-31 20:59:07 +01:00
parent f01c4e1f91
commit d3d73f5119
383 changed files with 638 additions and 716 deletions

1
debian/changelog vendored
View File

@ -202,6 +202,7 @@ linux (4.14.15-1) UNRELEASED; urgency=medium
* Revert "module: Add retpoline tag to VERMAGIC" * Revert "module: Add retpoline tag to VERMAGIC"
* [rt] Update to 4.14.15-rt11 * [rt] Update to 4.14.15-rt11
* nfsd: auth: Fix gid sorting when rootsquash enabled (CVE-2018-1000028) * nfsd: auth: Fix gid sorting when rootsquash enabled (CVE-2018-1000028)
* [rt] Update to 4.14.15-rt13
[ Ben Hutchings ] [ Ben Hutchings ]
* bpf: Avoid ABI change in 4.14.14 * bpf: Avoid ABI change in 4.14.14

View File

@ -1,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:50 +0100 Date: Wed, 20 Dec 2017 17:12:50 +0100
Subject: [PATCH 01/29] timers: Use static keys for migrate_enable/nohz_active Subject: [PATCH 01/29] timers: Use static keys for migrate_enable/nohz_active
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The members migrate_enable and nohz_active in the timer/hrtimer per CPU The members migrate_enable and nohz_active in the timer/hrtimer per CPU
bases have been introduced to avoid accessing global variables for these bases have been introduced to avoid accessing global variables for these

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:23 -0600 Date: Mon, 15 Jan 2018 20:51:35 -0600
Subject: [PATCH 01/37] tracing: Move hist trigger Documentation to Subject: [PATCH 01/37] tracing: Move hist trigger Documentation to
histogram.txt histogram.txt
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The hist trigger Documentation takes up a large part of events.txt - The hist trigger Documentation takes up a large part of events.txt -
since it will be getting even larger, move it to a separate file. since it will be getting even larger, move it to a separate file.

View File

@ -2,7 +2,7 @@ From: Steven Rostedt <rostedt@goodmis.org>
Date: Fri, 22 Sep 2017 14:58:15 -0500 Date: Fri, 22 Sep 2017 14:58:15 -0500
Subject: [PATCH 01/42] tracing: Steve's unofficial trace_recursive_lock() Subject: [PATCH 01/42] tracing: Steve's unofficial trace_recursive_lock()
patch patch
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
On Tue, 5 Sep 2017 16:57:52 -0500 On Tue, 5 Sep 2017 16:57:52 -0500
Tom Zanussi <tom.zanussi@linux.intel.com> wrote: Tom Zanussi <tom.zanussi@linux.intel.com> wrote:

View File

@ -1,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:51 +0100 Date: Wed, 20 Dec 2017 17:12:51 +0100
Subject: [PATCH 02/29] hrtimer: Correct blantanly wrong comment Subject: [PATCH 02/29] hrtimer: Correct blantanly wrong comment
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The protection of a hrtimer which runs its callback against migration to a The protection of a hrtimer which runs its callback against migration to a
different CPU has nothing to do with hard interrupt context. different CPU has nothing to do with hard interrupt context.

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:24 -0600 Date: Mon, 15 Jan 2018 20:51:36 -0600
Subject: [PATCH 02/37] tracing: Add Documentation for log2 modifier Subject: [PATCH 02/37] tracing: Add Documentation for log2 modifier
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Add a line for the log2 modifier, to keep it aligned with Add a line for the log2 modifier, to keep it aligned with
tracing/README. tracing/README.

View File

@ -2,7 +2,7 @@ From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Date: Fri, 22 Sep 2017 14:58:16 -0500 Date: Fri, 22 Sep 2017 14:58:16 -0500
Subject: [PATCH 02/42] tracing: Reverse the order of trace_types_lock and Subject: [PATCH 02/42] tracing: Reverse the order of trace_types_lock and
event_mutex event_mutex
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
In order to make future changes where we need to call In order to make future changes where we need to call
tracing_set_clock() from within an event command, the order of tracing_set_clock() from within an event command, the order of

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:52 +0100 Date: Wed, 20 Dec 2017 17:12:52 +0100
Subject: [PATCH 03/29] hrtimer: Fix kerneldoc for struct hrtimer_cpu_base Subject: [PATCH 03/29] hrtimer: Fix kerneldoc for struct hrtimer_cpu_base
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The sequence '/**' marks the start of a struct description. Add the The sequence '/**' marks the start of a struct description. Add the
missing second asterisk. While at it adapt the ordering of the struct missing second asterisk. While at it adapt the ordering of the struct

View File

@ -1,7 +1,7 @@
From: Vedang Patel <vedang.patel@intel.com> From: Vedang Patel <vedang.patel@intel.com>
Date: Thu, 21 Dec 2017 10:02:25 -0600 Date: Mon, 15 Jan 2018 20:51:37 -0600
Subject: [PATCH 03/37] tracing: Add support to detect and avoid duplicates Subject: [PATCH 03/37] tracing: Add support to detect and avoid duplicates
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
A duplicate in the tracing_map hash table is when 2 different entries A duplicate in the tracing_map hash table is when 2 different entries
have the same key and, as a result, the key_hash. This is possible due have the same key and, as a result, the key_hash. This is possible due

View File

@ -2,7 +2,7 @@ From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:53 +0100 Date: Wed, 20 Dec 2017 17:12:53 +0100
Subject: [PATCH 04/29] hrtimer: Cleanup clock argument in Subject: [PATCH 04/29] hrtimer: Cleanup clock argument in
schedule_hrtimeout_range_clock() schedule_hrtimeout_range_clock()
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
schedule_hrtimeout_range_clock() uses an integer for the clock id schedule_hrtimeout_range_clock() uses an integer for the clock id
instead of the predefined type "clockid_t". The ID of the clock is instead of the predefined type "clockid_t". The ID of the clock is

View File

@ -1,7 +1,7 @@
From: Vedang Patel <vedang.patel@intel.com> From: Vedang Patel <vedang.patel@intel.com>
Date: Thu, 21 Dec 2017 10:02:26 -0600 Date: Mon, 15 Jan 2018 20:51:38 -0600
Subject: [PATCH 04/37] tracing: Remove code which merges duplicates Subject: [PATCH 04/37] tracing: Remove code which merges duplicates
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
We now have the logic to detect and remove duplicates in the We now have the logic to detect and remove duplicates in the
tracing_map hash table. The code which merges duplicates in the tracing_map hash table. The code which merges duplicates in the

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Fri, 22 Sep 2017 14:58:18 -0500 Date: Fri, 22 Sep 2017 14:58:18 -0500
Subject: [PATCH 04/42] tracing: Remove lookups from tracing_map hitcount Subject: [PATCH 04/42] tracing: Remove lookups from tracing_map hitcount
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Lookups inflate the hitcount, making it essentially useless. Only Lookups inflate the hitcount, making it essentially useless. Only
inserts and updates should really affect the hitcount anyway, so inserts and updates should really affect the hitcount anyway, so

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:54 +0100 Date: Wed, 20 Dec 2017 17:12:54 +0100
Subject: [PATCH 05/29] hrtimer: Fix hrtimer function description Subject: [PATCH 05/29] hrtimer: Fix hrtimer function description
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The hrtimer_start[_range_ns]() starts a timer reliable on this CPU only The hrtimer_start[_range_ns]() starts a timer reliable on this CPU only
when HRTIMER_MODE_PINNED is set. Furthermore the HRTIMER_MODE_PINNED mode when HRTIMER_MODE_PINNED is set. Furthermore the HRTIMER_MODE_PINNED mode

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:27 -0600 Date: Mon, 15 Jan 2018 20:51:39 -0600
Subject: [PATCH 05/37] ring-buffer: Add interface for setting absolute time Subject: [PATCH 05/37] ring-buffer: Add interface for setting absolute time
stamps stamps
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Define a new function, tracing_set_time_stamp_abs(), which can be used Define a new function, tracing_set_time_stamp_abs(), which can be used
to enable or disable the use of absolute timestamps rather than time to enable or disable the use of absolute timestamps rather than time

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Fri, 22 Sep 2017 14:58:19 -0500 Date: Fri, 22 Sep 2017 14:58:19 -0500
Subject: [PATCH 05/42] tracing: Increase tracing map KEYS_MAX size Subject: [PATCH 05/42] tracing: Increase tracing map KEYS_MAX size
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The current default for the number of subkeys in a compound key is 2, The current default for the number of subkeys in a compound key is 2,
which is too restrictive. Increase it to a more realistic value of 3. which is too restrictive. Increase it to a more realistic value of 3.

View File

@ -2,7 +2,7 @@ From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:55 +0100 Date: Wed, 20 Dec 2017 17:12:55 +0100
Subject: [PATCH 06/29] hrtimer: Ensure POSIX compliance (relative Subject: [PATCH 06/29] hrtimer: Ensure POSIX compliance (relative
CLOCK_REALTIME hrtimers) CLOCK_REALTIME hrtimers)
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
POSIX specification defines, that relative CLOCK_REALTIME timers are not POSIX specification defines, that relative CLOCK_REALTIME timers are not
affected by clock modifications. Those timers have to use CLOCK_MONOTONIC affected by clock modifications. Those timers have to use CLOCK_MONOTONIC

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:28 -0600 Date: Mon, 15 Jan 2018 20:51:40 -0600
Subject: [PATCH 06/37] ring-buffer: Redefine the unimplemented Subject: [PATCH 06/37] ring-buffer: Redefine the unimplemented
RINGBUF_TYPE_TIME_STAMP RINGBUF_TYPE_TIME_STAMP
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
RINGBUF_TYPE_TIME_STAMP is defined but not used, and from what I can RINGBUF_TYPE_TIME_STAMP is defined but not used, and from what I can
gather was reserved for something like an absolute timestamp feature gather was reserved for something like an absolute timestamp feature

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Fri, 22 Sep 2017 14:58:20 -0500 Date: Fri, 22 Sep 2017 14:58:20 -0500
Subject: [PATCH 06/42] tracing: Make traceprobe parsing code reusable Subject: [PATCH 06/42] tracing: Make traceprobe parsing code reusable
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
traceprobe_probes_write() and traceprobe_command() actually contain traceprobe_probes_write() and traceprobe_command() actually contain
nothing that ties them to kprobes - the code is generically useful for nothing that ties them to kprobes - the code is generically useful for

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:56 +0100 Date: Wed, 20 Dec 2017 17:12:56 +0100
Subject: [PATCH 07/29] hrtimer: Cleanup hrtimer_mode enum Subject: [PATCH 07/29] hrtimer: Cleanup hrtimer_mode enum
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
It's not obvious that the HRTIMER_MODE variants are bit combinations It's not obvious that the HRTIMER_MODE variants are bit combinations
because all modes are hard coded constants. because all modes are hard coded constants.

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:29 -0600 Date: Mon, 15 Jan 2018 20:51:41 -0600
Subject: [PATCH 07/37] tracing: Add timestamp_mode trace file Subject: [PATCH 07/37] tracing: Add timestamp_mode trace file
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Add a new option flag indicating whether or not the ring buffer is in Add a new option flag indicating whether or not the ring buffer is in
'absolute timestamp' mode. 'absolute timestamp' mode.

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Fri, 22 Sep 2017 14:58:21 -0500 Date: Fri, 22 Sep 2017 14:58:21 -0500
Subject: [PATCH 07/42] tracing: Clean up hist_field_flags enum Subject: [PATCH 07/42] tracing: Clean up hist_field_flags enum
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
As we add more flags, specifying explicit integers for the flag values As we add more flags, specifying explicit integers for the flag values
becomes more unwieldy and error-prone - switch them over to left-shift becomes more unwieldy and error-prone - switch them over to left-shift

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Fri, 22 Sep 2017 14:58:22 -0500 Date: Fri, 22 Sep 2017 14:58:22 -0500
Subject: [PATCH 08/42] tracing: Add hist_field_name() accessor Subject: [PATCH 08/42] tracing: Add hist_field_name() accessor
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
In preparation for hist_fields that won't be strictly based on In preparation for hist_fields that won't be strictly based on
trace_event_fields, add a new hist_field_name() accessor to allow that trace_event_fields, add a new hist_field_name() accessor to allow that

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:30 -0600 Date: Mon, 15 Jan 2018 20:51:42 -0600
Subject: [PATCH 08/37] tracing: Give event triggers access to Subject: [PATCH 08/37] tracing: Give event triggers access to
ring_buffer_event ring_buffer_event
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The ring_buffer event can provide a timestamp that may be useful to The ring_buffer event can provide a timestamp that may be useful to
various triggers - pass it into the handlers for that purpose. various triggers - pass it into the handlers for that purpose.

View File

@ -2,7 +2,7 @@ From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:57 +0100 Date: Wed, 20 Dec 2017 17:12:57 +0100
Subject: [PATCH 08/29] tracing/hrtimer: Take all clock bases and modes into Subject: [PATCH 08/29] tracing/hrtimer: Take all clock bases and modes into
account account
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
So far only CLOCK_MONOTONIC and CLOCK_REALTIME were taken into account as So far only CLOCK_MONOTONIC and CLOCK_REALTIME were taken into account as
well as HRTIMER_MODE_ABS/REL in hrtimer_init tracepoint. The query for well as HRTIMER_MODE_ABS/REL in hrtimer_init tracepoint. The query for

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:31 -0600 Date: Mon, 15 Jan 2018 20:51:43 -0600
Subject: [PATCH 09/37] tracing: Add ring buffer event param to hist field Subject: [PATCH 09/37] tracing: Add ring buffer event param to hist field
functions functions
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Some events such as timestamps require access to a ring_buffer_event Some events such as timestamps require access to a ring_buffer_event
struct; add a param so that hist field functions can access that. struct; add a param so that hist field functions can access that.

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Fri, 22 Sep 2017 14:58:23 -0500 Date: Fri, 22 Sep 2017 14:58:23 -0500
Subject: [PATCH 09/42] tracing: Reimplement log2 Subject: [PATCH 09/42] tracing: Reimplement log2
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
log2 as currently implemented applies only to u64 trace_event_field log2 as currently implemented applies only to u64 trace_event_field
derived fields, and assumes that anything it's applied to is a u64 derived fields, and assumes that anything it's applied to is a u64

View File

@ -2,7 +2,7 @@ From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:58 +0100 Date: Wed, 20 Dec 2017 17:12:58 +0100
Subject: [PATCH 09/29] tracing/hrtimer: Print hrtimer mode in hrtimer_start Subject: [PATCH 09/29] tracing/hrtimer: Print hrtimer mode in hrtimer_start
tracepoint tracepoint
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The hrtimer_start tracepoint lacks the mode information. The mode is The hrtimer_start tracepoint lacks the mode information. The mode is
important because consecutive starts can switch from ABS to REL or from important because consecutive starts can switch from ABS to REL or from

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:12:59 +0100 Date: Wed, 20 Dec 2017 17:12:59 +0100
Subject: [PATCH 10/29] hrtimer: Switch for loop to _ffs() evaluation Subject: [PATCH 10/29] hrtimer: Switch for loop to _ffs() evaluation
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Looping over all clock bases to find active bits is suboptimal if not all Looping over all clock bases to find active bits is suboptimal if not all
bases are active. bases are active.

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:32 -0600 Date: Mon, 15 Jan 2018 20:51:44 -0600
Subject: [PATCH 10/37] tracing: Break out hist trigger assignment parsing Subject: [PATCH 10/37] tracing: Break out hist trigger assignment parsing
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
This will make it easier to add variables, and makes the parsing code This will make it easier to add variables, and makes the parsing code
cleaner regardless. cleaner regardless.

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:00 +0100 Date: Wed, 20 Dec 2017 17:13:00 +0100
Subject: [PATCH 11/29] hrtimer: Store running timer in hrtimer_clock_base Subject: [PATCH 11/29] hrtimer: Store running timer in hrtimer_clock_base
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The pointer to the currently running timer is stored in hrtimer_cpu_base The pointer to the currently running timer is stored in hrtimer_cpu_base
before the base lock is dropped and the callback is invoked. before the base lock is dropped and the callback is invoked.

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:33 -0600 Date: Mon, 15 Jan 2018 20:51:45 -0600
Subject: [PATCH 11/37] tracing: Add hist trigger timestamp support Subject: [PATCH 11/37] tracing: Add hist trigger timestamp support
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Add support for a timestamp event field. This is actually a 'pseudo-' Add support for a timestamp event field. This is actually a 'pseudo-'
event field in that it behaves like it's part of the event record, but event field in that it behaves like it's part of the event record, but

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:01 +0100 Date: Wed, 20 Dec 2017 17:13:01 +0100
Subject: [PATCH 12/29] hrtimer: Make room in struct hrtimer_cpu_base Subject: [PATCH 12/29] hrtimer: Make room in struct hrtimer_cpu_base
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The upcoming softirq based hrtimers support requires an additional field in The upcoming softirq based hrtimers support requires an additional field in
the hrtimer_cpu_base struct, which would grow the struct size beyond a the hrtimer_cpu_base struct, which would grow the struct size beyond a

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:34 -0600 Date: Mon, 15 Jan 2018 20:51:46 -0600
Subject: [PATCH 12/37] tracing: Add per-element variable support to Subject: [PATCH 12/37] tracing: Add per-element variable support to
tracing_map tracing_map
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
In order to allow information to be passed between trace events, add In order to allow information to be passed between trace events, add
support for per-element variables to tracing_map. This provides a support for per-element variables to tracing_map. This provides a

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:02 +0100 Date: Wed, 20 Dec 2017 17:13:02 +0100
Subject: [PATCH 13/29] hrtimer: Reduce conditional code (hres_active) Subject: [PATCH 13/29] hrtimer: Reduce conditional code (hres_active)
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The hrtimer_cpu_base struct has the CONFIG_HIGH_RES_TIMERS conditional The hrtimer_cpu_base struct has the CONFIG_HIGH_RES_TIMERS conditional
struct member hres_active. All related functions to this member are struct member hres_active. All related functions to this member are

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:35 -0600 Date: Mon, 15 Jan 2018 20:51:47 -0600
Subject: [PATCH 13/37] tracing: Add hist_data member to hist_field Subject: [PATCH 13/37] tracing: Add hist_data member to hist_field
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Allow hist_data access via hist_field. Some users of hist_fields Allow hist_data access via hist_field. Some users of hist_fields
require or will require more access to the associated hist_data. require or will require more access to the associated hist_data.

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:03 +0100 Date: Wed, 20 Dec 2017 17:13:03 +0100
Subject: [PATCH 14/29] hrtimer: Use accesor functions instead of direct access Subject: [PATCH 14/29] hrtimer: Use accesor functions instead of direct access
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
__hrtimer_hres_active() is now available unconditionally. Replace the __hrtimer_hres_active() is now available unconditionally. Replace the
direct access to hrtimer_cpu_base.hres_active. direct access to hrtimer_cpu_base.hres_active.

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:36 -0600 Date: Mon, 15 Jan 2018 20:51:48 -0600
Subject: [PATCH 14/37] tracing: Add usecs modifier for hist trigger timestamps Subject: [PATCH 14/37] tracing: Add usecs modifier for hist trigger timestamps
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Appending .usecs onto a common_timestamp field will cause the Appending .usecs onto a common_timestamp field will cause the
timestamp value to be in microseconds instead of the default timestamp value to be in microseconds instead of the default

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:04 +0100 Date: Wed, 20 Dec 2017 17:13:04 +0100
Subject: [PATCH 15/29] hrtimer: Make the remote enqueue check unconditional Subject: [PATCH 15/29] hrtimer: Make the remote enqueue check unconditional
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
hrtimer_cpu_base.expires_next is used to cache the next event armed in the hrtimer_cpu_base.expires_next is used to cache the next event armed in the
timer hardware. The value is used to check whether an hrtimer can be timer hardware. The value is used to check whether an hrtimer can be

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:37 -0600 Date: Mon, 15 Jan 2018 20:51:49 -0600
Subject: [PATCH 15/37] tracing: Add variable support to hist triggers Subject: [PATCH 15/37] tracing: Add variable support to hist triggers
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Add support for saving the value of a current event's event field by Add support for saving the value of a current event's event field by
assigning it to a variable that can be read by a subsequent event. assigning it to a variable that can be read by a subsequent event.

View File

@ -2,7 +2,7 @@ From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:05 +0100 Date: Wed, 20 Dec 2017 17:13:05 +0100
Subject: [PATCH 16/29] hrtimer: Make hrtimer_cpu_base.next_timer handling Subject: [PATCH 16/29] hrtimer: Make hrtimer_cpu_base.next_timer handling
unconditional unconditional
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
hrtimer_cpu_base.next_timer stores the pointer to the next expiring timer hrtimer_cpu_base.next_timer stores the pointer to the next expiring timer
in a cpu base. in a cpu base.

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:38 -0600 Date: Mon, 15 Jan 2018 20:51:50 -0600
Subject: [PATCH 16/37] tracing: Account for variables in named trigger Subject: [PATCH 16/37] tracing: Account for variables in named trigger
compatibility compatibility
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Named triggers must also have the same set of variables in order to be Named triggers must also have the same set of variables in order to be
considered compatible - update the trigger match test to account for considered compatible - update the trigger match test to account for

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:06 +0100 Date: Wed, 20 Dec 2017 17:13:06 +0100
Subject: [PATCH 17/29] hrtimer: Make hrtimer_reprogramm() unconditional Subject: [PATCH 17/29] hrtimer: Make hrtimer_reprogramm() unconditional
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
hrtimer_reprogram() needs to be available unconditionally for softirq based hrtimer_reprogram() needs to be available unconditionally for softirq based
hrtimers. Move the function and all required struct members out of the hrtimers. Move the function and all required struct members out of the

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:39 -0600 Date: Mon, 15 Jan 2018 20:51:51 -0600
Subject: [PATCH 17/37] tracing: Move get_hist_field_flags() Subject: [PATCH 17/37] tracing: Move get_hist_field_flags()
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Move get_hist_field_flags() to make it more easily accessible for new Move get_hist_field_flags() to make it more easily accessible for new
code (and keep the move separate from new functionality). code (and keep the move separate from new functionality).

View File

@ -2,7 +2,7 @@ From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:07 +0100 Date: Wed, 20 Dec 2017 17:13:07 +0100
Subject: [PATCH 18/29] hrtimer: Make hrtimer_force_reprogramm() Subject: [PATCH 18/29] hrtimer: Make hrtimer_force_reprogramm()
unconditionally available unconditionally available
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
hrtimer_force_reprogram() needs to be available unconditionally for softirq hrtimer_force_reprogram() needs to be available unconditionally for softirq
based hrtimers. Move the function and all required struct members out of based hrtimers. Move the function and all required struct members out of

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:40 -0600 Date: Mon, 15 Jan 2018 20:51:52 -0600
Subject: [PATCH 18/37] tracing: Add simple expression support to hist triggers Subject: [PATCH 18/37] tracing: Add simple expression support to hist triggers
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Add support for simple addition, subtraction, and unary expressions Add support for simple addition, subtraction, and unary expressions
(-(expr) and expr, where expr = b-a, a+b, a+b+c) to hist triggers, in (-(expr) and expr, where expr = b-a, a+b, a+b+c) to hist triggers, in
@ -15,10 +15,12 @@ In the process, factor out some common code from key and value
parsing. parsing.
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
[kbuild test robot fix, add static to parse_atom()]
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- ---
kernel/trace/trace_events_hist.c | 482 +++++++++++++++++++++++++++++++++------ kernel/trace/trace_events_hist.c | 487 +++++++++++++++++++++++++++++++++------
1 file changed, 409 insertions(+), 73 deletions(-) 1 file changed, 413 insertions(+), 74 deletions(-)
--- a/kernel/trace/trace_events_hist.c --- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c
@ -104,10 +106,24 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (field_name == NULL) if (field_name == NULL)
field_name = ""; field_name = "";
@@ -519,6 +566,95 @@ static const char *get_hist_field_flags( @@ -519,12 +566,104 @@ static const char *get_hist_field_flags(
return flags_str; return flags_str;
} }
+static void expr_field_str(struct hist_field *field, char *expr)
+{
+ strcat(expr, hist_field_name(field, 0));
+
+ if (field->flags) {
+ const char *flags_str = get_hist_field_flags(field);
+
+ if (flags_str) {
+ strcat(expr, ".");
+ strcat(expr, flags_str);
+ }
+ }
+}
+
+static char *expr_str(struct hist_field *field, unsigned int level) +static char *expr_str(struct hist_field *field, unsigned int level)
+{ +{
+ char *expr; + char *expr;
@ -119,6 +135,11 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ if (!expr) + if (!expr)
+ return NULL; + return NULL;
+ +
+ if (!field->operands[0]) {
+ expr_field_str(field, expr);
+ return expr;
+ }
+
+ if (field->operator == FIELD_OP_UNARY_MINUS) { + if (field->operator == FIELD_OP_UNARY_MINUS) {
+ char *subexpr; + char *subexpr;
+ +
@ -136,15 +157,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ return expr; + return expr;
+ } + }
+ +
+ strcat(expr, hist_field_name(field->operands[0], 0)); + expr_field_str(field->operands[0], expr);
+ if (field->operands[0]->flags) {
+ const char *flags_str = get_hist_field_flags(field->operands[0]);
+
+ if (flags_str) {
+ strcat(expr, ".");
+ strcat(expr, flags_str);
+ }
+ }
+ +
+ switch (field->operator) { + switch (field->operator) {
+ case FIELD_OP_MINUS: + case FIELD_OP_MINUS:
@ -158,15 +171,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ return NULL; + return NULL;
+ } + }
+ +
+ strcat(expr, hist_field_name(field->operands[1], 0)); + expr_field_str(field->operands[1], expr);
+ if (field->operands[1]->flags) {
+ const char *flags_str = get_hist_field_flags(field->operands[1]);
+
+ if (flags_str) {
+ strcat(expr, ".");
+ strcat(expr, flags_str);
+ }
+ }
+ +
+ return expr; + return expr;
+} +}
@ -200,7 +205,14 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static void destroy_hist_field(struct hist_field *hist_field, static void destroy_hist_field(struct hist_field *hist_field,
unsigned int level) unsigned int level)
{ {
@@ -534,6 +670,7 @@ static void destroy_hist_field(struct hi unsigned int i;
- if (level > 2)
+ if (level > 3)
return;
if (!hist_field)
@@ -534,6 +673,7 @@ static void destroy_hist_field(struct hi
destroy_hist_field(hist_field->operands[i], level + 1); destroy_hist_field(hist_field->operands[i], level + 1);
kfree(hist_field->var.name); kfree(hist_field->var.name);
@ -208,7 +220,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
kfree(hist_field); kfree(hist_field);
} }
@@ -554,6 +691,9 @@ static struct hist_field *create_hist_fi @@ -554,6 +694,9 @@ static struct hist_field *create_hist_fi
hist_field->hist_data = hist_data; hist_field->hist_data = hist_data;
@ -218,7 +230,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (flags & HIST_FIELD_FL_HITCOUNT) { if (flags & HIST_FIELD_FL_HITCOUNT) {
hist_field->fn = hist_field_counter; hist_field->fn = hist_field_counter;
goto out; goto out;
@@ -626,6 +766,257 @@ static void destroy_hist_fields(struct h @@ -626,6 +769,257 @@ static void destroy_hist_fields(struct h
} }
} }
@ -274,9 +286,9 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ return field; + return field;
+} +}
+ +
+struct hist_field *parse_atom(struct hist_trigger_data *hist_data, +static struct hist_field *parse_atom(struct hist_trigger_data *hist_data,
+ struct trace_event_file *file, char *str, + struct trace_event_file *file, char *str,
+ unsigned long *flags, char *var_name) + unsigned long *flags, char *var_name)
+{ +{
+ struct ftrace_event_field *field = NULL; + struct ftrace_event_field *field = NULL;
+ struct hist_field *hist_field = NULL; + struct hist_field *hist_field = NULL;
@ -316,7 +328,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ +
+ // we support only -(xxx) i.e. explicit parens required + // we support only -(xxx) i.e. explicit parens required
+ +
+ if (level > 2) { + if (level > 3) {
+ ret = -EINVAL; + ret = -EINVAL;
+ goto free; + goto free;
+ } + }
@ -331,7 +343,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ goto free; + goto free;
+ } + }
+ +
+ s = strchr(str, ')'); + s = strrchr(str, ')');
+ if (s) + if (s)
+ *s = '\0'; + *s = '\0';
+ else { + else {
@ -339,12 +351,6 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ goto free; + goto free;
+ } + }
+ +
+ strsep(&str, "(");
+ if (!str) {
+ ret = -EINVAL;
+ goto free;
+ }
+
+ flags |= HIST_FIELD_FL_EXPR; + flags |= HIST_FIELD_FL_EXPR;
+ expr = create_hist_field(hist_data, NULL, flags, var_name); + expr = create_hist_field(hist_data, NULL, flags, var_name);
+ if (!expr) { + if (!expr) {
@ -359,6 +365,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ goto free; + goto free;
+ } + }
+ +
+ expr->flags |= operand1->flags &
+ (HIST_FIELD_FL_TIMESTAMP | HIST_FIELD_FL_TIMESTAMP_USECS);
+ expr->fn = hist_field_unary_minus; + expr->fn = hist_field_unary_minus;
+ expr->operands[0] = operand1; + expr->operands[0] = operand1;
+ expr->operator = FIELD_OP_UNARY_MINUS; + expr->operator = FIELD_OP_UNARY_MINUS;
@ -393,7 +401,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ int field_op, ret = -EINVAL; + int field_op, ret = -EINVAL;
+ char *sep, *operand1_str; + char *sep, *operand1_str;
+ +
+ if (level > 2) + if (level > 3)
+ return ERR_PTR(-EINVAL); + return ERR_PTR(-EINVAL);
+ +
+ field_op = contains_operator(str); + field_op = contains_operator(str);
@ -442,6 +450,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ goto free; + goto free;
+ +
+ flags |= HIST_FIELD_FL_EXPR; + flags |= HIST_FIELD_FL_EXPR;
+
+ flags |= operand1->flags &
+ (HIST_FIELD_FL_TIMESTAMP | HIST_FIELD_FL_TIMESTAMP_USECS);
+
+ expr = create_hist_field(hist_data, NULL, flags, var_name); + expr = create_hist_field(hist_data, NULL, flags, var_name);
+ if (!expr) { + if (!expr) {
+ ret = -ENOMEM; + ret = -ENOMEM;
@ -476,7 +488,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static int create_hitcount_val(struct hist_trigger_data *hist_data) static int create_hitcount_val(struct hist_trigger_data *hist_data)
{ {
hist_data->fields[HITCOUNT_IDX] = hist_data->fields[HITCOUNT_IDX] =
@@ -648,37 +1039,17 @@ static int __create_val_field(struct his @@ -648,37 +1042,17 @@ static int __create_val_field(struct his
char *var_name, char *field_str, char *var_name, char *field_str,
unsigned long flags) unsigned long flags)
{ {
@ -520,7 +532,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
++hist_data->n_vals; ++hist_data->n_vals;
++hist_data->n_fields; ++hist_data->n_fields;
@@ -765,8 +1136,8 @@ static int create_key_field(struct hist_ @@ -765,8 +1139,8 @@ static int create_key_field(struct hist_
struct trace_event_file *file, struct trace_event_file *file,
char *field_str) char *field_str)
{ {
@ -530,7 +542,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
unsigned long flags = 0; unsigned long flags = 0;
unsigned int key_size; unsigned int key_size;
int ret = 0; int ret = 0;
@@ -781,60 +1152,24 @@ static int create_key_field(struct hist_ @@ -781,60 +1155,24 @@ static int create_key_field(struct hist_
key_size = sizeof(unsigned long) * HIST_STACKTRACE_DEPTH; key_size = sizeof(unsigned long) * HIST_STACKTRACE_DEPTH;
hist_field = create_hist_field(hist_data, NULL, flags, NULL); hist_field = create_hist_field(hist_data, NULL, flags, NULL);
} else { } else {
@ -600,7 +612,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (hist_data->key_size > HIST_KEY_SIZE_MAX) { if (hist_data->key_size > HIST_KEY_SIZE_MAX) {
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
@@ -1419,7 +1754,8 @@ hist_trigger_entry_print(struct seq_file @@ -1419,7 +1757,8 @@ hist_trigger_entry_print(struct seq_file
for (i = 1; i < hist_data->n_vals; i++) { for (i = 1; i < hist_data->n_vals; i++) {
field_name = hist_field_name(hist_data->fields[i], 0); field_name = hist_field_name(hist_data->fields[i], 0);

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:08 +0100 Date: Wed, 20 Dec 2017 17:13:08 +0100
Subject: [PATCH 19/29] hrtimer: Unify handling of hrtimer remove Subject: [PATCH 19/29] hrtimer: Unify handling of hrtimer remove
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
When the first hrtimer on the current CPU is removed, When the first hrtimer on the current CPU is removed,
hrtimer_force_reprogram() is invoked but only when hrtimer_force_reprogram() is invoked but only when

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:41 -0600 Date: Mon, 15 Jan 2018 20:51:53 -0600
Subject: [PATCH 19/37] tracing: Generalize per-element hist trigger data Subject: [PATCH 19/37] tracing: Generalize per-element hist trigger data
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Up until now, hist triggers only needed per-element support for saving Up until now, hist triggers only needed per-element support for saving
'comm' data, which was saved directly as a private data pointer. 'comm' data, which was saved directly as a private data pointer.
@ -106,7 +106,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
}; };
static const char *get_hist_field_flags(struct hist_field *hist_field) static const char *get_hist_field_flags(struct hist_field *hist_field)
@@ -1481,21 +1501,6 @@ static int create_tracing_map_fields(str @@ -1484,21 +1504,6 @@ static int create_tracing_map_fields(str
return 0; return 0;
} }
@ -128,7 +128,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static struct hist_trigger_data * static struct hist_trigger_data *
create_hist_data(unsigned int map_bits, create_hist_data(unsigned int map_bits,
struct hist_trigger_attrs *attrs, struct hist_trigger_attrs *attrs,
@@ -1521,8 +1526,7 @@ create_hist_data(unsigned int map_bits, @@ -1524,8 +1529,7 @@ create_hist_data(unsigned int map_bits,
if (ret) if (ret)
goto free; goto free;
@ -138,7 +138,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
hist_data->map = tracing_map_create(map_bits, hist_data->key_size, hist_data->map = tracing_map_create(map_bits, hist_data->key_size,
map_ops, hist_data); map_ops, hist_data);
@@ -1710,7 +1714,13 @@ hist_trigger_entry_print(struct seq_file @@ -1713,7 +1717,13 @@ hist_trigger_entry_print(struct seq_file
seq_printf(m, "%s: [%llx] %-55s", field_name, seq_printf(m, "%s: [%llx] %-55s", field_name,
uval, str); uval, str);
} else if (key_field->flags & HIST_FIELD_FL_EXECNAME) { } else if (key_field->flags & HIST_FIELD_FL_EXECNAME) {

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:09 +0100 Date: Wed, 20 Dec 2017 17:13:09 +0100
Subject: [PATCH 20/29] hrtimer: Unify handling of remote enqueue Subject: [PATCH 20/29] hrtimer: Unify handling of remote enqueue
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
hrtimer_reprogram() is conditionally invoked from hrtimer_start_range_ns() hrtimer_reprogram() is conditionally invoked from hrtimer_start_range_ns()
when hrtimer_cpu_base.hres_active is true. when hrtimer_cpu_base.hres_active is true.

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:42 -0600 Date: Mon, 15 Jan 2018 20:51:54 -0600
Subject: [PATCH 20/37] tracing: Pass tracing_map_elt to hist_field accessor Subject: [PATCH 20/37] tracing: Pass tracing_map_elt to hist_field accessor
functions functions
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Some accessor functions, such as for variable references, require Some accessor functions, such as for variable references, require
access to a corrsponding tracing_map_elt. access to a corrsponding tracing_map_elt.
@ -182,7 +182,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
{ {
struct hist_trigger_data *hist_data = hist_field->hist_data; struct hist_trigger_data *hist_data = hist_field->hist_data;
struct trace_array *tr = hist_data->event_file->tr; struct trace_array *tr = hist_data->event_file->tr;
@@ -1567,7 +1590,7 @@ static void hist_trigger_elt_update(stru @@ -1570,7 +1593,7 @@ static void hist_trigger_elt_update(stru
for_each_hist_val_field(i, hist_data) { for_each_hist_val_field(i, hist_data) {
hist_field = hist_data->fields[i]; hist_field = hist_data->fields[i];
@ -191,7 +191,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (hist_field->flags & HIST_FIELD_FL_VAR) { if (hist_field->flags & HIST_FIELD_FL_VAR) {
var_idx = hist_field->var.idx; var_idx = hist_field->var.idx;
tracing_map_set_var(elt, var_idx, hist_val); tracing_map_set_var(elt, var_idx, hist_val);
@@ -1579,7 +1602,7 @@ static void hist_trigger_elt_update(stru @@ -1582,7 +1605,7 @@ static void hist_trigger_elt_update(stru
for_each_hist_key_field(i, hist_data) { for_each_hist_key_field(i, hist_data) {
hist_field = hist_data->fields[i]; hist_field = hist_data->fields[i];
if (hist_field->flags & HIST_FIELD_FL_VAR) { if (hist_field->flags & HIST_FIELD_FL_VAR) {
@ -200,7 +200,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
var_idx = hist_field->var.idx; var_idx = hist_field->var.idx;
tracing_map_set_var(elt, var_idx, hist_val); tracing_map_set_var(elt, var_idx, hist_val);
} }
@@ -1617,9 +1640,9 @@ static void event_hist_trigger(struct ev @@ -1620,9 +1643,9 @@ static void event_hist_trigger(struct ev
bool use_compound_key = (hist_data->n_keys > 1); bool use_compound_key = (hist_data->n_keys > 1);
unsigned long entries[HIST_STACKTRACE_DEPTH]; unsigned long entries[HIST_STACKTRACE_DEPTH];
char compound_key[HIST_KEY_SIZE_MAX]; char compound_key[HIST_KEY_SIZE_MAX];
@ -211,7 +211,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
u64 field_contents; u64 field_contents;
void *key = NULL; void *key = NULL;
unsigned int i; unsigned int i;
@@ -1640,7 +1663,7 @@ static void event_hist_trigger(struct ev @@ -1643,7 +1666,7 @@ static void event_hist_trigger(struct ev
key = entries; key = entries;
} else { } else {

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:10 +0100 Date: Wed, 20 Dec 2017 17:13:10 +0100
Subject: [PATCH 21/29] hrtimer: Make remote enqueue decision less restrictive Subject: [PATCH 21/29] hrtimer: Make remote enqueue decision less restrictive
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The current decision whether a timer can be queued on a remote CPU checks The current decision whether a timer can be queued on a remote CPU checks
for timer->expiry <= remote_cpu_base.expires_next. for timer->expiry <= remote_cpu_base.expires_next.

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:43 -0600 Date: Mon, 15 Jan 2018 20:51:55 -0600
Subject: [PATCH 21/37] tracing: Add hist_field 'type' field Subject: [PATCH 21/37] tracing: Add hist_field 'type' field
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Future support for synthetic events requires hist_field 'type' Future support for synthetic events requires hist_field 'type'
information, so add a field for that. information, so add a field for that.
@ -25,7 +25,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
struct hist_field *operands[HIST_FIELD_OPERANDS_MAX]; struct hist_field *operands[HIST_FIELD_OPERANDS_MAX];
struct hist_trigger_data *hist_data; struct hist_trigger_data *hist_data;
struct hist_var var; struct hist_var var;
@@ -714,6 +715,7 @@ static void destroy_hist_field(struct hi @@ -717,6 +718,7 @@ static void destroy_hist_field(struct hi
kfree(hist_field->var.name); kfree(hist_field->var.name);
kfree(hist_field->name); kfree(hist_field->name);
@ -33,7 +33,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
kfree(hist_field); kfree(hist_field);
} }
@@ -739,6 +741,10 @@ static struct hist_field *create_hist_fi @@ -742,6 +744,10 @@ static struct hist_field *create_hist_fi
if (flags & HIST_FIELD_FL_HITCOUNT) { if (flags & HIST_FIELD_FL_HITCOUNT) {
hist_field->fn = hist_field_counter; hist_field->fn = hist_field_counter;
@ -44,7 +44,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
goto out; goto out;
} }
@@ -752,12 +758,18 @@ static struct hist_field *create_hist_fi @@ -755,12 +761,18 @@ static struct hist_field *create_hist_fi
hist_field->fn = hist_field_log2; hist_field->fn = hist_field_log2;
hist_field->operands[0] = create_hist_field(hist_data, field, fl, NULL); hist_field->operands[0] = create_hist_field(hist_data, field, fl, NULL);
hist_field->size = hist_field->operands[0]->size; hist_field->size = hist_field->operands[0]->size;
@ -63,7 +63,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
goto out; goto out;
} }
@@ -767,6 +779,11 @@ static struct hist_field *create_hist_fi @@ -770,6 +782,11 @@ static struct hist_field *create_hist_fi
if (is_string_field(field)) { if (is_string_field(field)) {
flags |= HIST_FIELD_FL_STRING; flags |= HIST_FIELD_FL_STRING;
@ -75,7 +75,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (field->filter_type == FILTER_STATIC_STRING) if (field->filter_type == FILTER_STATIC_STRING)
hist_field->fn = hist_field_string; hist_field->fn = hist_field_string;
else if (field->filter_type == FILTER_DYN_STRING) else if (field->filter_type == FILTER_DYN_STRING)
@@ -774,6 +791,12 @@ static struct hist_field *create_hist_fi @@ -777,6 +794,12 @@ static struct hist_field *create_hist_fi
else else
hist_field->fn = hist_field_pstring; hist_field->fn = hist_field_pstring;
} else { } else {
@ -88,7 +88,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
hist_field->fn = select_value_fn(field->size, hist_field->fn = select_value_fn(field->size,
field->is_signed); field->is_signed);
if (!hist_field->fn) { if (!hist_field->fn) {
@@ -950,6 +973,11 @@ static struct hist_field *parse_unary(st @@ -949,6 +972,11 @@ static struct hist_field *parse_unary(st
expr->operands[0] = operand1; expr->operands[0] = operand1;
expr->operator = FIELD_OP_UNARY_MINUS; expr->operator = FIELD_OP_UNARY_MINUS;
expr->name = expr_str(expr, 0); expr->name = expr_str(expr, 0);
@ -100,7 +100,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return expr; return expr;
free: free:
@@ -1039,6 +1067,11 @@ static struct hist_field *parse_expr(str @@ -1042,6 +1070,11 @@ static struct hist_field *parse_expr(str
expr->operands[1] = operand2; expr->operands[1] = operand2;
expr->operator = field_op; expr->operator = field_op;
expr->name = expr_str(expr, 0); expr->name = expr_str(expr, 0);

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:11 +0100 Date: Wed, 20 Dec 2017 17:13:11 +0100
Subject: [PATCH 22/29] hrtimer: Remove base argument from hrtimer_reprogram() Subject: [PATCH 22/29] hrtimer: Remove base argument from hrtimer_reprogram()
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
hrtimer_reprogram() must have access to the hrtimer_clock_base of the new hrtimer_reprogram() must have access to the hrtimer_clock_base of the new
first expiring timer to access hrtimer_clock_base.offset for adjusting the first expiring timer to access hrtimer_clock_base.offset for adjusting the

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:44 -0600 Date: Mon, 15 Jan 2018 20:51:56 -0600
Subject: [PATCH 22/37] tracing: Add variable reference handling to hist Subject: [PATCH 22/37] tracing: Add variable reference handling to hist
triggers triggers
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Add the necessary infrastructure to allow the variables defined on one Add the necessary infrastructure to allow the variables defined on one
event to be referenced in another. This allows variables set by a event to be referenced in another. This allows variables set by a
@ -27,9 +27,9 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- ---
kernel/trace/trace.c | 2 kernel/trace/trace.c | 2
kernel/trace/trace.h | 3 kernel/trace/trace.h | 3
kernel/trace/trace_events_hist.c | 660 +++++++++++++++++++++++++++++++++++- kernel/trace/trace_events_hist.c | 661 +++++++++++++++++++++++++++++++++++-
kernel/trace/trace_events_trigger.c | 6 kernel/trace/trace_events_trigger.c | 6
4 files changed, 655 insertions(+), 16 deletions(-) 4 files changed, 656 insertions(+), 16 deletions(-)
--- a/kernel/trace/trace.c --- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c +++ b/kernel/trace/trace.c
@ -136,7 +136,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ struct hist_field *found = NULL; + struct hist_field *found = NULL;
+ unsigned int i; + unsigned int i;
+ +
+ if (level > 2) + if (level > 3)
+ return found; + return found;
+ +
+ if (!hist_field) + if (!hist_field)
@ -234,7 +234,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+{ +{
+ int i; + int i;
+ +
+ if (level > 2) + if (level > 3)
+ return false; + return false;
+ +
+ if (!hist_field) + if (!hist_field)
@ -476,25 +476,17 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (field_name == NULL) if (field_name == NULL)
field_name = ""; field_name = "";
@@ -638,6 +993,8 @@ static char *expr_str(struct hist_field @@ -612,6 +967,9 @@ static const char *get_hist_field_flags(
return expr;
}
+ if (field->operands[0]->flags & HIST_FIELD_FL_VAR_REF) static void expr_field_str(struct hist_field *field, char *expr)
{
+ if (field->flags & HIST_FIELD_FL_VAR_REF)
+ strcat(expr, "$"); + strcat(expr, "$");
strcat(expr, hist_field_name(field->operands[0], 0)); +
if (field->operands[0]->flags) { strcat(expr, hist_field_name(field, 0));
const char *flags_str = get_hist_field_flags(field->operands[0]);
@@ -660,6 +1017,8 @@ static char *expr_str(struct hist_field
return NULL;
}
+ if (field->operands[1]->flags & HIST_FIELD_FL_VAR_REF) if (field->flags) {
+ strcat(expr, "$"); @@ -742,6 +1100,11 @@ static struct hist_field *create_hist_fi
strcat(expr, hist_field_name(field->operands[1], 0));
if (field->operands[1]->flags) {
const char *flags_str = get_hist_field_flags(field->operands[1]);
@@ -739,6 +1098,11 @@ static struct hist_field *create_hist_fi
if (flags & HIST_FIELD_FL_EXPR) if (flags & HIST_FIELD_FL_EXPR)
goto out; /* caller will populate */ goto out; /* caller will populate */
@ -506,7 +498,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (flags & HIST_FIELD_FL_HITCOUNT) { if (flags & HIST_FIELD_FL_HITCOUNT) {
hist_field->fn = hist_field_counter; hist_field->fn = hist_field_counter;
hist_field->size = sizeof(u64); hist_field->size = sizeof(u64);
@@ -832,6 +1196,142 @@ static void destroy_hist_fields(struct h @@ -835,6 +1198,144 @@ static void destroy_hist_fields(struct h
} }
} }
@ -520,6 +512,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ ref_field->var.hist_data = var_field->hist_data; + ref_field->var.hist_data = var_field->hist_data;
+ ref_field->size = var_field->size; + ref_field->size = var_field->size;
+ ref_field->is_signed = var_field->is_signed; + ref_field->is_signed = var_field->is_signed;
+ ref_field->flags |= var_field->flags &
+ (HIST_FIELD_FL_TIMESTAMP | HIST_FIELD_FL_TIMESTAMP_USECS);
+ +
+ if (system) { + if (system) {
+ ref_field->system = kstrdup(system, GFP_KERNEL); + ref_field->system = kstrdup(system, GFP_KERNEL);
@ -649,9 +643,9 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static struct ftrace_event_field * static struct ftrace_event_field *
parse_field(struct hist_trigger_data *hist_data, struct trace_event_file *file, parse_field(struct hist_trigger_data *hist_data, struct trace_event_file *file,
char *field_str, unsigned long *flags) char *field_str, unsigned long *flags)
@@ -888,10 +1388,40 @@ struct hist_field *parse_atom(struct his @@ -891,10 +1392,40 @@ static struct hist_field *parse_atom(str
struct trace_event_file *file, char *str, struct trace_event_file *file, char *str,
unsigned long *flags, char *var_name) unsigned long *flags, char *var_name)
{ {
+ char *s, *ref_system = NULL, *ref_event = NULL, *ref_var = str; + char *s, *ref_system = NULL, *ref_event = NULL, *ref_var = str;
struct ftrace_event_field *field = NULL; struct ftrace_event_field *field = NULL;
@ -690,7 +684,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
field = parse_field(hist_data, file, str, flags); field = parse_field(hist_data, file, str, flags);
if (IS_ERR(field)) { if (IS_ERR(field)) {
ret = PTR_ERR(field); ret = PTR_ERR(field);
@@ -1063,6 +1593,9 @@ static struct hist_field *parse_expr(str @@ -1066,6 +1597,9 @@ static struct hist_field *parse_expr(str
goto free; goto free;
} }
@ -700,7 +694,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
expr->operands[0] = operand1; expr->operands[0] = operand1;
expr->operands[1] = operand2; expr->operands[1] = operand2;
expr->operator = field_op; expr->operator = field_op;
@@ -1235,6 +1768,12 @@ static int create_key_field(struct hist_ @@ -1238,6 +1772,12 @@ static int create_key_field(struct hist_
goto out; goto out;
} }
@ -713,7 +707,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
key_size = hist_field->size; key_size = hist_field->size;
} }
@@ -1573,6 +2112,7 @@ create_hist_data(unsigned int map_bits, @@ -1576,6 +2116,7 @@ create_hist_data(unsigned int map_bits,
hist_data->attrs = attrs; hist_data->attrs = attrs;
hist_data->remove = remove; hist_data->remove = remove;
@ -721,7 +715,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = create_hist_fields(hist_data, file); ret = create_hist_fields(hist_data, file);
if (ret) if (ret)
@@ -1595,12 +2135,6 @@ create_hist_data(unsigned int map_bits, @@ -1598,12 +2139,6 @@ create_hist_data(unsigned int map_bits,
ret = create_tracing_map_fields(hist_data); ret = create_tracing_map_fields(hist_data);
if (ret) if (ret)
goto free; goto free;
@ -734,7 +728,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
out: out:
return hist_data; return hist_data;
free: free:
@@ -1615,12 +2149,17 @@ create_hist_data(unsigned int map_bits, @@ -1618,12 +2153,17 @@ create_hist_data(unsigned int map_bits,
static void hist_trigger_elt_update(struct hist_trigger_data *hist_data, static void hist_trigger_elt_update(struct hist_trigger_data *hist_data,
struct tracing_map_elt *elt, void *rec, struct tracing_map_elt *elt, void *rec,
@ -753,7 +747,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
for_each_hist_val_field(i, hist_data) { for_each_hist_val_field(i, hist_data) {
hist_field = hist_data->fields[i]; hist_field = hist_data->fields[i];
hist_val = hist_field->fn(hist_field, elt, rbe, rec); hist_val = hist_field->fn(hist_field, elt, rbe, rec);
@@ -1672,6 +2211,7 @@ static void event_hist_trigger(struct ev @@ -1675,6 +2215,7 @@ static void event_hist_trigger(struct ev
struct hist_trigger_data *hist_data = data->private_data; struct hist_trigger_data *hist_data = data->private_data;
bool use_compound_key = (hist_data->n_keys > 1); bool use_compound_key = (hist_data->n_keys > 1);
unsigned long entries[HIST_STACKTRACE_DEPTH]; unsigned long entries[HIST_STACKTRACE_DEPTH];
@ -761,7 +755,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
char compound_key[HIST_KEY_SIZE_MAX]; char compound_key[HIST_KEY_SIZE_MAX];
struct tracing_map_elt *elt = NULL; struct tracing_map_elt *elt = NULL;
struct stack_trace stacktrace; struct stack_trace stacktrace;
@@ -1711,9 +2251,15 @@ static void event_hist_trigger(struct ev @@ -1714,9 +2255,15 @@ static void event_hist_trigger(struct ev
if (use_compound_key) if (use_compound_key)
key = compound_key; key = compound_key;
@ -779,7 +773,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
} }
static void hist_trigger_stacktrace_print(struct seq_file *m, static void hist_trigger_stacktrace_print(struct seq_file *m,
@@ -1930,8 +2476,11 @@ static void hist_field_print(struct seq_ @@ -1933,8 +2480,11 @@ static void hist_field_print(struct seq_
if (hist_field->flags & HIST_FIELD_FL_TIMESTAMP) if (hist_field->flags & HIST_FIELD_FL_TIMESTAMP)
seq_puts(m, "common_timestamp"); seq_puts(m, "common_timestamp");
@ -792,7 +786,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (hist_field->flags) { if (hist_field->flags) {
const char *flags_str = get_hist_field_flags(hist_field); const char *flags_str = get_hist_field_flags(hist_field);
@@ -2071,7 +2620,11 @@ static void event_hist_trigger_free(stru @@ -2074,7 +2624,11 @@ static void event_hist_trigger_free(stru
if (!data->ref) { if (!data->ref) {
if (data->name) if (data->name)
del_named_trigger(data); del_named_trigger(data);
@ -804,7 +798,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
destroy_hist_data(hist_data); destroy_hist_data(hist_data);
} }
} }
@@ -2284,23 +2837,55 @@ static int hist_register_trigger(char *g @@ -2287,23 +2841,55 @@ static int hist_register_trigger(char *g
goto out; goto out;
} }
@ -864,7 +858,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static void hist_unregister_trigger(char *glob, struct event_trigger_ops *ops, static void hist_unregister_trigger(char *glob, struct event_trigger_ops *ops,
struct event_trigger_data *data, struct event_trigger_data *data,
struct trace_event_file *file) struct trace_event_file *file)
@@ -2333,11 +2918,30 @@ static void hist_unregister_trigger(char @@ -2336,11 +2922,30 @@ static void hist_unregister_trigger(char
} }
} }
@ -895,7 +889,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
list_for_each_entry_safe(test, n, &file->triggers, list) { list_for_each_entry_safe(test, n, &file->triggers, list) {
if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) { if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {
hist_data = test->private_data; hist_data = test->private_data;
@@ -2413,6 +3017,11 @@ static int event_hist_trigger_func(struc @@ -2416,6 +3021,11 @@ static int event_hist_trigger_func(struc
} }
if (remove) { if (remove) {
@ -907,7 +901,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
cmd_ops->unreg(glob+1, trigger_ops, trigger_data, file); cmd_ops->unreg(glob+1, trigger_ops, trigger_data, file);
ret = 0; ret = 0;
goto out_free; goto out_free;
@@ -2430,14 +3039,33 @@ static int event_hist_trigger_func(struc @@ -2433,14 +3043,33 @@ static int event_hist_trigger_func(struc
goto out_free; goto out_free;
} else if (ret < 0) } else if (ret < 0)
goto out_free; goto out_free;

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:12 +0100 Date: Wed, 20 Dec 2017 17:13:12 +0100
Subject: [PATCH 23/29] hrtimer: Split hrtimer_start_range_ns() Subject: [PATCH 23/29] hrtimer: Split hrtimer_start_range_ns()
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Preparatory patch for softirq based hrtimers to avoid code duplication. No Preparatory patch for softirq based hrtimers to avoid code duplication. No
functional change. functional change.

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:45 -0600 Date: Mon, 15 Jan 2018 20:51:57 -0600
Subject: [PATCH 23/37] tracing: Add hist trigger action hook Subject: [PATCH 23/37] tracing: Add hist trigger action hook
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Add a hook for executing extra actions whenever a histogram entry is Add a hook for executing extra actions whenever a histogram entry is
added or updated. added or updated.
@ -101,7 +101,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
} }
} }
@@ -2043,11 +2076,55 @@ static int create_sort_keys(struct hist_ @@ -2047,11 +2080,55 @@ static int create_sort_keys(struct hist_
return ret; return ret;
} }
@ -157,7 +157,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
kfree(hist_data); kfree(hist_data);
} }
@@ -2114,6 +2191,10 @@ create_hist_data(unsigned int map_bits, @@ -2118,6 +2195,10 @@ create_hist_data(unsigned int map_bits,
hist_data->remove = remove; hist_data->remove = remove;
hist_data->event_file = file; hist_data->event_file = file;
@ -168,7 +168,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = create_hist_fields(hist_data, file); ret = create_hist_fields(hist_data, file);
if (ret) if (ret)
goto free; goto free;
@@ -2205,6 +2286,20 @@ static inline void add_to_key(char *comp @@ -2209,6 +2290,20 @@ static inline void add_to_key(char *comp
memcpy(compound_key + key_field->offset, key, size); memcpy(compound_key + key_field->offset, key, size);
} }
@ -189,7 +189,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static void event_hist_trigger(struct event_trigger_data *data, void *rec, static void event_hist_trigger(struct event_trigger_data *data, void *rec,
struct ring_buffer_event *rbe) struct ring_buffer_event *rbe)
{ {
@@ -2260,6 +2355,9 @@ static void event_hist_trigger(struct ev @@ -2264,6 +2359,9 @@ static void event_hist_trigger(struct ev
return; return;
hist_trigger_elt_update(hist_data, elt, rec, rbe, var_ref_vals); hist_trigger_elt_update(hist_data, elt, rec, rbe, var_ref_vals);
@ -199,7 +199,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
} }
static void hist_trigger_stacktrace_print(struct seq_file *m, static void hist_trigger_stacktrace_print(struct seq_file *m,
@@ -3046,6 +3144,10 @@ static int event_hist_trigger_func(struc @@ -3050,6 +3148,10 @@ static int event_hist_trigger_func(struc
if (has_hist_vars(hist_data)) if (has_hist_vars(hist_data))
save_hist_vars(hist_data); save_hist_vars(hist_data);

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:13 +0100 Date: Wed, 20 Dec 2017 17:13:13 +0100
Subject: [PATCH 24/29] hrtimer: Split __hrtimer_get_next_event() Subject: [PATCH 24/29] hrtimer: Split __hrtimer_get_next_event()
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Preparatory patch for softirq based hrtimers to avoid code duplication. No Preparatory patch for softirq based hrtimers to avoid code duplication. No
functional change. functional change.

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:46 -0600 Date: Mon, 15 Jan 2018 20:51:58 -0600
Subject: [PATCH 24/37] tracing: Add support for 'synthetic' events Subject: [PATCH 24/37] tracing: Add support for 'synthetic' events
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Synthetic events are user-defined events generated from hist trigger Synthetic events are user-defined events generated from hist trigger
variables saved from one or more other events. variables saved from one or more other events.
@ -50,8 +50,8 @@ Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- ---
kernel/trace/trace_events_hist.c | 899 ++++++++++++++++++++++++++++++++++++++- kernel/trace/trace_events_hist.c | 895 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 897 insertions(+), 2 deletions(-) 1 file changed, 893 insertions(+), 2 deletions(-)
--- a/kernel/trace/trace_events_hist.c --- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c
@ -99,7 +99,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
struct action_data; struct action_data;
typedef void (*action_fn_t) (struct hist_trigger_data *hist_data, typedef void (*action_fn_t) (struct hist_trigger_data *hist_data,
@@ -282,6 +308,794 @@ struct action_data { @@ -282,6 +308,790 @@ struct action_data {
unsigned int var_ref_idx; unsigned int var_ref_idx;
}; };
@ -785,7 +785,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+{ +{
+ struct list_head release_events; + struct list_head release_events;
+ struct synth_event *event, *e; + struct synth_event *event, *e;
+ int ret = 0, err = 0; + int ret = 0;
+ +
+ INIT_LIST_HEAD(&release_events); + INIT_LIST_HEAD(&release_events);
+ +
@ -798,8 +798,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ } + }
+ } + }
+ +
+ list_for_each_entry_safe(event, e, &synth_event_list, list) + list_splice_init(&event->list, &release_events);
+ list_move(&event->list, &release_events);
+ +
+ mutex_unlock(&synth_event_mutex); + mutex_unlock(&synth_event_mutex);
+ +
@ -810,9 +809,6 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ add_or_delete_synth_event(event, !ret); + add_or_delete_synth_event(event, !ret);
+ } + }
+ +
+ if (err)
+ ret = err;
+
+ return ret; + return ret;
+} +}
+ +
@ -894,7 +890,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static u64 hist_field_timestamp(struct hist_field *hist_field, static u64 hist_field_timestamp(struct hist_field *hist_field,
struct tracing_map_elt *elt, struct tracing_map_elt *elt,
struct ring_buffer_event *rbe, struct ring_buffer_event *rbe,
@@ -2961,6 +3775,28 @@ static int hist_trigger_enable(struct ev @@ -2965,6 +3775,28 @@ static int hist_trigger_enable(struct ev
return ret; return ret;
} }
@ -923,7 +919,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static bool hist_trigger_check_refs(struct event_trigger_data *data, static bool hist_trigger_check_refs(struct event_trigger_data *data,
struct trace_event_file *file) struct trace_event_file *file)
{ {
@@ -3036,6 +3872,8 @@ static void hist_unreg_all(struct trace_ @@ -3040,6 +3872,8 @@ static void hist_unreg_all(struct trace_
{ {
struct event_trigger_data *test, *n; struct event_trigger_data *test, *n;
struct hist_trigger_data *hist_data; struct hist_trigger_data *hist_data;
@ -932,7 +928,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (hist_file_check_refs(file)) if (hist_file_check_refs(file))
return; return;
@@ -3045,6 +3883,14 @@ static void hist_unreg_all(struct trace_ @@ -3049,6 +3883,14 @@ static void hist_unreg_all(struct trace_
hist_data = test->private_data; hist_data = test->private_data;
list_del_rcu(&test->list); list_del_rcu(&test->list);
trace_event_trigger_enable_disable(file, 0); trace_event_trigger_enable_disable(file, 0);
@ -947,7 +943,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
update_cond_flag(file); update_cond_flag(file);
if (hist_data->enable_timestamps) if (hist_data->enable_timestamps)
tracing_set_time_stamp_abs(file->tr, false); tracing_set_time_stamp_abs(file->tr, false);
@@ -3063,6 +3909,8 @@ static int event_hist_trigger_func(struc @@ -3067,6 +3909,8 @@ static int event_hist_trigger_func(struc
struct hist_trigger_attrs *attrs; struct hist_trigger_attrs *attrs;
struct event_trigger_ops *trigger_ops; struct event_trigger_ops *trigger_ops;
struct hist_trigger_data *hist_data; struct hist_trigger_data *hist_data;
@ -956,7 +952,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
bool remove = false; bool remove = false;
char *trigger; char *trigger;
int ret = 0; int ret = 0;
@@ -3093,10 +3941,11 @@ static int event_hist_trigger_func(struc @@ -3097,10 +3941,11 @@ static int event_hist_trigger_func(struc
trigger_ops = cmd_ops->get_trigger_ops(cmd, trigger); trigger_ops = cmd_ops->get_trigger_ops(cmd, trigger);
@ -970,7 +966,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
trigger_data->count = -1; trigger_data->count = -1;
trigger_data->ops = trigger_ops; trigger_data->ops = trigger_ops;
@@ -3115,12 +3964,23 @@ static int event_hist_trigger_func(struc @@ -3119,12 +3964,23 @@ static int event_hist_trigger_func(struc
} }
if (remove) { if (remove) {
@ -994,7 +990,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = 0; ret = 0;
goto out_free; goto out_free;
} }
@@ -3156,6 +4016,13 @@ static int event_hist_trigger_func(struc @@ -3160,6 +4016,13 @@ static int event_hist_trigger_func(struc
if (ret) if (ret)
goto out_unreg; goto out_unreg;
@ -1008,7 +1004,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/* Just return zero, not the number of registered triggers */ /* Just return zero, not the number of registered triggers */
ret = 0; ret = 0;
out: out:
@@ -3328,3 +4195,31 @@ static __init void unregister_trigger_hi @@ -3332,3 +4195,31 @@ static __init void unregister_trigger_hi
return ret; return ret;
} }

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:14 +0100 Date: Wed, 20 Dec 2017 17:13:14 +0100
Subject: [PATCH 25/29] hrtimer: Use irqsave/irqrestore around __run_hrtimer() Subject: [PATCH 25/29] hrtimer: Use irqsave/irqrestore around __run_hrtimer()
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
__run_hrtimer() is called with the hrtimer_cpu_base.lock held and __run_hrtimer() is called with the hrtimer_cpu_base.lock held and
interrupts disabled. Before invoking the timer callback the base lock is interrupts disabled. Before invoking the timer callback the base lock is

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:47 -0600 Date: Mon, 15 Jan 2018 20:51:59 -0600
Subject: [PATCH 25/37] tracing: Add support for 'field variables' Subject: [PATCH 25/37] tracing: Add support for 'field variables'
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Users should be able to directly specify event fields in hist trigger Users should be able to directly specify event fields in hist trigger
'actions' rather than being forced to explicitly create a variable for 'actions' rather than being forced to explicitly create a variable for
@ -76,7 +76,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
}; };
struct synth_field { struct synth_field {
@@ -1431,6 +1447,7 @@ static struct hist_field *find_event_var @@ -1427,6 +1443,7 @@ static struct hist_field *find_event_var
struct hist_elt_data { struct hist_elt_data {
char *comm; char *comm;
u64 *var_ref_vals; u64 *var_ref_vals;
@ -84,7 +84,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
}; };
static u64 hist_field_var_ref(struct hist_field *hist_field, static u64 hist_field_var_ref(struct hist_field *hist_field,
@@ -1735,6 +1752,11 @@ static inline void save_comm(char *comm, @@ -1731,6 +1748,11 @@ static inline void save_comm(char *comm,
static void hist_elt_data_free(struct hist_elt_data *elt_data) static void hist_elt_data_free(struct hist_elt_data *elt_data)
{ {
@ -96,7 +96,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
kfree(elt_data->comm); kfree(elt_data->comm);
kfree(elt_data); kfree(elt_data);
} }
@@ -1752,7 +1774,7 @@ static int hist_trigger_elt_data_alloc(s @@ -1748,7 +1770,7 @@ static int hist_trigger_elt_data_alloc(s
unsigned int size = TASK_COMM_LEN; unsigned int size = TASK_COMM_LEN;
struct hist_elt_data *elt_data; struct hist_elt_data *elt_data;
struct hist_field *key_field; struct hist_field *key_field;
@ -105,7 +105,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
elt_data = kzalloc(sizeof(*elt_data), GFP_KERNEL); elt_data = kzalloc(sizeof(*elt_data), GFP_KERNEL);
if (!elt_data) if (!elt_data)
@@ -1771,6 +1793,18 @@ static int hist_trigger_elt_data_alloc(s @@ -1767,6 +1789,18 @@ static int hist_trigger_elt_data_alloc(s
} }
} }

View File

@ -2,7 +2,7 @@ From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:15 +0100 Date: Wed, 20 Dec 2017 17:13:15 +0100
Subject: [PATCH 26/29] hrtimer: Add clock bases and hrtimer mode for soft irq Subject: [PATCH 26/29] hrtimer: Add clock bases and hrtimer mode for soft irq
context context
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
hrtimer callback functions are always executed in hard interrupt hrtimer callback functions are always executed in hard interrupt
context. Users of hrtimer which need their timer function to be executed context. Users of hrtimer which need their timer function to be executed

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:48 -0600 Date: Mon, 15 Jan 2018 20:52:00 -0600
Subject: [PATCH 26/37] tracing: Add 'onmatch' hist trigger action support Subject: [PATCH 26/37] tracing: Add 'onmatch' hist trigger action support
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Add an 'onmatch(matching.event).<synthetic_event_name>(param list)' Add an 'onmatch(matching.event).<synthetic_event_name>(param list)'
hist trigger action which is invoked with the set of variables or hist trigger action which is invoked with the set of variables or
@ -99,7 +99,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static void add_or_delete_synth_event(struct synth_event *event, int delete) static void add_or_delete_synth_event(struct synth_event *event, int delete)
{ {
if (delete) if (delete)
@@ -1128,11 +1156,6 @@ static u64 hist_field_timestamp(struct h @@ -1124,11 +1152,6 @@ static u64 hist_field_timestamp(struct h
return ts; return ts;
} }
@ -111,7 +111,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static struct hist_field * static struct hist_field *
check_field_for_var_ref(struct hist_field *hist_field, check_field_for_var_ref(struct hist_field *hist_field,
struct hist_trigger_data *var_data, struct hist_trigger_data *var_data,
@@ -1198,6 +1221,14 @@ static struct hist_field *find_var_ref(s @@ -1194,6 +1217,14 @@ static struct hist_field *find_var_ref(s
return found; return found;
} }
@ -126,7 +126,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return found; return found;
} }
@@ -1426,6 +1457,37 @@ static struct hist_field *find_file_var( @@ -1422,6 +1453,37 @@ static struct hist_field *find_file_var(
return NULL; return NULL;
} }
@ -164,7 +164,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static struct hist_field *find_event_var(struct hist_trigger_data *hist_data, static struct hist_field *find_event_var(struct hist_trigger_data *hist_data,
char *system, char *system,
char *event_name, char *event_name,
@@ -1435,6 +1497,14 @@ static struct hist_field *find_event_var @@ -1431,6 +1493,14 @@ static struct hist_field *find_event_var
struct hist_field *hist_field = NULL; struct hist_field *hist_field = NULL;
struct trace_event_file *file; struct trace_event_file *file;
@ -179,7 +179,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
file = find_var_file(tr, system, event_name, var_name); file = find_var_file(tr, system, event_name, var_name);
if (!file) if (!file)
return NULL; return NULL;
@@ -1626,11 +1696,21 @@ static void destroy_hist_trigger_attrs(s @@ -1622,11 +1692,21 @@ static void destroy_hist_trigger_attrs(s
static int parse_action(char *str, struct hist_trigger_attrs *attrs) static int parse_action(char *str, struct hist_trigger_attrs *attrs)
{ {

View File

@ -2,7 +2,7 @@ From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:16 +0100 Date: Wed, 20 Dec 2017 17:13:16 +0100
Subject: [PATCH 27/29] hrtimer: Prepare handling of hard and softirq based Subject: [PATCH 27/29] hrtimer: Prepare handling of hard and softirq based
hrtimers hrtimers
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The softirq based hrtimer can utilize most of the existing hrtimers The softirq based hrtimer can utilize most of the existing hrtimers
functions, but need to operate on a different data set. functions, but need to operate on a different data set.

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:49 -0600 Date: Mon, 15 Jan 2018 20:52:01 -0600
Subject: [PATCH 27/37] tracing: Add 'onmax' hist trigger action support Subject: [PATCH 27/37] tracing: Add 'onmax' hist trigger action support
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Add an 'onmax(var).save(field,...)' hist trigger action which is Add an 'onmax(var).save(field,...)' hist trigger action which is
invoked whenever an event exceeds the current maximum. invoked whenever an event exceeds the current maximum.
@ -86,7 +86,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
}; };
}; };
@@ -1701,7 +1713,8 @@ static int parse_action(char *str, struc @@ -1697,7 +1709,8 @@ static int parse_action(char *str, struc
if (attrs->n_actions >= HIST_ACTIONS_MAX) if (attrs->n_actions >= HIST_ACTIONS_MAX)
return ret; return ret;
@ -96,7 +96,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
attrs->action_str[attrs->n_actions] = kstrdup(str, GFP_KERNEL); attrs->action_str[attrs->n_actions] = kstrdup(str, GFP_KERNEL);
if (!attrs->action_str[attrs->n_actions]) { if (!attrs->action_str[attrs->n_actions]) {
ret = -ENOMEM; ret = -ENOMEM;
@@ -1873,7 +1886,7 @@ static int hist_trigger_elt_data_alloc(s @@ -1869,7 +1882,7 @@ static int hist_trigger_elt_data_alloc(s
} }
} }

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:17 +0100 Date: Wed, 20 Dec 2017 17:13:17 +0100
Subject: [PATCH 28/29] hrtimer: Implement support for softirq based hrtimers Subject: [PATCH 28/29] hrtimer: Implement support for softirq based hrtimers
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
hrtimer callbacks are always invoked in hard interrupt context. Several hrtimer callbacks are always invoked in hard interrupt context. Several
users in tree require soft interrupt context for their callbacks and users in tree require soft interrupt context for their callbacks and

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:50 -0600 Date: Mon, 15 Jan 2018 20:52:02 -0600
Subject: [PATCH 28/37] tracing: Allow whitespace to surround hist trigger Subject: [PATCH 28/37] tracing: Allow whitespace to surround hist trigger
filter filter
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The existing code only allows for one space before and after the 'if' The existing code only allows for one space before and after the 'if'
specifying the filter for a hist trigger. Add code to make that more specifying the filter for a hist trigger. Add code to make that more

View File

@ -1,7 +1,7 @@
From: Anna-Maria Gleixner <anna-maria@linutronix.de> From: Anna-Maria Gleixner <anna-maria@linutronix.de>
Date: Wed, 20 Dec 2017 17:13:18 +0100 Date: Wed, 20 Dec 2017 17:13:18 +0100
Subject: [PATCH 29/29] hrtimer: Implement SOFT/HARD clock base selection Subject: [PATCH 29/29] hrtimer: Implement SOFT/HARD clock base selection
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
All prerequisites to handle hrtimers for expiry in either hard or soft All prerequisites to handle hrtimers for expiry in either hard or soft
interrupt context are in place. interrupt context are in place.

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:51 -0600 Date: Mon, 15 Jan 2018 20:52:03 -0600
Subject: [PATCH 29/37] tracing: Add cpu field for hist triggers Subject: [PATCH 29/37] tracing: Add cpu field for hist triggers
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
A common key to use in a histogram is the cpuid - add a new cpu A common key to use in a histogram is the cpuid - add a new cpu
'synthetic' field named 'cpu' for that purpose. 'synthetic' field named 'cpu' for that purpose.
@ -47,7 +47,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
}; };
struct var_defs { struct var_defs {
@@ -1168,6 +1169,16 @@ static u64 hist_field_timestamp(struct h @@ -1164,6 +1165,16 @@ static u64 hist_field_timestamp(struct h
return ts; return ts;
} }
@ -64,7 +64,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static struct hist_field * static struct hist_field *
check_field_for_var_ref(struct hist_field *hist_field, check_field_for_var_ref(struct hist_field *hist_field,
struct hist_trigger_data *var_data, struct hist_trigger_data *var_data,
@@ -1606,6 +1617,8 @@ static const char *hist_field_name(struc @@ -1602,6 +1613,8 @@ static const char *hist_field_name(struc
field_name = hist_field_name(field->operands[0], ++level); field_name = hist_field_name(field->operands[0], ++level);
else if (field->flags & HIST_FIELD_FL_TIMESTAMP) else if (field->flags & HIST_FIELD_FL_TIMESTAMP)
field_name = "common_timestamp"; field_name = "common_timestamp";
@ -73,7 +73,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
else if (field->flags & HIST_FIELD_FL_EXPR || else if (field->flags & HIST_FIELD_FL_EXPR ||
field->flags & HIST_FIELD_FL_VAR_REF) { field->flags & HIST_FIELD_FL_VAR_REF) {
if (field->system) { if (field->system) {
@@ -2111,6 +2124,15 @@ static struct hist_field *create_hist_fi @@ -2109,6 +2122,15 @@ static struct hist_field *create_hist_fi
goto out; goto out;
} }

View File

@ -2,7 +2,7 @@ From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:11 +0100 Date: Thu, 23 Nov 2017 16:39:11 +0100
Subject: [PATCH 30/36] can/bcm: Replace hrtimer_tasklet with softirq based Subject: [PATCH 30/36] can/bcm: Replace hrtimer_tasklet with softirq based
hrtimer hrtimer
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Switch the timer to HRTIMER_MODE_SOFT, which executed the timer Switch the timer to HRTIMER_MODE_SOFT, which executed the timer
callback in softirq context and remove the hrtimer_tasklet. callback in softirq context and remove the hrtimer_tasklet.

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:52 -0600 Date: Mon, 15 Jan 2018 20:52:04 -0600
Subject: [PATCH 30/37] tracing: Add hist trigger support for variable Subject: [PATCH 30/37] tracing: Add hist trigger support for variable
reference aliases reference aliases
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Add support for alias=$somevar where alias can be used as Add support for alias=$somevar where alias can be used as
onmatch.xxx($alias). onmatch.xxx($alias).
@ -24,8 +24,8 @@ uses that in the call instead:
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- ---
kernel/trace/trace_events_hist.c | 58 ++++++++++++++++++++++++++++++++++++--- kernel/trace/trace_events_hist.c | 74 +++++++++++++++++++++++++++++++++++----
1 file changed, 55 insertions(+), 3 deletions(-) 1 file changed, 67 insertions(+), 7 deletions(-)
--- a/kernel/trace/trace_events_hist.c --- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c
@ -37,7 +37,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
}; };
struct var_defs { struct var_defs {
@@ -1613,7 +1614,8 @@ static const char *hist_field_name(struc @@ -1609,7 +1610,8 @@ static const char *hist_field_name(struc
if (field->field) if (field->field)
field_name = field->field->name; field_name = field->field->name;
@ -47,7 +47,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
field_name = hist_field_name(field->operands[0], ++level); field_name = hist_field_name(field->operands[0], ++level);
else if (field->flags & HIST_FIELD_FL_TIMESTAMP) else if (field->flags & HIST_FIELD_FL_TIMESTAMP)
field_name = "common_timestamp"; field_name = "common_timestamp";
@@ -2082,7 +2084,7 @@ static struct hist_field *create_hist_fi @@ -2080,7 +2082,7 @@ static struct hist_field *create_hist_fi
hist_field->hist_data = hist_data; hist_field->hist_data = hist_data;
@ -56,7 +56,30 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
goto out; /* caller will populate */ goto out; /* caller will populate */
if (flags & HIST_FIELD_FL_VAR_REF) { if (flags & HIST_FIELD_FL_VAR_REF) {
@@ -2382,6 +2384,28 @@ parse_field(struct hist_trigger_data *hi @@ -2217,10 +2219,18 @@ static int init_var_ref(struct hist_fiel
}
}
- ref_field->name = kstrdup(var_field->var.name, GFP_KERNEL);
- if (!ref_field->name) {
- err = -ENOMEM;
- goto free;
+ if (var_field->var.name) {
+ ref_field->name = kstrdup(var_field->var.name, GFP_KERNEL);
+ if (!ref_field->name) {
+ err = -ENOMEM;
+ goto free;
+ }
+ } else if (var_field->name) {
+ ref_field->name = kstrdup(var_field->name, GFP_KERNEL);
+ if (!ref_field->name) {
+ err = -ENOMEM;
+ goto free;
+ }
}
ref_field->type = kstrdup(var_field->type, GFP_KERNEL);
@@ -2382,6 +2392,28 @@ parse_field(struct hist_trigger_data *hi
return field; return field;
} }
@ -82,10 +105,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ return alias; + return alias;
+} +}
+ +
struct hist_field *parse_atom(struct hist_trigger_data *hist_data, static struct hist_field *parse_atom(struct hist_trigger_data *hist_data,
struct trace_event_file *file, char *str, struct trace_event_file *file, char *str,
unsigned long *flags, char *var_name) unsigned long *flags, char *var_name)
@@ -2415,6 +2439,13 @@ struct hist_field *parse_atom(struct his @@ -2415,6 +2447,13 @@ static struct hist_field *parse_atom(str
if (hist_field) { if (hist_field) {
hist_data->var_refs[hist_data->n_var_refs] = hist_field; hist_data->var_refs[hist_data->n_var_refs] = hist_field;
hist_field->var_ref_idx = hist_data->n_var_refs++; hist_field->var_ref_idx = hist_data->n_var_refs++;
@ -99,7 +122,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return hist_field; return hist_field;
} }
} else } else
@@ -2519,6 +2550,26 @@ static int check_expr_operands(struct hi @@ -2515,6 +2554,26 @@ static int check_expr_operands(struct hi
unsigned long operand1_flags = operand1->flags; unsigned long operand1_flags = operand1->flags;
unsigned long operand2_flags = operand2->flags; unsigned long operand2_flags = operand2->flags;
@ -126,7 +149,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if ((operand1_flags & HIST_FIELD_FL_TIMESTAMP_USECS) != if ((operand1_flags & HIST_FIELD_FL_TIMESTAMP_USECS) !=
(operand2_flags & HIST_FIELD_FL_TIMESTAMP_USECS)) (operand2_flags & HIST_FIELD_FL_TIMESTAMP_USECS))
return -EINVAL; return -EINVAL;
@@ -4648,7 +4699,8 @@ static void hist_field_print(struct seq_ @@ -4648,7 +4707,8 @@ static void hist_field_print(struct seq_
else if (hist_field->flags & HIST_FIELD_FL_CPU) else if (hist_field->flags & HIST_FIELD_FL_CPU)
seq_puts(m, "cpu"); seq_puts(m, "cpu");
else if (field_name) { else if (field_name) {

View File

@ -2,7 +2,7 @@ From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:12 +0100 Date: Thu, 23 Nov 2017 16:39:12 +0100
Subject: [PATCH 31/36] mac80211_hwsim: Replace hrtimer tasklet with softirq Subject: [PATCH 31/36] mac80211_hwsim: Replace hrtimer tasklet with softirq
hrtimer hrtimer
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Switch the timer to HRTIMER_MODE_SOFT, which executed the timer Switch the timer to HRTIMER_MODE_SOFT, which executed the timer
callback in softirq context and remove the hrtimer_tasklet. callback in softirq context and remove the hrtimer_tasklet.

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:53 -0600 Date: Mon, 15 Jan 2018 20:52:05 -0600
Subject: [PATCH 31/37] tracing: Add 'last error' error facility for hist Subject: [PATCH 31/37] tracing: Add 'last error' error facility for hist
triggers triggers
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
With the addition of variables and actions, it's become necessary to With the addition of variables and actions, it's become necessary to
provide more detailed error information to users about syntax errors. provide more detailed error information to users about syntax errors.
@ -27,8 +27,8 @@ Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- ---
Documentation/trace/histogram.txt | 20 ++++ Documentation/trace/histogram.txt | 20 ++++
kernel/trace/trace_events_hist.c | 159 ++++++++++++++++++++++++++++++++++---- kernel/trace/trace_events_hist.c | 164 ++++++++++++++++++++++++++++++++++----
2 files changed, 166 insertions(+), 13 deletions(-) 2 files changed, 170 insertions(+), 14 deletions(-)
--- a/Documentation/trace/histogram.txt --- a/Documentation/trace/histogram.txt
+++ b/Documentation/trace/histogram.txt +++ b/Documentation/trace/histogram.txt
@ -127,7 +127,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
static LIST_HEAD(synth_event_list); static LIST_HEAD(synth_event_list);
static DEFINE_MUTEX(synth_event_mutex); static DEFINE_MUTEX(synth_event_mutex);
@@ -1452,8 +1511,10 @@ static struct trace_event_file *find_var @@ -1448,8 +1507,10 @@ static struct trace_event_file *find_var
continue; continue;
if (find_var_field(var_hist_data, var_name)) { if (find_var_field(var_hist_data, var_name)) {
@ -139,7 +139,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
found = file; found = file;
} }
@@ -1502,6 +1563,7 @@ find_match_var(struct hist_trigger_data @@ -1498,6 +1559,7 @@ find_match_var(struct hist_trigger_data
hist_field = find_file_var(file, var_name); hist_field = find_file_var(file, var_name);
if (hist_field) { if (hist_field) {
if (found) { if (found) {
@ -147,7 +147,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
@@ -1785,6 +1847,7 @@ static int parse_assignment(char *str, s @@ -1781,6 +1843,7 @@ static int parse_assignment(char *str, s
char *assignment; char *assignment;
if (attrs->n_assignments == TRACING_MAP_VARS_MAX) { if (attrs->n_assignments == TRACING_MAP_VARS_MAX) {
@ -155,7 +155,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
@@ -2327,6 +2390,10 @@ static struct hist_field *parse_var_ref( @@ -2335,6 +2398,10 @@ static struct hist_field *parse_var_ref(
if (var_field) if (var_field)
ref_field = create_var_ref(var_field, system, event_name); ref_field = create_var_ref(var_field, system, event_name);
@ -166,7 +166,15 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return ref_field; return ref_field;
} }
@@ -2571,8 +2638,10 @@ static int check_expr_operands(struct hi @@ -2494,6 +2561,7 @@ static struct hist_field *parse_unary(st
// we support only -(xxx) i.e. explicit parens required
if (level > 3) {
+ hist_err("Too many subexpressions (3 max): ", str);
ret = -EINVAL;
goto free;
}
@@ -2575,8 +2643,10 @@ static int check_expr_operands(struct hi
} }
if ((operand1_flags & HIST_FIELD_FL_TIMESTAMP_USECS) != if ((operand1_flags & HIST_FIELD_FL_TIMESTAMP_USECS) !=
@ -178,7 +186,19 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return 0; return 0;
} }
@@ -2818,12 +2887,17 @@ create_field_var_hist(struct hist_trigge @@ -2591,8 +2661,10 @@ static struct hist_field *parse_expr(str
int field_op, ret = -EINVAL;
char *sep, *operand1_str;
- if (level > 3)
+ if (level > 3) {
+ hist_err("Too many subexpressions (3 max): ", str);
return ERR_PTR(-EINVAL);
+ }
field_op = contains_operator(str);
@@ -2826,12 +2898,17 @@ create_field_var_hist(struct hist_trigge
char *cmd; char *cmd;
int ret; int ret;
@ -197,7 +217,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = PTR_ERR(file); ret = PTR_ERR(file);
return ERR_PTR(ret); return ERR_PTR(ret);
} }
@@ -2835,8 +2909,11 @@ create_field_var_hist(struct hist_trigge @@ -2843,8 +2920,11 @@ create_field_var_hist(struct hist_trigge
* yet a registered histogram so we can't use that. * yet a registered histogram so we can't use that.
*/ */
hist_data = find_compatible_hist(target_hist_data, file); hist_data = find_compatible_hist(target_hist_data, file);
@ -210,7 +230,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/* See if a synthetic field variable has already been created */ /* See if a synthetic field variable has already been created */
event_var = find_synthetic_field_var(target_hist_data, subsys_name, event_var = find_synthetic_field_var(target_hist_data, subsys_name,
@@ -2895,6 +2972,8 @@ create_field_var_hist(struct hist_trigge @@ -2903,6 +2983,8 @@ create_field_var_hist(struct hist_trigge
kfree(cmd); kfree(cmd);
kfree(var_hist->cmd); kfree(var_hist->cmd);
kfree(var_hist); kfree(var_hist);
@ -219,7 +239,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return ERR_PTR(ret); return ERR_PTR(ret);
} }
@@ -2906,6 +2985,8 @@ create_field_var_hist(struct hist_trigge @@ -2914,6 +2996,8 @@ create_field_var_hist(struct hist_trigge
if (IS_ERR_OR_NULL(event_var)) { if (IS_ERR_OR_NULL(event_var)) {
kfree(var_hist->cmd); kfree(var_hist->cmd);
kfree(var_hist); kfree(var_hist);
@ -228,7 +248,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
@@ -3042,18 +3123,21 @@ static struct field_var *create_field_va @@ -3050,18 +3134,21 @@ static struct field_var *create_field_va
int ret = 0; int ret = 0;
if (hist_data->n_field_vars >= SYNTH_FIELDS_MAX) { if (hist_data->n_field_vars >= SYNTH_FIELDS_MAX) {
@ -250,7 +270,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
kfree(val); kfree(val);
ret = PTR_ERR(var); ret = PTR_ERR(var);
goto err; goto err;
@@ -3196,13 +3280,17 @@ static int onmax_create(struct hist_trig @@ -3204,13 +3291,17 @@ static int onmax_create(struct hist_trig
int ret = 0; int ret = 0;
onmax_var_str = data->onmax.var_str; onmax_var_str = data->onmax.var_str;
@ -270,7 +290,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
flags = HIST_FIELD_FL_VAR_REF; flags = HIST_FIELD_FL_VAR_REF;
ref_field = create_hist_field(hist_data, NULL, flags, NULL); ref_field = create_hist_field(hist_data, NULL, flags, NULL);
@@ -3222,6 +3310,7 @@ static int onmax_create(struct hist_trig @@ -3230,6 +3321,7 @@ static int onmax_create(struct hist_trig
data->onmax.max_var_ref_idx = var_ref_idx; data->onmax.max_var_ref_idx = var_ref_idx;
max_var = create_var(hist_data, file, "max", sizeof(u64), "u64"); max_var = create_var(hist_data, file, "max", sizeof(u64), "u64");
if (IS_ERR(max_var)) { if (IS_ERR(max_var)) {
@ -278,7 +298,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = PTR_ERR(max_var); ret = PTR_ERR(max_var);
goto out; goto out;
} }
@@ -3236,6 +3325,7 @@ static int onmax_create(struct hist_trig @@ -3244,6 +3336,7 @@ static int onmax_create(struct hist_trig
field_var = create_target_field_var(hist_data, NULL, NULL, param); field_var = create_target_field_var(hist_data, NULL, NULL, param);
if (IS_ERR(field_var)) { if (IS_ERR(field_var)) {
@ -286,7 +306,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = PTR_ERR(field_var); ret = PTR_ERR(field_var);
kfree(param); kfree(param);
goto out; goto out;
@@ -3268,6 +3358,7 @@ static int parse_action_params(char *par @@ -3276,6 +3369,7 @@ static int parse_action_params(char *par
param = strstrip(param); param = strstrip(param);
if (strlen(param) < 2) { if (strlen(param) < 2) {
@ -294,7 +314,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
@@ -3443,6 +3534,9 @@ onmatch_find_var(struct hist_trigger_dat @@ -3451,6 +3545,9 @@ onmatch_find_var(struct hist_trigger_dat
hist_field = find_event_var(hist_data, system, event, var); hist_field = find_event_var(hist_data, system, event, var);
} }
@ -304,7 +324,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return hist_field; return hist_field;
} }
@@ -3510,6 +3604,7 @@ static int onmatch_create(struct hist_tr @@ -3518,6 +3615,7 @@ static int onmatch_create(struct hist_tr
mutex_lock(&synth_event_mutex); mutex_lock(&synth_event_mutex);
event = find_synth_event(data->onmatch.synth_event_name); event = find_synth_event(data->onmatch.synth_event_name);
if (!event) { if (!event) {
@ -312,7 +332,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
mutex_unlock(&synth_event_mutex); mutex_unlock(&synth_event_mutex);
return -EINVAL; return -EINVAL;
} }
@@ -3569,12 +3664,15 @@ static int onmatch_create(struct hist_tr @@ -3577,12 +3675,15 @@ static int onmatch_create(struct hist_tr
continue; continue;
} }
@ -328,7 +348,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = -EINVAL; ret = -EINVAL;
goto err; goto err;
} }
@@ -3604,15 +3702,22 @@ static struct action_data *onmatch_parse @@ -3612,15 +3713,22 @@ static struct action_data *onmatch_parse
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
match_event = strsep(&str, ")"); match_event = strsep(&str, ")");
@ -354,7 +374,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
data->onmatch.match_event = kstrdup(match_event, GFP_KERNEL); data->onmatch.match_event = kstrdup(match_event, GFP_KERNEL);
if (!data->onmatch.match_event) { if (!data->onmatch.match_event) {
@@ -3627,12 +3732,16 @@ static struct action_data *onmatch_parse @@ -3635,12 +3743,16 @@ static struct action_data *onmatch_parse
} }
strsep(&str, "."); strsep(&str, ".");
@ -373,7 +393,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
data->onmatch.synth_event_name = kstrdup(synth_event_name, GFP_KERNEL); data->onmatch.synth_event_name = kstrdup(synth_event_name, GFP_KERNEL);
if (!data->onmatch.synth_event_name) { if (!data->onmatch.synth_event_name) {
@@ -3641,8 +3750,10 @@ static struct action_data *onmatch_parse @@ -3649,8 +3761,10 @@ static struct action_data *onmatch_parse
} }
params = strsep(&str, ")"); params = strsep(&str, ")");
@ -385,7 +405,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = parse_action_params(params, data); ret = parse_action_params(params, data);
if (ret) if (ret)
@@ -3717,7 +3828,9 @@ static int create_var_field(struct hist_ @@ -3725,7 +3839,9 @@ static int create_var_field(struct hist_
if (WARN_ON(val_idx >= TRACING_MAP_VALS_MAX + TRACING_MAP_VARS_MAX)) if (WARN_ON(val_idx >= TRACING_MAP_VALS_MAX + TRACING_MAP_VARS_MAX))
return -EINVAL; return -EINVAL;
@ -395,7 +415,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return -EINVAL; return -EINVAL;
} }
@@ -3798,6 +3911,7 @@ static int create_key_field(struct hist_ @@ -3806,6 +3922,7 @@ static int create_key_field(struct hist_
} }
if (hist_field->flags & HIST_FIELD_FL_VAR_REF) { if (hist_field->flags & HIST_FIELD_FL_VAR_REF) {
@ -403,7 +423,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
destroy_hist_field(hist_field, 0); destroy_hist_field(hist_field, 0);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
@@ -3911,11 +4025,13 @@ static int parse_var_defs(struct hist_tr @@ -3919,11 +4036,13 @@ static int parse_var_defs(struct hist_tr
var_name = strsep(&field_str, "="); var_name = strsep(&field_str, "=");
if (!var_name || !field_str) { if (!var_name || !field_str) {
@ -417,7 +437,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = -EINVAL; ret = -EINVAL;
goto free; goto free;
} }
@@ -4669,6 +4785,11 @@ static int hist_show(struct seq_file *m, @@ -4677,6 +4796,11 @@ static int hist_show(struct seq_file *m,
hist_trigger_show(m, data, n++); hist_trigger_show(m, data, n++);
} }
@ -429,7 +449,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
out_unlock: out_unlock:
mutex_unlock(&event_mutex); mutex_unlock(&event_mutex);
@@ -5033,6 +5154,7 @@ static int hist_register_trigger(char *g @@ -5041,6 +5165,7 @@ static int hist_register_trigger(char *g
if (named_data) { if (named_data) {
if (!hist_trigger_match(data, named_data, named_data, if (!hist_trigger_match(data, named_data, named_data,
true)) { true)) {
@ -437,7 +457,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
@@ -5052,13 +5174,16 @@ static int hist_register_trigger(char *g @@ -5060,13 +5185,16 @@ static int hist_register_trigger(char *g
test->paused = false; test->paused = false;
else if (hist_data->attrs->clear) else if (hist_data->attrs->clear)
hist_clear(test); hist_clear(test);
@ -455,7 +475,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = -ENOENT; ret = -ENOENT;
goto out; goto out;
} }
@@ -5245,6 +5370,11 @@ static int event_hist_trigger_func(struc @@ -5253,6 +5381,11 @@ static int event_hist_trigger_func(struc
char *trigger, *p; char *trigger, *p;
int ret = 0; int ret = 0;
@ -467,7 +487,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (!param) if (!param)
return -EINVAL; return -EINVAL;
@@ -5383,6 +5513,9 @@ static int event_hist_trigger_func(struc @@ -5391,6 +5524,9 @@ static int event_hist_trigger_func(struc
/* Just return zero, not the number of registered triggers */ /* Just return zero, not the number of registered triggers */
ret = 0; ret = 0;
out: out:

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:54 -0600 Date: Mon, 15 Jan 2018 20:52:06 -0600
Subject: [PATCH 32/37] tracing: Add inter-event hist trigger Documentation Subject: [PATCH 32/37] tracing: Add inter-event hist trigger Documentation
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Add background and details on inter-event hist triggers, including Add background and details on inter-event hist triggers, including
hist variables, synthetic events, and actions. hist variables, synthetic events, and actions.

View File

@ -1,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:13 +0100 Date: Thu, 23 Nov 2017 16:39:13 +0100
Subject: [PATCH 32/36] xfrm: Replace hrtimer tasklet with softirq hrtimer Subject: [PATCH 32/36] xfrm: Replace hrtimer tasklet with softirq hrtimer
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Switch the timer to HRTIMER_MODE_SOFT, which executed the timer Switch the timer to HRTIMER_MODE_SOFT, which executed the timer
callback in softirq context and remove the hrtimer_tasklet. callback in softirq context and remove the hrtimer_tasklet.

View File

@ -1,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:14 +0100 Date: Thu, 23 Nov 2017 16:39:14 +0100
Subject: [PATCH 33/36] softirq: Remove tasklet_hrtimer Subject: [PATCH 33/36] softirq: Remove tasklet_hrtimer
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
There are no more tasklet_hrtimer users of this interface. There are no more tasklet_hrtimer users of this interface.
Remove it. Remove it.

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:55 -0600 Date: Mon, 15 Jan 2018 20:52:07 -0600
Subject: [PATCH 33/37] tracing: Make tracing_set_clock() non-static Subject: [PATCH 33/37] tracing: Make tracing_set_clock() non-static
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Allow tracing code outside of trace.c to access tracing_set_clock(). Allow tracing code outside of trace.c to access tracing_set_clock().

View File

@ -1,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:15 +0100 Date: Thu, 23 Nov 2017 16:39:15 +0100
Subject: [PATCH 34/36] ALSA/dummy: Replace tasklet with softirq hrtimer Subject: [PATCH 34/36] ALSA/dummy: Replace tasklet with softirq hrtimer
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The tasklet is used to defer the execution of snd_pcm_period_elapsed() to The tasklet is used to defer the execution of snd_pcm_period_elapsed() to
the softirq context. Using the HRTIMER_MODE_SOFT mode invokes the timer the softirq context. Using the HRTIMER_MODE_SOFT mode invokes the timer

View File

@ -1,7 +1,7 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:56 -0600 Date: Mon, 15 Jan 2018 20:52:08 -0600
Subject: [PATCH 34/37] tracing: Add a clock attribute for hist triggers Subject: [PATCH 34/37] tracing: Add a clock attribute for hist triggers
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The default clock if timestamps are used in a histogram is "global". The default clock if timestamps are used in a histogram is "global".
If timestamps aren't used, the clock is irrelevant. If timestamps aren't used, the clock is irrelevant.
@ -47,7 +47,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
bool pause; bool pause;
bool cont; bool cont;
bool clear; bool clear;
@@ -1780,6 +1781,7 @@ static void destroy_hist_trigger_attrs(s @@ -1776,6 +1777,7 @@ static void destroy_hist_trigger_attrs(s
kfree(attrs->sort_key_str); kfree(attrs->sort_key_str);
kfree(attrs->keys_str); kfree(attrs->keys_str);
kfree(attrs->vals_str); kfree(attrs->vals_str);
@ -55,7 +55,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
kfree(attrs); kfree(attrs);
} }
@@ -1835,6 +1837,19 @@ static int parse_assignment(char *str, s @@ -1831,6 +1833,19 @@ static int parse_assignment(char *str, s
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
@ -75,7 +75,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
} else if (strncmp(str, "size=", strlen("size=")) == 0) { } else if (strncmp(str, "size=", strlen("size=")) == 0) {
int map_bits = parse_map_size(str); int map_bits = parse_map_size(str);
@@ -1899,6 +1914,14 @@ static struct hist_trigger_attrs *parse_ @@ -1895,6 +1910,14 @@ static struct hist_trigger_attrs *parse_
goto free; goto free;
} }
@ -90,7 +90,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return attrs; return attrs;
free: free:
destroy_hist_trigger_attrs(attrs); destroy_hist_trigger_attrs(attrs);
@@ -4925,6 +4948,8 @@ static int event_hist_trigger_print(stru @@ -4936,6 +4959,8 @@ static int event_hist_trigger_print(stru
seq_puts(m, ".descending"); seq_puts(m, ".descending");
} }
seq_printf(m, ":size=%u", (1 << hist_data->map->map_bits)); seq_printf(m, ":size=%u", (1 << hist_data->map->map_bits));
@ -99,7 +99,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
print_actions_spec(m, hist_data); print_actions_spec(m, hist_data);
@@ -5192,7 +5217,6 @@ static int hist_register_trigger(char *g @@ -5203,7 +5228,6 @@ static int hist_register_trigger(char *g
data->paused = true; data->paused = true;
if (named_data) { if (named_data) {
@ -107,7 +107,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
data->private_data = named_data->private_data; data->private_data = named_data->private_data;
set_named_trigger_data(data, named_data); set_named_trigger_data(data, named_data);
data->ops = &event_hist_trigger_named_ops; data->ops = &event_hist_trigger_named_ops;
@@ -5204,10 +5228,22 @@ static int hist_register_trigger(char *g @@ -5215,10 +5239,22 @@ static int hist_register_trigger(char *g
goto out; goto out;
} }

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:57 -0600 Date: Mon, 15 Jan 2018 20:52:09 -0600
Subject: [PATCH 35/37] tracing: Increase trace_recursive_lock() limit for Subject: [PATCH 35/37] tracing: Increase trace_recursive_lock() limit for
synthetic events synthetic events
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Synthetic event generation needs to happen while the current event is Synthetic event generation needs to happen while the current event is
still in progress, so add 1 to the trace_recursive_lock() recursion still in progress, so add 1 to the trace_recursive_lock() recursion

View File

@ -1,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:16 +0100 Date: Thu, 23 Nov 2017 16:39:16 +0100
Subject: [PATCH 35/36] usb/gadget/NCM: Replace tasklet with softirq hrtimer Subject: [PATCH 35/36] usb/gadget/NCM: Replace tasklet with softirq hrtimer
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The tx_tasklet tasklet is used in invoke the hrtimer (task_timer) in The tx_tasklet tasklet is used in invoke the hrtimer (task_timer) in
softirq context. This can be also achieved without the tasklet but softirq context. This can be also achieved without the tasklet but

View File

@ -1,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 23 Nov 2017 16:39:17 +0100 Date: Thu, 23 Nov 2017 16:39:17 +0100
Subject: [PATCH 36/36] net/mvpp2: Replace tasklet with softirq hrtimer Subject: [PATCH 36/36] net/mvpp2: Replace tasklet with softirq hrtimer
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The tx_done_tasklet tasklet is used in invoke the hrtimer The tx_done_tasklet tasklet is used in invoke the hrtimer
(mvpp2_hr_timer_cb) in softirq context. This can be also achieved without (mvpp2_hr_timer_cb) in softirq context. This can be also achieved without

View File

@ -1,8 +1,8 @@
From: Tom Zanussi <tom.zanussi@linux.intel.com> From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 21 Dec 2017 10:02:58 -0600 Date: Mon, 15 Jan 2018 20:52:10 -0600
Subject: [PATCH 36/37] tracing: Add inter-event blurb to HIST_TRIGGERS config Subject: [PATCH 36/37] tracing: Add inter-event blurb to HIST_TRIGGERS config
option option
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
So that users know that inter-event tracing is supported as part of So that users know that inter-event tracing is supported as part of
the HIST_TRIGGERS option, include text to that effect in the help the HIST_TRIGGERS option, include text to that effect in the help

View File

@ -1,8 +1,8 @@
From: Rajvi Jingar <rajvi.jingar@intel.com> From: Rajvi Jingar <rajvi.jingar@intel.com>
Date: Thu, 21 Dec 2017 10:02:59 -0600 Date: Mon, 15 Jan 2018 20:52:11 -0600
Subject: [PATCH 37/37] selftests: ftrace: Add inter-event hist triggers Subject: [PATCH 37/37] selftests: ftrace: Add inter-event hist triggers
testcases testcases
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
This adds inter-event hist triggers testcases which covers following: This adds inter-event hist triggers testcases which covers following:
- create/remove synthetic event - create/remove synthetic event

View File

@ -1,7 +1,7 @@
From: "Yadi.hu" <yadi.hu@windriver.com> From: "Yadi.hu" <yadi.hu@windriver.com>
Date: Wed, 10 Dec 2014 10:32:09 +0800 Date: Wed, 10 Dec 2014 10:32:09 +0800
Subject: ARM: enable irq in translation/section permission fault handlers Subject: ARM: enable irq in translation/section permission fault handlers
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Probably happens on all ARM, with Probably happens on all ARM, with
CONFIG_PREEMPT_RT_FULL CONFIG_PREEMPT_RT_FULL

View File

@ -2,7 +2,7 @@ From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 21 Sep 2017 15:35:57 +0200 Date: Thu, 21 Sep 2017 15:35:57 +0200
Subject: Bluetooth: avoid recursive locking in Subject: Bluetooth: avoid recursive locking in
hci_send_to_channel() hci_send_to_channel()
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Mart reported a deadlock in -RT in the call path: Mart reported a deadlock in -RT in the call path:
hci_send_monitor_ctrl_event() -> hci_send_to_channel() hci_send_monitor_ctrl_event() -> hci_send_to_channel()

View File

@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 21 Mar 2013 19:01:05 +0100 Date: Thu, 21 Mar 2013 19:01:05 +0100
Subject: printk: Drop the logbuf_lock more often Subject: printk: Drop the logbuf_lock more often
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The lock is hold with irgs off. The latency drops 500us+ on my arm bugs The lock is hold with irgs off. The latency drops 500us+ on my arm bugs
with a "full" buffer after executing "dmesg" on the shell. with a "full" buffer after executing "dmesg" on the shell.

View File

@ -1,7 +1,7 @@
From: Josh Cartwright <joshc@ni.com> From: Josh Cartwright <joshc@ni.com>
Date: Thu, 11 Feb 2016 11:54:01 -0600 Date: Thu, 11 Feb 2016 11:54:01 -0600
Subject: KVM: arm/arm64: downgrade preempt_disable()d region to migrate_disable() Subject: KVM: arm/arm64: downgrade preempt_disable()d region to migrate_disable()
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
kvm_arch_vcpu_ioctl_run() disables the use of preemption when updating kvm_arch_vcpu_ioctl_run() disables the use of preemption when updating
the vgic and timer states to prevent the calling task from migrating to the vgic and timer states to prevent the calling task from migrating to

View File

@ -5,7 +5,7 @@ Cc: Anna Schumaker <anna.schumaker@netapp.com>,
linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
tglx@linutronix.de tglx@linutronix.de
Subject: NFSv4: replace seqcount_t with a seqlock_t Subject: NFSv4: replace seqcount_t with a seqlock_t
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The raw_write_seqcount_begin() in nfs4_reclaim_open_state() bugs me The raw_write_seqcount_begin() in nfs4_reclaim_open_state() bugs me
because it maps to preempt_disable() in -RT which I can't have at this because it maps to preempt_disable() in -RT which I can't have at this

View File

@ -2,7 +2,7 @@ From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 21 Sep 2017 14:25:13 +0200 Date: Thu, 21 Sep 2017 14:25:13 +0200
Subject: [PATCH] RCU: we need to skip that warning but only on sleeping Subject: [PATCH] RCU: we need to skip that warning but only on sleeping
locks locks
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
This check is okay for upstream. On RT we trigger this while blocking on This check is okay for upstream. On RT we trigger this while blocking on
sleeping lock. In this case, it is okay to schedule() within a RCU sleeping lock. In this case, it is okay to schedule() within a RCU

View File

@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 23 Nov 2017 17:51:51 +0100 Date: Thu, 23 Nov 2017 17:51:51 +0100
Subject: [PATCH] Revert "fs: jbd2: pull your plug when waiting for space" Subject: [PATCH] Revert "fs: jbd2: pull your plug when waiting for space"
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
This reverts commit "fs: jbd2: pull your plug when waiting for space". This reverts commit "fs: jbd2: pull your plug when waiting for space".
This was a duct-tape fix which shouldn't be needed since commit This was a duct-tape fix which shouldn't be needed since commit

View File

@ -2,7 +2,7 @@ From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Date: Wed, 22 Nov 2017 07:31:19 -0500 Date: Wed, 22 Nov 2017 07:31:19 -0500
Subject: [PATCH] Revert "memcontrol: Prevent scheduling while atomic in cgroup Subject: [PATCH] Revert "memcontrol: Prevent scheduling while atomic in cgroup
code" code"
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The commit "memcontrol: Prevent scheduling while atomic in cgroup code" The commit "memcontrol: Prevent scheduling while atomic in cgroup code"
fixed this issue: fixed this issue:

View File

@ -1,7 +1,7 @@
From: Steven Rostedt <rostedt@goodmis.org> From: Steven Rostedt <rostedt@goodmis.org>
Date: Wed, 13 Feb 2013 09:26:05 -0500 Date: Wed, 13 Feb 2013 09:26:05 -0500
Subject: acpi/rt: Convert acpi_gbl_hardware lock back to a raw_spinlock_t Subject: acpi/rt: Convert acpi_gbl_hardware lock back to a raw_spinlock_t
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
We hit the following bug with 3.6-rt: We hit the following bug with 3.6-rt:

View File

@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Sat, 27 May 2017 19:02:06 +0200 Date: Sat, 27 May 2017 19:02:06 +0200
Subject: kernel/sched/core: add migrate_disable() Subject: kernel/sched/core: add migrate_disable()
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
--- ---
include/linux/preempt.h | 23 ++++++++ include/linux/preempt.h | 23 ++++++++

View File

@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Wed, 11 Oct 2017 17:43:49 +0200 Date: Wed, 11 Oct 2017 17:43:49 +0200
Subject: apparmor: use a locallock instead preempt_disable() Subject: apparmor: use a locallock instead preempt_disable()
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
get_buffers() disables preemption which acts as a lock for the per-CPU get_buffers() disables preemption which acts as a lock for the per-CPU
variable. Since we can't disable preemption here on RT, a local_lock is variable. Since we can't disable preemption here on RT, a local_lock is

View File

@ -1,7 +1,7 @@
From: Anders Roxell <anders.roxell@linaro.org> From: Anders Roxell <anders.roxell@linaro.org>
Date: Thu, 14 May 2015 17:52:17 +0200 Date: Thu, 14 May 2015 17:52:17 +0200
Subject: arch/arm64: Add lazy preempt support Subject: arch/arm64: Add lazy preempt support
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
arm64 is missing support for PREEMPT_RT. The main feature which is arm64 is missing support for PREEMPT_RT. The main feature which is
lacking is support for lazy preemption. The arch-specific entry code, lacking is support for lazy preemption. The arch-specific entry code,

View File

@ -1,7 +1,7 @@
From: Benedikt Spranger <b.spranger@linutronix.de> From: Benedikt Spranger <b.spranger@linutronix.de>
Date: Sat, 6 Mar 2010 17:47:10 +0100 Date: Sat, 6 Mar 2010 17:47:10 +0100
Subject: ARM: AT91: PIT: Remove irq handler when clock event is unused Subject: ARM: AT91: PIT: Remove irq handler when clock event is unused
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
Setup and remove the interrupt handler in clock event mode selection. Setup and remove the interrupt handler in clock event mode selection.
This avoids calling the (shared) interrupt handler when the device is This avoids calling the (shared) interrupt handler when the device is

View File

@ -1,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 1 May 2010 18:29:35 +0200 Date: Sat, 1 May 2010 18:29:35 +0200
Subject: ARM: at91: tclib: Default to tclib timer for RT Subject: ARM: at91: tclib: Default to tclib timer for RT
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
RT is not too happy about the shared timer interrupt in AT91 RT is not too happy about the shared timer interrupt in AT91
devices. Default to tclib timer for RT. devices. Default to tclib timer for RT.

View File

@ -1,7 +1,7 @@
From: Frank Rowand <frank.rowand@am.sony.com> From: Frank Rowand <frank.rowand@am.sony.com>
Date: Mon, 19 Sep 2011 14:51:14 -0700 Date: Mon, 19 Sep 2011 14:51:14 -0700
Subject: arm: Convert arm boot_lock to raw Subject: arm: Convert arm boot_lock to raw
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The arm boot_lock is used by the secondary processor startup code. The locking The arm boot_lock is used by the secondary processor startup code. The locking
task is the idle thread, which has idle->sched_class == &idle_sched_class. task is the idle thread, which has idle->sched_class == &idle_sched_class.

View File

@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 1 Dec 2017 10:42:03 +0100 Date: Fri, 1 Dec 2017 10:42:03 +0100
Subject: [PATCH] arm*: disable NEON in kernel mode Subject: [PATCH] arm*: disable NEON in kernel mode
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
NEON in kernel mode is used by the crypto algorithms and raid6 code. NEON in kernel mode is used by the crypto algorithms and raid6 code.
While the raid6 code looks okay, the crypto algorithms do not: NEON While the raid6 code looks okay, the crypto algorithms do not: NEON

View File

@ -1,7 +1,7 @@
Subject: arm: Enable highmem for rt Subject: arm: Enable highmem for rt
From: Thomas Gleixner <tglx@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 13 Feb 2013 11:03:11 +0100 Date: Wed, 13 Feb 2013 11:03:11 +0100
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
fixup highmem for ARM. fixup highmem for ARM.

View File

@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Mon, 11 Mar 2013 21:37:27 +0100 Date: Mon, 11 Mar 2013 21:37:27 +0100
Subject: arm/highmem: Flush tlb on unmap Subject: arm/highmem: Flush tlb on unmap
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt11.tar.xz Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
The tlb should be flushed on unmap and thus make the mapping entry The tlb should be flushed on unmap and thus make the mapping entry
invalid. This is only done in the non-debug case which does not look invalid. This is only done in the non-debug case which does not look

Some files were not shown because too many files have changed in this diff Show More