* [PATCH AUTOSEL 6.3 08/59] bpf, mips: Implement DADDI workarounds for JIT [not found] <20230504194142.3805425-1-sashal@kernel.org> @ 2023-05-04 19:40 ` Sasha Levin 2023-05-05 12:04 ` Jiaxun Yang 0 siblings, 1 reply; 3+ messages in thread From: Sasha Levin @ 2023-05-04 19:40 UTC (permalink / raw) To: linux-kernel, stable Cc: Jiaxun Yang, Daniel Borkmann, Philippe Mathieu-Daudé, Johan Almbladh, Sasha Levin, tsbogend, ast, andrii, paulburton, linux-mips, bpf From: Jiaxun Yang <jiaxun.yang@flygoat.com> [ Upstream commit bbefef2f07080cd502a93cb1c529e1c8a6c4ac8e ] For DADDI errata we just workaround by disable immediate operation for BPF_ADD / BPF_SUB to avoid generation of DADDIU. All other use cases in JIT won't cause overflow thus they are all safe. Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Acked-by: Johan Almbladh <johan.almbladh@anyfinetworks.com> Link: https://lore.kernel.org/bpf/20230228113305.83751-2-jiaxun.yang@flygoat.com Signed-off-by: Sasha Levin <sashal@kernel.org> --- arch/mips/Kconfig | 1 - arch/mips/net/bpf_jit_comp.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index e2f3ca73f40d6..edc7d8790f1e8 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -64,7 +64,6 @@ config MIPS select HAVE_DMA_CONTIGUOUS select HAVE_DYNAMIC_FTRACE select HAVE_EBPF_JIT if !CPU_MICROMIPS && \ - !CPU_DADDI_WORKAROUNDS && \ !CPU_R4000_WORKAROUNDS && \ !CPU_R4400_WORKAROUNDS select HAVE_EXIT_THREAD diff --git a/arch/mips/net/bpf_jit_comp.c b/arch/mips/net/bpf_jit_comp.c index b17130d510d49..a40d926b65139 100644 --- a/arch/mips/net/bpf_jit_comp.c +++ b/arch/mips/net/bpf_jit_comp.c @@ -218,9 +218,13 @@ bool valid_alu_i(u8 op, s32 imm) /* All legal eBPF values are valid */ return true; case BPF_ADD: + if (IS_ENABLED(CONFIG_CPU_DADDI_WORKAROUNDS)) + return false; /* imm must be 16 bits */ return imm >= -0x8000 && imm <= 0x7fff; case BPF_SUB: + if (IS_ENABLED(CONFIG_CPU_DADDI_WORKAROUNDS)) + return false; /* -imm must be 16 bits */ return imm >= -0x7fff && imm <= 0x8000; case BPF_AND: -- 2.39.2 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH AUTOSEL 6.3 08/59] bpf, mips: Implement DADDI workarounds for JIT 2023-05-04 19:40 ` [PATCH AUTOSEL 6.3 08/59] bpf, mips: Implement DADDI workarounds for JIT Sasha Levin @ 2023-05-05 12:04 ` Jiaxun Yang 2023-05-18 17:03 ` Sasha Levin 0 siblings, 1 reply; 3+ messages in thread From: Jiaxun Yang @ 2023-05-05 12:04 UTC (permalink / raw) To: Sasha Levin Cc: linux-kernel, stable@vger.kernel.org, Daniel Borkmann, Philippe Mathieu-Daudé, Johan Almbladh, Thomas Bogendoerfer, Alexei Starovoitov, Andrii Nakryiko, paulburton@kernel.org, linux-mips@vger.kernel.org, bpf > 2023年5月4日 20:40，Sasha Levin <sashal@kernel.org> 写道： > > From: Jiaxun Yang <jiaxun.yang@flygoat.com> > > [ Upstream commit bbefef2f07080cd502a93cb1c529e1c8a6c4ac8e ] > > For DADDI errata we just workaround by disable immediate operation > for BPF_ADD / BPF_SUB to avoid generation of DADDIU. > > All other use cases in JIT won't cause overflow thus they are all safe. > > Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com> > Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Acked-by: Johan Almbladh <johan.almbladh@anyfinetworks.com> > Link: https://lore.kernel.org/bpf/20230228113305.83751-2-jiaxun.yang@flygoat.com > Signed-off-by: Sasha Levin <sashal@kernel.org> Hi Sasha, I think this patch should count as a functional improvement instead of regression fix. Please drop it from stable queue. Thanks Jiaxun > --- > arch/mips/Kconfig | 1 - > arch/mips/net/bpf_jit_comp.c | 4 ++++ > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > index e2f3ca73f40d6..edc7d8790f1e8 100644 > --- a/arch/mips/Kconfig > +++ b/arch/mips/Kconfig > @@ -64,7 +64,6 @@ config MIPS > select HAVE_DMA_CONTIGUOUS > select HAVE_DYNAMIC_FTRACE > select HAVE_EBPF_JIT if !CPU_MICROMIPS && \ > - !CPU_DADDI_WORKAROUNDS && \ > !CPU_R4000_WORKAROUNDS && \ > !CPU_R4400_WORKAROUNDS > select HAVE_EXIT_THREAD > diff --git a/arch/mips/net/bpf_jit_comp.c b/arch/mips/net/bpf_jit_comp.c > index b17130d510d49..a40d926b65139 100644 > --- a/arch/mips/net/bpf_jit_comp.c > +++ b/arch/mips/net/bpf_jit_comp.c > @@ -218,9 +218,13 @@ bool valid_alu_i(u8 op, s32 imm) > /* All legal eBPF values are valid */ > return true; > case BPF_ADD: > + if (IS_ENABLED(CONFIG_CPU_DADDI_WORKAROUNDS)) > + return false; > /* imm must be 16 bits */ > return imm >= -0x8000 && imm <= 0x7fff; > case BPF_SUB: > + if (IS_ENABLED(CONFIG_CPU_DADDI_WORKAROUNDS)) > + return false; > /* -imm must be 16 bits */ > return imm >= -0x7fff && imm <= 0x8000; > case BPF_AND: > -- > 2.39.2 > ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH AUTOSEL 6.3 08/59] bpf, mips: Implement DADDI workarounds for JIT 2023-05-05 12:04 ` Jiaxun Yang @ 2023-05-18 17:03 ` Sasha Levin 0 siblings, 0 replies; 3+ messages in thread From: Sasha Levin @ 2023-05-18 17:03 UTC (permalink / raw) To: Jiaxun Yang Cc: linux-kernel, stable@vger.kernel.org, Daniel Borkmann, Philippe Mathieu-Daudé, Johan Almbladh, Thomas Bogendoerfer, Alexei Starovoitov, Andrii Nakryiko, paulburton@kernel.org, linux-mips@vger.kernel.org, bpf On Fri, May 05, 2023 at 01:04:14PM +0100, Jiaxun Yang wrote: > > >> 2023年5月4日 20:40，Sasha Levin <sashal@kernel.org> 写道： >> >> From: Jiaxun Yang <jiaxun.yang@flygoat.com> >> >> [ Upstream commit bbefef2f07080cd502a93cb1c529e1c8a6c4ac8e ] >> >> For DADDI errata we just workaround by disable immediate operation >> for BPF_ADD / BPF_SUB to avoid generation of DADDIU. >> >> All other use cases in JIT won't cause overflow thus they are all safe. >> >> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com> >> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> >> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> Acked-by: Johan Almbladh <johan.almbladh@anyfinetworks.com> >> Link: https://lore.kernel.org/bpf/20230228113305.83751-2-jiaxun.yang@flygoat.com >> Signed-off-by: Sasha Levin <sashal@kernel.org> > >Hi Sasha, > >I think this patch should count as a functional improvement instead of regression fix. > >Please drop it from stable queue. Dropped, thanks! -- Thanks, Sasha ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-18 17:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20230504194142.3805425-1-sashal@kernel.org>
2023-05-04 19:40 ` [PATCH AUTOSEL 6.3 08/59] bpf, mips: Implement DADDI workarounds for JIT Sasha Levin
2023-05-05 12:04 ` Jiaxun Yang
2023-05-18 17:03 ` Sasha Levin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox