From patchwork Tue Oct 21 08:04:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Zhen-Hua" X-Patchwork-Id: 5111121 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D2BEE9F349 for ; Tue, 21 Oct 2014 08:07:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 051DF2015A for ; Tue, 21 Oct 2014 08:07:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00B6420149 for ; Tue, 21 Oct 2014 08:07:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754681AbaJUIFY (ORCPT ); Tue, 21 Oct 2014 04:05:24 -0400 Received: from g4t3427.houston.hp.com ([15.201.208.55]:11300 "EHLO g4t3427.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754664AbaJUIFN (ORCPT ); Tue, 21 Oct 2014 04:05:13 -0400 Received: from g4t3433.houston.hp.com (g4t3433.houston.hp.com [16.210.25.219]) by g4t3427.houston.hp.com (Postfix) with ESMTP id C2A7166; Tue, 21 Oct 2014 08:05:12 +0000 (UTC) Received: from piepie.asiapacific.hpqcorp.net (unknown [16.187.246.188]) by g4t3433.houston.hp.com (Postfix) with ESMTP id 0FF6270; Tue, 21 Oct 2014 08:05:07 +0000 (UTC) From: "Li, Zhen-Hua" To: , , , , , Cc: , , , , , , , , , , , , , "Li, Zhen-Hua" Subject: [PATCH 4/5] iommu/vt-d: Add domain-id functions Date: Tue, 21 Oct 2014 16:04:18 +0800 Message-Id: <1413878659-1383-5-git-send-email-zhen-hual@hp.com> X-Mailer: git-send-email 2.0.0-rc0 In-Reply-To: <1413878659-1383-1-git-send-email-zhen-hual@hp.com> References: <1413878659-1383-1-git-send-email-zhen-hual@hp.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Interfaces for when a new domain in the crashdump kernel needs some values from the panicked kernel's context entries. Signed-off-by: Bill Sumner --- drivers/iommu/intel-iommu.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 73afed4..bde8f22 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -348,6 +348,7 @@ static inline int first_pte_in_page(struct dma_pte *pte) #ifdef CONFIG_CRASH_DUMP + /* * Fix Crashdump failure caused by leftover DMA through a hardware IOMMU * @@ -437,6 +438,16 @@ static int intel_iommu_copy_translation_tables(struct dmar_drhd_unit *drhd, struct root_entry **root_new_virt_p, int g_num_of_iommus); +static struct domain_values_entry *intel_iommu_did_to_domain_values_entry( + int did, struct intel_iommu *iommu); + +static int intel_iommu_get_dids_from_old_kernel(struct intel_iommu *iommu); + +static struct domain_values_entry *intel_iommu_did_to_domain_values_entry( + int did, struct intel_iommu *iommu); + +static int intel_iommu_get_dids_from_old_kernel(struct intel_iommu *iommu); + #endif /* CONFIG_CRASH_DUMP */ /* @@ -5230,4 +5241,39 @@ static int intel_iommu_copy_translation_tables(struct dmar_drhd_unit *drhd, return 0; } +/* + * Interfaces for when a new domain in the crashdump kernel needs some + * values from the panicked kernel's context entries + * + */ +static struct domain_values_entry *intel_iommu_did_to_domain_values_entry( + int did, struct intel_iommu *iommu) +{ + struct domain_values_entry *dve; /* iterator */ + + list_for_each_entry(dve, &domain_values_list[iommu->seq_id], link) + if (dve->did == did) + return dve; + return NULL; +} + +/* Mark domain-id's from old kernel as in-use on this iommu so that a new + * domain-id is allocated in the case where there is a device in the new kernel + * that was not in the old kernel -- and therefore a new domain-id is needed. + */ +static int intel_iommu_get_dids_from_old_kernel(struct intel_iommu *iommu) +{ + struct domain_values_entry *dve; /* iterator */ + + pr_info("IOMMU:%d Domain ids from panicked kernel:\n", iommu->seq_id); + + list_for_each_entry(dve, &domain_values_list[iommu->seq_id], link) { + set_bit(dve->did, iommu->domain_ids); + pr_info("DID did:%d(0x%4.4x)\n", dve->did, dve->did); + } + + pr_info("----------------------------------------\n"); + return 0; +} + #endif /* CONFIG_CRASH_DUMP */