Re: [PATCH v2 2/8] kbuild: Support for Symbols.list creation

Joao Moreira
2019-03-26T18:13:40Z

On 3/26/19 1:15 PM, Joe Lawrence wrote:
> On 3/26/19 10:40 AM, Joao Moreira wrote:
>>
>>
>> On 3/20/19 4:08 PM, Miroslav Benes wrote:
>>>>> diff --git a/scripts/Makefile.build b/scripts/Makefile.build
>>>>> index fd03d60f6c5a..1e28ad21314c 100644
>>>>> --- a/scripts/Makefile.build
>>>>> +++ b/scripts/Makefile.build
>>>>> @@ -247,6 +247,11 @@ cmd_gen_ksymdeps = \
>>>>>        $(CONFIG_SHELL) $(srctree)/scripts/gen_ksymdeps.sh $@ >>
>>>>> $(dot-target).cmd
>>>>>    endif
>>>>> +ifdef CONFIG_LIVEPATCH
>>>>> +cmd_livepatch = $(if $(LIVEPATCH_$(basetarget).o),            \
>>>>> +    $(shell touch $(MODVERDIR)/$(basetarget).livepatch))
>>>>> +endif
>>>>> +
>>>>>    define rule_cc_o_c
>>>>>        $(call cmd,checksrc)
>>>>>        $(call cmd_and_fixdep,cc_o_c)
>>>>> @@ -283,6 +288,7 @@ $(single-used-m): $(obj)/%.o: $(src)/%.c
>>>>> $(recordmcount_source) $(objtool_dep) F
>>>>>        $(call if_changed_rule,cc_o_c)
>>>>>        @{ echo $(@:.o=.ko); echo $@; \
>>>>>           $(cmd_undef_syms); } > $(MODVERDIR)/$(@F:.o=.mod)
>>>>> +    $(call cmd_livepatch)
>>>>>    quiet_cmd_cc_lst_c = MKLST   $@
>>>>>          cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \
>>>>
>>>> Since cmd_livepatch is only called for single-used-m, does this mean
>>>> that we can only klp-convert single object file livepatch modules?
>>>>
>>>> I stumbled upon this when trying to create a self-test module that
>>>> incorporated two object files.  I tried adding a $(call cmd_livepatch)
>>>> in the recipe for $(obj)/%.o, but that didn't help.  My kbuild foo
>>>> wasn't good enough to figure this one out.
>>>
>>> I looked at my original code and it is a bit different there. I
>>> placed it
>>> under rule_cc_o_c right after objtool command. If I remember correctly
>>> this is the correct recipe for .c->.o. Unfortunately I forgot the
>>> details
>>> and there is of course nothing about it in my notes.
>>>
>>> Does it help?
>>>
>>> Joao, is there a reason you moved it elsewhere?
>>
>> Hi,
>>
>> Unfortunately I can't remember why the chunk was moved to where it is in
>> this version of the patch, sorry. Yet, I did try to move this into the
>> rule cc_o_c and it seemed to work with not damage.
>>
>> Joe, would you kindly verify and squash properly the patch below, which
>> places cmd_livepatch in rule_cc_o_c?
>>
>> Thank you.
>>
>> Subject: [PATCH] Move cmd_klp_convert to the right place
>>
>>
>> Signed-off-by: Joao Moreira <jmoreira@suse.de>
>>
>> ---
>>
>>    scripts/Makefile.build | 2 +-
>>
>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>
>> diff --git a/scripts/Makefile.build b/scripts/Makefile.build
>> index 1e28ad21314c..5f66106a47d6 100644
>> --- a/scripts/Makefile.build
>> +++ b/scripts/Makefile.build
>> @@ -260,6 +260,7 @@ define rule_cc_o_c
>>           $(call cmd,objtool)
>>           $(call cmd,modversions_c)
>>           $(call cmd,record_mcount)
>> +       $(call cmd,livepatch)
>>    endef
>>    define rule_as_o_S
>> @@ -288,7 +289,6 @@ $(single-used-m): $(obj)/%.o: $(src)/%.c
>> $(recordmcount_source) $(objtool_dep) F
>>           $(call if_changed_rule,cc_o_c)
>>           @{ echo $(@:.o=.ko); echo $@; \
>>              $(cmd_undef_syms); } > $(MODVERDIR)/$(@F:.o=.mod)
>> -       $(call cmd_livepatch)
>>    quiet_cmd_cc_lst_c = MKLST   $@
>>          cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \
>
> Hi Joao,
>
> This change seems to work okay for (again) single object modules, but
> I'm having issues with multi-object modules.
>

Hi Joe, thanks for the sources, this made everything much easier in my
side :)

In the patch below I change a little bit the interface used to inform
kbuild that a module is a livepatch. Instead of defining the flag
LIVEPATCH_ per .o file, we define it per module (what actually makes
much more sense). We later use $(basetarget) in the Makefile for
checking the flags. By doing so, and invoking cmd_livepatch both from
the $(single-used-m) and $(multi-used-m) we ensure that the .livepatch
file is created for each module, what later in the pipeline flags the
invocation of klp-convert.

I tested the following patch with the sources you provided (with little
modifications, removing the .o from the LIVEPATCH_ definitions and using
the module name instead of the object names), achieving successful
compilation and conversion. I also tested against the sample
livepatches, thus I think it might be ok now.

Do you think we can go this way to solve the problem in v3?

-- PATCH --

Subject: [PATCH] Fix cmd_livepatch for multi-object modules

Signed-off-by: Joao Moreira <jmoreira@suse.de>

---

samples/livepatch/Makefile | 10 +++++-----

scripts/Makefile.build | 5 +++--

2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/samples/livepatch/Makefile b/samples/livepatch/Makefile

index 93725c434f4f..dea530840725 100644

--- a/samples/livepatch/Makefile

+++ b/samples/livepatch/Makefile

@@ -1,8 +1,8 @@

-LIVEPATCH_livepatch-sample.o := y

-LIVEPATCH_livepatch-shadow-fix1.o := y

-LIVEPATCH_livepatch-shadow-fix2.o := y

-LIVEPATCH_livepatch-callbacks-demo.o := y

-LIVEPATCH_livepatch-annotated-sample.o := y

+LIVEPATCH_livepatch-sample := y

+LIVEPATCH_livepatch-shadow-fix1 := y

+LIVEPATCH_livepatch-shadow-fix2 := y

+LIVEPATCH_livepatch-callbacks-demo := y

+LIVEPATCH_livepatch-annotated-sample := y

obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch-sample.o

obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch-shadow-mod.o

diff --git a/scripts/Makefile.build b/scripts/Makefile.build

index dba89e605eab..52e69b4084d5 100644

--- a/scripts/Makefile.build

+++ b/scripts/Makefile.build

@@ -250,7 +250,7 @@ cmd_gen_ksymdeps = \

endif

ifdef CONFIG_LIVEPATCH

-cmd_livepatch = $(if $(LIVEPATCH_$(basetarget).o),
\
+cmd_livepatch = $(if $(LIVEPATCH_$(basetarget)),
\
$(shell touch $(MODVERDIR)/$(basetarget).livepatch))

endif

@@ -288,9 +288,9 @@ $(obj)/%.o: $(src)/%.c $(recordmcount_source)
$(objtool_dep) FORCE
$(single-used-m): $(obj)/%.o: $(src)/%.c $(recordmcount_source)
$(objtool_dep) FORCE
$(call cmd,force_checksrc)

$(call if_changed_rule,cc_o_c)

+ $(call cmd,livepatch)

@{ echo $(@:.o=.ko); echo $@; \

$(cmd_undef_syms); } > $(MODVERDIR)/$(@F:.o=.mod)

- $(call cmd_livepatch)

quiet_cmd_cc_lst_c = MKLST $@

cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \

@@ -469,6 +469,7 @@ cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@
$(filter %.o,$^) $(cmd_secanalysis

$(multi-used-m): FORCE

$(call if_changed,link_multi-m)

+ $(call cmd,livepatch)

@{ echo $(@:.o=.ko); echo $(filter %.o,$^); \

$(cmd_undef_syms); } > $(MODVERDIR)/$(@F:.o=.mod)

$(call multi_depend, $(multi-used-m), .o, -objs -y -m)

--

2.16.4