Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20221209060740.2785164-1-agordeev@linux.ibm.com>
 <CAMj1kXF5OR6TGhCrxYCmrnA=CTAfkGcga8BDE2Vj3rixgi7U3w@mail.gmail.com> <Y5Murs1nSi45xEuK@li-4a3a4a4c-28e5-11b2-a85c-a8d192c6f089.ibm.com>
In-Reply-To: <Y5Murs1nSi45xEuK@li-4a3a4a4c-28e5-11b2-a85c-a8d192c6f089.ibm.com>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Fri, 9 Dec 2022 14:48:49 +0100
Message-ID: <CAMj1kXEW-m4Z=wt0S-drRCD0naKrQk07hcONdQTRZJGmHYRY-Q@mail.gmail.com>
Subject: Re: [PATCH] jump_label: explicitly annotate inittext labels as init
To:     Alexander Gordeev <agordeev@linux.ibm.com>
Cc:     Peter Zijlstra <peterz@infradead.org>,
        Josh Poimboeuf <jpoimboe@kernel.org>,
        Jason Baron <jbaron@akamai.com>, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Fri, 9 Dec 2022 at 13:49, Alexander Gordeev <agordeev@linux.ibm.com> wrote:
>
> On Fri, Dec 09, 2022 at 10:41:55AM +0100, Ard Biesheuvel wrote:
> > > diff --git a/kernel/jump_label.c b/kernel/jump_label.c
> > > index 714ac4c3b556..77680665d374 100644
> > > --- a/kernel/jump_label.c
> > > +++ b/kernel/jump_label.c
> > > @@ -481,13 +481,16 @@ void __init jump_label_init(void)
> > >
> > >         for (iter = iter_start; iter < iter_stop; iter++) {
> > >                 struct static_key *iterk;
> > > +               unsigned long addr;
> > >                 bool in_init;
> > >
> > >                 /* rewrite NOPs */
> > >                 if (jump_label_type(iter) == JUMP_LABEL_NOP)
> > >                         arch_jump_label_transform_static(iter, JUMP_LABEL_NOP);
> > >
> > > -               in_init = init_section_contains((void *)jump_entry_code(iter), 1);
> > > +               addr = jump_entry_code(iter);
> > > +               in_init = init_section_contains((void *)addr, 1) ||
> > > +                         is_kernel_inittext(addr);
> >
> > Isn't it sufficient to only call is_kenel_inittext here?
>
> I am not sure every arch out there would stick to putting
> init code to inittext only.
>
> However, should not is_kernel_exittext() (which does not
> exist) also get checked here?

No, exittext either exists or it doesn't, rather than disappearing at
runtime like inittext.