1 files changed, 32 insertions, 28 deletions

diff --git a/patches/boot_time_opt/0152-x86-kvm-Notify-host-to-release-pages.patch b/patches/boot_time_opt/0152-x86-kvm-Notify-host-to-release-pages.patch
index 5f44930..d3a1553 100644
--- a/patches/boot_time_opt/0152-x86-kvm-Notify-host-to-release-pages.patch
+++ b/patches/boot_time_opt/0152-x86-kvm-Notify-host-to-release-pages.patch
@@ -1,4 +1,4 @@
-From d28921b5f797829e4e676f7968ae688ef96b7992 Mon Sep 17 00:00:00 2001
+From 771ee703122aa119bb662208066040f8b9356986 Mon Sep 17 00:00:00 2001
 From: Sebastien Boeuf <sebastien.boeuf@intel.com>
 Date: Mon, 23 Jan 2017 15:08:55 -0800
 Subject: [PATCH 152/154] x86: kvm: Notify host to release pages
@@ -31,21 +31,24 @@ use it.
 
 Suggested-by: Arjan van de Ven <arjan.van.de.ven@intel.com>
 Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
+
+Modified for aufs4 enabled kernel
+Signed-off-by: Martin Borg <martin.borg@enea.com>
 ---
  arch/x86/kvm/x86.c            | 17 +++++++++++++++++
  include/linux/mm.h            |  5 +++++
  include/uapi/linux/kvm_para.h |  3 +++
  kernel/sysctl.c               |  7 +++++++
  mm/Makefile                   |  2 +-
- mm/kvm.c                      | 25 +++++++++++++++++++++++++
- 6 files changed, 58 insertions(+), 1 deletion(-)
+ mm/kvm.c                      | 26 ++++++++++++++++++++++++++
+ 6 files changed, 59 insertions(+), 1 deletion(-)
  create mode 100644 mm/kvm.c
 
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 582c75311f95..683a94dd5f03 100644
+index 03869eb7fcd6..628bad46b8ad 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -46,6 +46,7 @@
+@@ -45,6 +45,7 @@
  #include <linux/user-return-notifier.h>
  #include <linux/srcu.h>
  #include <linux/slab.h>
@@ -53,7 +56,7 @@ index 582c75311f95..683a94dd5f03 100644
  #include <linux/perf_event.h>
  #include <linux/uaccess.h>
  #include <linux/hash.h>
-@@ -6019,6 +6020,19 @@ static void kvm_pv_kick_cpu_op(struct kvm *kvm, unsigned long flags, int apicid)
+@@ -6253,6 +6254,19 @@ static void kvm_pv_kick_cpu_op(struct kvm *kvm, unsigned long flags, int apicid)
         kvm_irq_delivery_to_apic(kvm, NULL, &lapic_irq, NULL);
  }
  
@@ -73,10 +76,10 @@ index 582c75311f95..683a94dd5f03 100644
  void kvm_vcpu_deactivate_apicv(struct kvm_vcpu *vcpu)
  {
         vcpu->arch.apicv_active = false;
-@@ -6065,6 +6079,9 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)
-                kvm_pv_kick_cpu_op(vcpu->kvm, a0, a1);
-                ret = 0;
+@@ -6304,6 +6318,9 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)
+                ret = kvm_pv_clock_pairing(vcpu, a0, a1);
                 break;
+ #endif
 +       case KVM_HC_RETURN_MEM:
 +               ret = kvm_pv_return_mem_op(vcpu->kvm, a0, a1);
 +               break;
@@ -84,10 +87,10 @@ index 582c75311f95..683a94dd5f03 100644
                 ret = -KVM_ENOSYS;
                 break;
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 925ec25f99a8..833f23d98baa 100644
+index c3153e9ee7ea..15e02bf3a6b3 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -2303,6 +2303,11 @@ extern bool process_shares_mm(struct task_struct *p, struct mm_struct *mm);
+@@ -2452,6 +2452,11 @@ extern bool process_shares_mm(struct task_struct *p, struct mm_struct *mm);
  extern int sysctl_drop_caches;
  int drop_caches_sysctl_handler(struct ctl_table *, int,
                                         void __user *, size_t *, loff_t *);
@@ -100,13 +103,13 @@ index 925ec25f99a8..833f23d98baa 100644
  
  void drop_slab(void);
 diff --git a/include/uapi/linux/kvm_para.h b/include/uapi/linux/kvm_para.h
-index bf6cd7d5cac2..7d90f77d87d0 100644
+index dcf629dd2889..85f9422fe59c 100644
 --- a/include/uapi/linux/kvm_para.h
 +++ b/include/uapi/linux/kvm_para.h
-@@ -23,6 +23,9 @@
- #define KVM_HC_MIPS_GET_CLOCK_FREQ     6
+@@ -26,6 +26,9 @@
  #define KVM_HC_MIPS_EXIT_VM            7
  #define KVM_HC_MIPS_CONSOLE_OUTPUT     8
+ #define KVM_HC_CLOCK_PAIRING           9
 +#define KVM_HC_RETURN_MEM              10
 +
 +#define KVM_MAX_RET_MEM_SIZE           (1 << 22) // 4MiB
@@ -114,10 +117,10 @@ index bf6cd7d5cac2..7d90f77d87d0 100644
  /*
   * hypercalls use architecture specific
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index c1095cdc0fe2..d8ae774fa042 100644
+index d9c31bc2eaea..9a1611f92a2a 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -1398,6 +1398,13 @@ static struct ctl_table vm_table[] = {
+@@ -1410,6 +1410,13 @@ static struct ctl_table vm_table[] = {
                 .extra1         = &one,
                 .extra2         = &four,
         },
@@ -132,25 +135,26 @@ index c1095cdc0fe2..d8ae774fa042 100644
         {
                 .procname       = "compact_memory",
 diff --git a/mm/Makefile b/mm/Makefile
-index 295bd7a..6455723 100644
+index 4659b93cba43..77b145de8a55 100644
 --- a/mm/Makefile
 +++ b/mm/Makefile
-@@ -47,6 +47,8 @@ else
-        obj-y           += bootmem.o
- endif
+@@ -40,7 +40,7 @@ obj-y                 := filemap.o mempool.o oom_kill.o \
+                           mm_init.o mmu_context.o percpu.o slab_common.o \
+                           compaction.o vmacache.o swap_slots.o \
+                           interval_tree.o list_lru.o workingset.o \
+-                          prfile.o debug.o $(mmu-y)
++                          prfile.o debug.o kvm.o $(mmu-y)
+ 
+ obj-y += init-mm.o
  
-+obj-y += kvm.o
-+
- obj-$(CONFIG_ADVISE_SYSCALLS)  += fadvise.o
- ifdef CONFIG_MMU
-        obj-$(CONFIG_ADVISE_SYSCALLS)   += madvise.o
 diff --git a/mm/kvm.c b/mm/kvm.c
 new file mode 100644
-index 000000000000..8945f6a311b9
+index 000000000000..1c5600788221
 --- /dev/null
 +++ b/mm/kvm.c
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,26 @@
 +#include <linux/mman.h>
++#include <linux/sysctl.h>
 +
 +int sysctl_kvm_madv_instant_free;
 +
@@ -176,5 +180,5 @@ index 000000000000..8945f6a311b9
 +       return 0;
 +}
 -- 
-2.12.1
+2.15.0