x86, 64-bit: patch paravirt inline replacements when loading modules

small speedup. Paravirt replacements were added to the i386 module loader by commit 139ec7c. This adds the same code to the x86_64 module loader. Signed-off-by: Anders Kaseorg <[email protected]> Acked-by: "H. Peter Anvin" <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
Findingmyway · Jun 30, 2008 · 5e5a29b · 5e5a29b
1 parent 543cf4c
commit 5e5a29b
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/arch/x86/kernel/module_64.c b/arch/x86/kernel/module_64.c
@@ -150,7 +150,8 @@ int module_finalize(const Elf_Ehdr *hdr,
                     const Elf_Shdr *sechdrs,
                     struct module *me)
 {
-	const Elf_Shdr *s, *text = NULL, *alt = NULL, *locks = NULL;
+	const Elf_Shdr *s, *text = NULL, *alt = NULL, *locks = NULL,
+		*para = NULL;
 	char *secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
 
 	for (s = sechdrs; s < sechdrs + hdr->e_shnum; s++) {
@@ -160,6 +161,8 @@ int module_finalize(const Elf_Ehdr *hdr,
 			alt = s;
 		if (!strcmp(".smp_locks", secstrings + s->sh_name))
 			locks= s;
+		if (!strcmp(".parainstructions", secstrings + s->sh_name))
+			para = s;
 	}
 
 	if (alt) {
@@ -175,6 +178,11 @@ int module_finalize(const Elf_Ehdr *hdr,
 					    tseg, tseg + text->sh_size);
 	}
 
+	if (para) {
+		void *pseg = (void *)para->sh_addr;
+		apply_paravirt(pseg, pseg + para->sh_size);
+	}
+
 	return module_bug_finalize(hdr, sechdrs, me);
 }