Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: Pass (protection.outlook.com: domain of nokia.com designates
 131.228.2.240 as permitted sender) receiver=protection.outlook.com;
 client-ip=131.228.2.240; helo=mailrelay.int.nokia.com;
Subject: Re: [PATCH v3 2/2] ARM: ftrace: Add MODULE_PLTS support
To:     Ard Biesheuvel <ard.biesheuvel@linaro.org>
CC:     linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Steven Rostedt <rostedt@goodmis.org>,
        Russell King <linux@armlinux.org.uk>
References: <20180309084151.2379-1-alexander.sverdlin@nokia.com>
 <20180309084151.2379-3-alexander.sverdlin@nokia.com>
 <CAKv+Gu87oP4Bxn_XkQkc2zf8GXLhoRkWBkUr5N0KMdyMfq1GMg@mail.gmail.com>
From:   Alexander Sverdlin <alexander.sverdlin@nokia.com>
Message-ID: <93864477-75bb-3f73-1d06-03d128b04f94@nokia.com>
Date:   Fri, 9 Mar 2018 09:54:48 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.6.0
MIME-Version: 1.0
In-Reply-To: <CAKv+Gu87oP4Bxn_XkQkc2zf8GXLhoRkWBkUr5N0KMdyMfq1GMg@mail.gmail.com>
Content-Type: text/plain; charset="utf-8"
Content-Language: en-US
Content-Transfer-Encoding: 7bit
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2018 08:55:51.7895
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 3d9899b5-ae82-4388-e199-08d5859b8fb2
X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0;Ip=[131.228.2.240];Helo=[mailrelay.int.nokia.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB1054
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hello Ard!

On 09/03/18 09:50, Ard Biesheuvel wrote:
>> +static u32 fixed_plts[] = {
>> +       FTRACE_ADDR,
>> +       MCOUNT_ADDR,
>> +#ifdef CONFIG_OLD_MCOUNT
>> +       (unsigned long)ftrace_caller_old,
>> +       (unsigned long)mcount,
>> +#endif
>> +};
>> +
> Do we need this stuff in the PLT loader if ftrace is disabled?

You are right, it probably would not even build w/o FTRACE.
I'll fix it, thanks for looking into this!

>>  static bool in_init(const struct module *mod, unsigned long loc)
>>  {
>>         return loc - (u32)mod->init_layout.base < mod->init_layout.size;
>> @@ -31,26 +41,43 @@ u32 get_module_plt(struct module *mod, unsigned long loc, Elf32_Addr val)
>>  {
>>         struct mod_plt_sec *pltsec = !in_init(mod, loc) ? &mod->arch.core :
>>                                                           &mod->arch.init;
>> +       int idx;
>> +       struct plt_entries *plt;
>> +
>> +       /* Pre-allocate entries in the first plt */
>> +       if (!pltsec->plt_count) {
>> +               plt = (struct plt_entries *)pltsec->plt->sh_addr;
>> +               for (idx = 0; idx < ARRAY_SIZE(plt->ldr); ++idx)
>> +                       plt->ldr[idx] = PLT_ENT_LDR;
>> +               memcpy(plt->lit, fixed_plts, sizeof(fixed_plts));
>> +               pltsec->plt_count = ARRAY_SIZE(fixed_plts);
>> +               /*
>> +                * cache the address,
>> +                * ELF header is available only during module load
>> +                */
>> +               pltsec->plt_ent = plt;
>> +       }
>> +       plt = pltsec->plt_ent;
>>
>> -       struct plt_entries *plt = (struct plt_entries *)pltsec->plt->sh_addr;
>> -       int idx = 0;
>> +       idx = ARRAY_SIZE(fixed_plts);
>> +       while (idx)
>> +               if (plt->lit[--idx] == val)
>> +                       return (u32)&plt->ldr[idx];
>>
> Same here.

-- 
Best regards,
Alexander Sverdlin.