From patchwork Thu Feb 27 13:35:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 230401 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 4692BC3F36C for ; Thu, 27 Feb 2020 14:13:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D38520801 for ; Thu, 27 Feb 2020 14:13:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812806; bh=/Z1FwlrqAQpiZx5xw6ycJeKA6LZrTe39tMRJSFipyms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HuK6Zo70BrR5mWhQrzGzwwssgi1Le7HwnArz5jwEHDqyBG4uYInpHDk//hZ/7TzZL npOcyrmPiDA5wX5UFWxmnN3WiyPS9LK0FAUusr02ajQuvSalQcsUixa0KUj0Kr2sFm OAChenGVyQptFfAAyZj9v8HkB8GOr+eMojIBPNuc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388631AbgB0ONY (ORCPT ); Thu, 27 Feb 2020 09:13:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:52320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388787AbgB0ONY (ORCPT ); Thu, 27 Feb 2020 09:13:24 -0500 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 6071024697; Thu, 27 Feb 2020 14:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812803; bh=/Z1FwlrqAQpiZx5xw6ycJeKA6LZrTe39tMRJSFipyms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=III6pwndXVrDw2sSpMB/o/8vLZaJIppbhhZM46tJC9JvJYOl6KOO2jgzC69HcsvEB v2zim9nMNhcrRjE85UZSjiU96kP7CqEF0VNcLSu/nVRsLbewu1ZS2Tr+JoL3Oa5AQk KzH8zacm7dkC0OQdvUGG4x63shNDoV7jwrDe8/wE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerry Snitselaar , Lu Baolu , Joerg Roedel Subject: [PATCH 5.5 004/150] iommu/vt-d: Do deferred attachment in iommu_need_mapping() Date: Thu, 27 Feb 2020 14:35:41 +0100 Message-Id: <20200227132233.391493066@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132232.815448360@linuxfoundation.org> References: <20200227132232.815448360@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: Joerg Roedel commit a11bfde9c77df1fd350ea27169ab921f511bf5d0 upstream. The attachment of deferred devices needs to happen before the check whether the device is identity mapped or not. Otherwise the check will return wrong results, cause warnings boot failures in kdump kernels, like WARNING: CPU: 0 PID: 318 at ../drivers/iommu/intel-iommu.c:592 domain_get_iommu+0x61/0x70 [...] Call Trace: __intel_map_single+0x55/0x190 intel_alloc_coherent+0xac/0x110 dmam_alloc_attrs+0x50/0xa0 ahci_port_start+0xfb/0x1f0 [libahci] ata_host_start.part.39+0x104/0x1e0 [libata] With the earlier check the kdump boot succeeds and a crashdump is written. Fixes: 1ee0186b9a12 ("iommu/vt-d: Refactor find_domain() helper") Cc: stable@vger.kernel.org # v5.5 Reviewed-by: Jerry Snitselaar Acked-by: Lu Baolu Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/intel-iommu.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -2452,9 +2452,6 @@ static void do_deferred_attach(struct de static struct dmar_domain *deferred_attach_domain(struct device *dev) { - if (unlikely(attach_deferred(dev))) - do_deferred_attach(dev); - return find_domain(dev); } @@ -3478,6 +3475,9 @@ static bool iommu_need_mapping(struct de if (iommu_dummy(dev)) return false; + if (unlikely(attach_deferred(dev))) + do_deferred_attach(dev); + ret = identity_mapping(dev); if (ret) { u64 dma_mask = *dev->dma_mask; @@ -3841,7 +3841,11 @@ bounce_map_single(struct device *dev, ph int prot = 0; int ret; + if (unlikely(attach_deferred(dev))) + do_deferred_attach(dev); + domain = deferred_attach_domain(dev); + if (WARN_ON(dir == DMA_NONE || !domain)) return DMA_MAPPING_ERROR;