Skip to content

interrupts_linux: Fix fields on aarch64 #2631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 10, 2023
Merged

interrupts_linux: Fix fields on aarch64 #2631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6fa601
interrupts_linux: Fix fields on aarch64
dveeden Mar 10, 2023
ab0a012
Fix codespell
dveeden Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ Windows support is now removed, the [wmi_exporter](https://github.com/martinlind
* [CHANGE] Switch to kingpin flags #639
* [CHANGE] Replace --collectors.enabled with per-collector flags #640
* [FEATURE] Add ARP collector for Linux #540
* [FEATURE] Add XFS colector for Linux #568, #575
* [FEATURE] Add XFS collector for Linux #568, #575
* [FEATURE] Add qdisc collector for Linux #580
* [FEATURE] Add cpufreq stats for Linux #548
* [FEATURE] Add diskstats for Darwin #593
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ zoneinfo | Exposes NUMA memory zone metrics. | Linux

### Deprecated

These colectors are deprecated and will be removed in the next major release.
These collectors are deprecated and will be removed in the next major release.

Name | Description | OS
---------|-------------|----
Expand Down
61 changes: 61 additions & 0 deletions collector/fixtures/proc/interrupts_aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
CPU0 CPU1 CPU2 CPU3 CPU4 CPU5 CPU6 CPU7
10: 3287008667 3310445093 3301386305 3273132897 3368262064 3641875466 3360412019 3225020442 GICv3 27 Level arch_timer
14: 7815 0 0 4 0 0 0 0 GICv3 37 Level ttyS0
17: 0 0 0 0 0 0 0 0 GICv3 48 Edge ACPI:Ged
18: 0 0 0 0 0 0 0 0 GICv3 49 Edge ACPI:Ged
19: 0 0 0 0 0 0 0 0 GICv3 50 Edge ACPI:Ged
20: 0 0 0 0 0 0 0 0 GICv3 51 Edge ACPI:Ged
21: 0 0 0 0 0 0 0 0 GICv3 52 Edge ACPI:Ged
22: 0 0 0 0 0 0 0 0 GICv3 53 Edge ACPI:Ged
23: 0 0 0 0 0 0 0 0 GICv3 54 Edge ACPI:Ged
24: 0 0 0 0 0 0 0 0 GICv3 55 Edge ACPI:Ged
25: 0 0 0 0 0 0 0 0 GICv3 56 Edge ACPI:Ged
26: 0 0 0 0 0 0 0 0 GICv3 57 Edge ACPI:Ged
27: 0 0 0 0 0 0 0 0 GICv3 58 Edge ACPI:Ged
28: 0 0 0 0 0 0 0 0 GICv3 59 Edge ACPI:Ged
29: 0 0 0 0 0 0 0 0 GICv3 60 Edge ACPI:Ged
30: 0 0 0 0 0 0 0 0 GICv3 61 Edge ACPI:Ged
31: 0 0 0 0 0 0 0 0 GICv3 62 Edge ACPI:Ged
32: 0 0 0 0 0 0 0 0 GICv3 63 Edge ACPI:Ged
33: 0 0 0 0 0 0 0 0 GICv3 64 Edge ACPI:Ged
34: 0 0 0 0 0 0 0 0 GICv3 65 Edge ACPI:Ged
35: 0 0 0 0 0 0 0 0 GICv3 66 Edge ACPI:Ged
36: 0 0 0 0 0 0 0 0 GICv3 67 Edge ACPI:Ged
37: 0 0 0 0 0 0 0 0 GICv3 68 Edge ACPI:Ged
38: 0 0 0 0 0 0 0 0 GICv3 69 Edge ACPI:Ged
39: 0 0 0 0 0 0 0 0 GICv3 70 Edge ACPI:Ged
40: 0 0 0 0 0 0 0 0 GICv3 71 Edge ACPI:Ged
41: 0 0 0 0 0 0 0 0 GICv3 72 Edge ACPI:Ged
42: 0 0 0 0 0 0 0 0 GICv3 73 Edge ACPI:Ged
43: 0 0 0 0 0 0 0 0 GICv3 74 Edge ACPI:Ged
44: 0 0 0 0 0 0 0 0 GICv3 75 Edge ACPI:Ged
45: 0 0 0 0 0 0 0 0 GICv3 76 Edge ACPI:Ged
46: 0 0 0 0 0 0 0 0 GICv3 77 Edge ACPI:Ged
47: 0 0 0 0 0 0 0 0 GICv3 78 Edge ACPI:Ged
48: 0 0 0 0 0 0 0 0 GICv3 79 Edge ACPI:Ged
49: 0 0 0 0 0 0 0 0 GICv3 23 Level arm-pmu
50: 0 0 0 0 0 0 0 0 ARMH0061:00 3 Edge ACPI:Event
51: 13 0 0 20 4 0 0 0 ITS-MSI 65536 Edge nvme0q0
52: 0 9 0 0 0 5 20 0 ITS-MSI 507904 Edge nvme1q0
53: 129969327 0 0 0 0 0 0 0 ITS-MSI 65537 Edge nvme0q1
54: 0 0 0 0 126913956 0 0 0 ITS-MSI 65538 Edge nvme0q2
55: 0 199619844 0 0 0 0 0 0 ITS-MSI 507905 Edge nvme1q1
56: 0 0 0 0 0 198494086 0 0 ITS-MSI 507906 Edge nvme1q2
57: 0 0 51 0 0 32479308 0 0 ITS-MSI 81920 Edge ena-mgmnt@pci:0000:00:05.0
58: 0 0 1195697946 437 0 0 0 0 ITS-MSI 81921 Edge eth0-Tx-Rx-0
59: 0 0 0 2709937608 1619 0 0 0 ITS-MSI 81922 Edge eth0-Tx-Rx-1
60: 0 1457922109 0 0 0 71 0 0 ITS-MSI 81923 Edge eth0-Tx-Rx-2
61: 2052879736 0 0 0 0 0 124 0 ITS-MSI 81924 Edge eth0-Tx-Rx-3
62: 0 0 0 0 0 0 2268695629 1530 ITS-MSI 81925 Edge eth0-Tx-Rx-4
63: 50 0 0 0 0 0 0 1997799253 ITS-MSI 81926 Edge eth0-Tx-Rx-5
64: 0 48 0 0 1238622585 0 0 0 ITS-MSI 81927 Edge eth0-Tx-Rx-6
65: 0 0 47 0 0 0 0 1574978449 ITS-MSI 81928 Edge eth0-Tx-Rx-7
IPI0:2768808080 2844211768 2878602432 2730576120 2723524623 3349096412 2717389879 2154252810 Rescheduling interrupts
IPI1: 357815098 213258177 153713187 132890624 124746406 123498004 122386326 120728639 Function call interrupts
IPI2: 0 0 0 0 0 0 0 0 CPU stop interrupts
IPI3: 0 0 0 0 0 0 0 0 CPU stop (for crash dump) interrupts
IPI4: 0 0 0 0 0 0 0 0 Timer broadcast interrupts
IPI5: 0 0 0 0 0 0 0 0 IRQ work interrupts
IPI6: 0 0 0 0 0 0 0 0 CPU wake-up interrupts
Err: 0

35 changes: 21 additions & 14 deletions collector/interrupts_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,29 @@ func parseInterrupts(r io.Reader) (map[string]interrupt, error) {
cpuNum := len(strings.Fields(scanner.Text())) // one header per cpu

for scanner.Scan() {
parts := strings.Fields(scanner.Text())
if len(parts) < cpuNum+2 { // irq + one column per cpu + details,
continue // we ignore ERR and MIS for now
}
intName := parts[0][:len(parts[0])-1] // remove trailing :
intr := interrupt{
values: parts[1 : cpuNum+1],
}
// On aarch64 there can be zero space between the name/label
// and the values, so we need to split on `:` before using
// strings.Fields() to split on fields.
group := strings.SplitN(scanner.Text(), ":", 2)
if len(group) > 1 {
parts := strings.Fields(group[1])

if len(parts) < cpuNum+1 { // irq + one column per cpu + details,
continue // we ignore ERR and MIS for now
}
intName := strings.TrimLeft(group[0], " ")
intr := interrupt{
values: parts[0:cpuNum],
}

if _, err := strconv.Atoi(intName); err == nil { // numeral interrupt
intr.info = parts[cpuNum+1]
intr.devices = strings.Join(parts[cpuNum+2:], " ")
} else {
intr.info = strings.Join(parts[cpuNum+1:], " ")
if _, err := strconv.Atoi(intName); err == nil { // numeral interrupt
intr.info = parts[cpuNum]
intr.devices = strings.Join(parts[cpuNum+1:], " ")
} else {
intr.info = strings.Join(parts[cpuNum:], " ")
}
interrupts[intName] = intr
}
interrupts[intName] = intr
}

return interrupts, scanner.Err()
Expand Down
33 changes: 31 additions & 2 deletions collector/interrupts_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,39 @@ func TestInterrupts(t *testing.T) {
}

if want, got := "5031", interrupts["NMI"].values[1]; want != got {
t.Errorf("want interrupts %s, got %s", want, got)
t.Errorf("want interrupts value %s, got %s", want, got)
}

if want, got := "4968", interrupts["NMI"].values[3]; want != got {
t.Errorf("want interrupts %s, got %s", want, got)
t.Errorf("want interrupts value %s, got %s", want, got)
}

if want, got := "IR-IO-APIC-edge", interrupts["12"].info; want != got {
t.Errorf("want interrupts info %s, got %s", want, got)
}

if want, got := "i8042", interrupts["12"].devices; want != got {
t.Errorf("want interrupts devices %s, got %s", want, got)
}

}

// https://github.com/prometheus/node_exporter/issues/2557
// On aarch64 the interrupts file can have zero spaces between the label of
// the row and the first value if the value is large
func TestInterruptsArm(t *testing.T) {
file, err := os.Open("fixtures/proc/interrupts_aarch64")
if err != nil {
t.Fatal(err)
}
defer file.Close()

interrupts, err := parseInterrupts(file)
if err != nil {
t.Fatal(err)
}

if _, ok := interrupts["IPI0"]; !ok {
t.Errorf("IPI0 label not found in interrupts")
}
}