2 files changed, 49 insertions, 4 deletions
diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index b2fc97a2c56c..9c4b57a7b265 100644
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -779,14 +779,14 @@ static int build_body(struct jit_ctx *ctx)
                int ret;
                ret = build_insn(insn, ctx);
-                if (ctx->image == NULL)
-                        ctx->offset[i] = ctx->idx;
                if (ret > 0) {
                        i++;
+                        if (ctx->image == NULL)
+                                ctx->offset[i] = ctx->idx;
                        continue;
                }
+                if (ctx->image == NULL)
+                        ctx->offset[i] = ctx->idx;
                if (ret)
                        return ret;
        }
diff --git a/lib/test_bpf.c b/lib/test_bpf.c
index 0362da0b66c3..2e385026915c 100644
--- a/lib/test_bpf.c
+++ b/lib/test_bpf.c
@@ -4656,6 +4656,51 @@ static struct bpf_test tests[] = {
                { },
                { { 0, 1 } },
        },
+        {
+                /* Mainly testing JIT + imm64 here. */
+                "JMP_JGE_X: ldimm64 test 1",
+                .u.insns_int = {
+                        BPF_ALU32_IMM(BPF_MOV, R0, 0),
+                        BPF_LD_IMM64(R1, 3),
+                        BPF_LD_IMM64(R2, 2),
+                        BPF_JMP_REG(BPF_JGE, R1, R2, 2),
+                        BPF_LD_IMM64(R0, 0xffffffffffffffffUL),
+                        BPF_LD_IMM64(R0, 0xeeeeeeeeeeeeeeeeUL),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 0xeeeeeeeeU } },
+        },
+        {
+                "JMP_JGE_X: ldimm64 test 2",
+                .u.insns_int = {
+                        BPF_ALU32_IMM(BPF_MOV, R0, 0),
+                        BPF_LD_IMM64(R1, 3),
+                        BPF_LD_IMM64(R2, 2),
+                        BPF_JMP_REG(BPF_JGE, R1, R2, 0),
+                        BPF_LD_IMM64(R0, 0xffffffffffffffffUL),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 0xffffffffU } },
+        },
+        {
+                "JMP_JGE_X: ldimm64 test 3",
+                .u.insns_int = {
+                        BPF_ALU32_IMM(BPF_MOV, R0, 1),
+                        BPF_LD_IMM64(R1, 3),
+                        BPF_LD_IMM64(R2, 2),
+                        BPF_JMP_REG(BPF_JGE, R1, R2, 4),
+                        BPF_LD_IMM64(R0, 0xffffffffffffffffUL),
+                        BPF_LD_IMM64(R0, 0xeeeeeeeeeeeeeeeeUL),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 1 } },
+        },
        /* BPF_JMP | BPF_JNE | BPF_X */
        {
                "JMP_JNE_X: if (3 != 2) return 1",

diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c index b2fc97a2c56c..9c4b57a7b265 100644 --- a/arch/arm64/net/bpf_jit_comp.c +++ b/arch/arm64/net/bpf_jit_comp.c
@@ -779,14 +779,14 @@ static int build_body(struct jit_ctx *ctx)
779	int ret;	779	int ret;
780		780
781	ret = build_insn(insn, ctx);	781	ret = build_insn(insn, ctx);
782
783	if (ctx->image == NULL)
784	ctx->offset[i] = ctx->idx;
785
786	if (ret > 0) {	782	if (ret > 0) {
787	i++;	783	i++;
		784	if (ctx->image == NULL)
		785	ctx->offset[i] = ctx->idx;
788	continue;	786	continue;
789	}	787	}
		788	if (ctx->image == NULL)
		789	ctx->offset[i] = ctx->idx;
790	if (ret)	790	if (ret)
791	return ret;	791	return ret;
792	}	792	}


diff --git a/lib/test_bpf.c b/lib/test_bpf.c index 0362da0b66c3..2e385026915c 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c
@@ -4656,6 +4656,51 @@ static struct bpf_test tests[] = {
4656	{ },	4656	{ },
4657	{ { 0, 1 } },	4657	{ { 0, 1 } },
4658	},	4658	},
		4659	{
		4660	/* Mainly testing JIT + imm64 here. */
		4661	"JMP_JGE_X: ldimm64 test 1",
		4662	.u.insns_int = {
		4663	BPF_ALU32_IMM(BPF_MOV, R0, 0),
		4664	BPF_LD_IMM64(R1, 3),
		4665	BPF_LD_IMM64(R2, 2),
		4666	BPF_JMP_REG(BPF_JGE, R1, R2, 2),
		4667	BPF_LD_IMM64(R0, 0xffffffffffffffffUL),
		4668	BPF_LD_IMM64(R0, 0xeeeeeeeeeeeeeeeeUL),
		4669	BPF_EXIT_INSN(),
		4670	},
		4671	INTERNAL,
		4672	{ },
		4673	{ { 0, 0xeeeeeeeeU } },
		4674	},
		4675	{
		4676	"JMP_JGE_X: ldimm64 test 2",
		4677	.u.insns_int = {
		4678	BPF_ALU32_IMM(BPF_MOV, R0, 0),
		4679	BPF_LD_IMM64(R1, 3),
		4680	BPF_LD_IMM64(R2, 2),
		4681	BPF_JMP_REG(BPF_JGE, R1, R2, 0),
		4682	BPF_LD_IMM64(R0, 0xffffffffffffffffUL),
		4683	BPF_EXIT_INSN(),
		4684	},
		4685	INTERNAL,
		4686	{ },
		4687	{ { 0, 0xffffffffU } },
		4688	},
		4689	{
		4690	"JMP_JGE_X: ldimm64 test 3",
		4691	.u.insns_int = {
		4692	BPF_ALU32_IMM(BPF_MOV, R0, 1),
		4693	BPF_LD_IMM64(R1, 3),
		4694	BPF_LD_IMM64(R2, 2),
		4695	BPF_JMP_REG(BPF_JGE, R1, R2, 4),
		4696	BPF_LD_IMM64(R0, 0xffffffffffffffffUL),
		4697	BPF_LD_IMM64(R0, 0xeeeeeeeeeeeeeeeeUL),
		4698	BPF_EXIT_INSN(),
		4699	},
		4700	INTERNAL,
		4701	{ },
		4702	{ { 0, 1 } },
		4703	},
4659	/* BPF_JMP \| BPF_JNE \| BPF_X */	4704	/* BPF_JMP \| BPF_JNE \| BPF_X */
4660	{	4705	{
4661	"JMP_JNE_X: if (3 != 2) return 1",	4706	"JMP_JNE_X: if (3 != 2) return 1",