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: <20230514152739.962109-1-masahiroy@kernel.org> <20230514152739.962109-11-masahiroy@kernel.org>
 <CAKwvOdmA1q1ojTWq79VK4HJqKfMHA=8VB9q61xJoKyYsegv3tg@mail.gmail.com> <CAK7LNAQ3KO1BY5Nq6uhHQGm_eOVNvk206A-s5pSguTO3ykLUng@mail.gmail.com>
In-Reply-To: <CAK7LNAQ3KO1BY5Nq6uhHQGm_eOVNvk206A-s5pSguTO3ykLUng@mail.gmail.com>
From:   Nick Desaulniers <ndesaulniers@google.com>
Date:   Mon, 22 May 2023 09:59:01 -0700
Message-ID: <CAKwvOdmrLTfX4sjgs+6n0SEr6GC-z0v4EQTJ7nCyy5LhvPi91Q@mail.gmail.com>
Subject: Re: [PATCH v5 10/21] modpost: rename find_elf_symbol() and find_elf_symbol2()
To:     Masahiro Yamada <masahiroy@kernel.org>
Cc:     linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
        Nathan Chancellor <nathan@kernel.org>,
        Nicolas Pitre <npitre@baylibre.com>,
        Nicolas Schier <nicolas@fjasle.eu>
Content-Type: multipart/mixed; boundary="000000000000a4019605fc4b30d0"
Precedence: bulk

--000000000000a4019605fc4b30d0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Sat, May 20, 2023 at 6:28=E2=80=AFAM Masahiro Yamada <masahiroy@kernel.o=
rg> wrote:
>
> On Thu, May 18, 2023 at 6:14=E2=80=AFAM Nick Desaulniers
> <ndesaulniers@google.com> wrote:
> >
> > On Sun, May 14, 2023 at 8:28=E2=80=AFAM Masahiro Yamada <masahiroy@kern=
el.org> wrote:
> > >
> > > find_elf_symbol() and find_elf_symbol2() are not good names.
> > >
> > > Rename them to find_tosym(), find_fromsym(), respectively.
> >
> > The comments maybe could be updated, too. The end of the comment looks
> > wrong for both.
>
>
> What do you mean?
>
> Please tell me which part should be changed, and how.

Attached the comment style changes.  I didn't have precise wording in
mind for the comments; I was suggesting to see if the comments could
be updated to clarify what the functions are doing.

>
>
>
>
>
>
> > Thanks for the patch!
> > Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> >
> > >
> > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> > > ---
> > >
> > > Changes in v5:
> > >   - Change the names
> > >
> > >  scripts/mod/modpost.c | 12 ++++++------
> > >  1 file changed, 6 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> > > index 3b7b78e69137..0d2c2aff2c03 100644
> > > --- a/scripts/mod/modpost.c
> > > +++ b/scripts/mod/modpost.c
> > > @@ -1124,8 +1124,8 @@ static inline int is_valid_name(struct elf_info=
 *elf, Elf_Sym *sym)
> > >   * In other cases the symbol needs to be looked up in the symbol tab=
le
> > >   * based on section and address.
> > >   *  **/
> > > -static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword ad=
dr,
> > > -                               Elf_Sym *relsym)
> > > +static Elf_Sym *find_tosym(struct elf_info *elf, Elf64_Sword addr,
> > > +                          Elf_Sym *relsym)
> > >  {
> > >         Elf_Sym *sym;
> > >         Elf_Sym *near =3D NULL;
> > > @@ -1168,8 +1168,8 @@ static Elf_Sym *find_elf_symbol(struct elf_info=
 *elf, Elf64_Sword addr,
> > >   * The ELF format may have a better way to detect what type of symbo=
l
> > >   * it is, but this works for now.
> > >   **/
> > > -static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr=
,
> > > -                                unsigned int secndx)
> > > +static Elf_Sym *find_fromsym(struct elf_info *elf, Elf_Addr addr,
> > > +                            unsigned int secndx)
> > >  {
> > >         Elf_Sym *sym;
> > >         Elf_Sym *near =3D NULL;
> > > @@ -1207,10 +1207,10 @@ static void default_mismatch_handler(const ch=
ar *modname, struct elf_info *elf,
> > >         const char *tosym;
> > >         const char *fromsym;
> > >
> > > -       from =3D find_elf_symbol2(elf, r->r_offset, fsecndx);
> > > +       from =3D find_fromsym(elf, r->r_offset, fsecndx);
> > >         fromsym =3D sym_name(elf, from);
> > >
> > > -       to =3D find_elf_symbol(elf, r->r_addend, sym);
> > > +       to =3D find_tosym(elf, r->r_addend, sym);
> > >         tosym =3D sym_name(elf, to);
> > >
> > >         /* check whitelist - we may ignore it */
> > > --
> > > 2.39.2
> > >
> >
> >
> > --
> > Thanks,
> > ~Nick Desaulniers
>
>
>
> --
> Best Regards
> Masahiro Yamada


--=20
Thanks,
~Nick Desaulniers

--000000000000a4019605fc4b30d0
Content-Type: text/plain; charset="US-ASCII"; name="patch.txt"
Content-Disposition: attachment; filename="patch.txt"
Content-Transfer-Encoding: base64
Content-ID: <f_lhz3c4un0>
X-Attachment-Id: f_lhz3c4un0

ZGlmZiAtLWdpdCBhL3NjcmlwdHMvbW9kL21vZHBvc3QuYyBiL3NjcmlwdHMvbW9kL21vZHBvc3Qu
YwppbmRleCBkNDUzMWQwOTk4NGQuLjE5MjZlNTAzYjBkNiAxMDA2NDQKLS0tIGEvc2NyaXB0cy9t
b2QvbW9kcG9zdC5jCisrKyBiL3NjcmlwdHMvbW9kL21vZHBvc3QuYwpAQCAtMTEzMSwxMyArMTEz
MSwxMyBAQCBzdGF0aWMgaW5saW5lIGludCBpc192YWxpZF9uYW1lKHN0cnVjdCBlbGZfaW5mbyAq
ZWxmLCBFbGZfU3ltICpzeW0pCiAJcmV0dXJuICFpc19tYXBwaW5nX3N5bWJvbChuYW1lKTsKIH0K
IAotLyoqCisvKgogICogRmluZCBzeW1ib2wgYmFzZWQgb24gcmVsb2NhdGlvbiByZWNvcmQgaW5m
by4KICAqIEluIHNvbWUgY2FzZXMgdGhlIHN5bWJvbCBzdXBwbGllZCBpcyBhIHZhbGlkIHN5bWJv
bCBzbwogICogcmV0dXJuIHJlZnN5bS4gSWYgc3RfbmFtZSAhPSAwIHdlIGFzc3VtZSB0aGlzIGlz
IGEgdmFsaWQgc3ltYm9sLgogICogSW4gb3RoZXIgY2FzZXMgdGhlIHN5bWJvbCBuZWVkcyB0byBi
ZSBsb29rZWQgdXAgaW4gdGhlIHN5bWJvbCB0YWJsZQogICogYmFzZWQgb24gc2VjdGlvbiBhbmQg
YWRkcmVzcy4KLSAqICAqKi8KKyAqLwogc3RhdGljIEVsZl9TeW0gKmZpbmRfZWxmX3N5bWJvbChz
dHJ1Y3QgZWxmX2luZm8gKmVsZiwgRWxmNjRfU3dvcmQgYWRkciwKIAkJCQlFbGZfU3ltICpyZWxz
eW0pCiB7CkBAIC0xMTgxLDcgKzExODEsNyBAQCBzdGF0aWMgRWxmX1N5bSAqZmluZF9lbGZfc3lt
Ym9sKHN0cnVjdCBlbGZfaW5mbyAqZWxmLCBFbGY2NF9Td29yZCBhZGRyLAogICogSWYgd2UgZmlu
ZCB0d28gc3ltYm9scyB3aXRoIGVxdWFsIG9mZnNldCBwcmVmZXIgb25lIHdpdGggYSB2YWxpZCBu
YW1lLgogICogVGhlIEVMRiBmb3JtYXQgbWF5IGhhdmUgYSBiZXR0ZXIgd2F5IHRvIGRldGVjdCB3
aGF0IHR5cGUgb2Ygc3ltYm9sCiAgKiBpdCBpcywgYnV0IHRoaXMgd29ya3MgZm9yIG5vdy4KLSAq
Ki8KKyAqLwogc3RhdGljIEVsZl9TeW0gKmZpbmRfZWxmX3N5bWJvbDIoc3RydWN0IGVsZl9pbmZv
ICplbGYsIEVsZl9BZGRyIGFkZHIsCiAJCQkJIGNvbnN0IGNoYXIgKnNlYykKIHsK
--000000000000a4019605fc4b30d0--