From patchwork Tue Oct 21 08:04:16 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: 5111151 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 80FA2C11AC for ; Tue, 21 Oct 2014 08:08:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ACD0B20158 for ; Tue, 21 Oct 2014 08:08:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB03120145 for ; Tue, 21 Oct 2014 08:08:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754644AbaJUIFI (ORCPT ); Tue, 21 Oct 2014 04:05:08 -0400 Received: from g4t3425.houston.hp.com ([15.201.208.53]:7265 "EHLO g4t3425.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754574AbaJUIFB (ORCPT ); Tue, 21 Oct 2014 04:05:01 -0400 Received: from g4t3433.houston.hp.com (g4t3433.houston.hp.com [16.210.25.219]) by g4t3425.houston.hp.com (Postfix) with ESMTP id DFB24118; Tue, 21 Oct 2014 08:04:59 +0000 (UTC) Received: from piepie.asiapacific.hpqcorp.net (unknown [16.187.246.188]) by g4t3433.houston.hp.com (Postfix) with ESMTP id 1E30485; Tue, 21 Oct 2014 08:04:54 +0000 (UTC) From: "Li, Zhen-Hua" To: , , , , , Cc: , , , , , , , , , , , , , "Li, Zhen-Hua" Subject: [PATCH 2/5] iommu/vt-d: Items required for kdump Date: Tue, 21 Oct 2014 16:04:16 +0800 Message-Id: <1413878659-1383-3-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 Add structure type domain_values_entry used for kdump; Add context functions needed for kdump. Bill Sumner: Original version; Li, Zhenhua: Changed the name of new functions, make them consistent with current context get/set functions. Signed-off-by: Bill Sumner Signed-off-by: Li, Zhen-Hua --- drivers/iommu/intel-iommu.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 1c7350d..99fe408 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -207,6 +207,15 @@ get_context_addr_from_root(struct root_entry *root) NULL); } +static inline struct context_entry * +get_context_phys_from_root(struct root_entry *root) +{ + return (struct context_entry *) + (root_present(root) ? (void *) (root->val & VTD_PAGE_MASK) + : NULL); +} + + /* * low 64 bits: * 0: present @@ -227,6 +236,32 @@ static inline bool context_present(struct context_entry *context) { return (context->lo & 1); } + +static inline int context_fault_enable(struct context_entry *c) +{ + return((c->lo >> 1) & 0x1); +} + +static inline int context_translation_type(struct context_entry *c) +{ + return((c->lo >> 2) & 0x3); +} + +static inline u64 context_address_root(struct context_entry *c) +{ + return((c->lo >> VTD_PAGE_SHIFT)); +} + +static inline int context_address_width(struct context_entry *c) +{ + return((c->hi >> 0) & 0x7); +} + +static inline int context_domain_id(struct context_entry *c) +{ + return((c->hi >> 8) & 0xffff); +} + static inline void context_set_present(struct context_entry *context) { context->lo |= 1; @@ -311,6 +346,40 @@ static inline int first_pte_in_page(struct dma_pte *pte) return !((unsigned long)pte & ~VTD_PAGE_MASK); } + +#ifdef CONFIG_CRASH_DUMP +/* + * Fix Crashdump failure caused by leftover DMA through a hardware IOMMU + * + * Fixes the crashdump kernel to deal with an active iommu and legacy + * DMA from the (old) panicked kernel in a manner similar to how legacy + * DMA is handled when no hardware iommu was in use by the old kernel -- + * allow the legacy DMA to continue into its current buffers. + * + * In the crashdump kernel, this code: + * 1. skips disabling the IOMMU's translating of IO Virtual Addresses (IOVA) + * 2. leaves the current translations in-place so that legacy DMA will + * continue to use its current buffers, + * 3. allocates to the device drivers in the crashdump kernel + * portions of the iova address ranges that are different + * from the iova address ranges that were being used by the old kernel + * at the time of the panic. + * + */ + +struct domain_values_entry { + struct list_head link; /* link entries into a list */ + struct iova_domain iovad; /* iova's that belong to this domain */ + struct dma_pte *pgd; /* virtual address */ + int did; /* domain id */ + int gaw; /* max guest address width */ + int iommu_superpage; /* Level of superpages supported: + 0 == 4KiB (no superpages), 1 == 2MiB, + 2 == 1GiB, 3 == 512GiB, 4 == 1TiB */ +}; + +#endif /* CONFIG_CRASH_DUMP */ + /* * This domain is a statically identity mapping domain. * 1. This domain creats a static 1:1 mapping to all usable memory.