From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753123AbcITMxd (ORCPT ); Tue, 20 Sep 2016 08:53:33 -0400 Received: from 8bytes.org ([81.169.241.247]:34556 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751218AbcITMxc (ORCPT ); Tue, 20 Sep 2016 08:53:32 -0400 Date: Tue, 20 Sep 2016 14:53:30 +0200 From: Joerg Roedel To: Baoquan He Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, dyoung@redhat.com, xlpang@redhat.com, Vincent.Wan@amd.com Subject: Re: [PATCH v5 8/8] iommu/amd: Update domain into to dte entry during device driver init Message-ID: <20160920125330.GG3541@8bytes.org> References: <1473951806-25511-1-git-send-email-bhe@redhat.com> <1473951806-25511-9-git-send-email-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1473951806-25511-9-git-send-email-bhe@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Sep 15, 2016 at 11:03:26PM +0800, Baoquan He wrote: > All devices are supposed to reset themselves at device driver initialization > stage. At this time if in kdump kernel those on-flight DMA will be stopped > because of device reset. It's best time to update the protection domain info, > especially pte_root, to dte entry which the device relates to. > > Signed-off-by: Baoquan He > --- > drivers/iommu/amd_iommu.c | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c > index 6c37300..00b64ee 100644 > --- a/drivers/iommu/amd_iommu.c > +++ b/drivers/iommu/amd_iommu.c > @@ -2310,6 +2310,10 @@ static dma_addr_t __map_single(struct device *dev, > unsigned int pages; > int prot = 0; > int i; > + struct iommu_dev_data *dev_data = get_dev_data(dev); > + struct protection_domain *domain = get_domain(dev); > + u16 alias = amd_iommu_alias_table[dev_data->devid]; > + struct amd_iommu *iommu = amd_iommu_rlookup_table[dev_data->devid]; > > pages = iommu_num_pages(paddr, size, PAGE_SIZE); > paddr &= PAGE_MASK; > @@ -2319,6 +2323,13 @@ static dma_addr_t __map_single(struct device *dev, > goto out; > > prot = dir2prot(direction); > + if (translation_pre_enabled(iommu) && !dev_data->domain_updated) { > + dev_data->domain_updated = true; > + set_dte_entry(dev_data->devid, domain, dev_data->ats.enabled); > + if (alias != dev_data->devid) > + set_dte_entry(alias, domain, dev_data->ats.enabled); > + device_flush_dte(dev_data); > + } Hmm, have you tried hooking this into the set_dma_mask call-back? Every driver should call it for its device, so that should be a better indicator to now map a new domain. Joerg