RDMA/rxe: Fix the failure of ibv_query_device() and ibv_query_device_ex() tests
Subsystems (2)
PATCH 1/1 RDMA/rxe: Fix the failure of ibv_query_device() and ibv_query_device_ex() tests
In rdma-core, the following failures appear.
"
$ ./build/bin/run_tests.py -k device
ssssssss....FF........s
======================================================================
FAIL: test_query_device (tests.test_device.DeviceTest.test_query_device)
Test ibv_query_device()
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/ubuntu/rdma-core/tests/test_device.py", line 63, in
test_query_device
self.verify_device_attr(attr, dev)
File "/home/ubuntu/rdma-core/tests/test_device.py", line 200, in
verify_device_attr
assert attr.sys_image_guid != 0
^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError======================================================================
FAIL: test_query_device_ex (tests.test_device.DeviceTest.test_query_device_ex) Test ibv_query_device_ex()
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/ubuntu/rdma-core/tests/test_device.py", line 222, in test_query_device_ex
self.verify_device_attr(attr_ex.orig_attr, dev)
File "/home/ubuntu/rdma-core/tests/test_device.py", line 200, in verify_device_attr
assert attr.sys_image_guid != 0
^^^^^^^^^^^^^^^^^^^^^^^^AssertionError
"
The root cause is: before a net device is set with rxe, this net device is used to generate a sys_image_guid.
The solution is from siw commit bad5b6e34ffb ("RDMA/siw: Fabricate a GID on tun and loopback devices").
--- drivers/infiniband/sw/rxe/rxe.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-)
drivers/infiniband/sw/rxe/rxe.c +1 -23
@@ -37,8 +37,6 @@ void rxe_dealloc(struct ib_device *ib_dev)/* initialize rxe device parameters */ static void rxe_init_device_param (struct rxe_dev *rxe) { -struct net_device *ndev; - rxe->max_inline_data =RXE_MAX_INLINE_DATA ; rxe->attr.vendor_id =RXE_VENDOR_ID ;
@@ -71,26 +69,11 @@ static void rxe_init_device_param(struct rxe_dev *rxe) rxe->attr.max_pkeys =RXE_MAX_PKEYS ; rxe->attr.local_ca_ack_delay =RXE_LOCAL_CA_ACK_DELAY ; - ndev =rxe_ib_device_get_netdev (&rxe->ib_dev); -if (!ndev) -return ; - -if (ndev->addr_len) { -memcpy (rxe->raw_gid, ndev->dev_addr, - min_t(unsigned int, ndev->addr_len, ETH_ALEN)); - }else { -/* -* This device does not have a HW address, but -* connection mangagement requires a unique gid. -*/ -eth_random_addr (rxe->raw_gid); - } +eth_random_addr (rxe->raw_gid);addrconf_addr_eui48 ((unsigned char *)&rxe->attr.sys_image_guid, rxe->raw_gid); -dev_put (ndev); - rxe->max_ucontext =RXE_MAX_UCONTEXT ;if (IS_ENABLED (CONFIG_INFINIBAND_ON_DEMAND_PAGING )) {
@@ -144,15 +127,10 @@ static void rxe_init_port_param(struct rxe_port *port)static void rxe_init_ports (struct rxe_dev *rxe) {struct rxe_port *port = &rxe->port; -struct net_device *ndev;rxe_init_port_param (port); - ndev =rxe_ib_device_get_netdev (&rxe->ib_dev); -if (!ndev) -return ;addrconf_addr_eui48 ((unsigned char *)&port->port_guid, rxe->raw_gid); -dev_put (ndev);spin_lock_init (&port->port_lock); }
Signature · 1 line
2.34.1