Skip to content
This repository was archived by the owner on Jan 10, 2025. It is now read-only.

Commit 946f109

Browse files
LichtsoLichtso
committed
Removes sign extension of the immediate values in unsigned PQR instructions.
1 parent a301b95 commit 946f109

File tree

3 files changed

+35
-19
lines changed

3 files changed

+35
-19
lines changed

‎src/interpreter.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ impl<'a, 'b, C: ContextObject> Interpreter<'a, 'b, C> {
403403
ebpf::LMUL32_REG if self.executable.get_sbpf_version().enable_pqr() => self.reg[dst] = (self.reg[dst] as u32).wrapping_mul(self.reg[src] as u32) as u64,
404404
ebpf::LMUL64_IMM if self.executable.get_sbpf_version().enable_pqr() => self.reg[dst] = self.reg[dst].wrapping_mul(insn.imm as u64),
405405
ebpf::LMUL64_REG if self.executable.get_sbpf_version().enable_pqr() => self.reg[dst] = self.reg[dst].wrapping_mul(self.reg[src]),
406-
ebpf::UHMUL64_IMM if self.executable.get_sbpf_version().enable_pqr() => self.reg[dst] = (self.reg[dst] as u128).wrapping_mul(insn.imm as u64 as u128).wrapping_shr(64) as u64,
406+
ebpf::UHMUL64_IMM if self.executable.get_sbpf_version().enable_pqr() => self.reg[dst] = (self.reg[dst] as u128).wrapping_mul(insn.imm as u32 as u128).wrapping_shr(64) as u64,
407407
ebpf::UHMUL64_REG if self.executable.get_sbpf_version().enable_pqr() => self.reg[dst] = (self.reg[dst] as u128).wrapping_mul(self.reg[src] as u128).wrapping_shr(64) as u64,
408408
ebpf::SHMUL64_IMM if self.executable.get_sbpf_version().enable_pqr() => self.reg[dst] = (self.reg[dst] as i64 as i128).wrapping_mul(insn.imm as i128).wrapping_shr(64) as u64,
409409
ebpf::SHMUL64_REG if self.executable.get_sbpf_version().enable_pqr() => self.reg[dst] = (self.reg[dst] as i64 as i128).wrapping_mul(self.reg[src] as i64 as i128).wrapping_shr(64) as u64,
@@ -415,7 +415,7 @@ impl<'a, 'b, C: ContextObject> Interpreter<'a, 'b, C> {
415415
self.reg[dst] = (self.reg[dst] as u32 / self.reg[src] as u32) as u64;
416416
},
417417
ebpf::UDIV64_IMM if self.executable.get_sbpf_version().enable_pqr() => {
418-
self.reg[dst] /= insn.imm as u64;
418+
self.reg[dst] /= insn.imm as u32 as u64;
419419
}
420420
ebpf::UDIV64_REG if self.executable.get_sbpf_version().enable_pqr() => {
421421
throw_error!(DivideByZero; self, self.reg[src], u64);
@@ -429,7 +429,7 @@ impl<'a, 'b, C: ContextObject> Interpreter<'a, 'b, C> {
429429
self.reg[dst] = (self.reg[dst] as u32 % self.reg[src] as u32) as u64;
430430
},
431431
ebpf::UREM64_IMM if self.executable.get_sbpf_version().enable_pqr() => {
432-
self.reg[dst] %= insn.imm as u64;
432+
self.reg[dst] %= insn.imm as u32 as u64;
433433
}
434434
ebpf::UREM64_REG if self.executable.get_sbpf_version().enable_pqr() => {
435435
throw_error!(DivideByZero; self, self.reg[src], u64);

‎src/jit.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -674,14 +674,20 @@ impl<'a, C: ContextObject> JitCompiler<'a, C> {
674674
ebpf::LMUL32_IMM | ebpf::LMUL64_IMM | ebpf::UHMUL64_IMM | ebpf::SHMUL64_IMM |
675675
ebpf::UDIV32_IMM | ebpf::UDIV64_IMM | ebpf::UREM32_IMM | ebpf::UREM64_IMM |
676676
ebpf::SDIV32_IMM | ebpf::SDIV64_IMM | ebpf::SREM32_IMM | ebpf::SREM64_IMM
677-
if self.executable.get_sbpf_version().enable_pqr() =>
677+
if self.executable.get_sbpf_version().enable_pqr() => {
678+
let signed = insn.opc & (1 << 7) != 0;
679+
let mut imm = insn.imm;
680+
if !signed {
681+
imm &= u32::MAX as i64;
682+
}
678683
self.emit_product_quotient_remainder(
679684
if insn.opc & (1 << 4) != 0 { OperandSize::S64 } else { OperandSize::S32 },
680685
insn.opc & (1 << 5) != 0,
681686
insn.opc & (1 << 6) != 0,
682-
insn.opc & (1 << 7) != 0,
683-
dst, dst, Some(insn.imm),
684-
),
687+
signed,
688+
dst, dst, Some(imm),
689+
)
690+
}
685691
ebpf::LMUL32_REG | ebpf::LMUL64_REG | ebpf::UHMUL64_REG | ebpf::SHMUL64_REG |
686692
ebpf::UDIV32_REG | ebpf::UDIV64_REG | ebpf::UREM32_REG | ebpf::UREM64_REG |
687693
ebpf::SDIV32_REG | ebpf::SDIV64_REG | ebpf::SREM32_REG | ebpf::SREM64_REG

‎tests/execution.rs

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -701,9 +701,9 @@ fn test_be64() {
701701
#[test]
702702
fn test_pqr() {
703703
let mut prog = [0; 48];
704-
prog[0] = ebpf::MOV64_IMM;
704+
prog[0] = ebpf::MOV32_IMM;
705705
prog[8] = ebpf::HOR64_IMM;
706-
prog[16] = ebpf::MOV64_IMM;
706+
prog[16] = ebpf::MOV32_IMM;
707707
prog[17] = 1; // dst = R1
708708
prog[24] = ebpf::HOR64_IMM;
709709
prog[25] = 1; // dst = R1
@@ -716,21 +716,31 @@ fn test_pqr() {
716716
(ebpf::UDIV64_IMM, 13u64, 4u64, 3u64),
717717
(ebpf::UREM32_IMM, 13u64, 4u64, 1u64),
718718
(ebpf::UREM64_IMM, 13u64, 4u64, 1u64),
719-
(ebpf::UHMUL64_IMM, 13u64, u64::MAX, 12u64),
720-
(ebpf::UDIV32_IMM, 13u64, u64::MAX, 0u64),
721-
(ebpf::UDIV64_IMM, 13u64, u64::MAX, 0u64),
722-
(ebpf::UREM32_IMM, 13u64, u64::MAX, 13u64),
723-
(ebpf::UREM64_IMM, 13u64, u64::MAX, 13u64),
719+
(ebpf::UHMUL64_IMM, 13u64, u32::MAX as u64, 0u64),
720+
(ebpf::UDIV32_IMM, 13u64, u32::MAX as u64, 0u64),
721+
(ebpf::UDIV64_IMM, 13u64, u32::MAX as u64, 0u64),
722+
(ebpf::UREM32_IMM, 13u64, u32::MAX as u64, 13u64),
723+
(ebpf::UREM64_IMM, 13u64, u32::MAX as u64, 13u64),
724724
(ebpf::UHMUL64_IMM, u64::MAX, 4u64, 3u64),
725725
(ebpf::UDIV32_IMM, u64::MAX, 4u64, (u32::MAX / 4) as u64),
726726
(ebpf::UDIV64_IMM, u64::MAX, 4u64, u64::MAX / 4),
727727
(ebpf::UREM32_IMM, u64::MAX, 4u64, 3u64),
728728
(ebpf::UREM64_IMM, u64::MAX, 4u64, 3u64),
729-
(ebpf::UHMUL64_IMM, u64::MAX, u64::MAX, u64::MAX - 1),
730-
(ebpf::UDIV32_IMM, u64::MAX, u64::MAX, 1u64),
731-
(ebpf::UDIV64_IMM, u64::MAX, u64::MAX, 1u64),
732-
(ebpf::UREM32_IMM, u64::MAX, u64::MAX, 0u64),
733-
(ebpf::UREM64_IMM, u64::MAX, u64::MAX, 0u64),
729+
(
730+
ebpf::UHMUL64_IMM,
731+
u64::MAX,
732+
u32::MAX as u64,
733+
u32::MAX as u64 - 1,
734+
),
735+
(ebpf::UDIV32_IMM, u64::MAX, u32::MAX as u64, 1u64),
736+
(
737+
ebpf::UDIV64_IMM,
738+
u64::MAX,
739+
u32::MAX as u64,
740+
u32::MAX as u64 + 2,
741+
),
742+
(ebpf::UREM32_IMM, u64::MAX, u32::MAX as u64, 0u64),
743+
(ebpf::UREM64_IMM, u64::MAX, u32::MAX as u64, 0u64),
734744
(
735745
ebpf::LMUL32_IMM,
736746
13i64 as u64,

0 commit comments

Comments
 (0)