Linux v4.15.14

kernel.spec

@@ -54,7 +54,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 13
+%define stable_update 14
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -641,9 +641,6 @@ Patch660: 0001-net-phy-mdio-bcm-unimac-fix-potential-NULL-dereferen.patch
 # rhbz 1549042
 Patch661: drm-i915-dp-Write-to-SET_POWER-dpcd-to-enable-MST-hub..patch
 
-# rhbz 1546709
-Patch662: mm-khugepaged-Convert-VM_BUG_ON-to-collapse-fail.patch
-
 # CVE-2017-18232 rhbz 1558066 1558067
 Patch663: 0001-scsi-libsas-direct-call-probe-and-destruct.patch
 
@@ -1951,6 +1948,9 @@ fi
 #
 #
 %changelog
+* Thu Mar 29 2018 Laura Abbott <labbott@redhat.com> - 4.15.14-200
+- Linux v4.15.14
+
 * Thu Mar 29 2018 Jeremy Cline <jeremy@jcline.org>
 - Fix mounting NFS with kerberos (rhbz 1558977)
 

mm-khugepaged-Convert-VM_BUG_ON-to-collapse-fail.patch

@@ -1,51 +0,0 @@
-From patchwork Thu Mar 15 15:23:53 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: mm/khugepaged: Convert VM_BUG_ON() to collapse fail
-From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
-X-Patchwork-Id: 10284785
-Message-Id: <20180315152353.27989-1-kirill.shutemov@linux.intel.com>
-To: Andrew Morton <akpm@linux-foundation.org>
-Cc: Laura Abbott <labbott@redhat.com>, linux-mm@kvack.org,
- linux-kernel@vger.kernel.org,
- "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
-Date: Thu, 15 Mar 2018 18:23:53 +0300
-
-khugepaged is not yet able to convert PTE-mapped huge pages back to PMD
-mapped. We do not collapse such pages. See check khugepaged_scan_pmd().
-
-But if between khugepaged_scan_pmd() and __collapse_huge_page_isolate()
-somebody managed to instantiate THP in the range and then split the PMD
-back to PTEs we would have a problem -- VM_BUG_ON_PAGE(PageCompound(page))
-will get triggered.
-
-It's possible since we drop mmap_sem during collapse to re-take for
-write.
-
-Replace the VM_BUG_ON() with graceful collapse fail.
-
-Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
-Fixes: b1caa957ae6d ("khugepaged: ignore pmd tables with THP mapped with ptes")
----
- mm/khugepaged.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/mm/khugepaged.c b/mm/khugepaged.c
-index b7e2268dfc9a..c15da1ea7e63 100644
---- a/mm/khugepaged.c
-+++ b/mm/khugepaged.c
-@@ -530,7 +530,12 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma,
- 			goto out;
- 		}
- 
--		VM_BUG_ON_PAGE(PageCompound(page), page);
-+		/* TODO: teach khugepaged to collapse THP mapped with pte */
-+		if (PageCompound(page)) {
-+			result = SCAN_PAGE_COMPOUND;
-+			goto out;
-+		}
-+
- 		VM_BUG_ON_PAGE(!PageAnon(page), page);
- 
- 		/*

sources

@@ -1,2 +1,2 @@
 SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
-SHA512 (patch-4.15.13.xz) = 8e134ce5127806b1668c6b0cf96745de3d93ca276ee9072aa37ad1c7caecdd21f64b1afc259ddf9a065ce3ec09866a8837f6fa8740f9c28634f002e4acaecd24
+SHA512 (patch-4.15.14.xz) = d8192dbfa7f1b6eddd4d3f70b113bdddb11021d6f03cff70dbd8a9667c4465992d70de4cd6a3b9229abdb1b1eb8460a06ec1388e7d58ad6da62253f80c9f3567