From patchwork Thu May 23 19:07:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 165060 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2624644ili; Thu, 23 May 2019 12:31:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqwAMJMel5XqchxJkSYaQhsrGlxASrCj3GuIHIoDWakja0HnB3XlNIaApHH56+vucZBDp0IZ X-Received: by 2002:a65:5304:: with SMTP id m4mr4531616pgq.126.1558639875180; Thu, 23 May 2019 12:31:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558639875; cv=none; d=google.com; s=arc-20160816; b=l8qBTmrciV5Wmft2lc9dgBdMOXq4d1RIayEWcnkF6BhrFX1vHHTfiLr2BRkTbdviKZ 4Vpdrdo+TKhWLwQfBFaKNI8oLyavfLLYONxc6436Z78BKGEr+kRLXMHMI1Pp/E6LlU8O QxZPKEZc9NWSLduZIg+X63ap2EJapUbudVJNn3nUX90MJKIZ9k9lPmwD4+AhR0UYbQfM g6uHiaQ6uY+wIJO/dZze6SyCOJLBKeCbS5EM5fz/7Q/PWn08kXjNLDA9Br2uDOJiLlBW Hag27TmG5Asd/6IFKByngoEIEkXp8ce+hh3yuajVARHb9vE7tQi2hEQiH9fQdXpPnOjJ tUVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ek35xSedyNXrlfArSFjiJ0Bc/eR0aTJDaGrzC2RJusk=; b=LuDxNM+GzKOF0kDyaKiKm+IV5FeS4aa+G7EdwMLygk96g1SqFjBrO03wjl0uvCI1dw yT3hI5v9CjspXPGzYxJYTITWqYDbG06y3pl3uuvZUVdLNaxCA5pnIPPe30O/MGZ8Pftl wlCCHami0wcoWxqUT5qh7jeI1GygA4iYKE0DT+cogHidcm1eYIcB3vqr+Fg22fpPWPx+ WTMvGag5pqhk9GfpTTJUDX7DO8VnsL1XkQGwhNDoqrUDQbwpcUgQYuX0y0PLeyODT/gy fxIlxH/z7MfNBnj28D0ER5PNoYhPiate4HmgZr7WWoEcpYmaNqnAlsdsAMvgByIp7wos txxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ls0VEv5e; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h1si681618pgv.67.2019.05.23.12.31.14; Thu, 23 May 2019 12:31:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ls0VEv5e; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391788AbfEWTbN (ORCPT + 14 others); Thu, 23 May 2019 15:31:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:44942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392233AbfEWTbM (ORCPT ); Thu, 23 May 2019 15:31:12 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 57697206BA; Thu, 23 May 2019 19:31:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558639871; bh=Pycf4tZHJJVc1EdtrAOP6wlos8p2T3C9kGsXHQzPX0I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ls0VEv5e9zRc6dYSqwuBN1iKy88mXlN8MbuJtmP7XmsN59tBP0QeNVSFxEz3jB8UB 9dWwBtswGAJH5CnFoo6ZEx2HFdG5frwCM9jAZMjyfY0jgL+CZpyKYGt6vLXItu8VmW suPP3txPFQuPd23pn/3u/KpKNK0/V5/TH9iLUN0I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiang Chen , John Garry , Robin Murphy Subject: [PATCH 5.1 115/122] driver core: Postpone DMA tear-down until after devres release for probe failure Date: Thu, 23 May 2019 21:07:17 +0200 Message-Id: <20190523181720.748780763@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181705.091418060@linuxfoundation.org> References: <20190523181705.091418060@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: John Garry commit 0b777eee88d712256ba8232a9429edb17c4f9ceb upstream. In commit 376991db4b64 ("driver core: Postpone DMA tear-down until after devres release"), we changed the ordering of tearing down the device DMA ops and releasing all the device's resources; this was because the DMA ops should be maintained until we release the device's managed DMA memories. However, we have seen another crash on an arm64 system when a device driver probe fails: hisi_sas_v3_hw 0000:74:02.0: Adding to iommu group 2 scsi host1: hisi_sas_v3_hw BUG: Bad page state in process swapper/0 pfn:313f5 page:ffff7e0000c4fd40 count:1 mapcount:0 mapping:0000000000000000 index:0x0 flags: 0xfffe00000001000(reserved) raw: 0fffe00000001000 ffff7e0000c4fd48 ffff7e0000c4fd48 0000000000000000 raw: 0000000000000000 0000000000000000 00000001ffffffff 0000000000000000 page dumped because: PAGE_FLAGS_CHECK_AT_FREE flag(s) set bad because of flags: 0x1000(reserved) Modules linked in: CPU: 49 PID: 1 Comm: swapper/0 Not tainted 5.1.0-rc1-43081-g22d97fd-dirty #1433 Hardware name: Huawei D06/D06, BIOS Hisilicon D06 UEFI RC0 - V1.12.01 01/29/2019 Call trace: dump_backtrace+0x0/0x118 show_stack+0x14/0x1c dump_stack+0xa4/0xc8 bad_page+0xe4/0x13c free_pages_check_bad+0x4c/0xc0 __free_pages_ok+0x30c/0x340 __free_pages+0x30/0x44 __dma_direct_free_pages+0x30/0x38 dma_direct_free+0x24/0x38 dma_free_attrs+0x9c/0xd8 dmam_release+0x20/0x28 release_nodes+0x17c/0x220 devres_release_all+0x34/0x54 really_probe+0xc4/0x2c8 driver_probe_device+0x58/0xfc device_driver_attach+0x68/0x70 __driver_attach+0x94/0xdc bus_for_each_dev+0x5c/0xb4 driver_attach+0x20/0x28 bus_add_driver+0x14c/0x200 driver_register+0x6c/0x124 __pci_register_driver+0x48/0x50 sas_v3_pci_driver_init+0x20/0x28 do_one_initcall+0x40/0x25c kernel_init_freeable+0x2b8/0x3c0 kernel_init+0x10/0x100 ret_from_fork+0x10/0x18 Disabling lock debugging due to kernel taint BUG: Bad page state in process swapper/0 pfn:313f6 page:ffff7e0000c4fd80 count:1 mapcount:0 mapping:0000000000000000 index:0x0 [ 89.322983] flags: 0xfffe00000001000(reserved) raw: 0fffe00000001000 ffff7e0000c4fd88 ffff7e0000c4fd88 0000000000000000 raw: 0000000000000000 0000000000000000 00000001ffffffff 0000000000000000 The crash occurs for the same reason. In this case, on the really_probe() failure path, we are still clearing the DMA ops prior to releasing the device's managed memories. This patch fixes this issue by reordering the DMA ops teardown and the call to devres_release_all() on the failure path. Reported-by: Xiang Chen Tested-by: Xiang Chen Signed-off-by: John Garry Reviewed-by: Robin Murphy Signed-off-by: Greg Kroah-Hartman --- drivers/base/dd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -490,7 +490,7 @@ re_probe: if (dev->bus->dma_configure) { ret = dev->bus->dma_configure(dev); if (ret) - goto dma_failed; + goto probe_failed; } if (driver_sysfs_add(dev)) { @@ -546,14 +546,13 @@ re_probe: goto done; probe_failed: - arch_teardown_dma_ops(dev); -dma_failed: if (dev->bus) blocking_notifier_call_chain(&dev->bus->p->bus_notifier, BUS_NOTIFY_DRIVER_NOT_BOUND, dev); pinctrl_bind_failed: device_links_no_driver(dev); devres_release_all(dev); + arch_teardown_dma_ops(dev); driver_sysfs_remove(dev); dev->driver = NULL; dev_set_drvdata(dev, NULL);