50a9ff6df4
The kernel is moved ahead to version 3.10.0-693.21.1.el7 To summarize: CVE-2017-5753 [bounds check bypass] aka 'Spectre Variant 1' This is fixed by load fences and is "baked in" and cannot be turned off. CVE-2017-5715 [branch target injection] aka 'Spectre Variant 2' This is fixed by a combination of retpolines and IBPB, or IBRS+IBPB if on skylake. This requires a microcode change in the processors. This feature, if on, has a significant performance impact. It is assumed on unless turned off via the "nospectre_v2" bootarg. CVE-2017-5754 [rogue data cache load] aka 'Meltdown' aka 'Variant 3' This is fixed by page table isolation using the Kaiser patches. This feature is assumed on unless turned off via the "nopti" bootarg. As of the commit date, we have changed the installer kickstarts to issue both "nopti nospectre_v2" bootargs to minimize realtime impacts by default. The customer will be able to optionally sacrifice performance for extra security at datafill time. Change-Id: Id7c99923f2ee2ee91f77c7bd9940e684eff8b476 Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From 5b06b6c35a65b9924cc8cd34efcfdabf80c56fd8 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <5b06b6c35a65b9924cc8cd34efcfdabf80c56fd8.1522795098.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
|
|
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
|
|
From: Akinobu Mita <akinobu.mita@gmail.com>
|
|
Date: Wed, 4 Jun 2014 16:06:56 -0700
|
|
Subject: [PATCH 18/33] arch/x86/kernel/pci-dma.c: fix
|
|
dma_generic_alloc_coherent() when CONFIG_DMA_CMA is enabled
|
|
|
|
dma_generic_alloc_coherent() firstly attempts to allocate by
|
|
dma_alloc_from_contiguous() if CONFIG_DMA_CMA is enabled. But the
|
|
memory region allocated by it may not fit within the device's DMA mask.
|
|
This change makes it fall back to usual alloc_pages_node() allocation
|
|
for such cases.
|
|
|
|
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
|
|
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
|
|
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
|
Cc: David Woodhouse <dwmw2@infradead.org>
|
|
Cc: Don Dutile <ddutile@redhat.com>
|
|
Cc: Thomas Gleixner <tglx@linutronix.de>
|
|
Cc: Ingo Molnar <mingo@redhat.com>
|
|
Cc: "H. Peter Anvin" <hpa@zytor.com>
|
|
Cc: Andi Kleen <andi@firstfloor.org>
|
|
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
|
(cherry picked from commit 38f7ea5a082bbde9e64b7ece389f20e71a9806f4)
|
|
|
|
Conflicts:
|
|
arch/x86/kernel/pci-dma.c
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
arch/x86/kernel/pci-dma.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
|
|
index 9d92ea8..dbc2c74 100644
|
|
--- a/arch/x86/kernel/pci-dma.c
|
|
+++ b/arch/x86/kernel/pci-dma.c
|
|
@@ -100,8 +100,13 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size,
|
|
flag &= ~__GFP_ZERO;
|
|
again:
|
|
page = NULL;
|
|
- if (!(flag & GFP_ATOMIC))
|
|
+ if (!(flag & GFP_ATOMIC)) {
|
|
page = dma_alloc_from_contiguous(dev, count, get_order(size));
|
|
+ if (page && page_to_phys(page) + size > dma_mask) {
|
|
+ dma_release_from_contiguous(dev, page, count);
|
|
+ page = NULL;
|
|
+ }
|
|
+ }
|
|
if (!page)
|
|
page = alloc_pages_node(dev_to_node(dev), flag, get_order(size));
|
|
if (!page)
|
|
--
|
|
1.8.3.1
|
|
|