From:   laurentiu.tudor@nxp.com
To:     gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Cc:     ioana.ciornei@nxp.com, Laurentiu Tudor <laurentiu.tudor@nxp.com>
Subject: [PATCH v3] bus: fsl-mc: don't assume child devices are all fsl-mc devices
Date:   Wed,  1 Feb 2023 18:59:23 +0200
Message-Id: <20230201165923.19369-1-laurentiu.tudor@nxp.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zIseN3Gz0dSIYTAodFZCnT+khmjJaBV+6uiaHzfwTJ452zU40njVkK88uzpR?=
 =?us-ascii?Q?gwkx9afZdBuLh+CBdTilOG3/8QX6HrDG0Tc5Vzw7ax+ihxWVWfTN2LHol257?=
 =?us-ascii?Q?Bs5SRaIRRd/BDEHWCnuIMgK+8EBKHBrHHpC1FSGJMJxP8EElUOnWQ5makine?=
 =?us-ascii?Q?KpHc1z6wZwzEoV71qKExhPtFtEtZZSfpjUFP1kQvcPRDyC9XWWZsIb3DrLhN?=
 =?us-ascii?Q?F963/D9yi8e+lbEef1G2NENOVGwsMQPky8Wmc5gV39CfDuT9MfsiSqJUtpYb?=
 =?us-ascii?Q?pbrq+lW1zW2H8QrvZxbokuuo7XiCQB510LJCBhRE99HYqH2WNxj2eRqUfMnB?=
 =?us-ascii?Q?i267k0B2x9JZlCYhRsPU29cLeBADBw8HfKVMlP6ECmYu9zq1Z7ePRm/xK6Fz?=
 =?us-ascii?Q?nTQz+1RXpuwANu85j6LCeQ7CqRFdN4uOyxU3y39uNrsi/wI9vvRp47f7jyRl?=
 =?us-ascii?Q?F7Tc/6OdBHUbOyKgvhApQUmJkIe8d6SHAAebR/XVKc5wpZ3fk+3PKXD0P5iL?=
 =?us-ascii?Q?Jl/k9swTN84Oc1GZi11QQu8W2MkSlH5RJRt5Jn8XJ6dTfikBuaHuyVTntHby?=
 =?us-ascii?Q?lRm4sQfEfXEdrZwXMurcypzb3Lfk7ktaw3Wyw4JlM+W62Qv+Fu1XFGL2VvSi?=
 =?us-ascii?Q?+c1qW06QSoQZc6RM3TXONYkyTUdCWhHfjswxF5jc9sFgQ1d1wLrTgzZXj5UT?=
 =?us-ascii?Q?xETlIy5WVivRNqagh/OpA6TMxztLz3h5CRWNO0YUdzgL12/VgzG1r9+K39As?=
 =?us-ascii?Q?iO+gwEmbk1NtEEZiQ0+nMw+NBlUmfu3EKgr84XSsMbxZLmVFWoCQwOa2ecCK?=
 =?us-ascii?Q?7gy1vupZ+Lm2biDEi4Ll1kTh719B0ZYLTqU9sHWplmGBoffZXBCeiDIHI0R+?=
 =?us-ascii?Q?ML0p/3PsODFzklInpgXMV1krXm0EIJazsuR2NPWCDTWM2ORbCYNyPgPvvsNe?=
 =?us-ascii?Q?QkHL8hRqz6bzufHJuCtn+1NXIptwLin1+IacHRlcQi0pMZcx9M+V2aOCNwor?=
 =?us-ascii?Q?cHkssu/ByQefu2D2sxOHFqdOBPDLH6nIVHQkB1vFPVDUvUGCnzUHVGb7XTYD?=
 =?us-ascii?Q?jnPuauhZdDNWPW8oxIAkzXqm4cr4FyC43z0FjD66S2ZFNIaXZbkCuRX1ZfUO?=
 =?us-ascii?Q?AL7Zu8iQfQI1GwWNFa3eNGeySGRZD5zSWwZkCFAObcOZdIK/U7/C5v+A7vdc?=
 =?us-ascii?Q?2vTeVyrYQwSU5CTRvdrw0vdS+VwQvzxA2VvZ1woJ9gU9RBQOv8NBFKqRsEIw?=
 =?us-ascii?Q?tE6HTpqkmoSbAShcBG9qbSNuyIbm8BRA9AY8zkKVZiv327UACT6TMRfU5ZW/?=
 =?us-ascii?Q?LFqywgi4jrLjzAMUBC18I4S/DyKWXbr5oZsVHjlYIxrdLEdr0VtQm9WcX6w7?=
 =?us-ascii?Q?eRXrLwNh38quDqMediIR7uTHrL6KlAui2WJEelaamM0y2cpeoxt617nr6QTo?=
 =?us-ascii?Q?s6sh2kG2FkUzuB7sXksU47HsgFYUqcvHUfxoWOkal65hQOSD0Qej93Zc7zMj?=
 =?us-ascii?Q?+SXG+D7MBqMcIo/wB+rvLN7CDr8ebbajL8NetcQLeXN+q5Fw0fERxMWh7j7G?=
 =?us-ascii?Q?1xFzQlT89dSiuVYmJWDX1KqHIbL+WPn8fYutHEE/?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 970b820e-7709-4e19-588f-08db0475b4e4
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3405.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 16:59:39.7949
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Lx0TpHtytNsg2L9/syUXCIrtWjW+hcLKsJfMk67CqFSQHQ9+93BjYMDAOhlyP8p7pXgASGeO/cTHJvFU4tHESA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB9051
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Laurentiu Tudor <laurentiu.tudor@nxp.com>

Changes in VFIO caused a pseudo-device to be created as child of
fsl-mc devices causing a crash [1] when trying to bind a fsl-mc
device to VFIO. Fix this by checking the device type when enumerating
fsl-mc child devices.

[1]
Modules linked in:
Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP
CPU: 6 PID: 1289 Comm: sh Not tainted 6.2.0-rc5-00047-g7c46948a6e9c #2
Hardware name: NXP Layerscape LX2160ARDB (DT)
pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : mc_send_command+0x24/0x1f0
lr : dprc_get_obj_region+0xfc/0x1c0
sp : ffff80000a88b900
x29: ffff80000a88b900 x28: ffff48a9429e1400 x27: 00000000000002b2
x26: ffff48a9429e1718 x25: 0000000000000000 x24: 0000000000000000
x23: ffffd59331ba3918 x22: ffffd59331ba3000 x21: 0000000000000000
x20: ffff80000a88b9b8 x19: 0000000000000000 x18: 0000000000000001
x17: 7270642f636d2d6c x16: 73662e3030303030 x15: ffffffffffffffff
x14: ffffd59330f1d668 x13: ffff48a8727dc389 x12: ffff48a8727dc386
x11: 0000000000000002 x10: 00008ceaf02f35d4 x9 : 0000000000000012
x8 : 0000000000000000 x7 : 0000000000000006 x6 : ffff80000a88bab0
x5 : 0000000000000000 x4 : 0000000000000000 x3 : ffff80000a88b9e8
x2 : ffff80000a88b9e8 x1 : 0000000000000000 x0 : ffff48a945142b80
Call trace:
 mc_send_command+0x24/0x1f0
 dprc_get_obj_region+0xfc/0x1c0
 fsl_mc_device_add+0x340/0x590
 fsl_mc_obj_device_add+0xd0/0xf8
 dprc_scan_objects+0x1c4/0x340
 dprc_scan_container+0x38/0x60
 vfio_fsl_mc_probe+0x9c/0xf8
 fsl_mc_driver_probe+0x24/0x70
 really_probe+0xbc/0x2a8
 __driver_probe_device+0x78/0xe0
 device_driver_attach+0x30/0x68
 bind_store+0xa8/0x130
 drv_attr_store+0x24/0x38
 sysfs_kf_write+0x44/0x60
 kernfs_fop_write_iter+0x128/0x1b8
 vfs_write+0x334/0x448
 ksys_write+0x68/0xf0
 __arm64_sys_write+0x1c/0x28
 invoke_syscall+0x44/0x108
 el0_svc_common.constprop.1+0x94/0xf8
 do_el0_svc+0x38/0xb0
 el0_svc+0x20/0x50
 el0t_64_sync_handler+0x98/0xc0
 el0t_64_sync+0x174/0x178
Code: aa0103f4 a9025bf5 d5384100 b9400801 (79401260)
---[ end trace 0000000000000000 ]---

Fixes: 3c28a76124b2 ("vfio: Add struct device to vfio_device")
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
Changes in v3:
 - added changelog

Changes in v2:
 - added "Fixes:" tag


 drivers/bus/fsl-mc/dprc-driver.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/bus/fsl-mc/dprc-driver.c b/drivers/bus/fsl-mc/dprc-driver.c
index 4c84be378bf2..ec5f26a45641 100644
--- a/drivers/bus/fsl-mc/dprc-driver.c
+++ b/drivers/bus/fsl-mc/dprc-driver.c
@@ -45,6 +45,9 @@ static int __fsl_mc_device_remove_if_not_in_mc(struct device *dev, void *data)
 	struct fsl_mc_child_objs *objs;
 	struct fsl_mc_device *mc_dev;
 
+	if (!dev_is_fsl_mc(dev))
+		return 0;
+
 	mc_dev = to_fsl_mc_device(dev);
 	objs = data;
 
@@ -64,6 +67,9 @@ static int __fsl_mc_device_remove_if_not_in_mc(struct device *dev, void *data)
 
 static int __fsl_mc_device_remove(struct device *dev, void *data)
 {
+	if (!dev_is_fsl_mc(dev))
+		return 0;
+
 	fsl_mc_device_remove(to_fsl_mc_device(dev));
 	return 0;
 }
-- 
2.17.1