kpatch/test/integration/module-kvm-fixup.patch

Index: src/arch/x86/kvm/vmx.c
===================================================================
--- src.orig/arch/x86/kvm/vmx.c
+++ src/arch/x86/kvm/vmx.c
@@ -8774,6 +8774,8 @@ static int vmx_check_intercept(struct kv
 			       struct x86_instruction_info *info,
 			       enum x86_intercept_stage stage)
 {
+	if (!jiffies)
+		printk("kpatch vmx_check_intercept\n");
 	return X86EMUL_CONTINUE;
 }
new .fixup group size algorithm The fixup_group_size() function assumes that all .fixup rela groups end with a jmpq instruction. That assumption turns out to be false when you take into account the ____kvm_handle_fault_on_reboot() macro which is used by kvm. This is a new, more reliable method. It turns out that each .fixup group is referenced by the __ex_table section. The new algorithm goes through the __ex_table relas to figure out the size of each .fixup group. Also the .fixup section is now processed before __ex_table, because it needs to access the original __ex_table relas before the unused ones have been stripped. Fixes the following error: ERROR: vmx.o: fixup_group_size: 1554: can't find jump instruction in .fixup section 2014-09-15 02:46:36 +00:00			`Index: src/arch/x86/kvm/vmx.c`
			`===================================================================`
			`--- src.orig/arch/x86/kvm/vmx.c`
			`+++ src/arch/x86/kvm/vmx.c`
fix integration test patch conflict 2014-10-06 17:42:45 +00:00			`@@ -8774,6 +8774,8 @@ static int vmx_check_intercept(struct kv`
new .fixup group size algorithm The fixup_group_size() function assumes that all .fixup rela groups end with a jmpq instruction. That assumption turns out to be false when you take into account the ____kvm_handle_fault_on_reboot() macro which is used by kvm. This is a new, more reliable method. It turns out that each .fixup group is referenced by the __ex_table section. The new algorithm goes through the __ex_table relas to figure out the size of each .fixup group. Also the .fixup section is now processed before __ex_table, because it needs to access the original __ex_table relas before the unused ones have been stripped. Fixes the following error: ERROR: vmx.o: fixup_group_size: 1554: can't find jump instruction in .fixup section 2014-09-15 02:46:36 +00:00			`struct x86_instruction_info *info,`
			`enum x86_intercept_stage stage)`
			`{`
			`+ if (!jiffies)`
			`+ printk("kpatch vmx_check_intercept\n");`
			`return X86EMUL_CONTINUE;`
			`}`