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] bus: fsl-mc: don't assume child devices are all fsl-mc devices
Date:   Fri, 27 Jan 2023 15:16:36 +0200
Message-Id: <20230127131636.20889-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?eCZtJtWllWKLMyAbx1xv3FeiCrZ2P6h7mNAIGp/JRLUcMPDrcOOFhbbRhOmu?=
 =?us-ascii?Q?UIMi/X/xOFHEGXs52/Bju/XnjMSW6hhzJWXUbARXhO3Iq8PwYh+M1i1BFO8o?=
 =?us-ascii?Q?V4IBof5DOQTnkxD88e8LaVErBmHPCCdoeAwn1m2Y+79b1a0LxL69jkPgW6qC?=
 =?us-ascii?Q?3/zgW5bPJH2htD6F4oSykry3XbdulMtoCoat7BLoL2nn/R4lWbvPM3L+QMEk?=
 =?us-ascii?Q?24MIna9kN6MhCXcdY0fu5ZugVXLM7D7jBPy9oZMxlOIShhVEnR6bcYRIkNWK?=
 =?us-ascii?Q?oZ7QFmgt5KP24Ez9bIIuZwZ7JBGQsliMMiLsRyt5HSNnUv6xvguk/jNmtEl7?=
 =?us-ascii?Q?23I42Ls8mMPjqK2poI3WhyWALicfapTakieM+bLTFghQAsfv5Dxe7vjRyp4a?=
 =?us-ascii?Q?ZaWWgnQSEvDy8+uCEt/XHuDL+Je/rY+myfhqct4k7n9I4sxL7f5NStOi8gzT?=
 =?us-ascii?Q?AI+RRoTGXdIzN4z8lddXIY+rh3Q/aIlBXoOIHsnXqS/AY/eo6qRSm07gNxBZ?=
 =?us-ascii?Q?GRZh8deSaZ3tEi5RwDoLovmr6WR3YvhFc+3gFj2LXC+hirw3HrnCi0T/FumV?=
 =?us-ascii?Q?Jblu6N66/PmkBbDAFSpK9HB2bsqLPgUpu2Lk/MPEcIunaXSZpVKOWST0fPQ3?=
 =?us-ascii?Q?PkpAAiCImiZWmEuNfi23woV1vAXxew9hnxa2nAqd+onTk+h6Ie8ef5ITHwPT?=
 =?us-ascii?Q?15CkUbJiXiqQe2xvbxRHrITnfMTBq0OTkCcKXXPL1V4owak3ogEoF7WqVo+x?=
 =?us-ascii?Q?DsBeGMoHhRX+rm9Tmfr+YeJlQEuIubs5w/v8D1yicne1AYHQxoE3Q6WLyCcj?=
 =?us-ascii?Q?nPnnYK0jPMjL7iUDSPNh3IlzQzP7qxQJh87RCdJNctawq7Gocr6lvgDRwI8W?=
 =?us-ascii?Q?RkvMU7T6n1p5/zr6fZfSA7nUFUUi2uPezK4rNXxwLUytDnrsZiwqFFMaulqm?=
 =?us-ascii?Q?VTzjpjJABIozOHfsn7M0RRtUkJ19PzzkVlhxYAEFBiY2LEtD+94RKf65b7li?=
 =?us-ascii?Q?guoS6sET5vYqrgExpekFbABObVxFXLkCxVHUDComGo/7nMO7Mv3H2zaaoWOy?=
 =?us-ascii?Q?LN/Ir/RJAS59sMtdzV4ikjGj/StNbXojVDNcblW4rW0hHzgvDh1MJVgG75VN?=
 =?us-ascii?Q?xV3Dcnpz7DrW5jnoGdV6MTHzALPSvl2d51Fy4EPyPALl5OIemlzimOFrUJFj?=
 =?us-ascii?Q?exFKPcpgl9DsAv6c9HfGkp5NdcJcYV0tFH9KzcchQGCJFMAtGIKVaEN1Jicc?=
 =?us-ascii?Q?q4eURjwvysLqG0RsZvWqBvE2pBfWmoUBTqWzxR3rySlcyguznFq0DttA8H8s?=
 =?us-ascii?Q?Yk8l/I9xPpy+4vrtumNFzmXx8GSiTzglfbI4HeXU40F6mZvR+RuXu+cWLjtd?=
 =?us-ascii?Q?WRJ/asf4y4V0W0P1YfyL1LIkGf58zU6RvIyq+Xgw624q1pK+UbG7JdhPSSWn?=
 =?us-ascii?Q?oD+PP1Af643jOPXByX9uE7cXpr9Ei1lQVygZBnHLsisSpXeLBNdbWjOnzjA/?=
 =?us-ascii?Q?8pw7CTDdLM6LTrphaONsSIa0tzpTL7zRG4AC1VSvMWDtYNd1/7VuEFC3oc3p?=
 =?us-ascii?Q?IWjjx+l/re9r9S/xpjqYIq+3EkX/wIfEmovK23OT?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4863a673-13ce-4f61-544c-08db0068bf73
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3405.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 13:16:49.5412
 (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: TFeHIvaYdqbq/hN9AP7FpJLI9WISVxN5bRRdvawXYicm/8dVUlMfGRtnUwwKqNlOOPx2Selna0n+txoGhKB7TA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8451
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 ]---

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
 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