* [PATCH bpf-next v2 0/2] bpf, mips: Do some small changes
@ 2021-10-11 1:19 Tiezhu Yang
2021-10-11 1:19 ` [PATCH bpf-next v2 1/2] bpf, mips: Clean up config options about JIT Tiezhu Yang
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Tiezhu Yang @ 2021-10-11 1:19 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Thomas Bogendoerfer, Johan Almbladh, Paul Burton
Cc: netdev, bpf, linux-mips, linux-kernel, Xuefeng Li,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh
This patchset is based on bpf-next tree:
https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
v2:
-- Update patch #2 to only fix the comment,
suggested by Johan Almbladh, thank you.
Tiezhu Yang (2):
bpf, mips: Clean up config options about JIT
bpf, mips: Fix comment on tail call count limiting
arch/mips/Kconfig | 9 ---------
arch/mips/net/Makefile | 6 +++---
arch/mips/net/bpf_jit_comp32.c | 2 +-
3 files changed, 4 insertions(+), 13 deletions(-)
--
2.1.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH bpf-next v2 1/2] bpf, mips: Clean up config options about JIT
2021-10-11 1:19 [PATCH bpf-next v2 0/2] bpf, mips: Do some small changes Tiezhu Yang
@ 2021-10-11 1:19 ` Tiezhu Yang
2021-10-11 1:19 ` [PATCH bpf-next v2 2/2] bpf, mips: Fix comment on tail call count limiting Tiezhu Yang
2021-10-11 13:40 ` [PATCH bpf-next v2 0/2] bpf, mips: Do some small changes patchwork-bot+netdevbpf
2 siblings, 0 replies; 5+ messages in thread
From: Tiezhu Yang @ 2021-10-11 1:19 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Thomas Bogendoerfer, Johan Almbladh, Paul Burton
Cc: netdev, bpf, linux-mips, linux-kernel, Xuefeng Li,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh
The config options MIPS_CBPF_JIT and MIPS_EBPF_JIT are useless, remove
them in arch/mips/Kconfig, and then modify arch/mips/net/Makefile.
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Acked-by: Johan Almbladh <johan.almbladh@anyfinetworks.com>
---
arch/mips/Kconfig | 9 ---------
arch/mips/net/Makefile | 6 +++---
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 38468f4..9b03c78 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1214,15 +1214,6 @@ config SYS_SUPPORTS_RELOCATABLE
The platform must provide plat_get_fdt() if it selects CONFIG_USE_OF
to allow access to command line and entropy sources.
-config MIPS_CBPF_JIT
- def_bool y
- depends on BPF_JIT && HAVE_CBPF_JIT
-
-config MIPS_EBPF_JIT
- def_bool y
- depends on BPF_JIT && HAVE_EBPF_JIT
-
-
#
# Endianness selection. Sufficiently obscure so many users don't know what to
# answer,so we try hard to limit the available choices. Also the use of a
diff --git a/arch/mips/net/Makefile b/arch/mips/net/Makefile
index 95e8267..e3e6ae6 100644
--- a/arch/mips/net/Makefile
+++ b/arch/mips/net/Makefile
@@ -1,10 +1,10 @@
# SPDX-License-Identifier: GPL-2.0-only
# MIPS networking code
-obj-$(CONFIG_MIPS_EBPF_JIT) += bpf_jit_comp.o
+obj-$(CONFIG_BPF_JIT) += bpf_jit_comp.o
ifeq ($(CONFIG_32BIT),y)
- obj-$(CONFIG_MIPS_EBPF_JIT) += bpf_jit_comp32.o
+ obj-$(CONFIG_BPF_JIT) += bpf_jit_comp32.o
else
- obj-$(CONFIG_MIPS_EBPF_JIT) += bpf_jit_comp64.o
+ obj-$(CONFIG_BPF_JIT) += bpf_jit_comp64.o
endif
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH bpf-next v2 2/2] bpf, mips: Fix comment on tail call count limiting
2021-10-11 1:19 [PATCH bpf-next v2 0/2] bpf, mips: Do some small changes Tiezhu Yang
2021-10-11 1:19 ` [PATCH bpf-next v2 1/2] bpf, mips: Clean up config options about JIT Tiezhu Yang
@ 2021-10-11 1:19 ` Tiezhu Yang
2021-10-11 8:13 ` Johan Almbladh
2021-10-11 13:40 ` [PATCH bpf-next v2 0/2] bpf, mips: Do some small changes patchwork-bot+netdevbpf
2 siblings, 1 reply; 5+ messages in thread
From: Tiezhu Yang @ 2021-10-11 1:19 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Thomas Bogendoerfer, Johan Almbladh, Paul Burton
Cc: netdev, bpf, linux-mips, linux-kernel, Xuefeng Li,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh
In emit_tail_call() of bpf_jit_comp32.c, "blez t2" (t2 <= 0) is
not consistent with the comment "t2 < 0", update the comment to
keep consistency.
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
arch/mips/net/bpf_jit_comp32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/net/bpf_jit_comp32.c b/arch/mips/net/bpf_jit_comp32.c
index 9d7041a..bd996ed 100644
--- a/arch/mips/net/bpf_jit_comp32.c
+++ b/arch/mips/net/bpf_jit_comp32.c
@@ -1315,7 +1315,7 @@ static int emit_tail_call(struct jit_context *ctx)
/* if (TCC-- <= 0) goto out */
emit(ctx, lw, t2, ctx->stack_size, MIPS_R_SP); /* t2 = *(SP + size) */
emit_load_delay(ctx); /* Load delay slot */
- emit(ctx, blez, t2, get_offset(ctx, 1)); /* PC += off(1) if t2 < 0 */
+ emit(ctx, blez, t2, get_offset(ctx, 1)); /* PC += off(1) if t2 <= 0 */
emit(ctx, addiu, t2, t2, -1); /* t2-- (delay slot) */
emit(ctx, sw, t2, ctx->stack_size, MIPS_R_SP); /* *(SP + size) = t2 */
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH bpf-next v2 2/2] bpf, mips: Fix comment on tail call count limiting
2021-10-11 1:19 ` [PATCH bpf-next v2 2/2] bpf, mips: Fix comment on tail call count limiting Tiezhu Yang
@ 2021-10-11 8:13 ` Johan Almbladh
0 siblings, 0 replies; 5+ messages in thread
From: Johan Almbladh @ 2021-10-11 8:13 UTC (permalink / raw)
To: Tiezhu Yang
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Thomas Bogendoerfer, Paul Burton, Networking, bpf, linux-mips,
linux-kernel, Xuefeng Li, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh
On Mon, Oct 11, 2021 at 3:19 AM Tiezhu Yang <yangtiezhu@loongson.cn> wrote:
>
> In emit_tail_call() of bpf_jit_comp32.c, "blez t2" (t2 <= 0) is
> not consistent with the comment "t2 < 0", update the comment to
> keep consistency.
>
> Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Acked-by: Johan Almbladh <johan.almbladh@anyfinetworks.com>
> ---
> arch/mips/net/bpf_jit_comp32.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/mips/net/bpf_jit_comp32.c b/arch/mips/net/bpf_jit_comp32.c
> index 9d7041a..bd996ed 100644
> --- a/arch/mips/net/bpf_jit_comp32.c
> +++ b/arch/mips/net/bpf_jit_comp32.c
> @@ -1315,7 +1315,7 @@ static int emit_tail_call(struct jit_context *ctx)
> /* if (TCC-- <= 0) goto out */
> emit(ctx, lw, t2, ctx->stack_size, MIPS_R_SP); /* t2 = *(SP + size) */
> emit_load_delay(ctx); /* Load delay slot */
> - emit(ctx, blez, t2, get_offset(ctx, 1)); /* PC += off(1) if t2 < 0 */
> + emit(ctx, blez, t2, get_offset(ctx, 1)); /* PC += off(1) if t2 <= 0 */
> emit(ctx, addiu, t2, t2, -1); /* t2-- (delay slot) */
> emit(ctx, sw, t2, ctx->stack_size, MIPS_R_SP); /* *(SP + size) = t2 */
>
> --
> 2.1.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH bpf-next v2 0/2] bpf, mips: Do some small changes
2021-10-11 1:19 [PATCH bpf-next v2 0/2] bpf, mips: Do some small changes Tiezhu Yang
2021-10-11 1:19 ` [PATCH bpf-next v2 1/2] bpf, mips: Clean up config options about JIT Tiezhu Yang
2021-10-11 1:19 ` [PATCH bpf-next v2 2/2] bpf, mips: Fix comment on tail call count limiting Tiezhu Yang
@ 2021-10-11 13:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-10-11 13:40 UTC (permalink / raw)
To: Tiezhu Yang
Cc: ast, daniel, andrii, tsbogend, johan.almbladh, paulburton,
netdev, bpf, linux-mips, linux-kernel, lixuefeng, kafai,
songliubraving, yhs, john.fastabend, kpsingh
Hello:
This series was applied to bpf/bpf-next.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:
On Mon, 11 Oct 2021 09:19:08 +0800 you wrote:
> This patchset is based on bpf-next tree:
> https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
>
> v2:
> -- Update patch #2 to only fix the comment,
> suggested by Johan Almbladh, thank you.
>
> [...]
Here is the summary with links:
- [bpf-next,v2,1/2] bpf, mips: Clean up config options about JIT
https://git.kernel.org/bpf/bpf-next/c/307d149d9435
- [bpf-next,v2,2/2] bpf, mips: Fix comment on tail call count limiting
https://git.kernel.org/bpf/bpf-next/c/431bfb9ee3e2
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-10-11 13:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-11 1:19 [PATCH bpf-next v2 0/2] bpf, mips: Do some small changes Tiezhu Yang
2021-10-11 1:19 ` [PATCH bpf-next v2 1/2] bpf, mips: Clean up config options about JIT Tiezhu Yang
2021-10-11 1:19 ` [PATCH bpf-next v2 2/2] bpf, mips: Fix comment on tail call count limiting Tiezhu Yang
2021-10-11 8:13 ` Johan Almbladh
2021-10-11 13:40 ` [PATCH bpf-next v2 0/2] bpf, mips: Do some small changes patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).