sysfs: add link_layer property to InfiniBandPort (#700)

* sysfs: add link_layer property to InfiniBandPort

Signed-off-by: Thomas Barrett <[email protected]>

* Update sysfs/class_infiniband.go

Co-authored-by: Ben Kochie <[email protected]>
Signed-off-by: Thomas Barrett <[email protected]>

---------

Signed-off-by: Thomas Barrett <[email protected]>
Signed-off-by: Thomas Barrett <[email protected]>
Co-authored-by: Ben Kochie <[email protected]>

Author: thomasbarrett

sysfs/class_infiniband.go

@@ -110,6 +110,7 @@ type InfiniBandHwCounters struct {
 type InfiniBandPort struct {
 	Name        string
 	Port        uint
+	LinkLayer   string // String representation from /sys/class/infiniband/<Name>/ports/<Port>/link_layer
 	State       string // String representation from /sys/class/infiniband/<Name>/ports/<Port>/state
 	StateID     uint   // ID from /sys/class/infiniband/<Name>/ports/<Port>/state
 	PhysState   string // String representation from /sys/class/infiniband/<Name>/ports/<Port>/phys_state
@@ -252,6 +253,13 @@ func (fs FS) parseInfiniBandPort(name string, port string) (*InfiniBandPort, err
 	ibp := InfiniBandPort{Name: name, Port: uint(portNumber)}
 
 	portPath := fs.sys.Path(infinibandClassPath, name, "ports", port)
+
+	linkLayer, err := os.ReadFile(filepath.Join(portPath, "link_layer"))
+	if err != nil {
+		return nil, err
+	}
+	ibp.LinkLayer = strings.TrimSpace(string(linkLayer))
+
 	content, err := os.ReadFile(filepath.Join(portPath, "state"))
 	if err != nil {
 		return nil, err

sysfs/class_infiniband_test.go

@@ -174,6 +174,7 @@ func TestInfiniBandClass(t *testing.T) {
 			HCAType:         "",
 			Ports: map[uint]InfiniBandPort{
 				1: {
+					LinkLayer:   "InfiniBand",
 					Name:        "hfi1_0",
 					Port:        1,
 					State:       "ACTIVE",
@@ -210,6 +211,7 @@ func TestInfiniBandClass(t *testing.T) {
 			HCAType:         "MT4099",
 			Ports: map[uint]InfiniBandPort{
 				1: {
+					LinkLayer:   "InfiniBand",
 					Name:        "mlx4_0",
 					Port:        1,
 					State:       "ACTIVE",
@@ -238,6 +240,7 @@ func TestInfiniBandClass(t *testing.T) {
 					},
 				},
 				2: {
+					LinkLayer:   "InfiniBand",
 					Name:        "mlx4_0",
 					Port:        2,
 					State:       "ACTIVE",
@@ -275,6 +278,7 @@ func TestInfiniBandClass(t *testing.T) {
 			NodeGUID:        "0a7f:bc12:45ef:d23b",
 			Ports: map[uint]InfiniBandPort{
 				1: {
+					LinkLayer:   "InfiniBand",
 					Name:        "mlx5_0",
 					Port:        1,
 					State:       "ACTIVE",

testdata/fixtures.ttar

@@ -5787,6 +5787,11 @@ Lines: 1
 0
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+Path: fixtures/sys/class/infiniband/hfi1_0/ports/1/link_layer
+Lines: 1
+InfiniBand
+Mode: 644
+# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/class/infiniband/hfi1_0/ports/1/phys_state
 Lines: 1
 5: LinkUp
@@ -5914,6 +5919,11 @@ Lines: 1
 0
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+Path: fixtures/sys/class/infiniband/mlx4_0/ports/1/link_layer
+Lines: 1
+InfiniBand
+Mode: 644
+# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/class/infiniband/mlx4_0/ports/1/phys_state
 Lines: 1
 5: LinkUp
@@ -6018,6 +6028,12 @@ Mode: 644
 Path: fixtures/sys/class/infiniband/mlx4_0/ports/2/counters/symbol_error
 Lines: 1
 0
+Mode: 644
+# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+Path: fixtures/sys/class/infiniband/mlx4_0/ports/2/link_layer
+Lines: 2
+InfiniBand
+
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/class/infiniband/mlx4_0/ports/2/phys_state
@@ -6300,6 +6316,11 @@ Lines: 1
 742114
 Mode: 644
 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+Path: fixtures/sys/class/infiniband/mlx5_0/ports/1/link_layer
+Lines: 1
+InfiniBand
+Mode: 644
+# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Path: fixtures/sys/class/infiniband/mlx5_0/ports/1/phys_state
 Lines: 1
 4: ACTIVE