integration/centos7: update module-shadow.patch

Switch to klp shadow-variable API.

Signed-off-by: Artem Savkov <asavkov@redhat.com>
This commit is contained in:
Artem Savkov 2019-01-09 12:32:20 +01:00
parent abe04af23a
commit 31f6b02279

View File

@ -1,22 +1,23 @@
diff -Nupr src.orig/arch/x86/kvm/vmx.c src/arch/x86/kvm/vmx.c
--- src.orig/arch/x86/kvm/vmx.c 2017-09-22 15:27:20.853052676 -0400
+++ src/arch/x86/kvm/vmx.c 2017-09-22 15:27:44.742151601 -0400
@@ -10581,10 +10581,20 @@ static void vmx_leave_nested(struct kvm_
Index: src/arch/x86/kvm/vmx.c
===================================================================
--- src.orig/arch/x86/kvm/vmx.c
+++ src/arch/x86/kvm/vmx.c
@@ -11406,10 +11406,20 @@ static void vmx_leave_nested(struct kvm_
* It should only be called before L2 actually succeeded to run, and when
* vmcs01 is current (it doesn't leave_guest_mode() or switch vmcss).
*/
+#include "kpatch.h"
+#include <linux/livepatch.h>
static void nested_vmx_entry_failure(struct kvm_vcpu *vcpu,
struct vmcs12 *vmcs12,
u32 reason, unsigned long qualification)
{
+ int *kpatch;
+
+ kpatch = kpatch_shadow_alloc(vcpu, "kpatch", sizeof(*kpatch),
+ GFP_KERNEL);
+ kpatch = klp_shadow_alloc(vcpu, 0, sizeof(*kpatch),
+ GFP_KERNEL, NULL, NULL);
+ if (kpatch) {
+ kpatch_shadow_get(vcpu, "kpatch");
+ kpatch_shadow_free(vcpu, "kpatch");
+ klp_shadow_get(vcpu, 0);
+ klp_shadow_free(vcpu, 0, NULL);
+ }
+
load_vmcs12_host_state(vcpu, vmcs12);