Make kobj variable (of type struct kobject) statically allocated in klp_object structure. It will allow us to move in the func-object-patch hierarchy through kobject links. The only reason to have it dynamic was to not have empty release callback in the code. However we have empty callbacks for function and patch in the code now, so it is no longer valid and the advantage of static allocation is clear.
Showing the changes to kernel/livepatch (1 of 2 files). Show all
Unified · Split
| @@ -651,6 +651,15 @@ static struct kobj_type klp_ktype_patch = { · 650 unmodified lines | ||
| 651 | 651 | .default_attrs = klp_patch_attrs, |
| 652 | 652 | }; |
| 653 | 653 | |
| 654 | +static void klp_kobj_release_object(struct kobject *kobj) | |
| 655 | +{ | |
| 656 | +} | |
| 657 | + | |
| 658 | +static struct kobj_type klp_ktype_object = { | |
| 659 | + .release = klp_kobj_release_object, | |
| 660 | + .sysfs_ops = &kobj_sysfs_ops, | |
| 661 | +}; | |
| 662 | + | |
| 654 | 663 | static void klp_kobj_release_func(struct kobject *kobj) |
| 655 | 664 | { |
| 656 | 665 | } |
| @@ -695,7 +704,7 @@ static void klp_free_objects_limited(struct klp_patch *patch, · 38 unmodified lines | ||
| 695 | 704 | |
| 696 | 705 | for (obj = patch->objs; obj->funcs && obj != limit; obj++) { |
| 697 | 706 | klp_free_funcs_limited(obj, NULL); |
| 698 | − kobject_put(obj->kobj); | |
| 707 | + kobject_put(&obj->kobj); | |
| 699 | 708 | } |
| 700 | 709 | } |
| 701 | 710 | |
| @@ -713,7 +722,7 @@ static int klp_init_func(struct klp_object *obj, struct klp_func *func) · 11 unmodified lines | ||
| 713 | 722 | func->state = KLP_DISABLED; |
| 714 | 723 | |
| 715 | 724 | return kobject_init_and_add(&func->kobj, &klp_ktype_func, |
| 716 | − obj->kobj, "%s", func->old_name); | |
| 725 | + &obj->kobj, "%s", func->old_name); | |
| 717 | 726 | } |
| 718 | 727 | |
| 719 | 728 | /* parts of the initialization that is done only when the object is loaded */ |
| @@ -753,9 +762,10 @@ static int klp_init_object(struct klp_patch *patch, struct klp_object *obj) · 33 unmodified lines | ||
| 753 | 762 | klp_find_object_module(obj); |
| 754 | 763 | |
| 755 | 764 | name = klp_is_module(obj) ? obj->name : "vmlinux"; |
| 756 | − obj->kobj = kobject_create_and_add(name, &patch->kobj); | |
| 757 | − if (!obj->kobj) | |
| 758 | − return -ENOMEM; | |
| 765 | + ret = kobject_init_and_add(&obj->kobj, &klp_ktype_object, | |
| 766 | + &patch->kobj, "%s", name); | |
| 767 | + if (ret) | |
| 768 | + return ret; | |
| 759 | 769 | |
| 760 | 770 | for (func = obj->funcs; func->old_name; func++) { |
| 761 | 771 | ret = klp_init_func(obj, func); |
| @@ -773,7 +783,7 @@ static int klp_init_object(struct klp_patch *patch, struct klp_object *obj) · 11 unmodified lines | ||
| 773 | 783 | |
| 774 | 784 | free: |
| 775 | 785 | klp_free_funcs_limited(obj, func); |
| 776 | − kobject_put(obj->kobj); | |
| 786 | + kobject_put(&obj->kobj); | |
| 777 | 787 | return ret; |
| 778 | 788 | } |
| 779 | 789 | |