Commit cf9f2f8d authored by Hao Luo's avatar Hao Luo Committed by Alexei Starovoitov
Browse files

bpf: Convert PTR_TO_MEM_OR_NULL to composable types. 



Remove PTR_TO_MEM_OR_NULL and replace it with PTR_TO_MEM combined with
flag PTR_MAYBE_NULL.

Signed-off-by: default avatarHao Luo <haoluo@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20211217003152.48334-7-haoluo@google.com
parent 20b2aff4

include/linux/bpf.h

+0 −1
Original line number Diff line number Diff line
@@ -506,7 +506,6 @@ enum bpf_reg_type { 
	PTR_TO_SOCK_COMMON_OR_NULL	= PTR_MAYBE_NULL | PTR_TO_SOCK_COMMON,

	PTR_TO_TCP_SOCK_OR_NULL		= PTR_MAYBE_NULL | PTR_TO_TCP_SOCK,

	PTR_TO_BTF_ID_OR_NULL		= PTR_MAYBE_NULL | PTR_TO_BTF_ID,

	PTR_TO_MEM_OR_NULL		= PTR_MAYBE_NULL | PTR_TO_MEM,



	/* This must be the last entry. Its purpose is to ensure the enum is

	 * wide enough to hold the higher bits reserved for bpf_type_flag.

kernel/bpf/btf.c

+1 −1
Original line number Diff line number Diff line
@@ -5859,7 +5859,7 @@ int btf_prepare_func_args(struct bpf_verifier_env *env, int subprog, 
				return -EINVAL;

			}



			reg->type = PTR_TO_MEM_OR_NULL;

			reg->type = PTR_TO_MEM | PTR_MAYBE_NULL;

			reg->id = ++env->id_gen;



			continue;

kernel/bpf/verifier.c

+1 −1
Original line number Diff line number Diff line
@@ -13578,7 +13578,7 @@ static int do_check_common(struct bpf_verifier_env *env, int subprog) 
				mark_reg_known_zero(env, regs, i);

			else if (regs[i].type == SCALAR_VALUE)

				mark_reg_unknown(env, regs, i);

			else if (regs[i].type == PTR_TO_MEM_OR_NULL) {

			else if (base_type(regs[i].type) == PTR_TO_MEM) {

				const u32 mem_size = regs[i].mem_size;



				mark_reg_known_zero(env, regs, i);