Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix handling of 32 bit left-shift operations in interperter #256

Merged
merged 3 commits into from
May 19, 2023
Merged

Fix handling of 32 bit left-shift operations in interperter #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a2ef84
Fix handling of 32 bit left-shift operations in interperter
May 10, 2023
19a623d
PR feedback
May 10, 2023
4a1fb8b
Merge branch 'main' into issue255
Alan-Jowett May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/bpf_conformance
Open in desktop
Submodule bpf_conformance updated 27 files
+5 −5 src/CMakeLists.txt
+10 −0 tests/arsh32-imm-high.data
+10 −0 tests/arsh32-imm-neg.data
+12 −0 tests/arsh32-reg-high.data
+12 −0 tests/arsh32-reg-neg.data
+9 −0 tests/arsh64-imm-high.data
+9 −0 tests/arsh64-imm-neg.data
+9 −0 tests/arsh64-imm.data
+1 −2 tests/arsh64-reg-high.data
+10 −0 tests/arsh64-reg-neg.data
+10 −0 tests/arsh64-reg.data
+3 −4 tests/lsh32-imm-high.data
+8 −0 tests/lsh32-imm-neg.data
+9 −0 tests/lsh32-reg-high.data
+9 −0 tests/lsh32-reg-neg.data
+8 −0 tests/lsh64-imm-high.data
+8 −0 tests/lsh64-imm-neg.data
+9 −0 tests/lsh64-reg-high.data
+9 −0 tests/lsh64-reg-neg.data
+9 −0 tests/rsh32-imm-high.data
+9 −0 tests/rsh32-imm-neg.data
+10 −0 tests/rsh32-reg-high.data
+10 −0 tests/rsh32-reg-neg.data
+8 −0 tests/rsh64-imm-high.data
+8 −0 tests/rsh64-imm-neg.data
+9 −0 tests/rsh64-reg-high.data
+9 −0 tests/rsh64-reg-neg.data
18 changes: 10 additions & 8 deletions vm/ubpf_vm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
#include <unistd.h>

#define MAX_EXT_FUNCS 64
#define SHIFT_MASK_32_BIT(X) ((X)&0x1f)
#define SHIFT_MASK_64_BIT(X) ((X)&0x3f)

static bool
validate(const struct ubpf_vm* vm, const struct ebpf_inst* insts, uint32_t num_insts, char** errmsg);
Expand Down Expand Up @@ -335,19 +337,19 @@ ubpf_exec(const struct ubpf_vm* vm, void* mem, size_t mem_len, uint64_t* bpf_ret
reg[inst.dst] &= UINT32_MAX;
break;
case EBPF_OP_LSH_IMM:
reg[inst.dst] <<= inst.imm;
reg[inst.dst] = u32(reg[inst.dst]) << SHIFT_MASK_32_BIT(inst.imm);
reg[inst.dst] &= UINT32_MAX;
break;
case EBPF_OP_LSH_REG:
reg[inst.dst] <<= reg[inst.src];
reg[inst.dst] = u32(reg[inst.dst]) << SHIFT_MASK_32_BIT(reg[inst.src]);
reg[inst.dst] &= UINT32_MAX;
break;
case EBPF_OP_RSH_IMM:
reg[inst.dst] = u32(reg[inst.dst]) >> inst.imm;
reg[inst.dst] = u32(reg[inst.dst]) >> SHIFT_MASK_32_BIT(inst.imm);
reg[inst.dst] &= UINT32_MAX;
break;
case EBPF_OP_RSH_REG:
reg[inst.dst] = u32(reg[inst.dst]) >> reg[inst.src];
reg[inst.dst] = u32(reg[inst.dst]) >> SHIFT_MASK_32_BIT(reg[inst.src]);
reg[inst.dst] &= UINT32_MAX;
break;
case EBPF_OP_NEG:
Expand Down Expand Up @@ -442,16 +444,16 @@ ubpf_exec(const struct ubpf_vm* vm, void* mem, size_t mem_len, uint64_t* bpf_ret
reg[inst.dst] &= reg[inst.src];
break;
case EBPF_OP_LSH64_IMM:
reg[inst.dst] <<= inst.imm;
reg[inst.dst] <<= SHIFT_MASK_64_BIT(inst.imm);
break;
case EBPF_OP_LSH64_REG:
reg[inst.dst] <<= reg[inst.src];
reg[inst.dst] <<= SHIFT_MASK_64_BIT(reg[inst.src]);
break;
case EBPF_OP_RSH64_IMM:
reg[inst.dst] >>= inst.imm;
reg[inst.dst] >>= SHIFT_MASK_64_BIT(inst.imm);
break;
case EBPF_OP_RSH64_REG:
reg[inst.dst] >>= reg[inst.src];
reg[inst.dst] >>= SHIFT_MASK_64_BIT(reg[inst.src]);
break;
case EBPF_OP_NEG64:
reg[inst.dst] = -reg[inst.dst];
Expand Down