- 30 11月, 2022 8 次提交
-
-
由 John Garry 提交于
mainline inclusion from mainline-v5.11-rc1 commit f6fe1e48 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I63VF5 CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f6fe1e48ae185d028dfcabecb7d79036e2d89d27 -------------------------------------------------------------------------- To aid supporting system event metric groups, break up the function metricgroup__print() into a part which iterates metrics and a part which actually "prints" the metric. No functional change intended. Signed-off-by: NJohn Garry <john.garry@huawei.com> Acked-by: NKajol Jain <kjain@linux.ibm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Joakim Zhang <qiangqing.zhang@nxp.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Kim Phillips <kim.phillips@amd.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Shaokun Zhang <zhangshaokun@hisilicon.com> Cc: Will Deacon <will@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linuxarm@huawei.com Link: http://lore.kernel.org/lkml/1607080216-36968-8-git-send-email-john.garry@huawei.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 John Garry 提交于
mainline inclusion from mainline-v5.11-rc1 commit c2337d67 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I63VF5 CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c2337d67199a1ea1c75083da5d376aced1ab2c40 -------------------------------------------------------------------------- Support for metric expressions using aliases which cover multiple PMUs is broken. Consider the following test metric expression: "MetricExpr": "UNC_CBO_XSNP_RESPONSE.MISS_XCORE * UNC_CBO_XSNP_RESPONSE.MISS_EVICTION" When used on my broadwell, "perf stat" gives: unc_cbo_xsnp_response.miss_eviction -> uncore_cbox_1/umask=0x81,event=0x22/ unc_cbo_xsnp_response.miss_eviction -> uncore_cbox_0/umask=0x81,event=0x22/ unc_cbo_xsnp_response.miss_xcore -> uncore_cbox_1/umask=0x41,event=0x22/ unc_cbo_xsnp_response.miss_xcore -> uncore_cbox_0/umask=0x41,event=0x22/ Control descriptor is not initialized unc_cbo_xsnp_response.miss_eviction: 3645925 1000850523 1000850523 unc_cbo_xsnp_response.miss_xcore: 106850 1000850523 1000850523 Performance counter stats for 'system wide': 3,645,925 unc_cbo_xsnp_response.miss_eviction # 389567086250.00 test_metric_inc 106,850 unc_cbo_xsnp_response.miss_xcore 1.000883096 seconds time elapsed Notice that only the results from one PMU are included. Fix the logic of find_evsel_group() to enable events which apply to multiple PMUs, by checking if the event pmu_name matches that of the metric event. With that, "perf stat" now gives: unc_cbo_xsnp_response.miss_eviction -> uncore_cbox_1/umask=0x81,event=0x22/ unc_cbo_xsnp_response.miss_eviction -> uncore_cbox_0/umask=0x81,event=0x22/ unc_cbo_xsnp_response.miss_xcore -> uncore_cbox_1/umask=0x41,event=0x22/ unc_cbo_xsnp_response.miss_xcore -> uncore_cbox_0/umask=0x41,event=0x22/ Control descriptor is not initialized unc_cbo_xsnp_response.miss_eviction: 4237983 1000904100 1000904100 unc_cbo_xsnp_response.miss_xcore: 218643 1000904100 1000904100 unc_cbo_xsnp_response.miss_eviction: 4254148 1000902629 1000902629 unc_cbo_xsnp_response.miss_xcore: 213352 1000902629 1000902629 Performance counter stats for 'system wide': 4,237,983 unc_cbo_xsnp_response.miss_eviction # 3668558131345.00 test_metric_inc 218,643 unc_cbo_xsnp_response.miss_xcore 4,254,148 unc_cbo_xsnp_response.miss_eviction 213,352 unc_cbo_xsnp_response.miss_xcore 1.000938151 seconds time elapsed Signed-off-by: NJohn Garry <john.garry@huawei.com> Acked-by: NKajol Jain <kjain@linux.ibm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Joakim Zhang <qiangqing.zhang@nxp.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Kim Phillips <kim.phillips@amd.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Shaokun Zhang <zhangshaokun@hisilicon.com> Cc: Will Deacon <will@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linuxarm@huawei.com Link: http://lore.kernel.org/lkml/1607080216-36968-7-git-send-email-john.garry@huawei.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 John Garry 提交于
mainline inclusion from mainline-v5.11-rc1 commit 6d2783fe category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I63VF5 CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6d2783fe365fa5f571cf1416b5f5b1e352447a0e -------------------------------------------------------------------------- Function find_evsel_group() expects events to be ordered such that they are grouped after their leader. Modify evlist__splice_list_tail() to guarantee this (ordering). [Should prob also change the function name] Signed-off-by: NJohn Garry <john.garry@huawei.com> Acked-by: NKajol Jain <kjain@linux.ibm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Joakim Zhang <qiangqing.zhang@nxp.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Kim Phillips <kim.phillips@amd.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Shaokun Zhang <zhangshaokun@hisilicon.com> Cc: Will Deacon <will@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linuxarm@huawei.com Link: http://lore.kernel.org/lkml/1607080216-36968-6-git-send-email-john.garry@huawei.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 John Garry 提交于
mainline inclusion from mainline-v5.11-rc1 commit 4513c719 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I63VF5 CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4513c719c6f1ccf0c362c8dcef1f9b476f8f5c9c -------------------------------------------------------------------------- Add pmu_add_sys_aliases() to add system PMU events aliases. For adding system PMU events, iterate through all the events for all SoC event tables in pmu_sys_event_tables[]. Matches must satisfy both: - PMU identifier matches event "compat" value - event "Unit" member must match, same as uncore event aliases matched by CPUID Signed-off-by: NJohn Garry <john.garry@huawei.com> Acked-by: NKajol Jain <kjain@linux.ibm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Joakim Zhang <qiangqing.zhang@nxp.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Kim Phillips <kim.phillips@amd.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Shaokun Zhang <zhangshaokun@hisilicon.com> Cc: Will Deacon <will@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linuxarm@huawei.com Link: http://lore.kernel.org/lkml/1607080216-36968-5-git-send-email-john.garry@huawei.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 John Garry 提交于
mainline inclusion from mainline-v5.11-rc1 commit 51d54847 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I63VF5 CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=51d548471510843e56d9f427aa6473ca0981c4a4 -------------------------------------------------------------------------- Add a function to read the PMU id sysfs entry. This is only done for uncore PMUs where this would possibly be relevant. Signed-off-by: NJohn Garry <john.garry@huawei.com> Acked-by: NKajol Jain <kjain@linux.ibm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Joakim Zhang <qiangqing.zhang@nxp.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Kim Phillips <kim.phillips@amd.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Shaokun Zhang <zhangshaokun@hisilicon.com> Cc: Will Deacon <will@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linuxarm@huawei.com Link: http://lore.kernel.org/lkml/1607080216-36968-4-git-send-email-john.garry@huawei.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 John Garry 提交于
mainline inclusion from mainline-v5.11-rc1 commit 4689f567 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I63VF5 CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4689f56796f87abee190d8a959dd318e006c5b5a -------------------------------------------------------------------------- Process the JSONs to find support for "system" events, which are not tied to a specific CPUID. A "COMPAT" property is now used to match against the namespace ID from the kernel PMU driver. The generated pmu-events.c will now have 2 tables: a. CPU events, as before. b. New pmu_sys_event_tables[] table, which will have events matched to specific SoCs. It will look like this: struct pmu_event pme_hisilicon_hip09_sys[] = { { .name = "cycles", .compat = "0x00030736", .event = "event=0", .desc = "Clock cycles", .topic = "smmu v3 pmcg", .long_desc = "Clock cycles", }, { .name = "smmuv3_pmcg.l1_tlb", .compat = "0x00030736", .event = "event=0x8a", .desc = "SMMUv3 PMCG l1_tlb. Unit: smmuv3_pmcg ", .topic = "smmu v3 pmcg", .long_desc = "SMMUv3 PMCG l1_tlb", .pmu = "smmuv3_pmcg", }, ... }; struct pmu_event pme_arm_cortex_a53[] = { { .name = "ext_mem_req", .event = "event=0xc0", .desc = "External memory request", .topic = "memory", }, { .name = "ext_mem_req_nc", .event = "event=0xc1", .desc = "Non-cacheable external memory request", .topic = "memory", }, ... }; struct pmu_event pme_hisilicon_hip09_cpu[] = { { .name = "l2d_cache_refill_wr", .event = "event=0x53", .desc = "L2D cache refill, write", .topic = "core imp def", .long_desc = "Attributable Level 2 data cache refill, write", }, ... }; struct pmu_events_map pmu_events_map[] = { { .cpuid = "0x00000000410fd030", .version = "v1", .type = "core", .table = pme_arm_cortex_a53 }, { .cpuid = "0x00000000480fd010", .version = "v1", .type = "core", .table = pme_hisilicon_hip09_cpu }, { .table = 0 }, }; struct pmu_event pme_hisilicon_hip09_cpu[] = { { .name = "uncore_hisi_l3c.rd_cpipe", .event = "event=0", .desc = "Total read accesses. Unit: hisi_sccl,l3c ", .topic = "uncore l3c", .long_desc = "Total read accesses", .pmu = "hisi_sccl,l3c", }, { .name = "uncore_hisi_l3c.wr_cpipe", .event = "event=0x1", .desc = "Total write accesses. Unit: hisi_sccl,l3c ", .topic = "uncore l3c", .long_desc = "Total write accesses", .pmu = "hisi_sccl,l3c", }, ... }; struct pmu_sys_events pmu_sys_event_tables[] = { { .table = pme_hisilicon_hip09_sys, }, ... }; Committer notes: Added the fix for architectures without PMU events, provided by John after I reported the build failing in such systems. Link: https://lore.kernel.org/lkml/650baaf2-36b6-a9e2-ff49-963ef864c1f3@huawei.com/Signed-off-by: NJohn Garry <john.garry@huawei.com> Acked-by: NKajol Jain <kjain@linux.ibm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Joakim Zhang <qiangqing.zhang@nxp.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Kim Phillips <kim.phillips@amd.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Shaokun Zhang <zhangshaokun@hisilicon.com> Cc: Will Deacon <will@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linuxarm@huawei.com Link: http://lore.kernel.org/lkml/1607080216-36968-3-git-send-email-john.garry@huawei.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 John Garry 提交于
mainline inclusion from mainline-v5.11-rc1 commit 4853f1ca category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I63VF5 CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4853f1caa43ea41a544c50a7cefc42e147aafeda -------------------------------------------------------------------------- Currently only upto a level 2 directory is supported, in form vendor/platform. Add support for a further level, to support vendor/platform sub-directories in future, which will be vendor/platform/cpu and vendor/platform/sys. Signed-off-by: NJohn Garry <john.garry@huawei.com> Acked-by: NKajol Jain <kjain@linux.ibm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Joakim Zhang <qiangqing.zhang@nxp.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Kim Phillips <kim.phillips@amd.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Shaokun Zhang <zhangshaokun@hisilicon.com> Cc: Will Deacon <will@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linuxarm@huawei.com Link: http://lore.kernel.org/lkml/1607080216-36968-2-git-send-email-john.garry@huawei.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 openeuler-ci-bot 提交于
Merge Pull Request from: @Hongchen_Zhang This series of patches adds support for LoongArch architecture. - Support information New firmware+New World system / Old firmware+New World system compile with new compiler . The Corresponding new world firmware can be download from: https://github.com/loongson/Firmware . The CLFS system can be used for verification,refer to the following link for detail: https://github.com/sunhaiyong1978/CLFS-for-LoongArch/releases/tag/6.0 https://github.com/sunhaiyong1978/CLFS-for-LoongArch/blob/main/CLFS_For_LoongArch64.md#8-%E5%88%9B%E5%BB%BA%E5%90%AF%E5%8A%A8u%E7%9B%98 - Patch from https://github.com/loongson/linux/tree/loongarch-next ,update to 2022-09-03 - Testing 3a5000+71000, 3C5000+7A1000 boot up,reboot test OK,ltp 24 hour test OK Link:https://gitee.com/openeuler/kernel/pulls/265 Reviewed-by: Zheng Zengkai <zhengzengkai@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
-
- 29 11月, 2022 8 次提交
-
-
由 openeuler-ci-bot 提交于
Merge Pull Request from: @anatas [Description] We try to implement a live-patch mechanism in the userspace based on the UPROBE. In the handler, we may change the PC register. In this case, UPROBE must skip the handle of the next instruction. [Testing] kernel options: UPROBES_SUPPORT_PC_ALTER=y Link:https://gitee.com/openeuler/kernel/pulls/250 Reviewed-by: Xu Kuohai <xukuohai@huawei.com> Reviewed-by: Liu Chao <liuchao173@huawei.com> Reviewed-by: Zheng Zengkai <zhengzengkai@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
-
由 openeuler-ci-bot 提交于
Merge Pull Request from: @liujie-248683921 This series contains support to get basic metricgroups working for arm64 CPUs. Initial support is added for HiSilicon hip08 platform. Some sample usage on Huawei D06 board: $ ./perf list metric List of pre-defined events (to be used in -e): Metrics: bp_misp_flush [BP misp flush L3 topdown metric] branch_mispredicts [Branch mispredicts L2 topdown metric] core_bound [Core bound L2 topdown metric] divider [Divider L3 topdown metric] exe_ports_util [EXE ports util L3 topdown metric] fetch_bandwidth_bound [Fetch bandwidth bound L2 topdown metric] fetch_latency_bound [Fetch latency bound L2 topdown metric] fsu_stall [FSU stall L3 topdown metric] idle_by_icache_miss $ sudo ./perf stat -v -M core_bound sleep 1 Using CPUID 0x00000000480fd010 metric expr (exe_stall_cycle - (mem_stall_anyload + armv8_pmuv3_0@event=0x7005@)) / cpu_cycles for core_bound found event cpu_cycles found event armv8_pmuv3_0/event=0x7005/ found event exe_stall_cycle found event mem_stall_anyload adding {cpu_cycles -> armv8_pmuv3_0/event=0x7001/ mem_stall_anyload -> armv8_pmuv3_0/event=0x7004/ Control descriptor is not initialized cpu_cycles: 989433 385050 385050 armv8_pmuv3_0/event=0x7005/: 19207 385050 385050 exe_stall_cycle: 900825 385050 385050 mem_stall_anyload: 253516 385050 385050 Performance counter stats for 'sleep': 989,433 cpu_cycles # 0.63 core_bound 19,207 armv8_pmuv3_0/event=0x7005/ 900,825 exe_stall_cycle 253,516 mem_stall_anyload 0.000805809 seconds time elapsed 0.000875000 seconds user 0.000000000 seconds sys perf stat --topdown is not supported, as this requires the CPU PMU to expose (alias) events for the TopDown L1 metrics from sysfs, which arm does not do. To get that to work, we probably need to make perf use the pmu-events cpumap to learn about those alias events. Metric reuse support is added for pmu-events parse metric testcase. This had been broken on power9 recently: https://lore.kernel.org/lkml/20210324015418.GC8931@li-24c3614c-2adc-11b2-a85c-85f334518bdb.ibm.com/ Differences to v2: Add TB and RB tags (Thanks!) Rename metricgroup__find_metric() from metricgroup_find_metric() Change resolve_metric_simple() to rescan after any insert Differences to v1: Add pmu_events_map__find() as arm64-specific function Fix metric reuse for pmu-events parse metric testcase John Garry (6): perf metricgroup: Make find_metric() public with name change perf test: Handle metric reuse in pmu-events parsing test perf pmu: Add pmu_events_map__find() perf vendor events arm64: Add Hisi hip08 L1 metrics perf vendor events arm64: Add Hisi hip08 L2 metrics perf vendor events arm64: Add Hisi hip08 L3 metrics tools/perf/arch/arm64/util/Build | 1 + tools/perf/arch/arm64/util/pmu.c | 25 ++ .../arch/arm64/hisilicon/hip08/metrics.json | 233 ++++++++++++++++++ tools/perf/tests/pmu-events.c | 83 ++++++- tools/perf/util/metricgroup.c | 12 +- tools/perf/util/metricgroup.h | 3 +- tools/perf/util/pmu.c | 5 + tools/perf/util/pmu.h | 1 + tools/perf/util/s390-sample-raw.c | 4 +- 9 files changed, 356 insertions(+), 11 deletions(-) create mode 100644 tools/perf/arch/arm64/util/pmu.c create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip08/metrics.json Reference:https://patchwork.kernel.org/project/linux-arm-kernel/cover/1617791570-165223-1-git-send-email-john.garry@huawei.com/ Bugfix:perf vendor events arm64: Fix incorrect metrics and improve readability First fix the incorrect hip08 metrics, then add some core events to the JSON file. Last, change the event code to the event name for improving readability. changes in v2: - adjust commit msg of 1st patch. - fix tab in 3rd patch. Shang XiaoJing (3): perf vendor events arm64: Fix incorrect Hisi hip08 L3 metrics perf vendor events arm64: Add HiSilicon hip08 core events perf vendor events arm64: Use event name instead of event code .../arm64/hisilicon/hip08/core-imp-def.json | 132 ++++++++++++++++++ .../arch/arm64/hisilicon/hip08/metrics.json | 48 +++---- 2 files changed, 156 insertions(+), 24 deletions(- Reference:https://lore.kernel.org/all/20221021105035.10000-1-shangxiaojing@huawei.com/ Link:https://gitee.com/openeuler/kernel/pulls/268 Reviewed-by: Cheng Jian <cj.chengjian@huawei.com> Reviewed-by: Zheng Zengkai <zhengzengkai@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
-
由 openeuler-ci-bot 提交于
Merge Pull Request from: @hejunhao3 ```shell Synchronize the code of mainline perf tool and support the parsing of TRBE trace data. [test log] estuary:/$ perf record -e /cs_etm/@trbe3/ -C 3 -o trace.data taskset -c 3 uname -a Linux (none) 5.10.0+ #7 SMP PREEMPT Thu Nov 24 11:26:48 CST 2022 aarch64 GNU/Linux [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.851 MB trace.data ] /estuary:/$ perf report --stdio -i trace.data -D > report.txt estuary:/$ grep -rn "ETE" report.txt 5835:. ... CoreSight ETE Trace data: size 0xd0d00 bytes estuary:/$ grep -rn "I_ASYNC : Alignment Synchronisation." report.txt | tail -n 5 497159: Idx:816712; ID:7; I_ASYNC : Alignment Synchronisation. 499987: Idx:820816; ID:7; I_ASYNC : Alignment Synchronisation. 502722: Idx:824928; ID:7; I_ASYNC : Alignment Synchronisation. 505083: Idx:829040; ID:7; I_ASYNC : Alignment Synchronisation. 507427: Idx:833132; ID:7; I_ASYNC : Alignment Synchronisation. estuary:/$ estuary:/$ perf record -e /cs_etm/@tmc_etr0/ -C 2 -o trace.data taskset -c 2 uname -a Linux (none) 5.10.0+ #7 SMP PREEMPT Thu Nov 24 11:26:48 CST 2022 aarch64 GNU/Linux [82501.067549] coresight tmc_etr0: timeout while waiting for completion of Manual Flush [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.690 MB trace.data ] /estuary:/$ perf report --stdio -i trace.data -D > report.txt estuary:/$ grep -rn "ETE" report.txt 8528:. ... CoreSight ETE Trace data: size 0xa40d0 bytes estuary:/$ grep -rn "I_ASYNC : Alignment Synchronisation." report.txt | tail -n 5 349615: Idx:633382; ID:5; I_ASYNC : Alignment Synchronisation. 350304: Idx:634786; ID:5; I_ASYNC : Alignment Synchronisation. 352589: Idx:639200; ID:5; I_ASYNC : Alignment Synchronisation. 354957: Idx:643604; ID:5; I_ASYNC : Alignment Synchronisation. 357246: Idx:648003; ID:5; I_ASYNC : Alignment Synchronisation. estuary:/$ estuary:/$ perf record -C 0 -e arm_spe_0/branch_filter=1/ -o branch.data sleep 3s [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.663 MB branch.data ] estuary:/$ perf report -D -i branch.data > branch.log estuary:/$ grep -rn "B COND" branch.log | tail -=n 5 133506:. 000996d4: 4a 01 B COND 133517:. 0009970c: 4a 01 B COND 133539:. 0009977c: 4a 01 B COND 133572:. 00099824: 4a 01 B COND 133671:. 00099a1c: 4a 01 B COND estuary:/$ perf -v perf version 5.10.gede0fc40b9bf ``` Link:https://gitee.com/openeuler/kernel/pulls/282 Reviewed-by: Zheng Zengkai <zhengzengkai@huawei.com> Reviewed-by: Ling Mingqiang <lingmingqiang@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
-
由 openeuler-ci-bot 提交于
Merge Pull Request from: @xiaosuli3109 Fibre Channel has been the standard connection type for storage area networks (SAN) in enterprise storage. Despite its name, Fibre Channel signaling can run on both twisted pair copper wire and fiber-optic cables. The FibreChannel Gen7 adapter supports 64G link speeds. Add debug print support to the driver. Fix Issue: https://gitee.com/openeuler/kernel/issues/I6337O Link:https://gitee.com/openeuler/kernel/pulls/283 Reviewed-by: Zheng Zengkai <zhengzengkai@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
-
由 Hongchen Zhang 提交于
LoongArch inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I5OHOB -------------------------------- Ensure the netswift 10G NIC driver ko can be distributed in ISO on LoongArch. Signed-off-by: NHongchen Zhang <zhanghongchen@loongson.cn>
-
由 Baoqi Zhang 提交于
LoongArch inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I5OHOB -------------------------------- Signed-off-by: NBaoqi Zhang <zhangbaoqi@loongson.cn> Change-Id: I7d70a63b5a813551b81f60f07dfedbbcd01d4336
-
由 Qing Zhang 提交于
LoongArch inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I5OHOB -------------------------------- This GMAC module is integrated into the Loongson-2K SoC and the LS7A bridge chip. commit 30bba69d upstream. Backport: stmmac: dwmac-loongson: fix uninitialized variable in loongson_dwmac_probe() stmmac: dwmac-loongson: Fix unsigned comparison to zero stmmac: dwmac-loongson:Fix missing return value stmmac: dwmac-loongson: change loongson_dwmac_driver from global to static stmmac: pci: Add LS7A support for dwmac-loongson This patch also disable dwmac FLOW_AUTO. Since DWMAC_LOONGSON do NOT support FLOW_AUTO. Signed-off-by: NQing Zhang <zhangqing@loongson.cn> Signed-off-by: NJiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: NDavid S. Miller <davem@davemloft.net> Signed-off-by: NMing Wang <wangming01@loongson.cn> Change-Id: Ifefac7d47a05373ca7160d22a44d6c07b6a896e5
-
由 Longjun Luo 提交于
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I61AXT CVE: N/A Within uprobe handlers, the pc register could be modified. In this situation, there is no need to do a single stepping. Just like the kprobe, we skip it. Signed-off-by: NLongjun Luo <luolongjun@huawei.com>
-
- 28 11月, 2022 3 次提交
-
-
由 openeuler-ci-bot 提交于
Merge Pull Request from: @svishen Background: Currently, the HNS3 driver, Linux kernel, and standard tools do not support the configuration of VXLAN tunnel tuple information as the key of the flow table. The ethtool –U command supports only the configuration of tuples for non-tunnel packets. Two types of tuples, vxlan4 and vxlan6, need to be added. Functions: The vxlan4 and vxlan6 flow types are added to the ethtool –U command. The vni in the outer header and the source MAC address, destination MAC address, source IP address, destination IP address, and VLAN ID in the inner header can be configured as tuple information. The HNS3 driver supports all tuple configurations of both types. patch name: (1) net: ethtool: add VxLAN to the NFC API (2) net: hns3: support set/get VxLAN rule of rx flow director by ethtool In include/uapi/linux/ethtool.h We changed a union, but didn't change its size.Neither of the two newly added members exceeds 52 bytes. The impact on user-mode tools is as follows: (1)The new tool is compiled on the old kernel and can configure the old flow table. The old kernel does not support VXLAN configuration. ``` [root@locaLhost ~]# [root@localhost alt rpm -ga | grep ethtool ethtool-5.15-4.aarch64 [root@localhost ~]# [root@localhost ~]# uname -a Linux localhost.localdomain 5.10.0-60.18.0.50.0e2203.aarch64 #1 SMP Wed Mar 30 02:43:08 UTC 2022 aarch64 aarch64 aarch64 GNU/Linux [root@localhost ~]# [root@localhost ~]# ethtool -U enol flow-type tep6 tclass Oxi8 src-ip fese::218:2dff:feee:12 loc 4 action -1 [root@localhost ~]# ethtool -u ethtool: bad command line argument(s) For more information run ethtool -h [root@localhost ~]# ethtool -u eno1 32 RX rings available Total 1 rules Filter: 4 Rule Type: TCP over IPv6 Src IP addr: fe80::218:2dff:fe00:12 mask: : Dest Ip addr: :: mask: ffff:ffff:fff:ffff:ffff:ffff:ffff:ffff Traffic class: 0x18 mask: 0x0 Src port: 0 mask: Oxffff Dest'port: 0 mask: 0xffff Action: Drop [root@localhost ~]# ethtool -U enol flow-type udp4 src-ip 1.1.1.1 vf @ loc 4 queue 2 [root@localhost ~]# ethtool -u enot 32 RX rings available Total 1 rules Filter: 4 Rule Type: UDP over IPv4 Src IP addr: 1.1.1.1 mask: 0.0.0.0 Dest IP addr: 0.0.0.0 mask: 255.255.255.255 TOS: 0x0 mask: Oxff Src port: 0 mask: oxffff Dest'port: 0 mask: 0xffff Action: Direct to VF 0 queue 2 [root@localhost ~]# ethtool -U enol flow-type vxlan src-ip 192.168.1.2 loc 4 Add rule, invalid syntax ethtool: bad command line argument(s) For more information run ethtool -h [root@localhost ~]# ``` (2)The old tool is deployed on the new kernel and can configure the old flow table. ``` [root@localhost aarch64]# uname -a inux (none) 5.106.0+ #1 SMP Thu Nov 24 21:25:01 CST 2022 aarch64 GNU/Linux [root@localhost aarch64]# [root@localhost aarch64]# ethtool --version sthtool version 5.10 [root@localhost aarch64]# -oot@fpga: /root# ethtool -U eth1 flow-type tcp4 src-ip 192.168.49.30 action 3 loc 4 [root@localhost aarch64]# /root# [root@localhost aarch64]# ethtool -u etht 1 RX rings_ available Total 1 rules -ilter: 4 Rule Type: TCP over IPv4 Src IP addr: 192.168.40.30 mask: 0.0.0.0 Dest IP addr: 0.0.0.0 mask: 255.255.255.255 TOS: 0x0 mask: 0xff Src port: 0 mask: oxffff Dest port: 0 mask: Oxffff Action: Direct to queue 3 [root@localhost aarch64]# ethtool -U eth1 delete 4 [root@localhost aarch64]# ethtool -u eth1 4 RX rings_available Total @ rules [root@localhost aarch64]# ``` (3)The VXLAN flow table is successfully configured using the new kernel and tool. ``` [root@localhost aarch64]# ip Link add vxlan® type vxlan id 100 local 192.168.1.2 remote 192.168.1.3 dstport 4789 dev eno1 [root@localhost aarch64]# ethtool -u enol 32 RX rings available Total 1 rules Filter: 511 Rule Type: Vxlan IPv4 Vni: 100 mask: 0x0 Src MAC addr: 00:00:00:00:00:00 mask: FF:FF:FF:FF:FF:FF Dest MAC addr: 00:00:00:00:00:00 mask: FF:FF:FF:FF:FF:FF Ethertype: 0x0 mask: OxFFFF Src IP addr: 0.0.0.0 mask: 255.255.255.255 Dest IP addr: 192.168.1.3 mask: 0.0.0.0 TOS: 0x0 mask: Oxff L4 protocol: © mask: Oxff Action: Direct to queue 0 [root@localhost aarch64]# [root@localhost aarch64]# ethtool -N eno1 delete 511 [root@localhost aarch64]# ethtool -u eno1 52 Rx rings available Total o rdles [root@localhost aarch64]# [root@localhost aarch64]# ethtool -U eno1 flow-type vxlan4 vni 100 dst-ip 192.168.1.3 Added rule with ID 511 [root@localhost aarch64]# ethtool -u enot 52 Rx rings available Total 1 rules Filter: 511 Rule Type: Vxlan IPv4 Vni: 100 mask: 0x0 Src MAC addr: 00:00:00:00:00:00 mask: FF:FF:FF:FF:FF:FF Dest MAC addr: 00:00:00:00:00:00 mask: FF:FF:FF:FF:FF:FF Ethertype: 0x0 mask: 0xFFFF Src IP addr: 0.0.0.0 mask: 255.255.255.255 Dest IP addr: 192.168.1.3 mask: 0.0.0.0 TOS: 0x0 mask: oxff L4 protocol: © mask: Oxff Action: Direct to queue 0 [root@localhost aarch64]# uname -a Linux localhost.localdomain 5.10.0+ #10 SMP Fri Nov 25 14:12:36 CST 2022 aarch64 aarch64 aarch64 GNU/Linux [root@localhost aarch64]# ethtool --version ethtool version 5.15 ``` Link:https://gitee.com/openeuler/kernel/pulls/276 Reviewed-by: Yue Haibing <yuehaibing@huawei.com> Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com>
-
由 openeuler-ci-bot 提交于
Merge Pull Request from: @lujialin2 In cgroupv1, cgroup writeback is not supported for two problems: 1) Blkcg_css and memcg_css are mounted on different cgroup trees. Therefore, blkcg_css cannot be found according to a certain memcg_css. 2) Buffer I/O is worked by kthread, which is in the root_blkcg. Therefore, blkcg cannot limit wbps and wiops of buffer I/O. We solve the two problems and support cgroup writeback on cgroupv1. CONFIG: CONFIG_CGROUP_V1_WRITEBACK startup params: cgroup1_writeback If someone want to support cgroup writeback in cgroupv1, turn on CONFIG_CGROUP_V1_WRITEBACK; add cgroup1_writeback;mount memcg and blkcg on cgroupv1; If someone want to attach a cerntain blkcg to a memcg, just echo the inode of the blkcg into memory_wb_blkcg_ino of memcg. Link:https://gitee.com/openeuler/kernel/pulls/215 Reviewed-by: Liu Chao <liuchao173@huawei.com> Reviewed-by: Zheng Zengkai <zhengzengkai@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
-
由 openeuler-ci-bot 提交于
Merge Pull Request from: @Zhao_Py [Description] To support generic vdpa deivce, we need add the following ioctls: - GET_CONFIG_SIZE: the size of the virtio config space - GET_VQS_COUNT: the count of virtqueues that exposed #I5WXCZ https://lore.kernel.org/all/20220315032553.455-1-longpeng2@huawei.com/ upstream commits list here: 64b9f64f vdpa: introduce virtio pci driver 442706f9 vdpa: add get_config_size callback in vdpa_config_ops a61280dd vdpa: support exposing the config size to userspace fd70a406 vdpa: Extend routine to accept vdpa device name 33b34750 vdpa: Define vdpa mgmt device, ops and a netlink interface 476c135e vdpa: Add missing comment for virtqueue count 903f7bca vdpa: Enable a user to add and delete a vdpa device b04d910a vdpa: support exposing the count of vqs to userspace 64f2087a virtio-pci: do not access iomem via struct virtio_pci_device directly b5d58094 virtio-pci: split out modern device 117a9de2 virtio-pci-modern: factor out modern device initialization logic 32490370 virtio-pci-modern: introduce vp_modern_remove() 1a5c85f1 virtio-pci-modern: introduce helper to set config vector e3669129 virtio-pci-modern: introduce helpers for setting and getting status 0b017708 virtio-pci-modern: introduce helpers for setting and getting features ed2a73db virtio-pci-modern: introduce vp_modern_generation() a6525b99 Merge tag 'mips_5.12_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux e1b0fa2e virtio-pci-modern: introduce vp_modern_queue_address() dc2e6481 virtio-pci-modern: introduce helper to set/get queue_enable 75658afb virtio-pci-modern: introduce helper for setting/geting queue size 6e52fc44 virtio-pci-modern: introduce helper for getting queue nums 1bfd8413 virtio-pci-modern: introduce helper to get notification offset 8000a6b6 virito-pci-modern: rename map_capability() to vp_modern_map_capability() fd502729 virtio-pci: introduce modern device module bc0d90ee vdpa: Enable user to query vdpa device info 29b90f92 vdpa: remove unnecessary 'default n' in Kconfig entries 275900df vdpa_sim: split vdpasim_virtqueue's iov field in out_iov and in_iov 2f8f4618 vdpa_sim: add device id field in vdpasim_dev_attr a13b5918 vdpa_sim: add work_fn in vdpasim_dev_attr c124a95e vdpa_sim: add set_config callback in vdpasim_dev_attr 011c35ba vdpa_sim: add supported_features field in vdpasim_dev_attr f00bdce0 vdpa: set the virtqueue num during register db1e8bb6 vdpa: split vdpasim to core and net modules 0c853c2c vdpa: add vdpa simulator for block device da7af696 vdpa_sim: make vdpasim->buffer size configurable a3c06ae1 vdpa_sim_net: Add support for user supported devices 899c4d18 vdpa_sim_blk: add support for vdpa management tool 539fec78 vdpa: add driver_override support d6d8bb92: vhost/vdpa: use get_config_size callback in vhost_vdpa_config_validate() 9e3bb9b7: virtio_pci_modern: introduce helper to map vq notify area 7dca6c0e: virtio-pci library: switch to use vp_modern_map_vq_notify() 11d8ffed: vp_vdpa: switch to use vp_modern_map_vq_notify() 9e311bca: virtio-pci library: report resource address 526cb858: vp_vdpa: report doorbell address 0686082d: vdpa: Add reset callback in vdpa_config_ops 5bbfea1e: vp_vdpa: add vq irq offloading support 530a5678: vdpa: support packed virtqueue for set/get_vq_state() 0140b3d0: virtio-pci library: introduce vp_modern_get_driver_features() 1225c216: vp_vdpa: allow set vq state to initial state after reset 0f8a0b0b: virtio_pci_modern: __force cast the notify mapping d7bce85a: virtio_pci_modern: correct sparse tags for notify 9632e78e: vp_vdpa: Fix return value check for vdpa_alloc_device() 27d9839f: virtio: always enter drivers/virtio/ eb057b44: vdpa: fix use-after-free on vp_vdpa_remove bb47620b: vdpa: Consider device id larger than 31 ef76eb83: vdpa/mlx5: Fix clearing of VIRTIO_NET_F_MAC feature bit 870aaff9: vdpa: clean up get_config_size ret value handling [Testing] kernel options: CONFIG_VDPA=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_SIM_BLOCK=m CONFIG_VP_VDPA=m CONFIG_VHOST=m CONFIG_VHOST_MENU=y CONFIG_VHOST_NET=m CONFIG_VHOST_VSOCK=m CONFIG_VHOST_VDPA=m CONFIG_RUNTIME_TESTING_MENU=y Tested on openEuler 22.03 LTS: ``` $ modprobe vdpa $ modprobe vdpa_sim $ modprobe vdpa-sim-net $ modprobe vhost-vdpa $ vdpa dev add mgmtdev vdpasim_net name vdpa0 $ vdpa dev show vdpa0: type network mgmtdev vdpasim_net vendor_id 0 max_vqs 2 max_vq_size 256 $ ls /dev/vhost-vdpa-* /dev/vhost-vdpa-0 ``` Link:https://gitee.com/openeuler/kernel/pulls/222 Reviewed-by: Kevin Zhu <zhukeqian1@huawei.com> Reviewed-by: Zheng Zengkai <zhengzengkai@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
-
- 26 11月, 2022 1 次提交
-
-
由 openeuler-ci-bot 提交于
Merge Pull Request from: @Linwang_68f8 **Content:** Intel® Advanced Matrix Extensions (Intel® AMX) is a new 64-bit programming paradigm consisting of two components: a set of 2-dimensional registers (tiles) representing sub-arrays from a larger 2-dimensional memory image, and an accelerator able to operate on tiles, the first implementation is called TMUL (tile matrix multiply unit). There are 37 patches in total in this patch set to introduce AMX guest support in openEuler. **Intel-kernel issue:** https://gitee.com/openeuler/intel-kernel/issues/I5RQLJ **Test environment:** Host: openEuler 22.09 + backporting kernel Guest: openEuler 22.09 + QEMU 7.0 + backporting kernel **Test cases:** Host: kernel self-test including sigaltstack and AMX state management testing. TMUL functional testing. AMX stress. Context switch testing. INT8/BF16 online inference. Guest: AMX stress. Context switch testing. INT8/BF16 online inference. **Known issue:** N/A **Default config change:** N/A Link:https://gitee.com/openeuler/kernel/pulls/275 Reviewed-by: Jun Tian <jun.j.tian@intel.com> Reviewed-by: Zheng Zengkai <zhengzengkai@huawei.com> Reviewed-by: Liu Chao <liuchao173@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
-
- 25 11月, 2022 20 次提交
-
-
由 openeuler-ci-bot 提交于
Merge Pull Request from: @allen-shi This is a cherry-pick of [PR75](https://gitee.com/openeuler/kernel/pulls/75) from openEuler-22.09 branch. This patchset is to enable Intel SPR features in default kernel config for OLK-5.10. **Intel Kernel Issue** [#I5MJBR](https://gitee.com/openeuler/intel-kernel/issues/I5MJBR) **Test** Build and boot kernel with this patchset and check /proc/config.gz after boot. Also check various features in dmesg and /proc/cpuinfo. ``` #dmesg|grep AMX [ 0.000000] x86/fpu: Supporting XSAVE feature 0x20000: 'AMX Tile config' [ 0.000000] x86/fpu: Supporting XSAVE feature 0x40000: 'AMX Tile data' #cat /proc/cpuinfo|grep sgx ... #cat /proc/cpuinfo|grep split_lock_detect ``` **Known Issue** N/A **Default Config Change** See patches. Link:https://gitee.com/openeuler/kernel/pulls/227 Reviewed-by: Kai Liu <kai.liu@suse.com> Reviewed-by: Jiao Fenfang <jiaofenfang@uniontech.com> Reviewed-by: Jun Tian <jun.j.tian@intel.com> Reviewed-by: Chen Wei <chenwei@xfusion.com> Reviewed-by: Liu Chao <liuchao173@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
-
由 Quinn Tran 提交于
mainline inclusion from mainline-v5.15-rc1 commit 85818882 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I6337O CVE: NA Reference: https://lore.kernel.org/r/20210810043720.1137-7-njavali@marvell.com ------------------------------------------ Add debug print of 64G link speed. Signed-off-by: NQuinn Tran <qutran@marvell.com> Signed-off-by: NNilesh Javali <njavali@marvell.com> Reviewed-by: NHimanshu Madhani <himanshu.madhani@oracle.com> Signed-off-by: Nxiaosu3109 <lxshhh@139.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.17-rc4 commit 9de07369 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9de0736973dd7f0f710d0f5e0a3dfd9fa9ffeb3f -------------------------------------------------------------------------- 'perf inject' with Coresight data generates files that cannot be opened when only the last branch option is specified: perf inject -i perf.data --itrace=l -o inject.data perf script -i inject.data 0x33faa8 [0x8]: failed to process type: 9 [Bad address] This is because cs_etm__synth_instruction_sample() is called even when the sample type for instructions hasn't been setup. Last branch records are attached to instruction samples so it doesn't make sense to generate them when --itrace=i isn't specified anyway. This change disables all calls of cs_etm__synth_instruction_sample() unless --itrace=i is specified, resulting in a file with no samples if only --itrace=l is provided, rather than a bad file. Reviewed-by: NLeo Yan <leo.yan@linaro.org> Signed-off-by: NJames Clark <james.clark@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https://lore.kernel.org/r/20220210200620.1227232-2-james.clark@arm.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.17-rc4 commit 0b31ea66 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0b31ea6613ad1e6b9b84d877c1be18e39934e90a -------------------------------------------------------------------------- sample_branches and sample_instructions are already saved in the synth_opts struct. Other usages like synth_opts.last_branch don't save a value, so make this more consistent by always going through synth_opts and not saving duplicate values. Reviewed-by: NLeo Yan <leo.yan@linaro.org> Signed-off-by: NJames Clark <james.clark@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https://lore.kernel.org/r/20220210200620.1227232-1-james.clark@arm.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.17-rc3 commit aca8af3c category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=aca8af3c2e8cb57662e6035c0ccb3c111a11d97a -------------------------------------------------------------------------- Now that a config flag for branch broadcast has been added, take it into account when trying to deduce what the driver would have programmed the TRCCONFIGR register to. Reviewed-by: NLeo Yan <leo.yan@linaro.org> Reviewed-by: NMike Leach <mike.leach@linaro.org> Reviewed-by: NSuzuki Poulouse <suzuki.poulose@arm.com> Signed-off-by: NJames Clark <james.clark@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-doc@vger.kernel.org Link: https://lore.kernel.org/r/20220113091056.1297982-4-james.clark@arm.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.16-rc5 commit 7cc9680c category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7cc9680c4be7c1da7a3570711f01273b781b936b -------------------------------------------------------------------------- There are two checks, one is for size when running without admin, but this one is covered by the driver and reported on in more detail here (builtin-record.c): pr_err("Permission error mapping pages.\n" "Consider increasing " "/proc/sys/kernel/perf_event_mlock_kb,\n" "or try again with a smaller value of -m/--mmap_pages.\n" "(current value: %u,%u)\n", This had the effect of artificially limiting the aux buffer size to a value smaller than what was allowed because perf_event_mlock_kb wasn't taken into account. The second is to check for a power of two, but this is covered here (evlist.c): pr_info("rounding mmap pages size to %s (%lu pages)\n", buf, pages); Reviewed-by: NLeo Yan <leo.yan@linaro.org> Signed-off-by: NJames Clark <james.clark@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https://lore.kernel.org/r/20211208115435.610101-1-james.clark@arm.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 Andrew Kilroy 提交于
mainline inclusion from mainline-v5.15 commit d54e50b7 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d54e50b7c9a4a3d30eba5075528c7b0a187667bb -------------------------------------------------------------------------- Since the size is already printed earlier in hex, print the same data using the same format, in hex. Reviewed-by: NJames Clark <james.clark@arm.com> Reviewed-by: NLeo Yan <leo.yan@linaro.org> Reviewed-by: NMathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: NAndrew Kilroy <andrew.kilroy@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https://lore.kernel.org/r/20211109142153.56546-2-german.gomez@arm.comSigned-off-by: NGerman Gomez <german.gomez@arm.com> Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.14-rc4 commit a80aea64 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a80aea64aa07361a57f2245a0695878f2ae67ee7 -------------------------------------------------------------------------- Currently perf reports "Cannot allocate memory" which isn't very helpful for a potentially user facing issue. If we add a new magic number in the future, perf will be able to report unrecognised magic numbers. Reviewed-by: NLeo Yan <leo.yan@linaro.org> Signed-off-by: NJames Clark <james.clark@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https //lore.kernel.org/r/20210806134109.1182235-10-james.clark@arm.com Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.14-rc4 commit 56c62f52 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=56c62f52b6f25802a2154243b6dacdc6ff4f75bd -------------------------------------------------------------------------- Use the real name of the decoder instead of hard-coding "ETM" to avoid confusion when the trace is ETE. This also now distinguishes between ETMv3 and ETMv4. Reviewed-by: NLeo Yan <leo.yan@linaro.org> Reviewed-by: NSuzuki Poulouse <suzuki.poulose@arm.com> Signed-off-by: NJames Clark <james.clark@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https //lore.kernel.org/r/20210806134109.1182235-9-james.clark@arm.com Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.14-rc4 commit 779f414a category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=779f414a4849fb3e650cad8525c84e76fdd3c0ea -------------------------------------------------------------------------- If the magic number indicates ETE instantiate a OCSD_BUILTIN_DCD_ETE decoder instead of OCSD_BUILTIN_DCD_ETMV4I. ETE is the new trace feature for Armv9. Testing performed ================= * Old files with v0 and v1 headers for ETMv4 still open correctly * New files with new magic number open on new versions of perf * New files with new magic number fail to open on old versions of perf * Decoding with the ETE decoder results in the same output as the ETMv4 decoder as long as there are no new ETE packet types Reviewed-by: NLeo Yan <leo.yan@linaro.org> Signed-off-by: NJames Clark <james.clark@arm.com> Acked-by: NSuzuki Poulouse <suzuki.poulose@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https //lore.kernel.org/r/20210806134109.1182235-8-james.clark@arm.com Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.14-rc4 commit 212095f7 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=212095f7ca4a5182487ae12b62a8616ed87d617e -------------------------------------------------------------------------- OpenCSD v1.1.1 has a bug fix for the installation of the ETE decoder headers. This also means that including headers separately for each decoder is unnecessary so remove these. Reviewed-by: NLeo Yan <leo.yan@linaro.org> Signed-off-by: NJames Clark <james.clark@arm.com> Acked-by: NSuzuki Poulouse <suzuki.poulose@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https //lore.kernel.org/r/20210806134109.1182235-7-james.clark@arm.com Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.14-rc4 commit 050a0fc4 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=050a0fc4edc75a97b4dba7b834fd6bf243bf06ed -------------------------------------------------------------------------- TRCIRD2 should be TRCIDR2 Reviewed-by: NLeo Yan <leo.yan@linaro.org> Signed-off-by: NJames Clark <james.clark@arm.com> Acked-by: NSuzuki Poulouse <suzuki.poulose@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https //lore.kernel.org/r/20210806134109.1182235-6-james.clark@arm.com Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.14-rc4 commit 51ba8811 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=51ba8811318ac9a8f800c1d446af3f1ce81ec911 -------------------------------------------------------------------------- When ETE is present save the TRCDEVARCH register and set a new magic number. It will be used to configure the decoder in a later commit. Old versions of perf will not be able to open files with this new magic number, but old files will still work with newer versions of perf. Reviewed-by: NLeo Yan <leo.yan@linaro.org> Signed-off-by: NJames Clark <james.clark@arm.com> Acked-by: NSuzuki Poulouse <suzuki.poulose@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https //lore.kernel.org/r/20210806134109.1182235-5-james.clark@arm.com [ Addressed some cosmetic suggestions by Suzuki Poulouse ] Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.14-rc4 commit c9ccc96b category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c9ccc96bf6f28d83ef497ee985b8f6ffd493de2a -------------------------------------------------------------------------- Extract a function for saving the ETMv4 header because this will be used for ETE in a later commit. Reviewed-by: NLeo Yan <leo.yan@linaro.org> Signed-off-by: NJames Clark <james.clark@arm.com> Acked-by: NSuzuki Poulouse <suzuki.poulose@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https //lore.kernel.org/r/20210806134109.1182235-4-james.clark@arm.com Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.14-rc4 commit f4aef1ea category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f4aef1ea2663ac7efddd796970678911e56ea1f7 -------------------------------------------------------------------------- Currently the architecture is hard coded as ARCH_V8, but from ETMv4.4 onwards this should be ARCH_AA64. Reviewed-by: NLeo Yan <leo.yan@linaro.org> Signed-off-by: NJames Clark <james.clark@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https //lore.kernel.org/r/20210806134109.1182235-3-james.clark@arm.com Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.14-rc4 commit 991f69e9 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=991f69e9e0bb33e4917485bead62b51f0afefac0 -------------------------------------------------------------------------- The initialisation of the decoder params is duplicated between creation of the packet printer and packet decoder. Put them both into one function so that future changes only need to be made in one place. Reviewed-by: NLeo Yan <leo.yan@linaro.org> Signed-off-by: NJames Clark <james.clark@arm.com> Acked-by: NSuzuki Poulouse <suzuki.poulose@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https //lore.kernel.org/r/20210806134109.1182235-2-james.clark@arm.com Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.14-rc4 commit 9c38b671 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9c38b671ebd5297d861522806e09cf9e639d0af6 -------------------------------------------------------------------------- Currently decode will silently fail if no binary data is available for the decode. This is made worse if only partial data is available because the decode will appear to work, but any trace from that missing DSO will silently not be generated. Add a UI popup once if there is any data missing, and then warn in the bottom left for each individual DSO that's missing. Reviewed-by: NLeo Yan <leo.yan@linaro.org> Signed-off-by: NJames Clark <james.clark@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: http //lore.kernel.org/lkml/20210805130354.878120-2-james.clark@arm.com Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.14-rc4 commit f3c33cbd category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f3c33cbd9221e543bb4dd3c9028aef758fa2aa0e -------------------------------------------------------------------------- Only show the warning if the user hasn't already set timeless mode and improve the text because there was ambiguity around the meaning of '...' Change the warning to a UI warning instead of printing straight to stderr because this corrupts the UI when perf report TUI is used. The UI warning function also handles printing to stderr when in perf script mode. Suggested-by: NLeo Yan <leo.yan@linaro.org> Signed-off-by: NJames Clark <james.clark@arm.com> Reviewed-by: NLeo Yan <leo.yan@linaro.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: http://lore.kernel.org/lkml/20210729155805.2830-6-james.clark@arm.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.14-rc4 commit 243c3a3e category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=243c3a3eb4e03201dec36f2edfc4fe604d8b9078 -------------------------------------------------------------------------- Currently 'perf annotate --stdio' (and --stdio2) will exit without printing anything if there are disassembly errors. Apply the same error handler that's used for TUI and GTK modes. This makes comparing disassembly across the different modes more consistent. Signed-off-by: NJames Clark <james.clark@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: http://lore.kernel.org/lkml/20210729155805.2830-4-james.clark@arm.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-
由 James Clark 提交于
mainline inclusion from mainline-v5.14-rc4 commit 3d8b9247 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I636PS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3d8b92472ae7ba91d759cadb4670bd492ef97d04 -------------------------------------------------------------------------- Setting annotate_warned to true on errors was removed in commit ee51d851 ("perf annotate: Introduce strerror for handling symbol__disassemble() errors") which means when 'perf annotate --skip-missing' is used warnings are shown multiple times for the same DSO. Setting this again restores the original behavior of only one warning each. Signed-off-by: NJames Clark <james.clark@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: John Garry <john.garry@huawei.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Will Deacon <will@kernel.org> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: http://lore.kernel.org/lkml/20210729155805.2830-3-james.clark@arm.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: NJunhao He <hejunhao3@huawei.com>
-