Commit 9288e1f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-for-v5.12-2020-04-09' of... 

Merge tag 'perf-tools-fixes-for-v5.12-2020-04-09' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull perf tool fixes from Arnaldo Carvalho de Melo:

 - Fix wrong LBR block sorting in 'perf report'

 - Fix 'perf inject' repipe usage when consuming perf.data files

 - Avoid potential buffer overrun when decoding ARM SPE hardware tracing
   packets, bug found using a fuzzer

* tag 'perf-tools-fixes-for-v5.12-2020-04-09' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  perf arm-spe: Avoid potential buffer overrun
  perf report: Fix wrong LBR block sorting
  perf inject: Fix repipe usage
parents adb2c417 92f1e8ad

tools/perf/builtin-inject.c

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ int cmd_inject(int argc, const char **argv) 
	}



	data.path = inject.input_name;

	inject.session = perf_session__new(&data, true, &inject.tool);

	inject.session = perf_session__new(&data, inject.output.is_pipe, &inject.tool);

	if (IS_ERR(inject.session))

		return PTR_ERR(inject.session);

tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c

+3 −1
Original line number Diff line number Diff line
@@ -210,8 +210,10 @@ static int arm_spe_do_get_packet(const unsigned char *buf, size_t len, 


	if ((hdr & SPE_HEADER0_MASK2) == SPE_HEADER0_EXTENDED) {

		/* 16-bit extended format header */

		ext_hdr = 1;

		if (len == 1)

			return ARM_SPE_BAD_PACKET;



		ext_hdr = 1;

		hdr = buf[1];

		if (hdr == SPE_HEADER1_ALIGNMENT)

			return arm_spe_get_alignment(buf, len, packet);

tools/perf/util/block-info.c

+3 −3
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int block_total_cycles_pct_entry(struct perf_hpp_fmt *fmt, 
	double ratio = 0.0;



	if (block_fmt->total_cycles)

		ratio = (double)bi->cycles / (double)block_fmt->total_cycles;

		ratio = (double)bi->cycles_aggr / (double)block_fmt->total_cycles;



	return color_pct(hpp, block_fmt->width, 100.0 * ratio);

}
@@ -216,9 +216,9 @@ static int64_t block_total_cycles_pct_sort(struct perf_hpp_fmt *fmt, 
	double l, r;



	if (block_fmt->total_cycles) {

		l = ((double)bi_l->cycles /

		l = ((double)bi_l->cycles_aggr /

			(double)block_fmt->total_cycles) * 100000.0;

		r = ((double)bi_r->cycles /

		r = ((double)bi_r->cycles_aggr /

			(double)block_fmt->total_cycles) * 100000.0;

		return (int64_t)l - (int64_t)r;

	}