From nobody Mon Feb 9 05:41:56 2026 Received: from mail-ot1-f99.google.com (mail-ot1-f99.google.com [209.85.210.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C66AB39A7F7 for ; Thu, 8 Jan 2026 10:26:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767868019; cv=none; b=Y0HTanA3a+B+2UmuakJPAW3hB1I0yGww9uxuyQhIAMuzIqYfwILWykAl/TystYZ9X2Je93lTXQ3xaeaKtSeltaduTjCK3tE5IjMFgcjV2vvjmb8r7IfiUyPyGSf8k2yW2Cx0Q3bNschW1SXeqEyLDOIxHM152txzVd/NiFhWjAY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767868019; c=relaxed/simple; bh=f31CHMhQWqNlQtDA++NF7UwXwugjtlGMeu/v6z0UZNQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jTF5al+TnvRNbYlhR4/A9HiZyu4GfGO8zsIs0ed2iar10nP5uM3lVnA5XKj6i+NJLkQkk+rZBK6486N8pczLmZJpYW5cUX8b26e51LeuwaV4kaF4ruA9jTm1299/1y/KFrcSwgFAxV58i5WZei8b3vf7eVeZVvDpsZpD0tIe35k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=ezeb+pzh; arc=none smtp.client-ip=209.85.210.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="ezeb+pzh" Received: by mail-ot1-f99.google.com with SMTP id 46e09a7af769-7c75a5cb752so2194320a34.2 for ; Thu, 08 Jan 2026 02:26:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767868010; x=1768472810; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bRGzylfuTGBzLuULxrttYZ/W8538Ph4NnSuvcrcPCLg=; b=VRmym0gC10RgY1aXw0hO2o+SDkySp7n42L7K4iyQf9Q/sZ4oSlQfeHD+JLeR3iOHpL xBlC1GbLNJsHWqCxu3dU0dzBflwRYJMIp8kfKBIoMCGObRZSQPrpmUBOLqKnktdY735j eY6r+4hwKNOXAGY5nAxdUjwa5elbw00Y9zEXHQCj/Pk2UcRxye/fCnqakBS3diL37lIo cgkerIOtNJ41yBHYaJZLLrx0SubzUD9vSM7gil+SXDkCCjI/cvyX6cyH2OqJW+utwY7v R1aIzrrlNvkcsh9b3z+BId3s0v2G2UiHGmLKgc0U9Y9bfXxvlghi0BmTI8q2AWcxT4TW qrJw== X-Forwarded-Encrypted: i=1; AJvYcCW8eIjtPpF9lGHIGBGoJzbcLUxL+DhNUaVthiVZQgf6V5edYG5+QZk8dh49rbCqZbH7xmS9nRSjKiRvJ5M=@vger.kernel.org X-Gm-Message-State: AOJu0YyJE0RM9x1VOjFCqLKmsNr7rZmUQG499DELnpcMq4lQ4zkr26QU txbtwYO6URmt3tPQFQzywLYlBxTdbd98vPXVn9NiBH2u3h5C1qM1ry7XxNCLHG3zal9C9b9xv6m PWHL65mHk+uf/94YR7a33sY66/uKGkaxuxva09vFE6lt9WfixGPgABdoKTacDyP6fzyExE9iVz/ 2bg/2/r4eBc6iV/I/E7IMuByVao6CqQ+tJVdZIrPFRWKH/CAXfMz4OXnyljJQXcmtBvnrjASVQC m4V3A9khx9VazNWfUhIv+7lvw== X-Gm-Gg: AY/fxX4E74uX2PzUHgjjk+zPjaBQVLlHgOBKH6ZEwAkDuUcxdgbsdHDys9WYcfRn2WS 00POTMg9FeBZzyRH67KaC28OVgqW/uCIhNtVJTHU7ss6qcDc9La3+BVOLMSreSo5UEui8Z+SOga C77f/eNxaS/Y/CuvSWVVdp2PlSchSl/+ZLs21J5+kFuwrxKtkAWF+/23QkoW65j6obUrhU0nyK1 JSIYTblcSmeD57G+BXM7YAXOXcO1hykere3Lep+Z8JPEuUU5btGLxeGWWluun/Vsz9Dke5s41gT 2eR8ejIhbHVrBAMApxapvIIwl0hF0kFdkGbxbeVb066IFY+UVyO2cvQ5vlEqK9Dv+gLL8TAV0i7 ELtsGR+jxHhvd99HBRclBloupWru9d/5zHzVZlMkczXApBgK13dvvD9dcOVT7fwHHDdO1oq+PQj vAFkRyQYSM10l4MQWfzQ5gHknbwLtJpp9aqxrWtAALVFmFKg== X-Google-Smtp-Source: AGHT+IHq8CQvSHouDrMEPKl0pXwQzFqAD1vePgXXbVipUfyCV7LSn+BnDukE4FT5i5OO//TV+KoyhpA2SitN X-Received: by 2002:a05:6830:4426:b0:7c7:61e0:a4ee with SMTP id 46e09a7af769-7ce508ceac9mr3120506a34.11.1767868010401; Thu, 08 Jan 2026 02:26:50 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-1.dlp.protect.broadcom.com. [144.49.247.1]) by smtp-relay.gmail.com with ESMTPS id 46e09a7af769-7ce4788c5c9sm1118926a34.4.2026.01.08.02.26.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jan 2026 02:26:50 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-4ffb40c0272so46998971cf.3 for ; Thu, 08 Jan 2026 02:26:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1767868009; x=1768472809; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bRGzylfuTGBzLuULxrttYZ/W8538Ph4NnSuvcrcPCLg=; b=ezeb+pzhg/TTaNLxg+wY5Xs6RFtTL4oZzEkjIbt4LJd3OKKUf6ECcJdY5+ni10+l5L jchx129eOp5S/EVe7LThZQp4AkgCUDFgWfKmcutvguECXarVYMXtq6XrRvaXZGww86ff Vdv63MdhyGuNtHLp4t8M9r7qFdD1iqD/IwxgU= X-Forwarded-Encrypted: i=1; AJvYcCWS43Ii31JPshhZMvOeEqFQW9nplYopNx20CTZYBtIV4yTSp/gY9OloM00u63Bx56cWfDctokemXNVZNbg=@vger.kernel.org X-Received: by 2002:a05:622a:14d3:b0:4f4:c0ac:6666 with SMTP id d75a77b69052e-4ffb4b592e4mr72784701cf.77.1767868009555; Thu, 08 Jan 2026 02:26:49 -0800 (PST) X-Received: by 2002:a05:622a:14d3:b0:4f4:c0ac:6666 with SMTP id d75a77b69052e-4ffb4b592e4mr72784471cf.77.1767868009156; Thu, 08 Jan 2026 02:26:49 -0800 (PST) Received: from shivania.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4ffa8e362fdsm45124721cf.21.2026.01.08.02.26.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jan 2026 02:26:48 -0800 (PST) From: Shivani Agarwal To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: jgg@ziepe.ca, leon@kernel.org, zyjzyj2000@gmail.com, mbloch@nvidia.com, parav@nvidia.com, mrgolin@amazon.com, roman.gushchin@linux.dev, wangliang74@huawei.com, marco.crivellari@suse.com, zhao.xichao@vivo.com, haggaie@mellanox.com, monis@mellanox.com, dledford@redhat.com, amirv@mellanox.com, kamalh@mellanox.com, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, ajay.kaher@broadcom.com, alexey.makhalov@broadcom.com, vamsi-krishna.brahmajosyula@broadcom.com, yin.ding@broadcom.com, tapas.kundu@broadcom.com, Zhu Yanjun , Daisuke Matsuda , Sasha Levin , Shivani Agarwal Subject: [PATCH 2/2 v6.6] RDMA/rxe: Fix the failure of ibv_query_device() and ibv_query_device_ex() tests Date: Thu, 8 Jan 2026 02:05:40 -0800 Message-Id: <20260108100540.672666-3-shivani.agarwal@broadcom.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260108100540.672666-1-shivani.agarwal@broadcom.com> References: <20260108100540.672666-1-shivani.agarwal@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: text/plain; charset="utf-8" From: Zhu Yanjun [ Upstream commit 8ce2eb9dfac8743d1c423b86339336a5b6a6069e ] In rdma-core, the following failures appear. " $ ./build/bin/run_tests.py -k device ssssssss....FF........s =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D FAIL: test_query_device (tests.test_device.DeviceTest.test_query_device) Test ibv_query_device() Reviewed-by: Daisuke Matsuda Tested-by: Daisuke Matsuda ---------------------------------------------------------------------- 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 !=3D 0 ^^^^^^^^^^^^^^^^^^^^^^^^ AssertionError =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 !=3D 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. Fixes: 2ac5415022d1 ("RDMA/rxe: Remove the direct link to net_device") Signed-off-by: Zhu Yanjun Link: https://patch.msgid.link/20250302215444.3742072-1-yanjun.zhu@linux.dev Reviewed-by: Daisuke Matsuda Tested-by: Daisuke Matsuda Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin [Shivani: Modified to apply on 6.6.y] Signed-off-by: Shivani Agarwal --- drivers/infiniband/sw/rxe/rxe.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rx= e.c index 1fb4fa4514bf..50c583a55464 100644 --- a/drivers/infiniband/sw/rxe/rxe.c +++ b/drivers/infiniband/sw/rxe/rxe.c @@ -38,10 +38,8 @@ void rxe_dealloc(struct ib_device *ib_dev) } =20 /* initialize rxe device parameters */ -static void rxe_init_device_param(struct rxe_dev *rxe) +static void rxe_init_device_param(struct rxe_dev *rxe, struct net_device *= ndev) { - struct net_device *ndev; - rxe->max_inline_data =3D RXE_MAX_INLINE_DATA; =20 rxe->attr.vendor_id =3D RXE_VENDOR_ID; @@ -74,15 +72,9 @@ static void rxe_init_device_param(struct rxe_dev *rxe) rxe->attr.max_pkeys =3D RXE_MAX_PKEYS; rxe->attr.local_ca_ack_delay =3D RXE_LOCAL_CA_ACK_DELAY; =20 - ndev =3D rxe_ib_device_get_netdev(&rxe->ib_dev); - if (!ndev) - return; - addrconf_addr_eui48((unsigned char *)&rxe->attr.sys_image_guid, ndev->dev_addr); =20 - dev_put(ndev); - rxe->max_ucontext =3D RXE_MAX_UCONTEXT; } =20 @@ -115,18 +107,13 @@ static void rxe_init_port_param(struct rxe_port *port) /* initialize port state, note IB convention that HCA ports are always * numbered from 1 */ -static void rxe_init_ports(struct rxe_dev *rxe) +static void rxe_init_ports(struct rxe_dev *rxe, struct net_device *ndev) { struct rxe_port *port =3D &rxe->port; - struct net_device *ndev; =20 rxe_init_port_param(port); - ndev =3D rxe_ib_device_get_netdev(&rxe->ib_dev); - if (!ndev) - return; addrconf_addr_eui48((unsigned char *)&port->port_guid, ndev->dev_addr); - dev_put(ndev); spin_lock_init(&port->port_lock); } =20 @@ -144,12 +131,12 @@ static void rxe_init_pools(struct rxe_dev *rxe) } =20 /* initialize rxe device state */ -static void rxe_init(struct rxe_dev *rxe) +static void rxe_init(struct rxe_dev *rxe, struct net_device *ndev) { /* init default device parameters */ - rxe_init_device_param(rxe); + rxe_init_device_param(rxe, ndev); =20 - rxe_init_ports(rxe); + rxe_init_ports(rxe, ndev); rxe_init_pools(rxe); =20 /* init pending mmap list */ @@ -186,7 +173,7 @@ void rxe_set_mtu(struct rxe_dev *rxe, unsigned int ndev= _mtu) int rxe_add(struct rxe_dev *rxe, unsigned int mtu, const char *ibdev_name, struct net_device *ndev) { - rxe_init(rxe); + rxe_init(rxe, ndev); rxe_set_mtu(rxe, mtu); =20 return rxe_register_device(rxe, ibdev_name, ndev); --=20 2.43.7