Linux IOMMU Development
 help / color / mirror / Atom feed
From: "Li, Zhen-Hua" <zhen-hual-VXdhtT5mjnY@public.gmane.org>
To: dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org,
	indou.takao-+CUm20s59erQFUHtdCDX3A@public.gmane.org,
	bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
	joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org,
	vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
	dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Cc: tom.vaden-VXdhtT5mjnY@public.gmane.org,
	rwright-VXdhtT5mjnY@public.gmane.org,
	linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
	lisa.mitchell-VXdhtT5mjnY@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	zhen-hual-VXdhtT5mjnY@public.gmane.org,
	doug.hatch-VXdhtT5mjnY@public.gmane.org,
	ishii.hironobu-+CUm20s59erQFUHtdCDX3A@public.gmane.org,
	bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org,
	billsumnerlinux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
	li.zhang6-VXdhtT5mjnY@public.gmane.org
Subject: [PATCH v11 04/10] iommu/vt-d: functions to copy data from old mem
Date: Mon, 11 May 2015 17:52:48 +0800	[thread overview]
Message-ID: <1431337974-545-5-git-send-email-zhen-hual@hp.com> (raw)
In-Reply-To: <1431337974-545-1-git-send-email-zhen-hual-VXdhtT5mjnY@public.gmane.org>

Add some functions to copy the data from old kernel.
These functions are used to copy context tables and page tables.

To avoid calling iounmap between spin_lock_irqsave and spin_unlock_irqrestore,
use a link here, store the pointers , and then use iounmap to free them in
another place.

Li, Zhen-hua:
    The functions and logics.

Takao Indoh:
    Check if pfn is ram:
        if (page_is_ram(pfn))

Signed-off-by: Li, Zhen-Hua <zhen-hual-VXdhtT5mjnY@public.gmane.org>
Signed-off-by: Takao Indoh <indou.takao-+CUm20s59erQFUHtdCDX3A@public.gmane.org>
---
 drivers/iommu/intel-iommu.c | 102 ++++++++++++++++++++++++++++++++++++++++++++
 include/linux/intel-iommu.h |   6 +++
 2 files changed, 108 insertions(+)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 07e6118..0b97c15 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -371,6 +371,17 @@ static struct context_entry *device_to_existing_context_entry(
 				struct intel_iommu *iommu,
 				u8 bus, u8 devfn);
 
+/*
+ * A structure used to store the address allocated by ioremap();
+ * The we need to call iounmap() to free them out of spin_lock_irqsave/unlock;
+ */
+struct iommu_remapped_entry {
+	struct list_head list;
+	void __iomem *mem;
+};
+static LIST_HEAD(__iommu_remapped_mem);
+static DEFINE_MUTEX(__iommu_mem_list_lock);
+
 
 /*
  * This domain is a statically identity mapping domain.
@@ -4833,3 +4844,94 @@ static struct context_entry *device_to_existing_context_entry(
 	return ret;
 }
 
+/*
+ * Copy memory from a physically-addressed area into a virtually-addressed area
+ */
+int __iommu_load_from_oldmem(void *to, unsigned long from, unsigned long size)
+{
+	unsigned long pfn;		/* Page Frame Number */
+	size_t csize = (size_t)size;	/* Num(bytes to copy) */
+	unsigned long offset;		/* Lower 12 bits of to */
+	void __iomem *virt_mem;
+	struct iommu_remapped_entry *mapped;
+
+	pfn = from >> VTD_PAGE_SHIFT;
+	offset = from & (~VTD_PAGE_MASK);
+
+	if (page_is_ram(pfn)) {
+		memcpy(to, pfn_to_kaddr(pfn) + offset, csize);
+	} else{
+
+		mapped = kzalloc(sizeof(struct iommu_remapped_entry),
+				GFP_KERNEL);
+		if (!mapped)
+			return -ENOMEM;
+
+		virt_mem = ioremap_cache((unsigned long)from, size);
+		if (!virt_mem) {
+			kfree(mapped);
+			return -ENOMEM;
+		}
+		memcpy(to, virt_mem, size);
+
+		mutex_lock(&__iommu_mem_list_lock);
+		mapped->mem = virt_mem;
+		list_add_tail(&mapped->list, &__iommu_remapped_mem);
+		mutex_unlock(&__iommu_mem_list_lock);
+	}
+	return size;
+}
+
+/*
+ * Copy memory from a virtually-addressed area into a physically-addressed area
+ */
+int __iommu_save_to_oldmem(unsigned long to, void *from, unsigned long size)
+{
+	unsigned long pfn;		/* Page Frame Number */
+	size_t csize = (size_t)size;	/* Num(bytes to copy) */
+	unsigned long offset;		/* Lower 12 bits of to */
+	void __iomem *virt_mem;
+	struct iommu_remapped_entry *mapped;
+
+	pfn = to >> VTD_PAGE_SHIFT;
+	offset = to & (~VTD_PAGE_MASK);
+
+	if (page_is_ram(pfn)) {
+		memcpy(pfn_to_kaddr(pfn) + offset, from, csize);
+	} else{
+		mapped = kzalloc(sizeof(struct iommu_remapped_entry),
+				GFP_KERNEL);
+		if (!mapped)
+			return -ENOMEM;
+
+		virt_mem = ioremap_cache((unsigned long)to, size);
+		if (!virt_mem) {
+			kfree(mapped);
+			return -ENOMEM;
+		}
+		memcpy(virt_mem, from, size);
+		mutex_lock(&__iommu_mem_list_lock);
+		mapped->mem = virt_mem;
+		list_add_tail(&mapped->list, &__iommu_remapped_mem);
+		mutex_unlock(&__iommu_mem_list_lock);
+	}
+	return size;
+}
+
+/*
+ * Free the mapped memory for ioremap;
+ */
+int __iommu_free_mapped_mem(void)
+{
+	struct iommu_remapped_entry *mem_entry, *tmp;
+
+	mutex_lock(&__iommu_mem_list_lock);
+	list_for_each_entry_safe(mem_entry, tmp, &__iommu_remapped_mem, list) {
+		iounmap(mem_entry->mem);
+		list_del(&mem_entry->list);
+		kfree(mem_entry);
+	}
+	mutex_unlock(&__iommu_mem_list_lock);
+	return 0;
+}
+
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 796ef96..ced1fac 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -380,4 +380,10 @@ extern int dmar_ir_support(void);
 
 extern const struct attribute_group *intel_iommu_groups[];
 
+extern int __iommu_load_from_oldmem(void *to, unsigned long from,
+					unsigned long size);
+extern int __iommu_save_to_oldmem(unsigned long to, void *from,
+					unsigned long size);
+extern int __iommu_free_mapped_mem(void);
+
 #endif
-- 
2.0.0-rc0

  parent reply	other threads:[~2015-05-11  9:52 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-11  9:52 [PATCH v11 0/10] iommu/vt-d: Fix intel vt-d faults in kdump kernel Li, Zhen-Hua
     [not found] ` <1431337974-545-1-git-send-email-zhen-hual-VXdhtT5mjnY@public.gmane.org>
2015-05-11  9:52   ` [PATCH v11 01/10] iommu/vt-d: New function to attach domain with id Li, Zhen-Hua
2015-05-11  9:52   ` [PATCH v11 02/10] iommu/vt-d: Items required for kdump Li, Zhen-Hua
2015-05-12  8:17     ` Dave Young
2015-05-13  1:45       ` Li, ZhenHua
2015-05-13  6:31         ` Alexander Duyck
     [not found]         ` <5552ACB9.5050309-VXdhtT5mjnY@public.gmane.org>
2015-05-13  8:42           ` Dave Young
2015-05-11  9:52   ` [PATCH v11 03/10] iommu/vt-d: Function to get existing context entry Li, Zhen-Hua
2015-05-11  9:52   ` Li, Zhen-Hua [this message]
     [not found]     ` <1431337974-545-5-git-send-email-zhen-hual-VXdhtT5mjnY@public.gmane.org>
2015-05-12  8:29       ` [PATCH v11 04/10] iommu/vt-d: functions to copy data from old mem Dave Young
2015-05-13  9:00     ` Baoquan He
2015-05-13  9:13       ` Li, ZhenHua
2015-05-13  9:21         ` Baoquan He
2015-06-08 14:15     ` David Woodhouse
     [not found]       ` <1433772935.2952.47.camel-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2015-06-08 15:21         ` Joerg Roedel
2015-06-08 15:44           ` David Woodhouse
2015-05-11  9:52   ` [PATCH v11 05/10] iommu/vt-d: Add functions to load and save old re Li, Zhen-Hua
     [not found]     ` <1431337974-545-6-git-send-email-zhen-hual-VXdhtT5mjnY@public.gmane.org>
2015-05-12  8:37       ` Dave Young
     [not found]         ` <20150512083745.GE4561-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2015-05-13  1:47           ` Li, ZhenHua
2015-05-13  8:49             ` Dave Young
2015-05-11  9:52   ` [PATCH v11 06/10] iommu/vt-d: datatypes and functions used for kdump Li, Zhen-Hua
2015-05-12  8:48     ` Dave Young
     [not found]     ` <1431337974-545-7-git-send-email-zhen-hual-VXdhtT5mjnY@public.gmane.org>
2015-05-13  8:56       ` Baoquan He
     [not found]         ` <20150513085609.GD3736-0VdLhd/A9PlfpSRLqpFUpR/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
2015-05-13  8:58           ` Li, ZhenHua
     [not found]             ` <55531231.6040506-VXdhtT5mjnY@public.gmane.org>
2015-05-13  9:10               ` Baoquan He
2015-05-11  9:52   ` [PATCH v11 07/10] iommu/vt-d: enable kdump support in iommu module Li, Zhen-Hua
     [not found]     ` <1431337974-545-8-git-send-email-zhen-hual-VXdhtT5mjnY@public.gmane.org>
2015-05-12  8:52       ` Dave Young
2015-05-13  2:10     ` Baoquan He
2015-05-13  2:28       ` Li, ZhenHua
2015-05-13  2:36         ` Baoquan He
2015-05-11  9:52   ` [PATCH v11 08/10] iommu/vt-d: assign new page table for dma_map Li, Zhen-Hua
2015-05-20 23:52     ` Baoquan He
2015-05-21  1:27       ` Li, ZhenHua
2015-05-21  6:54         ` Baoquan He
     [not found]           ` <20150521065451.GA23661-0VdLhd/A9PlfpSRLqpFUpR/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
2015-05-21  8:40             ` Li, ZhenHua
2015-05-21 10:11               ` Baoquan He
2015-05-11  9:52   ` [PATCH v11 09/10] iommu/vt-d: Copy functions for irte Li, Zhen-Hua
2015-05-12  9:00     ` Dave Young
2015-05-11  9:52   ` [PATCH v11 10/10] iommu/vt-d: Use old irte in kdump kernel Li, Zhen-Hua
2015-05-12  6:18   ` [PATCH v11 0/10] iommu/vt-d: Fix intel vt-d faults " Baoquan He
2015-05-12  9:04   ` Dave Young
2015-05-12  9:34   ` Li, Zhen-Hua
2015-06-08 14:26   ` David Woodhouse
     [not found]     ` <1433773583.2952.52.camel-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2015-06-08 15:29       ` Joerg Roedel
     [not found]         ` <20150608152957.GW20384-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2015-06-08 15:50           ` David Woodhouse
2015-06-08 16:13             ` Joerg Roedel
2015-06-09 12:55               ` David Woodhouse
2015-06-10  9:21                 ` Joerg Roedel
     [not found]                   ` <20150610092150.GZ20384-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2015-06-10  9:32                     ` Li, ZhenHua
     [not found]                       ` <5578042D.9050407-VXdhtT5mjnY@public.gmane.org>
2015-06-10 14:10                         ` David Woodhouse
2015-05-13  1:54 ` Li, ZhenHua
     [not found]   ` <5552AEE9.80408-VXdhtT5mjnY@public.gmane.org>
2015-05-18 10:05     ` Li, ZhenHua
2015-05-19  1:13       ` Dave Young
2015-05-19  7:43         ` Li, ZhenHua
2015-05-29 16:21 ` Joerg Roedel
     [not found]   ` <20150529162151.GB20384-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2015-05-30 11:23     ` Li, Zhen-Hua

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1431337974-545-5-git-send-email-zhen-hual@hp.com \
    --to=zhen-hual-vxdhtt5mjny@public.gmane.org \
    --cc=bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
    --cc=billsumnerlinux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=doug.hatch-VXdhtT5mjnY@public.gmane.org \
    --cc=dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org \
    --cc=dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=indou.takao-+CUm20s59erQFUHtdCDX3A@public.gmane.org \
    --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
    --cc=ishii.hironobu-+CUm20s59erQFUHtdCDX3A@public.gmane.org \
    --cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \
    --cc=kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=li.zhang6-VXdhtT5mjnY@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=lisa.mitchell-VXdhtT5mjnY@public.gmane.org \
    --cc=rwright-VXdhtT5mjnY@public.gmane.org \
    --cc=tom.vaden-VXdhtT5mjnY@public.gmane.org \
    --cc=vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox