diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-09 20:04:12 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-09 20:04:12 -0500 |
commit | c1a1e6b3781d7847d95c9f5ac68eb97a1ea30adc (patch) | |
tree | e914d3468543df124e9949932ad7f01bde0c4015 | |
parent | 2bc9a7e67e34a92446183d47286e60ac90fee19e (diff) | |
download | longterm-queue-4.8-c1a1e6b3781d7847d95c9f5ac68eb97a1ea30adc.tar.gz |
xen: drop patch n/a for 4.8.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r-- | queue/series | 1 | ||||
-rw-r--r-- | queue/xen-adjust-early-dom0-p2m-handling-to-xen-hypervisor.patch | 57 |
2 files changed, 0 insertions, 58 deletions
diff --git a/queue/series b/queue/series index ab50214..58b68c3 100644 --- a/queue/series +++ b/queue/series @@ -140,7 +140,6 @@ wlcore-Pass-win_size-taken-from-ieee80211_sta-to-FW.patch wlcore-Add-RX_BA_WIN_SIZE_CHANGE_EVENT-event.patch drm-ttm-fix-use-after-free-races-in-vm-fault-handlin.patch block-get-rid-of-blk_integrity_revalidate.patch -xen-adjust-early-dom0-p2m-handling-to-xen-hypervisor.patch target-Fix-compare_and_write_callback-handling-for-n.patch target-fileio-Fix-zero-length-READ-and-WRITE-handlin.patch iscsi-target-Set-session_fall_back_to_erl0-when-forc.patch diff --git a/queue/xen-adjust-early-dom0-p2m-handling-to-xen-hypervisor.patch b/queue/xen-adjust-early-dom0-p2m-handling-to-xen-hypervisor.patch deleted file mode 100644 index 3262415..0000000 --- a/queue/xen-adjust-early-dom0-p2m-handling-to-xen-hypervisor.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 69861e0a52f8733355ce246f0db15e1b240ad667 Mon Sep 17 00:00:00 2001 -From: Juergen Gross <jgross@suse.com> -Date: Wed, 10 May 2017 06:08:44 +0200 -Subject: [PATCH] xen: adjust early dom0 p2m handling to xen hypervisor - behavior - -commit 69861e0a52f8733355ce246f0db15e1b240ad667 upstream. - -When booted as pv-guest the p2m list presented by the Xen is already -mapped to virtual addresses. In dom0 case the hypervisor might make use -of 2M- or 1G-pages for this mapping. Unfortunately while being properly -aligned in virtual and machine address space, those pages might not be -aligned properly in guest physical address space. - -So when trying to obtain the guest physical address of such a page -pud_pfn() and pmd_pfn() must be avoided as those will mask away guest -physical address bits not being zero in this special case. - -Signed-off-by: Juergen Gross <jgross@suse.com> -Reviewed-by: Jan Beulich <jbeulich@suse.com> -Signed-off-by: Juergen Gross <jgross@suse.com> - -diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c -index 9d9ae6650aa1..7397d8b8459d 100644 ---- a/arch/x86/xen/mmu_pv.c -+++ b/arch/x86/xen/mmu_pv.c -@@ -2025,7 +2025,8 @@ static unsigned long __init xen_read_phys_ulong(phys_addr_t addr) - - /* - * Translate a virtual address to a physical one without relying on mapped -- * page tables. -+ * page tables. Don't rely on big pages being aligned in (guest) physical -+ * space! - */ - static phys_addr_t __init xen_early_virt_to_phys(unsigned long vaddr) - { -@@ -2046,7 +2047,7 @@ static phys_addr_t __init xen_early_virt_to_phys(unsigned long vaddr) - sizeof(pud))); - if (!pud_present(pud)) - return 0; -- pa = pud_pfn(pud) << PAGE_SHIFT; -+ pa = pud_val(pud) & PTE_PFN_MASK; - if (pud_large(pud)) - return pa + (vaddr & ~PUD_MASK); - -@@ -2054,7 +2055,7 @@ static phys_addr_t __init xen_early_virt_to_phys(unsigned long vaddr) - sizeof(pmd))); - if (!pmd_present(pmd)) - return 0; -- pa = pmd_pfn(pmd) << PAGE_SHIFT; -+ pa = pmd_val(pmd) & PTE_PFN_MASK; - if (pmd_large(pmd)) - return pa + (vaddr & ~PMD_MASK); - --- -2.12.0 - |