Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH stable 4.9 v2 0/4] ARM: ftrace MODULE_PLTS warning
To:     Alexander Sverdlin <alexander.sverdlin@nokia.com>,
        Sasha Levin <sashal@kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Steven Rostedt <rostedt@goodmis.org>,
        Ingo Molnar <mingo@redhat.com>,
        Russell King <linux@armlinux.org.uk>,
        "moderated list:ARM PORT" <linux-arm-kernel@lists.infradead.org>
References: <20210922170246.190499-1-f.fainelli@gmail.com>
 <YUxYV/m36iPuxdoe@kroah.com> <YU2769mOr3lb8jFi@sashalap>
 <bb9fde7d-3644-6d30-c238-73427ab200e6@nokia.com>
From:   Florian Fainelli <f.fainelli@gmail.com>
Message-ID: <34ae79e3-f109-bc4b-341a-f05d95cf15e3@gmail.com>
Date:   Fri, 24 Sep 2021 09:11:18 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.13.0
MIME-Version: 1.0
In-Reply-To: <bb9fde7d-3644-6d30-c238-73427ab200e6@nokia.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Precedence: bulk

On 9/24/21 8:27 AM, Alexander Sverdlin wrote:
> Hi Sasha,
> 
> On 24/09/2021 13:52, Sasha Levin wrote:
>>>> This patch series is present in v5.14 and fixes warnings seen at insmod
>>>> with FTRACE and MODULE_PLTS enabled on ARM/Linux.
>>>
>>> All now queued up, thanks.
>>
>> Looks like 4.19 and older break the build:
>>
>> arch/arm/kernel/ftrace.c: In function 'ftrace_update_ftrace_func':
>> arch/arm/kernel/ftrace.c:157:9: error: too few arguments to function 'ftrace_call_replace'
>>   157 |   new = ftrace_call_replace(pc, (unsigned long)func);
>>       |         ^~~~~~~~~~~~~~~~~~~
> 
> in principle you can add ", true" as a third argument in all these ftrace_call_replace()
> call-sites which still have two args.

Sasha, what configuration failed to build? I build tested with
mutli_v7_defconfig which does enable FTRACE by default and then ensured
that CONFIG_ARM_MODULE_PLTS was enabled. From there I will re-submit,
sorry about that.

> 
>> arch/arm/kernel/ftrace.c:99:22: note: declared here
>>    99 | static unsigned long ftrace_call_replace(unsigned long pc, unsigned long addr,
>>       |                      ^~~~~~~~~~~~~~~~~~~
>> arch/arm/kernel/ftrace.c: In function 'ftrace_make_nop':
>> arch/arm/kernel/ftrace.c:240:9: error: too few arguments to function 'ftrace_call_replace'
>>   240 |   old = ftrace_call_replace(ip, adjust_address(rec, addr));
>>       |         ^~~~~~~~~~~~~~~~~~~
>> arch/arm/kernel/ftrace.c:99:22: note: declared here
>>    99 | static unsigned long ftrace_call_replace(unsigned long pc, unsigned long addr,
>>       |                      ^~~~~~~~~~~~~~~~~~~
>> make[2]: *** [scripts/Makefile.build:303: arch/arm/kernel/ftrace.o] Error 1
>>
>> I've dropped them.
> 


-- 
Florian