From 73f18e698e41cb1a232ca94eb8feea021684153f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 13 Feb 2012 11:58:38 -0800 Subject: [PATCH] 3.0-stable patches added patches: drm-i915-no-lvds-quirk-for-aopen-mp45.patch perf-evsel-fix-an-issue-where-perf-report-fails-to-show-the-proper-percentage.patch perf-tools-fix-perf-stack-to-non-executable-on-x86_64.patch --- ...rm-i915-no-lvds-quirk-for-aopen-mp45.patch | 38 ++++++++++++ ...-fails-to-show-the-proper-percentage.patch | 61 +++++++++++++++++++ ...rf-stack-to-non-executable-on-x86_64.patch | 53 ++++++++++++++++ queue-3.0/series | 3 + 4 files changed, 155 insertions(+) create mode 100644 queue-3.0/drm-i915-no-lvds-quirk-for-aopen-mp45.patch create mode 100644 queue-3.0/perf-evsel-fix-an-issue-where-perf-report-fails-to-show-the-proper-percentage.patch create mode 100644 queue-3.0/perf-tools-fix-perf-stack-to-non-executable-on-x86_64.patch create mode 100644 queue-3.0/series diff --git a/queue-3.0/drm-i915-no-lvds-quirk-for-aopen-mp45.patch b/queue-3.0/drm-i915-no-lvds-quirk-for-aopen-mp45.patch new file mode 100644 index 00000000000..cdfbff21020 --- /dev/null +++ b/queue-3.0/drm-i915-no-lvds-quirk-for-aopen-mp45.patch @@ -0,0 +1,38 @@ +From e57b6886f555ab57f40a01713304e2053efe51ec Mon Sep 17 00:00:00 2001 +From: Daniel Vetter +Date: Wed, 8 Feb 2012 16:42:52 +0100 +Subject: drm/i915: no lvds quirk for AOpen MP45 + +From: Daniel Vetter + +commit e57b6886f555ab57f40a01713304e2053efe51ec upstream. + +According to a bug report, it doesn't have one. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44263 +Acked-by: Chris Wilson +Signed-Off-by: Daniel Vetter +Signed-off-by: Keith Packard +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/i915/intel_lvds.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/drivers/gpu/drm/i915/intel_lvds.c ++++ b/drivers/gpu/drm/i915/intel_lvds.c +@@ -714,6 +714,14 @@ static const struct dmi_system_id intel_ + }, + { + .callback = intel_no_lvds_dmi_callback, ++ .ident = "AOpen i45GMx-I", ++ .matches = { ++ DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"), ++ DMI_MATCH(DMI_BOARD_NAME, "i45GMx-I"), ++ }, ++ }, ++ { ++ .callback = intel_no_lvds_dmi_callback, + .ident = "Aopen i945GTt-VFA", + .matches = { + DMI_MATCH(DMI_PRODUCT_VERSION, "AO00001JW"), diff --git a/queue-3.0/perf-evsel-fix-an-issue-where-perf-report-fails-to-show-the-proper-percentage.patch b/queue-3.0/perf-evsel-fix-an-issue-where-perf-report-fails-to-show-the-proper-percentage.patch new file mode 100644 index 00000000000..d7afce02b05 --- /dev/null +++ b/queue-3.0/perf-evsel-fix-an-issue-where-perf-report-fails-to-show-the-proper-percentage.patch @@ -0,0 +1,61 @@ +From a4a03fc7ef89020baca4f19174e6a43767c6d78a Mon Sep 17 00:00:00 2001 +From: "Naveen N. Rao" +Date: Fri, 3 Feb 2012 22:31:13 +0530 +Subject: perf evsel: Fix an issue where perf report fails to show the proper percentage + +From: "Naveen N. Rao" + +commit a4a03fc7ef89020baca4f19174e6a43767c6d78a upstream. + +This patch fixes an issue where perf report shows nan% for certain +perf.data files. The below is from a report for a do_fork probe: + + -nan% sshd [kernel.kallsyms] [k] do_fork + -nan% packagekitd [kernel.kallsyms] [k] do_fork + -nan% dbus-daemon [kernel.kallsyms] [k] do_fork + -nan% bash [kernel.kallsyms] [k] do_fork + +A git bisect shows commit f3bda2c as the cause. However, looking back +through the git history, I saw commit 640c03c which seems to have +removed the required initialization for perf_sample->period. The problem +only started showing after commit f3bda2c. The below patch re-introduces +the initialization and it fixes the problem for me. + +With the below patch, for the same perf.data: + + 73.08% bash [kernel.kallsyms] [k] do_fork + 8.97% 11-dhclient [kernel.kallsyms] [k] do_fork + 6.41% sshd [kernel.kallsyms] [k] do_fork + 3.85% 20-chrony [kernel.kallsyms] [k] do_fork + 2.56% sendmail [kernel.kallsyms] [k] do_fork + +This patch applies over current linux-tip commit 9949284. + +Problem introduced in: + +$ git describe 640c03c +v2.6.37-rc3-83-g640c03c + +Cc: Ananth N Mavinakayanahalli +Cc: Ingo Molnar +Cc: Robert Richter +Cc: Srikar Dronamraju +Link: http://lkml.kernel.org/r/20120203170113.5190.25558.stgit@localhost6.localdomain6 +Signed-off-by: Naveen N. Rao +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Greg Kroah-Hartman + +--- + tools/perf/util/evsel.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/tools/perf/util/evsel.c ++++ b/tools/perf/util/evsel.c +@@ -348,6 +348,7 @@ int perf_event__parse_sample(const union + + data->cpu = data->pid = data->tid = -1; + data->stream_id = data->id = data->time = -1ULL; ++ data->period = 1; + + if (event->header.type != PERF_RECORD_SAMPLE) { + if (!sample_id_all) diff --git a/queue-3.0/perf-tools-fix-perf-stack-to-non-executable-on-x86_64.patch b/queue-3.0/perf-tools-fix-perf-stack-to-non-executable-on-x86_64.patch new file mode 100644 index 00000000000..6c7db34bc29 --- /dev/null +++ b/queue-3.0/perf-tools-fix-perf-stack-to-non-executable-on-x86_64.patch @@ -0,0 +1,53 @@ +From 7a0153ee15575a4d07b5da8c96b79e0b0fd41a12 Mon Sep 17 00:00:00 2001 +From: Jiri Olsa +Date: Mon, 6 Feb 2012 18:54:06 -0200 +Subject: perf tools: Fix perf stack to non executable on x86_64 + +From: Jiri Olsa + +commit 7a0153ee15575a4d07b5da8c96b79e0b0fd41a12 upstream. + +By adding following objects: + bench/mem-memcpy-x86-64-asm.o +the x86_64 perf binary ended up with executable stack. + +The reason was that above object are assembler sourced and is missing the +GNU-stack note section. In such case the linker assumes that the final binary +should not be restricted at all and mark the stack as RWX. + +Adding section ".note.GNU-stack" definition to mentioned object, with all +flags disabled, thus omiting this object from linker stack flags decision. + +Problem introduced in: + + $ git describe ea7872b + v2.6.37-rc2-19-gea7872b + +Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=783570 +Reported-by: Clark Williams +Acked-by: Eric Dumazet +Cc: Corey Ashford +Cc: Ingo Molnar +Cc: Paul Mackerras +Cc: Peter Zijlstra +Link: http://lkml.kernel.org/r/1328100848-5630-1-git-send-email-jolsa@redhat.com +Signed-off-by: Jiri Olsa +[ committer note: Backported fix to perf/urgent (3.3-rc2+) ] +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Greg Kroah-Hartman + +--- + tools/perf/bench/mem-memcpy-x86-64-asm.S | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/tools/perf/bench/mem-memcpy-x86-64-asm.S ++++ b/tools/perf/bench/mem-memcpy-x86-64-asm.S +@@ -1,2 +1,8 @@ + + #include "../../../arch/x86/lib/memcpy_64.S" ++/* ++ * We need to provide note.GNU-stack section, saying that we want ++ * NOT executable stack. Otherwise the final linking will assume that ++ * the ELF stack should not be restricted at all and set it RWX. ++ */ ++.section .note.GNU-stack,"",@progbits diff --git a/queue-3.0/series b/queue-3.0/series new file mode 100644 index 00000000000..4698ed88b56 --- /dev/null +++ b/queue-3.0/series @@ -0,0 +1,3 @@ +perf-evsel-fix-an-issue-where-perf-report-fails-to-show-the-proper-percentage.patch +perf-tools-fix-perf-stack-to-non-executable-on-x86_64.patch +drm-i915-no-lvds-quirk-for-aopen-mp45.patch -- 2.47.3