From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB38CECE562 for ; Mon, 17 Sep 2018 03:25:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 720F8208AE for ; Mon, 17 Sep 2018 03:25:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microsoft.com header.i=@microsoft.com header.b="csE9psKt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 720F8208AE Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=microsoft.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729922AbeIQI2z (ORCPT ); Mon, 17 Sep 2018 04:28:55 -0400 Received: from mail-dm3nam03on0101.outbound.protection.outlook.com ([104.47.41.101]:50080 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729820AbeIQI2y (ORCPT ); Mon, 17 Sep 2018 04:28:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hHhQw2Hsj08jJSNACwYkFjw3GXTC6SojFZf5DEdNyO0=; b=csE9psKtkRWEuelSrbvIiU1BwIbwFcgq6ETm4Bq9MQAcwkviiFkV0L9PIeCzu4F5cxnzpPjHg0UwagZkPMhFXL5hzsOl/yNoNBnlm+urV29e8Xh7XAzmBw0M57i9N6Nq0ELvYxSDo3qbyLGJjbjKHElHn9oNQHurKG4N56gCOn4= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0855.namprd21.prod.outlook.com (10.173.192.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.4; Mon, 17 Sep 2018 03:03:35 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36%5]) with mapi id 15.20.1185.003; Mon, 17 Sep 2018 03:03:35 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Niklas Cassel , Joerg Roedel , Sasha Levin Subject: [PATCH AUTOSEL 4.14 16/87] iommu/msm: Don't call iommu_device_{,un}link from atomic context Thread-Topic: [PATCH AUTOSEL 4.14 16/87] iommu/msm: Don't call iommu_device_{,un}link from atomic context Thread-Index: AQHUTjLhhE8umt2jFEKqG8kktIrXNg== Date: Mon, 17 Sep 2018 03:02:34 +0000 Message-ID: <20180917030220.245686-16-alexander.levin@microsoft.com> References: <20180917030220.245686-1-alexander.levin@microsoft.com> In-Reply-To: <20180917030220.245686-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;CY4PR21MB0855;6:oy69AxWpn1gobdqvK6CxLrCE3KTu+4PlKU1SCUt1CQEbxg2tsT8M5k+WiIEo1KCRgNKkcXczXZfuxStf3IXc/KuQ8qX+TbKtVtNVsWwrcE/hDJtp6LJlUREN1gQonKXBddMZtbdR9ZIdbStPMh3e0q3vBrZwrYw4iU61qJhDNaXdZz1YvP0pcnWCKUBIbb9I+AsWgAA99TLF5rbn9x4MB0k+MDPEP68ElyiExzqyjdCK9UYH+HgcHSC0YvpTm5YLIkiwSf+cFUWUVc8R9OmaUeN5NK74gnJ4TnXPc4g+0jlbJDhD7RAuPLnS5ZS+oXo+bQS8oPkcgW+eojrL3hM0nrtIv4PpkdAaoptdO0GC1769sxbahAHU4loUYFi4gk5A12Okd2hdxEl7RU5ATIiUivznkI/2YDIRWwV+1LD8+Knj5filPeysfJuAe0DXQX7i6H0xpJN/wSlSqOW+JGcebA==;5:9EtfTdJZqI2upobsKM9W39xdIwjTXf8ZtA45p0JvBnDZfgrcZ6f1q0EpSusqbOzX9s27b+XhxTgFkVo1hTyxXHhS5EoPgzuRV2IJQP9sXJ+As1BOEAjGwHsGRS1nWxSg+KiAXsIer2DWu5SDYdnftYUi1AoZrDyfHsU/1H7aJPM=;7:PXUQ9KVPu3KxZNHjjYCvRirCSx03wXVjhKKyx/GFG1YZ+VIPTkxQYwuZD6qZPpIfgz5D6ursyqRrjwosKXkmyeLGpTKegTGVLSKia9y7BdiTwyOazQTLsfOR3p6hZypv343/x5ulgzFu0INWZ1Hfmi21WCqaAf8FaUspcTktz6pMIELLggXkaSrRSSRUjMGDGq0BaXaOAgiCqRpRzxLZS2hCXPgrK+FBVob0v7ndO749xk1SPYNXrQHQy4eKEOci x-ms-office365-filtering-correlation-id: f29fad0a-3e84-4588-77c8-08d61c4a2884 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7193020);SRVR:CY4PR21MB0855; x-ms-traffictypediagnostic: CY4PR21MB0855: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(2018427008)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699050)(76991041);SRVR:CY4PR21MB0855;BCL:0;PCL:0;RULEID:;SRVR:CY4PR21MB0855; x-forefront-prvs: 0798146F16 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(39860400002)(376002)(396003)(136003)(366004)(199004)(189003)(51234002)(6436002)(99286004)(7736002)(110136005)(54906003)(97736004)(5660300001)(66066001)(446003)(72206003)(76176011)(86362001)(86612001)(81166006)(81156014)(2906002)(478600001)(305945005)(68736007)(105586002)(2616005)(106356001)(476003)(11346002)(22452003)(6486002)(10090500001)(10290500003)(8676002)(36756003)(6346003)(6116002)(6506007)(3846002)(102836004)(107886003)(6512007)(1076002)(25786009)(217873002)(4326008)(14454004)(26005)(256004)(14444005)(5024004)(486006)(186003)(316002)(2900100001)(8936002)(53936002)(5250100002)(2501003);DIR:OUT;SFP:1102;SCL:1;SRVR:CY4PR21MB0855;H:CY4PR21MB0776.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: OnyiknYvvl1WRP3oFVRpftKAA8JffGxkFH5QYWWi1+71dchwvATaQOGzcT8uTkn2de937fSMCqURCu6SXdO1GwlSpQLSqpPICTZcKd2x8wyqDwZzFQxOsH5xOqq/B4vIhHGk2Djrwla40BaH/h+mTYrBlxSobp/NC5ShHxTdNmg3QdwV6peMOF4+HlQ42s3NdgueZ64hBhefYFzGw97ABgORJXV3vrWobq2l169qOzG1NTt7A2zGKwLwnyGMQGLSoYhqDxfHi8NfPw8GnCm/7MToOxLCdA2tbzHC8mbPn0eWunSCPtgQCqMOO4zRrVa+UZ4G11zoF4wd/Lt+6tFBmdRsfAuzaWmgTw94Fw5+qcA= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: f29fad0a-3e84-4588-77c8-08d61c4a2884 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Sep 2018 03:02:34.5563 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0855 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Niklas Cassel [ Upstream commit 379521462e4add27f3514da8e4ab1fd7a54fe1c7 ] Fixes the following splat during boot: BUG: sleeping function called from invalid context at kernel/locking/mutex.= c:747 in_atomic(): 1, irqs_disabled(): 128, pid: 77, name: kworker/2:1 4 locks held by kworker/2:1/77: #0: (ptrval) ((wq_completion)"events"){+.+.}, at: process_one_work+0x1fc/0= x8fc #1: (ptrval) (deferred_probe_work){+.+.}, at: process_one_work+0x1fc/0x8fc #2: (ptrval) (&dev->mutex){....}, at: __device_attach+0x40/0x178 #3: (ptrval) (msm_iommu_lock){....}, at: msm_iommu_add_device+0x28/0xcc irq event stamp: 348 hardirqs last enabled at (347): [] kfree+0xe0/0x3c0 hardirqs last disabled at (348): [] _raw_spin_lock_irqsave+0x2c/0= x68 softirqs last enabled at (0): [] copy_process.part.5+0x280/0x1a6= 8 softirqs last disabled at (0): [<00000000>] (null) Preemption disabled at: [<00000000>] (null) CPU: 2 PID: 77 Comm: kworker/2:1 Not tainted 4.17.0-rc5-wt-ath-01075-gaca05= 16bb4cf #239 Hardware name: Generic DT based system Workqueue: events deferred_probe_work_func [] (unwind_backtrace) from [] (show_stack+0x20/0x24) [] (show_stack) from [] (dump_stack+0xa0/0xcc) [] (dump_stack) from [] (___might_sleep+0x1f8/0x2d4) ath10k_sdio mmc2:0001:1: Direct firmware load for ath10k/QCA9377/hw1.0/boar= d-2.bin failed with error -2 [] (___might_sleep) from [] (__might_sleep+0x70/0xa8) [] (__might_sleep) from [] (__mutex_lock+0x50/0xb28) [] (__mutex_lock) from [] (mutex_lock_nested+0x2c/0x34) ath10k_sdio mmc2:0001:1: board_file api 1 bmi_id N/A crc32 544289f7 [] (mutex_lock_nested) from [] (kernfs_find_and_get_ns+= 0x30/0x5c) [] (kernfs_find_and_get_ns) from [] (sysfs_add_link_to_= group+0x28/0x58) [] (sysfs_add_link_to_group) from [] (iommu_device_link= +0x50/0xb4) [] (iommu_device_link) from [] (msm_iommu_add_device+0x= a0/0xcc) [] (msm_iommu_add_device) from [] (add_iommu_group+0x3c= /0x64) [] (add_iommu_group) from [] (bus_for_each_dev+0x84/0xc= 4) [] (bus_for_each_dev) from [] (bus_set_iommu+0xd0/0x10c= ) [] (bus_set_iommu) from [] (msm_iommu_probe+0x5b8/0x66c= ) [] (msm_iommu_probe) from [] (platform_drv_probe+0x60/0= xbc) [] (platform_drv_probe) from [] (driver_probe_device+0x= 30c/0x4cc) [] (driver_probe_device) from [] (__device_attach_drive= r+0xac/0x14c) [] (__device_attach_driver) from [] (bus_for_each_drv+0= x68/0xc8) [] (bus_for_each_drv) from [] (__device_attach+0xe4/0x1= 78) [] (__device_attach) from [] (device_initial_probe+0x1c= /0x20) [] (device_initial_probe) from [] (bus_probe_device+0x9= 8/0xa0) [] (bus_probe_device) from [] (deferred_probe_work_func= +0x74/0x198) [] (deferred_probe_work_func) from [] (process_one_work= +0x2c4/0x8fc) [] (process_one_work) from [] (worker_thread+0x2c4/0x5c= c) [] (worker_thread) from [] (kthread+0x180/0x188) [] (kthread) from [] (ret_from_fork+0x14/0x20) Fixes: 42df43b36163 ("iommu/msm: Make use of iommu_device_register interfac= e") Signed-off-by: Niklas Cassel Reviewed-by: Vivek Gautam Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/msm_iommu.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c index 04f4d51ffacb..92c8c83ce38c 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu.c @@ -395,20 +395,15 @@ static int msm_iommu_add_device(struct device *dev) struct msm_iommu_dev *iommu; struct iommu_group *group; unsigned long flags; - int ret =3D 0; =20 spin_lock_irqsave(&msm_iommu_lock, flags); - iommu =3D find_iommu_for_dev(dev); + spin_unlock_irqrestore(&msm_iommu_lock, flags); + if (iommu) iommu_device_link(&iommu->iommu, dev); else - ret =3D -ENODEV; - - spin_unlock_irqrestore(&msm_iommu_lock, flags); - - if (ret) - return ret; + return -ENODEV; =20 group =3D iommu_group_get_for_dev(dev); if (IS_ERR(group)) @@ -425,13 +420,12 @@ static void msm_iommu_remove_device(struct device *de= v) unsigned long flags; =20 spin_lock_irqsave(&msm_iommu_lock, flags); - iommu =3D find_iommu_for_dev(dev); + spin_unlock_irqrestore(&msm_iommu_lock, flags); + if (iommu) iommu_device_unlink(&iommu->iommu, dev); =20 - spin_unlock_irqrestore(&msm_iommu_lock, flags); - iommu_group_remove_device(dev); } =20 --=20 2.17.1