From 6a868fb8430d63765fe374b9acd2df9e0055e483 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <david.abdurachmanov@sifive.com>
Date: Sat, 14 Dec 2019 19:06:22 +0200
Subject: [PATCH] Bring back SHUFFLE_PAGE_ALLOCATOR and SLAB_FREELIST_HARDENED

Let's verify if *only* CONFIG_SLAB_FREELIST_RANDOM causes our boot
issues (kernel crashes) or a combination.

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
---
 configs/fedora/generic/riscv/CONFIG_SHUFFLE_PAGE_ALLOCATOR | 1 -
 configs/fedora/generic/riscv/CONFIG_SLAB_FREELIST_HARDENED | 1 -
 kernel-riscv64-debug.config                                | 4 ++--
 kernel-riscv64.config                                      | 4 ++--
 kernel.spec                                                | 4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 configs/fedora/generic/riscv/CONFIG_SHUFFLE_PAGE_ALLOCATOR
 delete mode 100644 configs/fedora/generic/riscv/CONFIG_SLAB_FREELIST_HARDENED

diff --git a/configs/fedora/generic/riscv/CONFIG_SHUFFLE_PAGE_ALLOCATOR b/configs/fedora/generic/riscv/CONFIG_SHUFFLE_PAGE_ALLOCATOR
deleted file mode 100644
index 0a7ea27a4..000000000
--- a/configs/fedora/generic/riscv/CONFIG_SHUFFLE_PAGE_ALLOCATOR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
diff --git a/configs/fedora/generic/riscv/CONFIG_SLAB_FREELIST_HARDENED b/configs/fedora/generic/riscv/CONFIG_SLAB_FREELIST_HARDENED
deleted file mode 100644
index 630a3ed81..000000000
--- a/configs/fedora/generic/riscv/CONFIG_SLAB_FREELIST_HARDENED
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SLAB_FREELIST_HARDENED is not set
diff --git a/kernel-riscv64-debug.config b/kernel-riscv64-debug.config
index 3deaf42d5..cb6449037 100644
--- a/kernel-riscv64-debug.config
+++ b/kernel-riscv64-debug.config
@@ -4712,7 +4712,7 @@ CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
 CONFIG_SGI_PARTITION=y
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
 # CONFIG_SI1145 is not set
 # CONFIG_SI7005 is not set
@@ -4729,7 +4729,7 @@ CONFIG_SKGE_GENESIS=y
 CONFIG_SKGE=m
 # CONFIG_SKY2_DEBUG is not set
 CONFIG_SKY2=m
-# CONFIG_SLAB_FREELIST_HARDENED is not set
+CONFIG_SLAB_FREELIST_HARDENED=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
diff --git a/kernel-riscv64.config b/kernel-riscv64.config
index 688bbd598..3c28bc9d4 100644
--- a/kernel-riscv64.config
+++ b/kernel-riscv64.config
@@ -4690,7 +4690,7 @@ CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
 CONFIG_SGI_PARTITION=y
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
 # CONFIG_SI1145 is not set
 # CONFIG_SI7005 is not set
@@ -4707,7 +4707,7 @@ CONFIG_SKGE_GENESIS=y
 CONFIG_SKGE=m
 # CONFIG_SKY2_DEBUG is not set
 CONFIG_SKY2=m
-# CONFIG_SLAB_FREELIST_HARDENED is not set
+CONFIG_SLAB_FREELIST_HARDENED=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
diff --git a/kernel.spec b/kernel.spec
index add9ae5ca..666cd34eb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -214,7 +214,7 @@ Summary: The Linux kernel
 # pkg_release is what we'll fill in for the rpm Release: field
 %if 0%{?released_kernel}
 
-%define pkg_release %{fedora_build}%{?buildid}.5.riscv64%{?dist}
+%define pkg_release %{fedora_build}%{?buildid}.6.riscv64%{?dist}
 
 %else
 
@@ -229,7 +229,7 @@ Summary: The Linux kernel
 %else
 %define gittag .git0
 %endif
-%define pkg_release 0%{?rctag}%{?gittag}.%{fedora_build}%{?buildid}.5.riscv64%{?dist}
+%define pkg_release 0%{?rctag}%{?gittag}.%{fedora_build}%{?buildid}.6.riscv64%{?dist}
 
 %endif