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:     Sasha Levin <sashal@kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     Florian Fainelli <f.fainelli@gmail.com>,
        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>
From:   Alexander Sverdlin <alexander.sverdlin@nokia.com>
Message-ID: <bb9fde7d-3644-6d30-c238-73427ab200e6@nokia.com>
Date:   Fri, 24 Sep 2021 17:27:38 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.11.0
In-Reply-To: <YU2769mOr3lb8jFi@sashalap>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QVRmSmdaRkxGTzFHMVRsVFJGZFRKeDdGcTl3U1p1U0ZmRUhseWtNbWRJSURM?=
 =?utf-8?B?dGd1V3JNQksrQjQ1eTN5QVl1M1pZbE1Bd1gyRU9wU2gzUXBhaFlpWE5pc2FU?=
 =?utf-8?B?KzZyNUw1RGFjWEF3dzI0QjAyeEtvTVRYbU0vN3dXNmJjUGJEa2tEZEVBM0hk?=
 =?utf-8?B?S3VNOXdmYy9QT0JaRlVKUE5zVmJsRGpGSDhlNHJxZWpPSHJQSkxFRlNtWEtD?=
 =?utf-8?B?aXp4ZkNaMjNFQWxMRnp5L3lraVJGRFl1ODR6RFlLMFREUGs4dkR5UTQ4M1FT?=
 =?utf-8?B?TEt1N3NKQ1JYdXRpcDl5ZlUzcWtCVHRRZkcxbVhjL05oblpkRW0zME1tcWpw?=
 =?utf-8?B?MjJkZUc2ME5DUUxSZnBtV1o5YVJxRy9hV3MwRi9KVTF5MWtKNnc4dEdNMnl4?=
 =?utf-8?B?ajdJd0dSNUNKcld4S1VhMUErMDFUdGZ2N0ZUUXREeFAwRG9DaWU0V1U4Qk1L?=
 =?utf-8?B?UTR1RHpvbldxL2dMbjJpWDgxeGsxektWeWRvdHdPZzdVbkpRaGJmWDJmOTdM?=
 =?utf-8?B?YTJTaUdGZlloQWFFOTg1RUtkRk9kTFhXY2p3dWdIWlVXWG1qQmNYVjVNU1BZ?=
 =?utf-8?B?Z3JQOVJFcmpvbXVYbTQyeWh0Uzk4K2dLWkNpUzhLUHZZZGtmeFZ5TzhZOUdr?=
 =?utf-8?B?RndUMm5jdkxZeWJWMm1JdHBkUVZ5SVQ2NDZvblEzSGdzSURjUjZIL0tYYVd3?=
 =?utf-8?B?OXlzVk1yaThmNER6VnE4V1pzNFVQb1lUaVJxM2dZV3pVckFRWFRXQzdpQnZ0?=
 =?utf-8?B?ZjRTNC9zcExtcnBFb1NFa0xiU0lWL3BZK3ZNaW9wMFk1ZXZQSXdkeDJ5a3N5?=
 =?utf-8?B?YmJoMFkrMWVIcnFDL2llckZOSUliVVpmb0M1cnBFZG9WaEhLRzdGQndGK1lF?=
 =?utf-8?B?UDFhWXp2Q2IzT0J2dWJ3R3RuS0tiaXRNK0NoSmNqTU82Umx4eit0YjJJb1B6?=
 =?utf-8?B?ZklJTWd1aWhwdGdtSmNVdDhUK1FnWWhnam8xMlBpdnRzbXE5Q01HelhGR2c3?=
 =?utf-8?B?eE9tOW9MOG5tMWpxdVVuMG5TQ0hJWWtJQmpDLzdGbm5qYmVQSlFINTZYVlVO?=
 =?utf-8?B?eTdRdXZtL3h4WGd5bEVBdWY4MGN1MFVHU2M1UFBLZzFqMnB0bGlIMXlVYXo3?=
 =?utf-8?B?bktFSzRwU0JtejBmQVB3MmY5NzlUUHN0c0p2azc0dFQ1Zm1xU1BXK1VaMzcz?=
 =?utf-8?B?R2hTSVlPckdiZ1dWdEh6VkVwdDQ4ZjNFN0QrQm5jY1o4bVlMWjg5NHUwK3Jr?=
 =?utf-8?B?T1RRaXQyeVUxT2Nqd0NZdHgvTDRxdUhxOVZ4RUJaMDVDbUtwSVRMbmNpSTND?=
 =?utf-8?B?RVQvMzJxaEdLTHdmdGp1YUN0WHVXbWs5THpicnM0UHE3SDc5Q2YvdWI5THVR?=
 =?utf-8?B?N1FyQTEwM2tPV09oMm5iekNQN2ErTHdhVzlJK1hVdVlMMjlBb3VFSUY3WVNj?=
 =?utf-8?B?dlhwc09SWFBsRWpzR3FKQStPanBXZCtlZ3dVTXpxSXhtTmo3aTZkUmdPS1hR?=
 =?utf-8?B?Q0FRbnJGNVhSZDVOTm83a3A5ZEpCTmRsekFuZUloMDZWWThGY09DOG5IRmJt?=
 =?utf-8?B?dENUcFFjT2pmakhiWUxwNWtneC9nWklzN3c3bXlIRnBRNWFSRkRsc0c0ekZx?=
 =?utf-8?B?Zm5zVDR6TVNqcHp1b3M1V0c2NGtBWXY2VldsZG9XVkRTdVZFSWpueHFvenBo?=
 =?utf-8?B?cE1nZHJPWGdEY1UwR1N1SnRmaXJ4aml6UTgrU3plN3k1emZIdXlTVDI1NWU0?=
 =?utf-8?Q?FW9FC55AyZLFMw+rmUOKTwv0KJaqOdQAuIbKz/p?=
X-OriginatorOrg: nokia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 20b81d6f-f776-4295-da3e-08d97f6ffa0b
X-MS-Exchange-CrossTenant-AuthSource: AM0PR07MB4531.eurprd07.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 15:28:36.4403
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: iJyUj9j7T5fcMORU04Htqbn9w0jJRmXwakUsItclm4Wm3sNgb0ldsKqUGDGT+F4UAkUoxQj2WlAsbs+JkJNLm9VnXmYjgomyTZS8ZHqHB8Y=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR07MB7633
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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.

> 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.

-- 
Best regards,
Alexander Sverdlin.