Skip to contentSkip to conversation

perf arch events: Fix duplicate RISC-V SBI firmware event name

PATCH Applied Eric Lin 6 participants 8 messages Jul 19, 2024 – Aug 1, 2024

Subsystems (3)
lore
Share & tools
lore

Eric Lin

author
#0 lore raw

PATCH v2 1/1 perf arch events: Fix duplicate RISC-V SBI firmware event name

Currently, the RISC-V firmware JSON file has duplicate event name "FW_SFENCE_VMA_RECEIVED". According to the RISC-V SBI PMU extension[1], the event name should be "FW_SFENCE_VMA_ASID_SENT".

Before this patch:

$ perf list

firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_received
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]

After this patch:

$ perf list

firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
.....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_asid_sent
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]
fw_sfence_vma_received
[Received SFENCE.VMA request from other HART event. Unit: cpu]

Fixes 8f0dcb4e7364 ("perf arch events: riscv sbi firmware std event files")
Fixes c4f769d4093d ("perf vendor events riscv: add Sifive U74 JSON file")
Fixes acbf6de674ef ("perf vendor events riscv: Add StarFive Dubhe-80 JSON file")
Fixes 7340c6df49df ("perf vendor events riscv: add T-HEAD C9xx JSON file")
Fixes f5102e31c209 ("riscv: andes: Support specifying symbolic firmware and hardware raw event")

---
Changes since V1:
- Add "Fixes:" tag for every patch that copied firmware.json

---
 tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json       | 2 +-
 tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json        | 2 +-
 tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json       | 2 +-
 .../perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json  | 2 +-
 .../perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json +1 -1
index a9939823b14b..0c9b9a2d2958 100644
@@ -74,7 +74,7 @@
   {
     "PublicDescription": "Sent SFENCE.VMA with ASID request to other HART event",
     "ConfigCode": "0x800000000000000c",
-    "EventName": "FW_SFENCE_VMA_RECEIVED",
+    "EventName": "FW_SFENCE_VMA_ASID_SENT",
     "BriefDescription": "Sent SFENCE.VMA with ASID request to other HART event"
   },
   {
tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
Signature · 1 line
2.43.2
Reviewed-by on v2 1/1
#1 lore raw
Quoted 47 lines · Eric Lin

Currently, the RISC-V firmware JSON file has duplicate event name "FW_SFENCE_VMA_RECEIVED". According to the RISC-V SBI PMU extension[1], the event name should be "FW_SFENCE_VMA_ASID_SENT".

Before this patch:

$ perf list

firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_received
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]

After this patch:

$ perf list

firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
.....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_asid_sent
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]
fw_sfence_vma_received
[Received SFENCE.VMA request from other HART event. Unit: cpu]

Fixes 8f0dcb4e7364 ("perf arch events: riscv sbi firmware std event files")
Fixes c4f769d4093d ("perf vendor events riscv: add Sifive U74 JSON file")
Fixes acbf6de674ef ("perf vendor events riscv: Add StarFive Dubhe-80 JSON file")
Fixes 7340c6df49df ("perf vendor events riscv: add T-HEAD C9xx JSON file")
Fixes f5102e31c209 ("riscv: andes: Support specifying symbolic firmware and hardware raw event")
Quoted 1 line

---

Thanks for the fix.

Quoted 78 lines

Changes since V1:
- Add "Fixes:" tag for every patch that copied firmware.json

---
 tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json       | 2 +-
 tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json        | 2 +-
 tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json       | 2 +-
 .../perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json  | 2 +-
 .../perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json +1 -1
index a9939823b14b..0c9b9a2d2958 100644
@@ -74,7 +74,7 @@
   {
     "PublicDescription": "Sent SFENCE.VMA with ASID request to other HART event",
     "ConfigCode": "0x800000000000000c",
-    "EventName": "FW_SFENCE_VMA_RECEIVED",
+    "EventName": "FW_SFENCE_VMA_ASID_SENT",
     "BriefDescription": "Sent SFENCE.VMA with ASID request to other HART event"
   },
   {
tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
Signature · 1 line
2.43.2
Reviewed-by on v2 1/1
#2 lore raw
In reply to Eric Lin
Quoted 126 lines · Eric Lin

Currently, the RISC-V firmware JSON file has duplicate event name "FW_SFENCE_VMA_RECEIVED". According to the RISC-V SBI PMU extension[1], the event name should be "FW_SFENCE_VMA_ASID_SENT".

Before this patch:

$ perf list

firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_received
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]

After this patch:

$ perf list

firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
.....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_asid_sent
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]
fw_sfence_vma_received
[Received SFENCE.VMA request from other HART event. Unit: cpu]

Fixes 8f0dcb4e7364 ("perf arch events: riscv sbi firmware std event files")
Fixes c4f769d4093d ("perf vendor events riscv: add Sifive U74 JSON file")
Fixes acbf6de674ef ("perf vendor events riscv: Add StarFive Dubhe-80 JSON file")
Fixes 7340c6df49df ("perf vendor events riscv: add T-HEAD C9xx JSON file")
Fixes f5102e31c209 ("riscv: andes: Support specifying symbolic firmware and hardware raw event")

---
Changes since V1:
- Add "Fixes:" tag for every patch that copied firmware.json

---
 tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json       | 2 +-
 tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json        | 2 +-
 tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json       | 2 +-
 .../perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json  | 2 +-
 .../perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json +1 -1
index a9939823b14b..0c9b9a2d2958 100644
@@ -74,7 +74,7 @@
   {
     "PublicDescription": "Sent SFENCE.VMA with ASID request to other HART event",
     "ConfigCode": "0x800000000000000c",
-    "EventName": "FW_SFENCE_VMA_RECEIVED",
+    "EventName": "FW_SFENCE_VMA_ASID_SENT",
     "BriefDescription": "Sent SFENCE.VMA with ASID request to other HART event"
   },
   {
tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
Signature · 1 line
2.43.2
#3 lore raw
In reply to Eric Lin
Quoted 123 lines

Currently, the RISC-V firmware JSON file has duplicate event name "FW_SFENCE_VMA_RECEIVED". According to the RISC-V SBI PMU extension[1], the event name should be "FW_SFENCE_VMA_ASID_SENT".

Before this patch:

$ perf list

firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_received
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]

After this patch:

$ perf list

firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
.....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_asid_sent
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]
fw_sfence_vma_received
[Received SFENCE.VMA request from other HART event. Unit: cpu]

Fixes 8f0dcb4e7364 ("perf arch events: riscv sbi firmware std event files")
Fixes c4f769d4093d ("perf vendor events riscv: add Sifive U74 JSON file")
Fixes acbf6de674ef ("perf vendor events riscv: Add StarFive Dubhe-80 JSON file")
Fixes 7340c6df49df ("perf vendor events riscv: add T-HEAD C9xx JSON file")
Fixes f5102e31c209 ("riscv: andes: Support specifying symbolic firmware and hardware raw event")

---
Changes since V1:
- Add "Fixes:" tag for every patch that copied firmware.json

---
 tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json       | 2 +-
 tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json        | 2 +-
 tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json       | 2 +-
 .../perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json  | 2 +-
 .../perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json +1 -1
index a9939823b14b..0c9b9a2d2958 100644
@@ -74,7 +74,7 @@
   {
     "PublicDescription": "Sent SFENCE.VMA with ASID request to other HART event",
     "ConfigCode": "0x800000000000000c",
-    "EventName": "FW_SFENCE_VMA_RECEIVED",
+    "EventName": "FW_SFENCE_VMA_ASID_SENT",
     "BriefDescription": "Sent SFENCE.VMA with ASID request to other HART event"
   },
   {
tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
Reviewed-by on v2 1/1
#4 lore raw
In reply to Eric Lin
Quoted 115 lines

Currently, the RISC-V firmware JSON file has duplicate event name "FW_SFENCE_VMA_RECEIVED". According to the RISC-V SBI PMU extension[1], the event name should be "FW_SFENCE_VMA_ASID_SENT".

Before this patch:

$ perf list

firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_received
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]

After this patch:

$ perf list

firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
.....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_asid_sent
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]
fw_sfence_vma_received
[Received SFENCE.VMA request from other HART event. Unit: cpu]

Fixes 8f0dcb4e7364 ("perf arch events: riscv sbi firmware std event files")
Fixes c4f769d4093d ("perf vendor events riscv: add Sifive U74 JSON file")
Fixes acbf6de674ef ("perf vendor events riscv: Add StarFive Dubhe-80 JSON file")
Fixes 7340c6df49df ("perf vendor events riscv: add T-HEAD C9xx JSON file")
Fixes f5102e31c209 ("riscv: andes: Support specifying symbolic firmware and hardware raw event")

---
Changes since V1:
- Add "Fixes:" tag for every patch that copied firmware.json

---
 tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json       | 2 +-
 tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json        | 2 +-
 tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json       | 2 +-
 .../perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json  | 2 +-
 .../perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json +1 -1
index a9939823b14b..0c9b9a2d2958 100644
@@ -74,7 +74,7 @@
   {
     "PublicDescription": "Sent SFENCE.VMA with ASID request to other HART event",
     "ConfigCode": "0x800000000000000c",
-    "EventName": "FW_SFENCE_VMA_RECEIVED",
+    "EventName": "FW_SFENCE_VMA_ASID_SENT",
     "BriefDescription": "Sent SFENCE.VMA with ASID request to other HART event"
   },
   {
tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json +1 -1
index 9b4a032186a7..7149caec4f80 100644
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json +0 -0
index 9b4a032186a7..7149caec4f80 100644

tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json line 42

Quoted 8 lines
tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json +1 -1
@@ -36,7 +36,7 @@
     "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
   },
   {
-    "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
+    "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
   },
   {
     "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
reviewer Reviewed-by
#5 lore raw
Quoted 51 lines · Atish Patra
Quoted 48 lines

Currently, the RISC-V firmware JSON file has duplicate event name "FW_SFENCE_VMA_RECEIVED". According to the RISC-V SBI PMU extension[1], the event name should be "FW_SFENCE_VMA_ASID_SENT".

Before this patch:

$ perf list

firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_received
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]

After this patch:

$ perf list

firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
.....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_asid_sent
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]
fw_sfence_vma_received
[Received SFENCE.VMA request from other HART event. Unit: cpu]

Fixes 8f0dcb4e7364 ("perf arch events: riscv sbi firmware std event files")
Fixes c4f769d4093d ("perf vendor events riscv: add Sifive U74 JSON file")
Fixes acbf6de674ef ("perf vendor events riscv: Add StarFive Dubhe-80 JSON file")
Fixes 7340c6df49df ("perf vendor events riscv: add T-HEAD C9xx JSON file")
Fixes f5102e31c209 ("riscv: andes: Support specifying symbolic firmware and hardware raw event")
Quoted 3 lines

---
Changes since V1:
- Add "Fixes:" tag for every patch that copied firmware.json

Quoted 1 line

Thanks,
Ian

#6 lore raw
In reply to Eric Lin
This patch was applied to riscv/linux.git (fixes) by Palmer Dabbelt <[email protected]>:

Hello:

This patch was applied to riscv/linux.git (fixes)
by Palmer Dabbelt <[email protected]>:

Quoted 8 lines · On Fri, 19 Jul 2024 19:50:18 +0800 you wrote:

Currently, the RISC-V firmware JSON file has duplicate event name "FW_SFENCE_VMA_RECEIVED". According to the RISC-V SBI PMU extension[1], the event name should be "FW_SFENCE_VMA_ASID_SENT".

Before this patch:

$ perf list

[...]

Here is the summary with links:
- [v2] perf arch events: Fix duplicate RISC-V SBI firmware event name

    https://git.kernel.org/riscv/c/63ba5b0fb4f5

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
reviewer
#7 lore raw
Quoted 14 lines · On Thu, Aug 1, 2024 at 9:40 AM <[email protected]> wrote:

Hello:

This patch was applied to riscv/linux.git (fixes)
by Palmer Dabbelt <[email protected]>:

Quoted 7 lines · On Fri, 19 Jul 2024 19:50:18 +0800 you wrote:

Currently, the RISC-V firmware JSON file has duplicate event name "FW_SFENCE_VMA_RECEIVED". According to the RISC-V SBI PMU extension[1], the event name should be "FW_SFENCE_VMA_ASID_SENT".

Before this patch:

$ perf list
Quoted 7 lines
Quoted 1 line

[...]

Here is the summary with links:
- [v2] perf arch events: Fix duplicate RISC-V SBI firmware event name

    https://git.kernel.org/riscv/c/63ba5b0fb4f5

You are awesome, thank you!

Fwiw, as this change is in tools/perf/pmu-events I was expecting it to go through the perf-tools/perf-tools-next tree.

Thanks,
Ian