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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable 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 56F58C34026 for ; Tue, 18 Feb 2020 11:55:03 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 19D392173E for ; Tue, 18 Feb 2020 11:55:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 19D392173E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DF8AC8738A; Tue, 18 Feb 2020 11:55:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tBQ0bE47gykY; Tue, 18 Feb 2020 11:55:01 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 5B52B87410; Tue, 18 Feb 2020 11:55:01 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 39837C1D85; Tue, 18 Feb 2020 11:55:01 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id A5A22C08A0 for ; Tue, 18 Feb 2020 11:54:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A223C8738A for ; Tue, 18 Feb 2020 11:54:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 94aV6NtsR82d for ; Tue, 18 Feb 2020 11:54:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by hemlock.osuosl.org (Postfix) with ESMTPS id 92B5387410 for ; Tue, 18 Feb 2020 11:54:57 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Feb 2020 03:54:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,456,1574150400"; d="scan'208";a="315032008" Received: from cuifangf-mobl.ccr.corp.intel.com (HELO [10.254.211.249]) ([10.254.211.249]) by orsmga001.jf.intel.com with ESMTP; 18 Feb 2020 03:54:53 -0800 Subject: Re: [PATCH 3/5 v2] iommu/vt-d: Do deferred attachment in iommu_need_mapping() To: Joerg Roedel References: <20200217193858.26990-1-joro@8bytes.org> <20200217193858.26990-4-joro@8bytes.org> <83b21e50-9097-06db-d404-8fe400134bac@linux.intel.com> <20200218092827.tp3pq67adzr56k7e@8bytes.org> From: Lu Baolu Message-ID: Date: Tue, 18 Feb 2020 19:54:52 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200218092827.tp3pq67adzr56k7e@8bytes.org> Content-Language: en-US Cc: iommu@lists.linux-foundation.org, jroedel@suse.de, David Woodhouse , linux-kernel@vger.kernel.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" Hi Joerg, On 2020/2/18 17:28, Joerg Roedel wrote: > Hi Baolu, > > On Tue, Feb 18, 2020 at 10:38:14AM +0800, Lu Baolu wrote: >>> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c >>> index 42cdcce1602e..32f43695a22b 100644 >>> --- a/drivers/iommu/intel-iommu.c >>> +++ b/drivers/iommu/intel-iommu.c >>> @@ -2541,9 +2541,6 @@ static void do_deferred_attach(struct device *dev) >>> static struct dmar_domain *deferred_attach_domain(struct device *dev) >>> { >>> - if (unlikely(attach_deferred(dev))) >>> - do_deferred_attach(dev); >>> - >> >> This should also be moved to the call place of deferred_attach_domain() >> in bounce_map_single(). >> >> bounce_map_single() assumes that devices always use DMA domain, so it >> doesn't call iommu_need_mapping(). We could do_deferred_attach() there >> manually. > > Good point, thanks for your review. Updated patch below. > Looks good to me now. For all patches in this series, Acked-by: Lu Baolu Best regards, baolu > From 3a5b8a66d288d86ac1fd45092e7d96f842d0cccf Mon Sep 17 00:00:00 2001 > From: Joerg Roedel > Date: Mon, 17 Feb 2020 17:20:59 +0100 > Subject: [PATCH 3/5] iommu/vt-d: Do deferred attachment in > iommu_need_mapping() > > 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. > > Signed-off-by: Joerg Roedel > --- > drivers/iommu/intel-iommu.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c > index 42cdcce1602e..723f615c6e84 100644 > --- a/drivers/iommu/intel-iommu.c > +++ b/drivers/iommu/intel-iommu.c > @@ -2541,9 +2541,6 @@ static void do_deferred_attach(struct device *dev) > > static struct dmar_domain *deferred_attach_domain(struct device *dev) > { > - if (unlikely(attach_deferred(dev))) > - do_deferred_attach(dev); > - > return find_domain(dev); > } > > @@ -3595,6 +3592,9 @@ static bool iommu_need_mapping(struct device *dev) > 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; > @@ -3958,7 +3958,11 @@ bounce_map_single(struct device *dev, phys_addr_t paddr, size_t size, > 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; > > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu