Received-SPF: pass (google.com: domain of linux-kernel+bounces-109826-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Sender: Ingo Molnar <mingo.kernel.org@gmail.com>
Date: Thu, 21 Mar 2024 10:05:08 +0100
From: Ingo Molnar <mingo@kernel.org>
To: Joan Bruguera =?iso-8859-1?Q?Mic=F3?= <joanbrugueram@gmail.com>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
	Thomas Gleixner <tglx@linutronix.de>,
	Uros Bizjak <ubizjak@gmail.com>, Borislav Petkov <bp@alien8.de>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	Peter Zijlstra <peterz@infradead.org>,
	"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: [PATCH 2/2] x86/bpf: Fix IP for relocating call depth accounting
Message-ID: <Zfv4RGwe5+h0zNI5@gmail.com>
References: <20240316232104.368561-1-joanbrugueram@gmail.com>
 <20240316232104.368561-3-joanbrugueram@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20240316232104.368561-3-joanbrugueram@gmail.com>


* Joan Bruguera Mic? <joanbrugueram@gmail.com> wrote:

> The recently introduced support for %rip-relative relocations in the
> call thunk template assumes that the code is being patched in-place,
> so the destination of the relocation matches the address of the code.
> This is not true for the call depth accounting emitted by the BPF JIT,
> so the calculated address is wrong and usually causes a page fault.
> 
> Pass the destination IP when the BPF JIT emits call depth accounting.
> 
> Fixes: 17bce3b2ae2d ("x86/callthunks: Handle %rip-relative relocations in call thunk template")
> Signed-off-by: Joan Bruguera Mic? <joanbrugueram@gmail.com>
> ---
>  arch/x86/include/asm/alternative.h |  4 ++--
>  arch/x86/kernel/callthunks.c       |  4 ++--

For the generic x86 changes - I guess you want to push this upstream via 
the networking tree:

  Acked-by: Ingo Molnar <mingo@kernel.org>

Thanks,

	Ingo