Skip to content

L
linux
Commit c2a3ab09 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files
Options

bpf: rename is_branch_taken reg arguments to prepare for the second one 

Just taking mundane refactoring bits out into a separate patch. No
functional changes.
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarShung-Hsi Yu <shung-hsi.yu@suse.com>
Link: https://lore.kernel.org/r/20231102033759.2541186-12-andrii@kernel.orgSigned-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 9e314f5d
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 54 deletions
kernel/bpf/verifier.c
View file @ c2a3ab09
......@@ -14188,26 +14188,26 @@ static void find_good_pkt_pointers(struct bpf_verifier_state *vstate,
}));
}
static int is_branch32_taken(struct bpf_reg_state *reg, u32 val, u8 opcode)
static int is_branch32_taken(struct bpf_reg_state *reg1, u32 val, u8 opcode)
{
struct tnum subreg = tnum_subreg(reg->var_off);
struct tnum subreg = tnum_subreg(reg1->var_off);
s32 sval = (s32)val;
switch (opcode) {
case BPF_JEQ:
if (tnum_is_const(subreg))
return !!tnum_equals_const(subreg, val);
else if (val < reg->u32_min_value || val > reg->u32_max_value)
else if (val < reg1->u32_min_value || val > reg1->u32_max_value)
return 0;
else if (sval < reg->s32_min_value || sval > reg->s32_max_value)
else if (sval < reg1->s32_min_value || sval > reg1->s32_max_value)
return 0;
break;
case BPF_JNE:
if (tnum_is_const(subreg))
return !tnum_equals_const(subreg, val);
else if (val < reg->u32_min_value || val > reg->u32_max_value)
else if (val < reg1->u32_min_value || val > reg1->u32_max_value)
return 1;
else if (sval < reg->s32_min_value || sval > reg->s32_max_value)
else if (sval < reg1->s32_min_value || sval > reg1->s32_max_value)
return 1;
break;
case BPF_JSET:
......@@ -14217,51 +14217,51 @@ static int is_branch32_taken(struct bpf_reg_state *reg, u32 val, u8 opcode)
return 0;
break;
case BPF_JGT:
if (reg->u32_min_value > val)
if (reg1->u32_min_value > val)
return 1;
else if (reg->u32_max_value <= val)
else if (reg1->u32_max_value <= val)
return 0;
break;
case BPF_JSGT:
if (reg->s32_min_value > sval)
if (reg1->s32_min_value > sval)
return 1;
else if (reg->s32_max_value <= sval)
else if (reg1->s32_max_value <= sval)
return 0;
break;
case BPF_JLT:
if (reg->u32_max_value < val)
if (reg1->u32_max_value < val)
return 1;
else if (reg->u32_min_value >= val)
else if (reg1->u32_min_value >= val)
return 0;
break;
case BPF_JSLT:
if (reg->s32_max_value < sval)
if (reg1->s32_max_value < sval)
return 1;
else if (reg->s32_min_value >= sval)
else if (reg1->s32_min_value >= sval)
return 0;
break;
case BPF_JGE:
if (reg->u32_min_value >= val)
if (reg1->u32_min_value >= val)
return 1;
else if (reg->u32_max_value < val)
else if (reg1->u32_max_value < val)
return 0;
break;
case BPF_JSGE:
if (reg->s32_min_value >= sval)
if (reg1->s32_min_value >= sval)
return 1;
else if (reg->s32_max_value < sval)
else if (reg1->s32_max_value < sval)
return 0;
break;
case BPF_JLE:
if (reg->u32_max_value <= val)
if (reg1->u32_max_value <= val)
return 1;
else if (reg->u32_min_value > val)
else if (reg1->u32_min_value > val)
return 0;
break;
case BPF_JSLE:
if (reg->s32_max_value <= sval)
if (reg1->s32_max_value <= sval)
return 1;
else if (reg->s32_min_value > sval)
else if (reg1->s32_min_value > sval)
return 0;
break;
}
......@@ -14270,79 +14270,79 @@ static int is_branch32_taken(struct bpf_reg_state *reg, u32 val, u8 opcode)
}
static int is_branch64_taken(struct bpf_reg_state *reg, u64 val, u8 opcode)
static int is_branch64_taken(struct bpf_reg_state *reg1, u64 val, u8 opcode)
{
s64 sval = (s64)val;
switch (opcode) {
case BPF_JEQ:
if (tnum_is_const(reg->var_off))
return !!tnum_equals_const(reg->var_off, val);
else if (val < reg->umin_value || val > reg->umax_value)
if (tnum_is_const(reg1->var_off))
return !!tnum_equals_const(reg1->var_off, val);
else if (val < reg1->umin_value || val > reg1->umax_value)
return 0;
else if (sval < reg->smin_value || sval > reg->smax_value)
else if (sval < reg1->smin_value || sval > reg1->smax_value)
return 0;
break;
case BPF_JNE:
if (tnum_is_const(reg->var_off))
return !tnum_equals_const(reg->var_off, val);
else if (val < reg->umin_value || val > reg->umax_value)
if (tnum_is_const(reg1->var_off))
return !tnum_equals_const(reg1->var_off, val);
else if (val < reg1->umin_value || val > reg1->umax_value)
return 1;
else if (sval < reg->smin_value || sval > reg->smax_value)
else if (sval < reg1->smin_value || sval > reg1->smax_value)
return 1;
break;
case BPF_JSET:
if ((~reg->var_off.mask & reg->var_off.value) & val)
if ((~reg1->var_off.mask & reg1->var_off.value) & val)
return 1;
if (!((reg->var_off.mask | reg->var_off.value) & val))
if (!((reg1->var_off.mask | reg1->var_off.value) & val))
return 0;
break;
case BPF_JGT:
if (reg->umin_value > val)
if (reg1->umin_value > val)
return 1;
else if (reg->umax_value <= val)
else if (reg1->umax_value <= val)
return 0;
break;
case BPF_JSGT:
if (reg->smin_value > sval)
if (reg1->smin_value > sval)
return 1;
else if (reg->smax_value <= sval)
else if (reg1->smax_value <= sval)
return 0;
break;
case BPF_JLT:
if (reg->umax_value < val)
if (reg1->umax_value < val)
return 1;
else if (reg->umin_value >= val)
else if (reg1->umin_value >= val)
return 0;
break;
case BPF_JSLT:
if (reg->smax_value < sval)
if (reg1->smax_value < sval)
return 1;
else if (reg->smin_value >= sval)
else if (reg1->smin_value >= sval)
return 0;
break;
case BPF_JGE:
if (reg->umin_value >= val)
if (reg1->umin_value >= val)
return 1;
else if (reg->umax_value < val)
else if (reg1->umax_value < val)
return 0;
break;
case BPF_JSGE:
if (reg->smin_value >= sval)
if (reg1->smin_value >= sval)
return 1;
else if (reg->smax_value < sval)
else if (reg1->smax_value < sval)
return 0;
break;
case BPF_JLE:
if (reg->umax_value <= val)
if (reg1->umax_value <= val)
return 1;
else if (reg->umin_value > val)
else if (reg1->umin_value > val)
return 0;
break;
case BPF_JSLE:
if (reg->smax_value <= sval)
if (reg1->smax_value <= sval)
return 1;
else if (reg->smin_value > sval)
else if (reg1->smin_value > sval)
return 0;
break;
}
......@@ -14357,11 +14357,11 @@ static int is_branch64_taken(struct bpf_reg_state *reg, u64 val, u8 opcode)
* -1 - unknown. Example: "if (reg < 5)" is unknown when register value
* range [0,10]
*/
static int is_branch_taken(struct bpf_reg_state *reg, u64 val, u8 opcode,
static int is_branch_taken(struct bpf_reg_state *reg1, u64 val, u8 opcode,
bool is_jmp32)
{
if (__is_pointer_value(false, reg)) {
if (!reg_not_null(reg))
if (__is_pointer_value(false, reg1)) {
if (!reg_not_null(reg1))
return -1;
/* If pointer is valid tests against zero will fail so we can
......@@ -14381,8 +14381,8 @@ static int is_branch_taken(struct bpf_reg_state *reg, u64 val, u8 opcode,
}
if (is_jmp32)
return is_branch32_taken(reg, val, opcode);
return is_branch64_taken(reg, val, opcode);
return is_branch32_taken(reg1, val, opcode);
return is_branch64_taken(reg1, val, opcode);
}
static int flip_opcode(u32 opcode)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7