Skip to content

Commit 66e5db4

Browse files
author
Ingo Molnar
committed
Merge tag 'perf-core-for-mingo-4.19-20180820' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: LLVM/clang/eBPF: (Arnaldo Carvalho de Melo) - Allow passing options to llc in addition to to clang. Hardware tracing: (Jack Henschel) - Improve error message for PMU address filters, clarifying availability of that feature in hardware having hardware tracing such as Intel PT. Python interface: (Jiri Olsa) - Fix read_on_cpu() interface. ELF/DWARF libraries: (Jiri Olsa) - Fix handling of the combo compressed module file + decompressed associated debuginfo file. Build (Rasmus Villemoes) - Disable parallelism for 'make clean', avoiding multiple submakes deleting the same files and causing the build to fail on systems such as Yocto. Kernel ABI copies: (Arnaldo Carvalho de Melo) - Update tools's copy of x86's cpufeatures.h. - Update arch/x86/lib/memcpy_64.S copy used in 'perf bench mem memcpy'. Miscellaneous: (Steven Rostedt) - Change libtraceevent to SPDX License format. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 5804b11 + 7830365 commit 66e5db4

26 files changed

+256
-266
lines changed

‎tools/arch/x86/include/asm/cpufeatures.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@
219219
#define X86_FEATURE_IBPB ( 7*32+26) /* Indirect Branch Prediction Barrier */
220220
#define X86_FEATURE_STIBP ( 7*32+27) /* Single Thread Indirect Branch Predictors */
221221
#define X86_FEATURE_ZEN ( 7*32+28) /* "" CPU is AMD family 0x17 (Zen) */
222+
#define X86_FEATURE_IBRS_ENHANCED ( 7*32+29) /* Enhanced IBRS */
222223

223224
/* Virtualization flags: Linux defined, word 8 */
224225
#define X86_FEATURE_TPR_SHADOW ( 8*32+ 0) /* Intel TPR Shadow */
@@ -229,7 +230,7 @@
229230

230231
#define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer VMMCALL to VMCALL */
231232
#define X86_FEATURE_XENPV ( 8*32+16) /* "" Xen paravirtual guest */
232-
233+
#define X86_FEATURE_EPT_AD ( 8*32+17) /* Intel Extended Page Table access-dirty bit */
233234

234235
/* Intel-defined CPU features, CPUID level 0x00000007:0 (EBX), word 9 */
235236
#define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* RDFSBASE, WRFSBASE, RDGSBASE, WRGSBASE instructions*/

‎tools/arch/x86/lib/memcpy_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ ENTRY(__memcpy_mcsafe)
256256

257257
/* Copy successful. Return zero */
258258
.L_done_memcpy_trap:
259-
xorq %rax, %rax
259+
xorl %eax, %eax
260260
ret
261261
ENDPROC(__memcpy_mcsafe)
262262
EXPORT_SYMBOL_GPL(__memcpy_mcsafe)

‎tools/lib/traceevent/event-parse.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
1+
// SPDX-License-Identifier: LGPL-2.1
12
/*
23
* Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
34
*
4-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5-
* This program is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License as published by the Free Software Foundation;
8-
* version 2.1 of the License (not later!)
9-
*
10-
* This program is distributed in the hope that it will be useful,
11-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
* GNU Lesser General Public License for more details.
14-
*
15-
* You should have received a copy of the GNU Lesser General Public
16-
* License along with this program; if not, see <http://www.gnu.org/licenses>
17-
*
18-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
195
*
206
* The parts for function graph printing was taken and modified from the
217
* Linux Kernel that were written by

‎tools/lib/traceevent/event-plugin.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
1+
// SPDX-License-Identifier: LGPL-2.1
12
/*
23
* Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
34
*
4-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5-
* This program is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License as published by the Free Software Foundation;
8-
* version 2.1 of the License (not later!)
9-
*
10-
* This program is distributed in the hope that it will be useful,
11-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
* GNU Lesser General Public License for more details.
14-
*
15-
* You should have received a copy of the GNU Lesser General Public
16-
* License along with this program; if not, see <http://www.gnu.org/licenses>
17-
*
18-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
195
*/
206

217
#include <ctype.h>

‎tools/lib/traceevent/event-utils.h

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
1+
/* SPDX-License-Identifier: LGPL-2.1 */
12
/*
23
* Copyright (C) 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
34
*
4-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5-
* This program is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License as published by the Free Software Foundation;
8-
* version 2.1 of the License (not later!)
9-
*
10-
* This program is distributed in the hope that it will be useful,
11-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
* GNU Lesser General Public License for more details.
14-
*
15-
* You should have received a copy of the GNU Lesser General Public
16-
* License along with this program; if not, see <http://www.gnu.org/licenses>
17-
*
18-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
195
*/
206
#ifndef __UTIL_H
217
#define __UTIL_H

‎tools/lib/traceevent/kbuffer-parse.c

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
1+
// SPDX-License-Identifier: LGPL-2.1
12
/*
23
* Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
34
*
4-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5-
* This program is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License as published by the Free Software Foundation;
8-
* version 2.1 of the License (not later!)
9-
*
10-
* This program is distributed in the hope that it will be useful,
11-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
* GNU Lesser General Public License for more details.
14-
*
15-
* You should have received a copy of the GNU Lesser General Public
16-
* License along with this program; if not, write to the Free Software
17-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18-
*
19-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
205
*/
216
#include <stdio.h>
227
#include <stdlib.h>

‎tools/lib/traceevent/parse-filter.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
1+
// SPDX-License-Identifier: LGPL-2.1
12
/*
23
* Copyright (C) 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
34
*
4-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5-
* This program is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License as published by the Free Software Foundation;
8-
* version 2.1 of the License (not later!)
9-
*
10-
* This program is distributed in the hope that it will be useful,
11-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
* GNU Lesser General Public License for more details.
14-
*
15-
* You should have received a copy of the GNU Lesser General Public
16-
* License along with this program; if not, see <http://www.gnu.org/licenses>
17-
*
18-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
195
*/
206
#include <stdio.h>
217
#include <stdlib.h>

‎tools/lib/traceevent/parse-utils.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
1+
// SPDX-License-Identifier: LGPL-2.1
12
/*
23
* Copyright (C) 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
34
*
4-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5-
* This program is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License as published by the Free Software Foundation;
8-
* version 2.1 of the License (not later!)
9-
*
10-
* This program is distributed in the hope that it will be useful,
11-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
* GNU Lesser General Public License for more details.
14-
*
15-
* You should have received a copy of the GNU Lesser General Public
16-
* License along with this program; if not, see <http://www.gnu.org/licenses>
17-
*
18-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
195
*/
206
#include <stdio.h>
217
#include <stdlib.h>

‎tools/lib/traceevent/trace-seq.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
1+
// SPDX-License-Identifier: LGPL-2.1
12
/*
23
* Copyright (C) 2009 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
34
*
4-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5-
* This program is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License as published by the Free Software Foundation;
8-
* version 2.1 of the License (not later!)
9-
*
10-
* This program is distributed in the hope that it will be useful,
11-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
* GNU Lesser General Public License for more details.
14-
*
15-
* You should have received a copy of the GNU Lesser General Public
16-
* License along with this program; if not, see <http://www.gnu.org/licenses>
17-
*
18-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
195
*/
206
#include <stdio.h>
217
#include <stdlib.h>

‎tools/perf/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ endif # has_clean
8484
endif # MAKECMDGOALS
8585

8686
#
87-
# The clean target is not really parallel, don't print the jobs info:
87+
# Explicitly disable parallelism for the clean target.
8888
#
8989
clean:
90-
$(make)
90+
$(make) -j1
9191

9292
#
9393
# The build-test target is not really parallel, don't print the jobs info,

‎tools/perf/tests/code-reading.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode,
232232
u64 objdump_addr;
233233
const char *objdump_name;
234234
char decomp_name[KMOD_DECOMP_LEN];
235+
bool decomp = false;
235236
int ret;
236237

237238
pr_debug("Reading object code for memory address: %#"PRIx64"\n", addr);
@@ -305,14 +306,15 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode,
305306
return -1;
306307
}
307308

309+
decomp = true;
308310
objdump_name = decomp_name;
309311
}
310312

311313
/* Read the object code using objdump */
312314
objdump_addr = map__rip_2objdump(al.map, al.addr);
313315
ret = read_via_objdump(objdump_name, objdump_addr, buf2, len);
314316

315-
if (dso__needs_decompress(al.map->dso))
317+
if (decomp)
316318
unlink(objdump_name);
317319

318320
if (ret > 0) {

0 commit comments

Comments
 (0)