RepoMirrors
/
kpatch
mirror of https://github.com/dynup/kpatch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change struct kpatch_patch s/old_addr/old_offset 

Make old addresses relative to the start address of the relocatable
kernel or module.

This commit has no functional effect; it just prepares the code for
future acceptance of the module patching support.

Signed-off-by: Seth Jennings <sjenning@redhat.com>
This commit is contained in:
Seth Jennings 2014-06-02 14:46:35 -05:00
parent 13f02e61ea
commit aa8c5da5ba
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kmod/core/core.c
View File

@ -120,6 +120,7 @@ enum kpatch_op {
struct kpatch_func {
struct kpatch_patch *patch;
unsigned long old_addr;
struct hlist_node node;
struct kpatch_module *kpmod;
enum kpatch_op op;
@ -163,7 +164,7 @@ static struct kpatch_func *kpatch_get_func(unsigned long ip)
/* Here, we have to use rcu safe hlist because of NMI concurrency */
hash_for_each_possible_rcu(kpatch_func_hash, f, node, ip)
if (f->patch->old_addr == ip)
if (f->old_addr == ip)
return f;
return NULL;
}
@ -172,7 +173,7 @@ static struct kpatch_func *kpatch_get_prev_func(struct kpatch_func *f,
unsigned long ip)
{
hlist_for_each_entry_continue_rcu(f, node)
if (f->patch->old_addr == ip)
if (f->old_addr == ip)
return f;
return NULL;
}
@ -207,10 +208,10 @@ static void kpatch_backtrace_address_verify(void *data, unsigned long address,
struct kpatch_func *active_func;
func = &kpmod->internal->funcs[i];
active_func = kpatch_get_func(func->patch->old_addr);
active_func = kpatch_get_func(func->old_addr);
if (!active_func) {
/* patching an unpatched func */
func_addr = func->patch->old_addr;
func_addr = func->old_addr;
func_size = func->patch->old_size;
} else {
/* repatching or unpatching */
@ -293,7 +294,7 @@ static int kpatch_apply_patch(void *data)
/* tentatively add the new funcs to the global func hash */
for (i = 0; i < num_funcs; i++)
hash_add_rcu(kpatch_func_hash, &funcs[i].node,
funcs[i].patch->old_addr);
funcs[i].old_addr);
/* memory barrier between func hash add and state change */
smp_wmb();
@ -414,15 +415,15 @@ static void kpatch_remove_funcs_from_filter(struct kpatch_func *funcs,
* If any other modules have also patched this function, don't
* remove its ftrace handler.
*/
if (kpatch_get_func(func->patch->old_addr))
if (kpatch_get_func(func->old_addr))
continue;
/* Remove the ftrace handler for this function. */
ret = ftrace_set_filter_ip(&kpatch_ftrace_ops,
func->patch->old_addr, 1, 0);
func->old_addr, 1, 0);
WARN(ret, "can't remove ftrace filter at address 0x%lx (rc=%d)",
func->patch->old_addr, ret);
func->old_addr, ret);
}
}
@ -560,9 +561,10 @@ int kpatch_register(struct kpatch_module *kpmod, bool replace)
func->op = KPATCH_OP_PATCH;
func->kpmod = kpmod;
func->patch = &kpmod->patches[i];
func->old_addr = func->patch->old_offset;
ret = kpatch_verify_symbol_match(func->patch->name,
func->patch->old_addr);
func->old_addr);
if (ret)
goto err_rollback;
@ -570,15 +572,15 @@ int kpatch_register(struct kpatch_module *kpmod, bool replace)
* If any other modules have also patched this function, it
* already has an ftrace handler.
*/
if (kpatch_get_func(func->patch->old_addr))
if (kpatch_get_func(func->old_addr))
continue;
/* Add an ftrace handler for this function. */
ret = ftrace_set_filter_ip(&kpatch_ftrace_ops,
func->patch->old_addr, 0, 0);
func->old_addr, 0, 0);
if (ret) {
pr_err("can't set ftrace filter at address 0x%lx\n",
func->patch->old_addr);
func->old_addr);
num_funcs = i;
goto err_rollback;
}

2
kmod/core/kpatch.h
View File

@ -26,7 +26,7 @@
struct kpatch_patch {
unsigned long new_addr;
unsigned long new_size;
unsigned long old_addr;
unsigned long old_offset;
unsigned long old_size;
char *name;
};

4
kmod/patch/kpatch-patch-hook.c
View File

@ -87,7 +87,7 @@ static ssize_t func_old_addr_show(struct kobject *kobj,
struct kpatch_func_obj *func =
container_of(kobj, struct kpatch_func_obj, kobj);
return sprintf(buf, "0x%lx\n", func->patch->old_addr);
return sprintf(buf, "0x%lx\n", func->patch->old_offset);
}
static ssize_t func_new_addr_show(struct kobject *kobj,
@ -195,7 +195,7 @@ static int __init patch_init(void)
}
funcs[i] = func;
sprint_symbol_no_offset(func->name, kpmod.patches[i].old_addr);
sprint_symbol_no_offset(func->name, kpmod.patches[i].old_offset);
ret = kobject_add(&func->kobj, functions_kobj,
"%s", func->name);

2
kpatch-build/create-diff-object.c
View File

@ -1498,7 +1498,7 @@ void kpatch_create_patches_sections(struct kpatch_elf *kelf,
sym->name, result.value, result.size);
/* add entry in text section */
patches[index].old_addr = result.value;
patches[index].old_offset = result.value;
patches[index].old_size = result.size;
patches[index].new_size = sym->sym.st_size;