integ/kernel-std/centos/meta_patches/Enable-DMA-CMA-with-swiotlb.patch
Jim Somerville 50a9ff6df4 Kernel Upgrades for Meltdown and Spectre
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>
2018-06-22 12:53:11 -04:00

46 lines
1.8 KiB
Diff

From 751ffa1e603af3affda807ca36c8c2f370739ba6 Mon Sep 17 00:00:00 2001
Message-Id: <751ffa1e603af3affda807ca36c8c2f370739ba6.1522099416.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:23 -0400
Subject: [PATCH 06/32] Enable DMA CMA with swiotlb
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 4f7b7b4..0447fe8 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -4,7 +4,7 @@
Summary: The Linux kernel
# This is the WRS patch release
-%define patch_rel 5
+%define patch_rel 6
%define buildid .%{patch_rel}.tis
# For a kernel released for public testing, released_kernel should be 1.
@@ -433,6 +433,7 @@ Patch40011: intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
Patch40012: mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
Patch40013: memblock-introduce-memblock_alloc_range.patch
Patch40014: cma-add-placement-specifier-for-cma-kernel-parameter.patch
+Patch40015: x86-enable-DMA-CMA-with-swiotlb.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -763,6 +764,7 @@ ApplyOptionalPatch intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
ApplyOptionalPatch mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
ApplyOptionalPatch memblock-introduce-memblock_alloc_range.patch
ApplyOptionalPatch cma-add-placement-specifier-for-cma-kernel-parameter.patch
+ApplyOptionalPatch x86-enable-DMA-CMA-with-swiotlb.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1