CoreSight

coresight@lists.linaro.org

9 participants
2375 discussions

[PATCH v8 00/13] Add support to configure TPDM DSB subunit

by Tao Zhang

Introduction of TPDM DSB subunit DSB subunit is responsible for creating a dataset element, and is also optionally responsible for packing it to fit multiple elements on a single ATB transfer if possible in the configuration. The TPDM Core Datapath requests timestamps be stored by the TPDA and then delivering ATB sized data (depending on ATB width and element size, this could be smaller or larger than a dataset element) to the ATB Mast FSM. The DSB subunit must be configured prior to enablement. This series adds support for TPDM to configure the configure DSB subunit. Once this series patches are applied properly, the new tpdm nodes for should be observed at the tpdm path /sys/bus/coresight/devices/tpdm* which supports DSB subunit. e.g. root@qemuarm64:/sys/devices/platform/soc@0/6c08000.tpdm/tpdm1# ls -l drwxr-xr-x 2 root root 0 Jan 1 00:00 connections drwxr-xr-x 2 root root 0 Jan 1 00:00 dsb_edge -rw-r--r-- 1 root root 4096 Jan 1 00:00 dsb_mode drwxr-xr-x 2 root root 0 Jan 1 00:00 dsb_msr drwxr-xr-x 2 root root 0 Jan 1 00:00 dsb_patt -rw-r--r-- 1 root root 4096 Jan 1 00:00 dsb_patt_ts -rw-r--r-- 1 root root 4096 Jan 1 00:00 dsb_patt_type drwxr-xr-x 2 root root 0 Jan 1 00:00 dsb_trig_patt -rw-r--r-- 1 root root 4096 Jan 1 00:00 dsb_trig_ts -rw-r--r-- 1 root root 4096 Jan 1 00:00 dsb_trig_type -rw-r--r-- 1 root root 4096 Jan 1 00:02 enable_source --w------- 1 root root 4096 Jan 1 00:00 integration_test drwxr-xr-x 2 root root 0 Jan 1 00:00 power --w------- 1 root root 4096 Jan 1 00:02 reset_dataset lrwxrwxrwx 1 root root 0 Apr 5 2021 subsystem -> ../../../../../bus/coresight -rw-r--r-- 1 root root 4096 Apr 5 2021 uevent -r--r--r-- 1 root root 4096 Jan 1 00:00 waiting_for_supplier We can use the commands are similar to the below to configure the TPDMs which support DSB subunit. Enable coresight sink first. echo 1 > /sys/bus/coresight/devices/tmc_etf0/enable_sink echo 1 > /sys/bus/coresight/devices/tpdm1/reset_dataset echo 0x3 > /sys/bus/coresight/devices/tpdm1/dsb_edge/ctrl_idx echo 0x1 > /sys/bus/coresight/devices/tpdm1/dsb_edge/ctrl_mask echo 0x0 > /sys/bus/coresight/devices/tpdm1/dsb_edge/ctrl_val echo 1 > /sys/bus/coresight/devices/tpdm1/dsb_patt_ts echo 1 > /sys/bus/coresight/devices/tpdm1/dsb_patt_type echo 0 > /sys/bus/coresight/devices/tpdm1/dsb_trig_ts echo 0xFFFFFFFF > /sys/bus/coresight/devices/tpdm1/dsb_patt/tpmr5 echo 0xFFFFFFFF > /sys/bus/coresight/devices/tpdm1/dsb_trig_patt/xpr2 echo 1 > /sys/bus/coresight/devices/tpdm1/enable_source TPDM_DSB commit tree: https://git.codelinaro.org/clo/linux-kernel/coresight/-/tree/tpdm-dsb-v8 https://git.codelinaro.org/clo/linux-kernel/coresight/-/commits/tpdm-dsb-v8 Changes in V8: 1. Refine the function "tpda_set_element_size" and rename it to "tpda_get_element_size" in the patch#4. -- Suzuki K Poulose 2. Refine the functioin "tpda_enable_port" in the patch#4. -- Suzuki K Poulose 3. Write a helper to check if the TPDM has DSB dataset in the patch#5. -- Suzuki K Poulose 4. Move the function "tpdm_reset_datasets" to "datasets_setup" to call in the patch#5. -- Suzuki K Poulose 5. Refine the comment of DSB in "tpdm_drvdata" in the patch#5. -- Suzuki K Poulose 6. Refine the comments in the documents for this patch series. -- Suzuki K Poulose 7. Adjust the code alignment in this patch series. -- Suzuki K Poulose 8. Combine the mode related functions to one in the patch#8. -- Suzuki K Poulose 9. Refine the R/W functions of "dsb_mode" in the patch#8. -- Suzuki K Poulose 10. Adjust the macros of mode in the TPDM header file in the patch#8. -- Suzuki K Poulose 11. Remove the unused code and fix the warnings in compiling for the patch#9. -- kernel test robot 12. Use the following sysfs nodes to read/set edge control related value in the patch#9. dsb_edge/ \- ctrl_idx -> Set the index number \- ctrl_val -> Set the edge control value \- ctrl_mask -> Set the edge control mask \- edcr0 ... edcr15 -> Read the edge control value \- edcmr0 ... edcmr7 -> Read the edge control mask -- Suzuki K Poulose 13. Use the following sysfs nodes to read/set DSB trigger pattern value and mask in the patch#10. dsb_trig_patt/ \- xpr0 ... xpr15 -> (RW) Set/Get the value \- xpmr0 ... xpmr7 -> (RW) Set/Get the mask -- Suzuki K Poulose 14. Use the following sysfs nodes to read/set DSB pattern value and mask in the patch#11. dsb_patt/ \- tpr0 ... tpr15 -> (RW) Set/Get the value \- tpmr0 ... tpmr7 -> (RW) Set/Get the mask -- Suzuki K Poulose 15. Add "Acked-by" tag to the patch#12. -- Rob Herring 16. Use the following sysfs nodes to read/set DSB MSR in the patch#13. dsb_msr/ \- msr0 ... msr31 -> (RW) Set/Get the value -- Suzuki K Poulose 17. Create the maximal number of DSB MSR sysfs nodes if the TPDM supports DSB MSR. Write the values set by user space to the DSB MSR according to the number of MSR supported by the TPDM. -- Suzuki K Poulose Changes in V7: 1. Since the "One value" limitation on SysFs file usage, add the nodes to read/write the index number for configuring the DSB TPDM. The following index number nodes are added. "dsb_edge_ctrl_idx" in the patch #9 "dsb_trig_patt_idx" in the patch #10 "dsb_patt_idx" in the patch #11 "dsb_msr_idx" in the patch #13 -- Suzuki K Poulose Changes in V6: 1. Align the code to fix the styling issue. -- Suzuki K Poulose Changes in V5: 1. Correct data type for DSB element size in dt-bindings patch. 2. Refine the recursive function "tpda_set_element_size". -- Suzuki K Poulose 3. Get return value of the function "__tpda_enable" in "tpda_enable". -- Suzuki K Poulose 4. Refine the comments on "dsb_esize". -- Suzuki K Poulose 5. Split the chage that introduce the subtype "SUBTYPE_SOURCE_TPDM" to Coresight driver. -- Suzuki K Poulose 6. Inline the trigger type setting to "tpdm_enable_dsb" simply. -- Suzuki K Poulose 7. Split the change that remove the needless CS_{UN,}LOCK in the function "tpdm_datasets_setup". -- Suzuki K Poulose 8. Remove the disablement step in the reset node. -- Suzuki K Poulose 9. Update the kernel version to 6.5 in the sysfs document. -- Suzuki K Poulose 10. Remove the needless check in "tpdm_dsb_is_visible". -- Suzuki K Poulose 11. Change the macro to mask the mode of DSB TPDM. -- Suzuki K Poulose 12. Add a check to make sure "sysfs_emit_at" calling will not cause overflow. -- Suzuki K Poulose 13. Change the macro to get "edge_ctrl" value. -- Suzuki K Poulose 14. Remove the needless comments in the sysfs document. -- Suzuki K Poulose 15. Replace "TPDM_DSB_MAX_PATT" with "drvdata->dsb->msr_num" in "dsb_msr_show". -- Suzuki K Poulose 16. Update the check of MSR number in "dsb_msr_store". -- Suzuki K Poulose 17. Write data to the MSR registers in the DSB TPDM enablement function. -- Suzuki K Poulose Changes in V4: 1. Change the range of the property "qcom,dsb-element-size", and change the type to enumeration. -- Suzuki K Poulose, Krzysztof Kozlowski 2. Change dsb_esize from 32 bits to 8 bits. -- Suzuki K Poulose 3. Update the function tpda_set_element_size since James has updated the dependency series. Meanwhile, it will send out a warning if it detects more than one TPDM from the same TPDA input port. -- Suzuki K Poulose 4. Add a source_sub_type for TPDM to distinguish TPDM from the other coresight source. -- Suzuki K Poulose 5. Return error if the element size is not configured on devicetree in TPDA enablement. -- Suzuki K Poulose 6. Move memory allocation from "tpdm_init_datasets" to "tpdm_datasets_setup". Rename "tpdm_init_datasets" as "tpdm_reset_datasets". -- Suzuki K Poulose 7. Replace "coresight_disable" with "coresight_disable_source" to disable the TPDM in resetting. -- Suzuki K Poulose 8. Make sure "drvdata" is not NULL pointer before using it. -- Suzuki K Poulose 9. Change "set_dsb_cycacc_mode" to "set_dsb_test_mode" since cycle accurate mode is not supported on the current targets. It is replaced by test mode. 10. Document the value of "dsb_mode". -- Suzuki K Poulose 11. Macros are used to replace the formulas on dsb edge control nodes. -- Suzuki K Poulose 12. Document the values of "dsb_trig_patt_val" and "dsb_trig_patt_mask". -- Suzuki K Poulose 13. Combine two pattern related loops to one. And move DSB TIER register configurations to the new function "set_dsb_tier". -- Suzuki K Poulose 14. Rename the property "qcom,dsb_msr_num" to "qcom,dsb-msrs-num". -- Suzuki K Poulose, Krzysztof Kozlowski Changes in V3: 1. Move the property "qcom,dsb-element-size" to TPDM devicetree and update the TPDM yaml file for this item. -- Suzuki K Poulose 2. Add the error message when the DSB element size is not set to 32-bit or 64-bit. -- Suzuki K Poulose 3. Add more information to the comments of patch #3 -- Suzuki K Poulose 4. Combine the value updates to the TPDM_DSB_CR for TPDM. -- Suzuki K Poulose 5. Remove the function "tpdm_datasets_alloc", and fold its code to a new function "tpdm_init_datasets". It will complete the initialization of TPDM. -- Suzuki K Poulose 6. Change the method of qualifying input values. -- Suzuki K Poulose 7. Add the documentation of the new sysfs handles. -- Suzuki K Poulose 8. Provide the separate handles for the "mode bits". -- Suzuki K Poulose Changes in V2: 1. Change the name of the property "qcom,dsb-elem-size" to "qcom,dsb-element-size" -- Suzuki K Poulose 2. Update the TPDA yaml file for the item "qcom,dsb-elem-size". -- Krzysztof Kozlowski 3. Add the full name of DSB in the description of the item "qcom,dsb-elem-size". -- Rob Herring Changes in V1: 1. Change the definition of the property "qcom,dsb-elem-size" from "uint32-array" to "uint32-matrix". -- Krzysztof Kozlowski 2. Add the full name of DSB. -- Rob Herring 3. Deal with 2 entries in an iteration in TPDA driver. -- Suzuki K Poulose 4. Divide the function "tpdm_datasets_alloc" into two functions, "tpdm_datasets_setup" and "tpdm_datasets_alloc". 5. Detecte the input string with the conventional semantics automatically, and constrain the size of the input value. -- Suzuki K Poulose 6. Use the hook function "is_visible()" to hide the DSB related knobs if the data sets are missing. -- Suzuki K Poulose 7. Use the macros "FIELD_GET" and "FIELD_PREP" to set the values. -- Suzuki K Poulose 8. Update the definition of the macros in TPDM driver. 9. Update the comments of the values for the nodes which are for DSB element creation and onfigure pattern match output. -- Suzuki K Poulose 10. Use API "sysfs_emit" to "replace scnprintf". -- Suzuki K Poulose Tao Zhang (13): coresight-tpdm: Remove the unnecessary lock dt-bindings: arm: Add support for DSB element size coresight-tpdm: Introduce TPDM subtype to TPDM driver coresight-tpda: Add DSB dataset support coresight-tpdm: Initialize DSB subunit configuration coresight-tpdm: Add reset node to TPDM node coresight-tpdm: Add nodes to set trigger timestamp and type coresight-tpdm: Add node to set dsb programming mode coresight-tpdm: Add nodes for dsb edge control coresight-tpdm: Add nodes to configure pattern match output coresight-tpdm: Add nodes for timestamp request dt-bindings: arm: Add support for DSB MSR register coresight-tpdm: Add nodes for dsb msr support .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 159 +++++ .../bindings/arm/qcom,coresight-tpdm.yaml | 20 + drivers/hwtracing/coresight/coresight-core.c | 3 + drivers/hwtracing/coresight/coresight-tpda.c | 126 +++- drivers/hwtracing/coresight/coresight-tpda.h | 2 + drivers/hwtracing/coresight/coresight-tpdm.c | 682 ++++++++++++++++++++- drivers/hwtracing/coresight/coresight-tpdm.h | 165 +++++ include/linux/coresight.h | 1 + 8 files changed, 1136 insertions(+), 22 deletions(-) -- 2.7.4

1 year, 9 months

[PATCH v3 0/2] coresight: Allow guests to be traced when FEAT_TRF and VHE are present

by James Clark

FEAT_TRF is a Coresight feature that allows trace capture to be completely filtered at different exception levels, unlike the existing TRCVICTLR controls which may still emit target addresses of branches, even if the following trace is filtered. Without FEAT_TRF, it was possible to start a trace session on a host and also collect trace from the guest as TRCVICTLR was never programmed to exclude guests (and it could still emit target addresses even if it was). Now when FEAT_TRF is present, because we don't write to TRFCR_EL1, guest trace will be completely disabled. This change fixes this issue, and also adds the ability to control it with the Perf exclude_host and exclude_guest flags. The first commit moves the register to sysreg because I add the EL12 version in the second commit. The test results have some single spurious EL2 addresses, but I don't think this is an issue with this patchset because it happens in the host-userspace case which maintains the existing programming of TRFCR. It's likely an issue with the model but I will follow it up separately. The corresponding change for nVHE is here [1]. The nVHE behaviour is is reversed, currently guest trace is always generated because the host already writes to TRFCR_EL1. This is the same both with and without FEAT_TRF. [1]: https://lore.kernel.org/kvmarm/20230804101317.460697-1-james.clark@arm.com/ --- Changes since v2: * E0TRE -> E0HTRE in TRFCR_EL2 to match Arm ARM * Add missing USE_TRFCR_EL1_TS enum value Changes since v1: * Split new sysreg definitions into TRFCR_EL2 and TRFCR_ELx so that TRFCR_ELx doesn't include CX which TRFCR_EL1 doesn't have. * Mask out TS and CX before writing to TRFCR_EL1 because it doesn't have CX and TS has no effect. * Expand cover letter James Clark (2): arm64/sysreg: Move TRFCR definitions to sysreg coresight: Allow guests to be traced when FEAT_TRF and VHE are present arch/arm64/include/asm/sysreg.h | 12 ----- arch/arm64/tools/sysreg | 41 +++++++++++++++ .../coresight/coresight-etm4x-core.c | 51 ++++++++++++++++--- drivers/hwtracing/coresight/coresight-etm4x.h | 2 +- drivers/hwtracing/coresight/coresight-priv.h | 3 ++ 5 files changed, 90 insertions(+), 19 deletions(-) -- 2.34.1

1 year, 9 months

[PATCH v1 0/2] perf cs-etm: Improve timestamp tracing

by Leo Yan

This patch series is to improve timestamp handling in per-thread mode. The current code doesn't validate timestamp and always return success for per-thread mode, for a sane implementation, the first patch is to allow validation timestamp tracing in per-thread mode. The second patch is to respect timestamp option "--timestamp" or "-T", when users set this option, the tool will automatically enable hardware timestamp tracing in Arm CoreSight. Leo Yan (2): perf cs-etm: Validate timestamp tracing in per-thread mode perf cs-etm: Respect timestamp option tools/perf/arch/arm/util/cs-etm.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) -- 2.34.1

1 year, 9 months

Re: [PATCH v1 2/3] perf tools: Revert enable indices setting syntax for BPF map

by James Clark

On 04/09/2023 15:56, Ian Rogers wrote: > On Mon, Sep 4, 2023 at 4:02 AM James Clark <james.clark(a)arm.com> wrote: >> >> >> >> On 28/07/2023 01:12, Ian Rogers wrote: >>> This reverts commit e571e029bdbf ("perf tools: Enable indices setting >>> syntax for BPF map"). >>> >>> The reverted commit added a notion of arrays that could be set as >>> event terms for BPF events. The parsing hasn't worked over multiple >>> Linux releases. Given the broken nature of the parsing it appears the >>> code isn't in use, nor could I find a way for it to be used to add a >>> test. >>> >>> The original commit contains a test in the commit message, >>> however, running it yields: >>> ``` >>> $ perf record -e './test_bpf_map_3.c/map:channel.value[0,1,2,3...5]=101/' usleep 2 >>> event syntax error: '..pf_map_3.c/map:channel.value[0,1,2,3...5]=101/' >>> \___ parser error >>> Run 'perf list' for a list of valid events >>> >>> Usage: perf record [<options>] [<command>] >>> or: perf record [<options>] -- <command> [<options>] >>> >>> -e, --event <event> event selector. use 'perf list' to list available events >>> ``` >>> >>> Given the code can't be used this commit reverts and removes it. >>> >> >> Hi Ian, >> >> Unfortunately this revert breaks Coresight sink argument parsing. >> >> Before: >> >> $ perf record -e cs_etm/@tmc_etr0/ -- true >> [ perf record: Woken up 1 times to write data ] >> [ perf record: Captured and wrote 4.008 MB perf.data ] >> >> After: >> >> $ perf record -e cs_etm/@tmc_etr0/ -- true >> event syntax error: 'cs_etm/@tmc_etr0/' >> \___ parser error >> >> I can't really see how it's related to the array syntax that the commit >> messages mention, but it could either be that the revert wasn't applied >> cleanly or just some unintended side effect. >> >> We should probably add a cross platform parsing test for Coresight >> arguments, but I don't know whether we should just blindly revert the >> revert for now, or work on a new change that explicitly fixes the >> Coresight case. > > Agreed, I'll take a look. Any chance you could post the full error > message? I suspect there's a first error hiding in there too. > > Thanks, > Ian > No that seems to be the whole thing, running with -vvv and pasting everything: $ perf record -e cs_etm/@tmc_etr0/ -vvv -- true event syntax error: 'cs_etm/@tmc_etr0/' \___ parser error Run 'perf list' for a list of valid events Usage: perf record [<options>] [<command>] or: perf record [<options>] -- <command> [<options>] -e, --event <event> event selector. use 'perf list' to list available events I previously mentioned that this is a Coresight thing, but I saw that it may actually be the more generic "drv_str". Unless nothing other than Coresight is using it, then it's just a Coresight thing. >> Thanks >> James >> >>> Signed-off-by: Ian Rogers <irogers(a)google.com> >>> --- >>> tools/perf/util/parse-events.c | 8 +-- >>> tools/perf/util/parse-events.l | 11 --- >>> tools/perf/util/parse-events.y | 122 --------------------------------- >>> 3 files changed, 1 insertion(+), 140 deletions(-) >>> >>> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c >>> index 02647313c918..0e2004511cf5 100644 >>> --- a/tools/perf/util/parse-events.c >>> +++ b/tools/perf/util/parse-events.c >>> @@ -800,13 +800,7 @@ parse_events_config_bpf(struct parse_events_state *parse_state, >>> >>> parse_events_error__handle(parse_state->error, idx, >>> strdup(errbuf), >>> - strdup( >>> -"Hint:\tValid config terms:\n" >>> -" \tmap:[<arraymap>].value<indices>=[value]\n" >>> -" \tmap:[<eventmap>].event<indices>=[event]\n" >>> -"\n" >>> -" \twhere <indices> is something like [0,3...5] or [all]\n" >>> -" \t(add -v to see detail)")); >>> + NULL); >>> return err; >>> } >>> } >>> diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l >>> index 99335ec586ae..d7d084cc4140 100644 >>> --- a/tools/perf/util/parse-events.l >>> +++ b/tools/perf/util/parse-events.l >>> @@ -175,7 +175,6 @@ do { \ >>> %x mem >>> %s config >>> %x event >>> -%x array >>> >>> group [^,{}/]*[{][^}]*[}][^,{}/]* >>> event_pmu [^,{}/]+[/][^/]*[/][^,{}/]* >>> @@ -251,14 +250,6 @@ non_digit [^0-9] >>> } >>> } >>> >>> -<array>{ >>> -"]" { BEGIN(config); return ']'; } >>> -{num_dec} { return value(yyscanner, 10); } >>> -{num_hex} { return value(yyscanner, 16); } >>> -, { return ','; } >>> -"\.\.\." { return PE_ARRAY_RANGE; } >>> -} >>> - >>> <config>{ >>> /* >>> * Please update config_term_names when new static term is added. >>> @@ -302,8 +293,6 @@ r0x{num_raw_hex} { return str(yyscanner, PE_RAW); } >>> {lc_type}-{lc_op_result} { return lc_str(yyscanner, _parse_state); } >>> {lc_type}-{lc_op_result}-{lc_op_result} { return lc_str(yyscanner, _parse_state); } >>> {name_minus} { return str(yyscanner, PE_NAME); } >>> -\[all\] { return PE_ARRAY_ALL; } >>> -"[" { BEGIN(array); return '['; } >>> @{drv_cfg_term} { return drv_str(yyscanner, PE_DRV_CFG_TERM); } >>> } >>> >>> diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y >>> index 454577f7aff6..5a90e7874c59 100644 >>> --- a/tools/perf/util/parse-events.y >>> +++ b/tools/perf/util/parse-events.y >>> @@ -64,7 +64,6 @@ static void free_list_evsel(struct list_head* list_evsel) >>> %token PE_LEGACY_CACHE >>> %token PE_PREFIX_MEM >>> %token PE_ERROR >>> -%token PE_ARRAY_ALL PE_ARRAY_RANGE >>> %token PE_DRV_CFG_TERM >>> %token PE_TERM_HW >>> %type <num> PE_VALUE >>> @@ -108,11 +107,6 @@ static void free_list_evsel(struct list_head* list_evsel) >>> %type <list_evsel> groups >>> %destructor { free_list_evsel ($$); } <list_evsel> >>> %type <tracepoint_name> tracepoint_name >>> -%destructor { free ($$.sys); free ($$.event); } <tracepoint_name> >>> -%type <array> array >>> -%type <array> array_term >>> -%type <array> array_terms >>> -%destructor { free ($$.ranges); } <array> >>> %type <hardware_term> PE_TERM_HW >>> %destructor { free ($$.str); } <hardware_term> >>> >>> @@ -127,7 +121,6 @@ static void free_list_evsel(struct list_head* list_evsel) >>> char *sys; >>> char *event; >>> } tracepoint_name; >>> - struct parse_events_array array; >>> struct hardware_term { >>> char *str; >>> u64 num; >>> @@ -878,121 +871,6 @@ PE_TERM >>> >>> $$ = term; >>> } >>> -| >>> -name_or_raw array '=' name_or_legacy >>> -{ >>> - struct parse_events_term *term; >>> - int err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, $1, $4, &@1, &@4); >>> - >>> - if (err) { >>> - free($1); >>> - free($4); >>> - free($2.ranges); >>> - PE_ABORT(err); >>> - } >>> - term->array = $2; >>> - $$ = term; >>> -} >>> -| >>> -name_or_raw array '=' PE_VALUE >>> -{ >>> - struct parse_events_term *term; >>> - int err = parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, $1, $4, false, &@1, &@4); >>> - >>> - if (err) { >>> - free($1); >>> - free($2.ranges); >>> - PE_ABORT(err); >>> - } >>> - term->array = $2; >>> - $$ = term; >>> -} >>> -| >>> -PE_DRV_CFG_TERM >>> -{ >>> - struct parse_events_term *term; >>> - char *config = strdup($1); >>> - int err; >>> - >>> - if (!config) >>> - YYNOMEM; >>> - err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, config, $1, &@1, NULL); >>> - if (err) { >>> - free($1); >>> - free(config); >>> - PE_ABORT(err); >>> - } >>> - $$ = term; >>> -} >>> - >>> -array: >>> -'[' array_terms ']' >>> -{ >>> - $$ = $2; >>> -} >>> -| >>> -PE_ARRAY_ALL >>> -{ >>> - $$.nr_ranges = 0; >>> - $$.ranges = NULL; >>> -} >>> - >>> -array_terms: >>> -array_terms ',' array_term >>> -{ >>> - struct parse_events_array new_array; >>> - >>> - new_array.nr_ranges = $1.nr_ranges + $3.nr_ranges; >>> - new_array.ranges = realloc($1.ranges, >>> - sizeof(new_array.ranges[0]) * >>> - new_array.nr_ranges); >>> - if (!new_array.ranges) >>> - YYNOMEM; >>> - memcpy(&new_array.ranges[$1.nr_ranges], $3.ranges, >>> - $3.nr_ranges * sizeof(new_array.ranges[0])); >>> - free($3.ranges); >>> - $$ = new_array; >>> -} >>> -| >>> -array_term >>> - >>> -array_term: >>> -PE_VALUE >>> -{ >>> - struct parse_events_array array; >>> - >>> - array.nr_ranges = 1; >>> - array.ranges = malloc(sizeof(array.ranges[0])); >>> - if (!array.ranges) >>> - YYNOMEM; >>> - array.ranges[0].start = $1; >>> - array.ranges[0].length = 1; >>> - $$ = array; >>> -} >>> -| >>> -PE_VALUE PE_ARRAY_RANGE PE_VALUE >>> -{ >>> - struct parse_events_array array; >>> - >>> - if ($3 < $1) { >>> - struct parse_events_state *parse_state = _parse_state; >>> - struct parse_events_error *error = parse_state->error; >>> - char *err_str; >>> - >>> - if (asprintf(&err_str, "Expected '%ld' to be less-than '%ld'", $3, $1) < 0) >>> - err_str = NULL; >>> - >>> - parse_events_error__handle(error, @1.first_column, err_str, NULL); >>> - YYABORT; >>> - } >>> - array.nr_ranges = 1; >>> - array.ranges = malloc(sizeof(array.ranges[0])); >>> - if (!array.ranges) >>> - YYNOMEM; >>> - array.ranges[0].start = $1; >>> - array.ranges[0].length = $3 - $1 + 1; >>> - $$ = array; >>> -} >>> >>> sep_dc: ':' | >>>

1 year, 9 months

Re: [PATCH v1 2/3] perf tools: Revert enable indices setting syntax for BPF map

by James Clark

On 28/07/2023 01:12, Ian Rogers wrote: > This reverts commit e571e029bdbf ("perf tools: Enable indices setting > syntax for BPF map"). > > The reverted commit added a notion of arrays that could be set as > event terms for BPF events. The parsing hasn't worked over multiple > Linux releases. Given the broken nature of the parsing it appears the > code isn't in use, nor could I find a way for it to be used to add a > test. > > The original commit contains a test in the commit message, > however, running it yields: > ``` > $ perf record -e './test_bpf_map_3.c/map:channel.value[0,1,2,3...5]=101/' usleep 2 > event syntax error: '..pf_map_3.c/map:channel.value[0,1,2,3...5]=101/' > \___ parser error > Run 'perf list' for a list of valid events > > Usage: perf record [<options>] [<command>] > or: perf record [<options>] -- <command> [<options>] > > -e, --event <event> event selector. use 'perf list' to list available events > ``` > > Given the code can't be used this commit reverts and removes it. > Hi Ian, Unfortunately this revert breaks Coresight sink argument parsing. Before: $ perf record -e cs_etm/@tmc_etr0/ -- true [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 4.008 MB perf.data ] After: $ perf record -e cs_etm/@tmc_etr0/ -- true event syntax error: 'cs_etm/@tmc_etr0/' \___ parser error I can't really see how it's related to the array syntax that the commit messages mention, but it could either be that the revert wasn't applied cleanly or just some unintended side effect. We should probably add a cross platform parsing test for Coresight arguments, but I don't know whether we should just blindly revert the revert for now, or work on a new change that explicitly fixes the Coresight case. Thanks James > Signed-off-by: Ian Rogers <irogers(a)google.com> > --- > tools/perf/util/parse-events.c | 8 +-- > tools/perf/util/parse-events.l | 11 --- > tools/perf/util/parse-events.y | 122 --------------------------------- > 3 files changed, 1 insertion(+), 140 deletions(-) > > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c > index 02647313c918..0e2004511cf5 100644 > --- a/tools/perf/util/parse-events.c > +++ b/tools/perf/util/parse-events.c > @@ -800,13 +800,7 @@ parse_events_config_bpf(struct parse_events_state *parse_state, > > parse_events_error__handle(parse_state->error, idx, > strdup(errbuf), > - strdup( > -"Hint:\tValid config terms:\n" > -" \tmap:[<arraymap>].value<indices>=[value]\n" > -" \tmap:[<eventmap>].event<indices>=[event]\n" > -"\n" > -" \twhere <indices> is something like [0,3...5] or [all]\n" > -" \t(add -v to see detail)")); > + NULL); > return err; > } > } > diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l > index 99335ec586ae..d7d084cc4140 100644 > --- a/tools/perf/util/parse-events.l > +++ b/tools/perf/util/parse-events.l > @@ -175,7 +175,6 @@ do { \ > %x mem > %s config > %x event > -%x array > > group [^,{}/]*[{][^}]*[}][^,{}/]* > event_pmu [^,{}/]+[/][^/]*[/][^,{}/]* > @@ -251,14 +250,6 @@ non_digit [^0-9] > } > } > > -<array>{ > -"]" { BEGIN(config); return ']'; } > -{num_dec} { return value(yyscanner, 10); } > -{num_hex} { return value(yyscanner, 16); } > -, { return ','; } > -"\.\.\." { return PE_ARRAY_RANGE; } > -} > - > <config>{ > /* > * Please update config_term_names when new static term is added. > @@ -302,8 +293,6 @@ r0x{num_raw_hex} { return str(yyscanner, PE_RAW); } > {lc_type}-{lc_op_result} { return lc_str(yyscanner, _parse_state); } > {lc_type}-{lc_op_result}-{lc_op_result} { return lc_str(yyscanner, _parse_state); } > {name_minus} { return str(yyscanner, PE_NAME); } > -\[all\] { return PE_ARRAY_ALL; } > -"[" { BEGIN(array); return '['; } > @{drv_cfg_term} { return drv_str(yyscanner, PE_DRV_CFG_TERM); } > } > > diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y > index 454577f7aff6..5a90e7874c59 100644 > --- a/tools/perf/util/parse-events.y > +++ b/tools/perf/util/parse-events.y > @@ -64,7 +64,6 @@ static void free_list_evsel(struct list_head* list_evsel) > %token PE_LEGACY_CACHE > %token PE_PREFIX_MEM > %token PE_ERROR > -%token PE_ARRAY_ALL PE_ARRAY_RANGE > %token PE_DRV_CFG_TERM > %token PE_TERM_HW > %type <num> PE_VALUE > @@ -108,11 +107,6 @@ static void free_list_evsel(struct list_head* list_evsel) > %type <list_evsel> groups > %destructor { free_list_evsel ($$); } <list_evsel> > %type <tracepoint_name> tracepoint_name > -%destructor { free ($$.sys); free ($$.event); } <tracepoint_name> > -%type <array> array > -%type <array> array_term > -%type <array> array_terms > -%destructor { free ($$.ranges); } <array> > %type <hardware_term> PE_TERM_HW > %destructor { free ($$.str); } <hardware_term> > > @@ -127,7 +121,6 @@ static void free_list_evsel(struct list_head* list_evsel) > char *sys; > char *event; > } tracepoint_name; > - struct parse_events_array array; > struct hardware_term { > char *str; > u64 num; > @@ -878,121 +871,6 @@ PE_TERM > > $$ = term; > } > -| > -name_or_raw array '=' name_or_legacy > -{ > - struct parse_events_term *term; > - int err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, $1, $4, &@1, &@4); > - > - if (err) { > - free($1); > - free($4); > - free($2.ranges); > - PE_ABORT(err); > - } > - term->array = $2; > - $$ = term; > -} > -| > -name_or_raw array '=' PE_VALUE > -{ > - struct parse_events_term *term; > - int err = parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, $1, $4, false, &@1, &@4); > - > - if (err) { > - free($1); > - free($2.ranges); > - PE_ABORT(err); > - } > - term->array = $2; > - $$ = term; > -} > -| > -PE_DRV_CFG_TERM > -{ > - struct parse_events_term *term; > - char *config = strdup($1); > - int err; > - > - if (!config) > - YYNOMEM; > - err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, config, $1, &@1, NULL); > - if (err) { > - free($1); > - free(config); > - PE_ABORT(err); > - } > - $$ = term; > -} > - > -array: > -'[' array_terms ']' > -{ > - $$ = $2; > -} > -| > -PE_ARRAY_ALL > -{ > - $$.nr_ranges = 0; > - $$.ranges = NULL; > -} > - > -array_terms: > -array_terms ',' array_term > -{ > - struct parse_events_array new_array; > - > - new_array.nr_ranges = $1.nr_ranges + $3.nr_ranges; > - new_array.ranges = realloc($1.ranges, > - sizeof(new_array.ranges[0]) * > - new_array.nr_ranges); > - if (!new_array.ranges) > - YYNOMEM; > - memcpy(&new_array.ranges[$1.nr_ranges], $3.ranges, > - $3.nr_ranges * sizeof(new_array.ranges[0])); > - free($3.ranges); > - $$ = new_array; > -} > -| > -array_term > - > -array_term: > -PE_VALUE > -{ > - struct parse_events_array array; > - > - array.nr_ranges = 1; > - array.ranges = malloc(sizeof(array.ranges[0])); > - if (!array.ranges) > - YYNOMEM; > - array.ranges[0].start = $1; > - array.ranges[0].length = 1; > - $$ = array; > -} > -| > -PE_VALUE PE_ARRAY_RANGE PE_VALUE > -{ > - struct parse_events_array array; > - > - if ($3 < $1) { > - struct parse_events_state *parse_state = _parse_state; > - struct parse_events_error *error = parse_state->error; > - char *err_str; > - > - if (asprintf(&err_str, "Expected '%ld' to be less-than '%ld'", $3, $1) < 0) > - err_str = NULL; > - > - parse_events_error__handle(error, @1.first_column, err_str, NULL); > - YYABORT; > - } > - array.nr_ranges = 1; > - array.ranges = malloc(sizeof(array.ranges[0])); > - if (!array.ranges) > - YYNOMEM; > - array.ranges[0].start = $1; > - array.ranges[0].length = $3 - $1 + 1; > - $$ = array; > -} > > sep_dc: ':' | >

1 year, 9 months

[PATCH] MAINTAINERS: Remove myself as a Arm CoreSight reviewer

by Leo Yan

I haven't done any meaningful work for a long while on Arm CoreSight and it's unlikely I'll be able to do related work in the future. Remove myself from the Arm CoreSight "Reviewers" list. Signed-off-by: Leo Yan <leo.yan(a)linaro.org> --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index e0ad886d3163..342b8a3e19e3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2102,7 +2102,6 @@ N: digicolor ARM/CORESIGHT FRAMEWORK AND DRIVERS M: Suzuki K Poulose <suzuki.poulose(a)arm.com> R: Mike Leach <mike.leach(a)linaro.org> -R: Leo Yan <leo.yan(a)linaro.org> L: coresight(a)lists.linaro.org (moderated for non-subscribers) L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Maintained -- 2.39.2

1 year, 9 months

[RESEND PATCH] MAINTAINERS: Remove myself as a Arm CoreSight reviewer

by Leo Yan

I haven't done any meaningful work for a long while on Arm CoreSight and it's unlikely I'll be able to do related work in the future. Remove myself from the Arm CoreSight "Reviewers" list. Signed-off-by: Leo Yan <leo.yan(a)linaro.org> --- Rebased on Linux kernel 6.5. MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 1cc0be8ea75a..f72a275c8ea1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2044,7 +2044,6 @@ ARM/CORESIGHT FRAMEWORK AND DRIVERS M: Suzuki K Poulose <suzuki.poulose(a)arm.com> R: Mike Leach <mike.leach(a)linaro.org> R: James Clark <james.clark(a)arm.com> -R: Leo Yan <leo.yan(a)linaro.org> L: coresight(a)lists.linaro.org (moderated for non-subscribers) L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Maintained -- 2.34.1

1 year, 9 months

[RFC 0/7] coresight: Move remaining AMBA ACPI devices into platform driver

by Anshuman Khandual

This moves remaining AMBA ACPI devices into respective platform drivers for enabling ACPI based power management support. This might still require some further changes but presented here just for some initial review & feedback. This series applies on coresight/next coresight-next-v6.6 and has been built tested. This series has also been boot tested on a DT based coresight device platform. Although it still requires testing on ACPI platform. Cc: Suzuki Poulose <suzuki.poulose(a)arm.com> Cc: James Clark <james.clark(a)arm.com> Cc: Mike Leach <mike.leach(a)linaro.org> Cc: coresight(a)lists.linaro.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-kernel(a)vger.kernel.org Anshuman Khandual (7): coresight: replicator: Move ACPI support from AMBA driver to platform driver coresight: funnel: Move ACPI support from AMBA driver to platform driver coresight: catu: Move ACPI support from AMBA driver to platform driver coresight: tpiu: Move ACPI support from AMBA driver to platform driver coresight: tmc: Move ACPI support from AMBA driver to platform driver coresight: stm: Move ACPI support from AMBA driver to platform driver coresight: debug: Move ACPI support from AMBA driver to platform driver drivers/acpi/acpi_amba.c | 8 -- drivers/hwtracing/coresight/coresight-catu.c | 136 ++++++++++++++++-- drivers/hwtracing/coresight/coresight-catu.h | 1 + .../hwtracing/coresight/coresight-cpu-debug.c | 130 +++++++++++++++-- .../hwtracing/coresight/coresight-funnel.c | 49 ++++--- .../coresight/coresight-replicator.c | 44 +++--- drivers/hwtracing/coresight/coresight-stm.c | 80 +++++++++-- .../hwtracing/coresight/coresight-tmc-core.c | 127 ++++++++++++++-- drivers/hwtracing/coresight/coresight-tmc.h | 1 + drivers/hwtracing/coresight/coresight-tpiu.c | 76 +++++++++- 10 files changed, 549 insertions(+), 103 deletions(-) -- 2.25.1

1 year, 9 months

Re: Merge conflict resolution for CoreSight ACPI TRBE support

by Suzuki K Poulose

On 01/09/2023 20:23, Greg Kroah-Hartman wrote: > On Fri, Sep 01, 2023 at 06:38:14PM +0100, Suzuki K Poulose wrote: >> On 01/09/2023 16:47, Greg Kroah-Hartman wrote: >>> On Fri, Sep 01, 2023 at 12:15:51PM +0100, Suzuki K Poulose wrote: >>>> Hi Greg >>>> >>>> I have a question for you w.r.t pushing this series [0]. This >>>> involved some changes to the ARM PMU ACPI stub code, for parsing >>>> the ACPI tables to detect TRBE (managed via CoreSight drivers). >>>> >>>> The ARM PMU ACPI stub is maintained by Will and he tried to queue this >>>> in, but there was a conflict [1] with the CoreSight branch and >>>> hence he dropped the coresight changes, keeping the base changes. >>>> >>>> His questions in the thread above were clariried [2] and Anshuman has >>>> posted the "coresight" changes alone [3]. >>>> >>>> Now, I have already sent a pull request for v6.6. Do you think >>>> I can send a pull request with the remaining changes from Anshuman ? >>> >>> Has any of this been in linux-next yet? If not, then 6.6 is not going >>> to happen, sorry. >> >> As mentioned they were in shortly, but dropped due to the conflict with >> CoreSight tree. > > Then the code can't be merged into 6.6-rc1. > >>> If it has been in linux-next, then what's the issue? >>> >>>> If so, what do you recommend ? The dependent patches are already queued >>>> via Will's tree and merged by Linus [4] >>>> >>>> I am happy to wait for the next cycle, if this is inconvenient for you. >>> >>> I can't take anything new for my trees until after 6.6-rc1 is out, >>> neither can anyone else. >>> >>> And if the dependancies are going to go in for 6.6-rc1, then what's the >>> issue? >> >> It is just that the functionality was split and there is something in >> in 6.6-rc1, which nobody is consuming, unless these two patches come in. >> Do you recommend sending them for v6.6 ? Or queue them for v6.7 ? > > Queue for 6.7 please. Thanks, will do. Suzuki

1 year, 9 months

Re: Merge conflict resolution for CoreSight ACPI TRBE support

by Suzuki K Poulose

On 01/09/2023 16:47, Greg Kroah-Hartman wrote: > On Fri, Sep 01, 2023 at 12:15:51PM +0100, Suzuki K Poulose wrote: >> Hi Greg >> >> I have a question for you w.r.t pushing this series [0]. This >> involved some changes to the ARM PMU ACPI stub code, for parsing >> the ACPI tables to detect TRBE (managed via CoreSight drivers). >> >> The ARM PMU ACPI stub is maintained by Will and he tried to queue this >> in, but there was a conflict [1] with the CoreSight branch and >> hence he dropped the coresight changes, keeping the base changes. >> >> His questions in the thread above were clariried [2] and Anshuman has >> posted the "coresight" changes alone [3]. >> >> Now, I have already sent a pull request for v6.6. Do you think >> I can send a pull request with the remaining changes from Anshuman ? > > Has any of this been in linux-next yet? If not, then 6.6 is not going > to happen, sorry. As mentioned they were in shortly, but dropped due to the conflict with CoreSight tree. > > If it has been in linux-next, then what's the issue? > >> If so, what do you recommend ? The dependent patches are already queued >> via Will's tree and merged by Linus [4] >> >> I am happy to wait for the next cycle, if this is inconvenient for you. > > I can't take anything new for my trees until after 6.6-rc1 is out, > neither can anyone else. > > And if the dependancies are going to go in for 6.6-rc1, then what's the > issue? It is just that the functionality was split and there is something in in 6.6-rc1, which nobody is consuming, unless these two patches come in. Do you recommend sending them for v6.6 ? Or queue them for v6.7 ? Kind regards Suzuki > > confused, > > greg k-h

1 year, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

CoreSight