Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
MIME-Version: 1.0
References: <20231105213731.1878100-1-ubizjak@gmail.com> <20231105213731.1878100-3-ubizjak@gmail.com>
 <20231201035457.GA321497@dev-arch.thelio-3990X>
In-Reply-To: <20231201035457.GA321497@dev-arch.thelio-3990X>
From:   Uros Bizjak <ubizjak@gmail.com>
Date:   Fri, 1 Dec 2023 08:48:10 +0100
Message-ID: <CAFULd4YWa+Xfue-JEebR9JgjxKtQy7byr68Q+tTOdR+Jf1DBEg@mail.gmail.com>
Subject: Re: [PATCH -tip v2 2/3] x86/callthunks: Handle %rip-relative
 relocations in call thunk template
To:     Nathan Chancellor <nathan@kernel.org>
Cc:     x86@kernel.org, linux-kernel@vger.kernel.org,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@kernel.org>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>, llvm@lists.linux.dev
Content-Type: multipart/mixed; boundary="0000000000000a641c060b6dfec8"
Precedence: bulk

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

On Fri, Dec 1, 2023 at 4:55=E2=80=AFAM Nathan Chancellor <nathan@kernel.org=
> wrote:
>
> Hi Uros,
>
> On Sun, Nov 05, 2023 at 10:34:36PM +0100, Uros Bizjak wrote:
> > Contrary to alternatives, relocations are currently not supported in
> > call thunk templates.  Re-use the existing infrastructure from
> > alternative.c to allow %rip-relative relocations when copying call
> > thunk template from its storage location.
> >
> > The patch allows unification of ASM_INCREMENT_CALL_DEPTH, which already
> > uses PER_CPU_VAR macro, with INCREMENT_CALL_DEPTH, used in call thunk
> > template, which is currently limited to use absolute address.
> >
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Ingo Molnar <mingo@kernel.org>
> > Cc: Borislav Petkov <bp@alien8.de>
> > Cc: Dave Hansen <dave.hansen@linux.intel.com>
> > Cc: "H. Peter Anvin" <hpa@zytor.com>
> > Cc: Peter Zijlstra <peterz@infradead.org>
> > Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
> ...
> > diff --git a/arch/x86/kernel/callthunks.c b/arch/x86/kernel/callthunks.=
c
> > index e9ad518a5003..ef9c04707b3c 100644
> > --- a/arch/x86/kernel/callthunks.c
> > +++ b/arch/x86/kernel/callthunks.c
> ...
> > @@ -291,20 +298,27 @@ void *callthunks_translate_call_dest(void *dest)
> >  static bool is_callthunk(void *addr)
> >  {
> >       unsigned int tmpl_size =3D SKL_TMPL_SIZE;
> > -     void *tmpl =3D skl_call_thunk_template;
> > +     u8 insn_buff[MAX_PATCH_LEN];
> >       unsigned long dest;
> > +     u8 *pad;
> >
> >       dest =3D roundup((unsigned long)addr, CONFIG_FUNCTION_ALIGNMENT);
> >       if (!thunks_initialized || skip_addr((void *)dest))
> >               return false;
> >
> > -     return !bcmp((void *)(dest - tmpl_size), tmpl, tmpl_size);
> > +     *pad =3D dest - tmpl_size;
>
> Clang warns (or errors with CONFIG_WERROR=3Dy):

Uh, GCC didn't warn at all (and there is some mixup with types here,
so a thinko slipped through.

The attached patch fixes the oversight. I'll post a formal patch later
today after some more testing.

Thanks,
Uros.

--0000000000000a641c060b6dfec8
Content-Type: text/plain; charset="US-ASCII"; name="p.diff.txt"
Content-Disposition: attachment; filename="p.diff.txt"
Content-Transfer-Encoding: base64
Content-ID: <f_lpmbofu90>
X-Attachment-Id: f_lpmbofu90

ZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC9jYWxsdGh1bmtzLmMgYi9hcmNoL3g4Ni9rZXJu
ZWwvY2FsbHRodW5rcy5jCmluZGV4IGY1NTA3Yzk1ZTdiZS4uNzFiNzRhMDdjOGVlIDEwMDY0NAot
LS0gYS9hcmNoL3g4Ni9rZXJuZWwvY2FsbHRodW5rcy5jCisrKyBiL2FyY2gveDg2L2tlcm5lbC9j
YWxsdGh1bmtzLmMKQEAgLTMwNiw3ICszMDYsNyBAQCBzdGF0aWMgYm9vbCBpc19jYWxsdGh1bmso
dm9pZCAqYWRkcikKIAlpZiAoIXRodW5rc19pbml0aWFsaXplZCB8fCBza2lwX2FkZHIoKHZvaWQg
KilkZXN0KSkKIAkJcmV0dXJuIGZhbHNlOwogCi0JKnBhZCA9IGRlc3QgLSB0bXBsX3NpemU7CisJ
cGFkID0gKHZvaWQgKilkZXN0IC0gdG1wbF9zaXplOwogCiAJbWVtY3B5KGluc25fYnVmZiwgc2ts
X2NhbGxfdGh1bmtfdGVtcGxhdGUsIHRtcGxfc2l6ZSk7CiAJYXBwbHlfcmVsb2NhdGlvbihpbnNu
X2J1ZmYsIHRtcGxfc2l6ZSwgcGFkLAo=
--0000000000000a641c060b6dfec8--