Commit e8f59d84 authored by Andrii Nakryiko's avatar Andrii Nakryiko
Browse files

Merge branch 'bpf: Follow up to RCU enforcement in the verifier.' 



Alexei Starovoitov says:

====================

From: Alexei Starovoitov <ast@kernel.org>

The patch set is addressing a fallout from
commit 6fcd486b ("bpf: Refactor RCU enforcement in the verifier.")
It was too aggressive with PTR_UNTRUSTED marks.
Patches 1-6 are cleanup and adding verifier smartness to address real
use cases in bpf programs that broke with too aggressive PTR_UNTRUSTED.
The partial revert is done in patch 7 anyway.
====================

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parents 8fc59c26 69f41a78

include/linux/bpf.h

+5 −5
Original line number Diff line number Diff line
@@ -893,8 +893,7 @@ struct bpf_verifier_ops { 
				  struct bpf_prog *prog, u32 *target_size);

	int (*btf_struct_access)(struct bpf_verifier_log *log,

				 const struct bpf_reg_state *reg,

				 int off, int size, enum bpf_access_type atype,

				 u32 *next_btf_id, enum bpf_type_flag *flag);

				 int off, int size);

};



struct bpf_prog_offload_ops {
@@ -2264,7 +2263,7 @@ static inline bool bpf_tracing_btf_ctx_access(int off, int size, 
int btf_struct_access(struct bpf_verifier_log *log,

		      const struct bpf_reg_state *reg,

		      int off, int size, enum bpf_access_type atype,

		      u32 *next_btf_id, enum bpf_type_flag *flag);

		      u32 *next_btf_id, enum bpf_type_flag *flag, const char **field_name);

bool btf_struct_ids_match(struct bpf_verifier_log *log,

			  const struct btf *btf, u32 id, int off,

			  const struct btf *need_btf, u32 need_type_id,
@@ -2303,7 +2302,7 @@ struct bpf_core_ctx { 


bool btf_nested_type_is_trusted(struct bpf_verifier_log *log,

				const struct bpf_reg_state *reg,

				int off, const char *suffix);

				const char *field_name, u32 btf_id, const char *suffix);



bool btf_type_ids_nocast_alias(struct bpf_verifier_log *log,

			       const struct btf *reg_btf, u32 reg_id,
@@ -2518,7 +2517,8 @@ static inline struct bpf_prog *bpf_prog_by_id(u32 id) 
static inline int btf_struct_access(struct bpf_verifier_log *log,

				    const struct bpf_reg_state *reg,

				    int off, int size, enum bpf_access_type atype,

				    u32 *next_btf_id, enum bpf_type_flag *flag)

				    u32 *next_btf_id, enum bpf_type_flag *flag,

				    const char **field_name)

{

	return -EACCES;

}

include/linux/filter.h

+1 −2
Original line number Diff line number Diff line
@@ -571,8 +571,7 @@ DECLARE_STATIC_KEY_FALSE(bpf_stats_enabled_key); 
extern struct mutex nf_conn_btf_access_lock;

extern int (*nfct_btf_struct_access)(struct bpf_verifier_log *log,

				     const struct bpf_reg_state *reg,

				     int off, int size, enum bpf_access_type atype,

				     u32 *next_btf_id, enum bpf_type_flag *flag);

				     int off, int size);



typedef unsigned int (*bpf_dispatcher_fn)(const void *ctx,

					  const struct bpf_insn *insnsi,

kernel/bpf/bpf_cgrp_storage.c

+2 −2
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ const struct bpf_func_proto bpf_cgrp_storage_get_proto = { 
	.gpl_only	= false,

	.ret_type	= RET_PTR_TO_MAP_VALUE_OR_NULL,

	.arg1_type	= ARG_CONST_MAP_PTR,

	.arg2_type	= ARG_PTR_TO_BTF_ID,

	.arg2_type	= ARG_PTR_TO_BTF_ID_OR_NULL,

	.arg2_btf_id	= &bpf_cgroup_btf_id[0],

	.arg3_type	= ARG_PTR_TO_MAP_VALUE_OR_NULL,

	.arg4_type	= ARG_ANYTHING,
@@ -235,6 +235,6 @@ const struct bpf_func_proto bpf_cgrp_storage_delete_proto = { 
	.gpl_only	= false,

	.ret_type	= RET_INTEGER,

	.arg1_type	= ARG_CONST_MAP_PTR,

	.arg2_type	= ARG_PTR_TO_BTF_ID,

	.arg2_type	= ARG_PTR_TO_BTF_ID_OR_NULL,

	.arg2_btf_id	= &bpf_cgroup_btf_id[0],

};

kernel/bpf/bpf_inode_storage.c

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ const struct bpf_func_proto bpf_inode_storage_get_proto = { 
	.gpl_only	= false,

	.ret_type	= RET_PTR_TO_MAP_VALUE_OR_NULL,

	.arg1_type	= ARG_CONST_MAP_PTR,

	.arg2_type	= ARG_PTR_TO_BTF_ID,

	.arg2_type	= ARG_PTR_TO_BTF_ID_OR_NULL,

	.arg2_btf_id	= &bpf_inode_storage_btf_ids[0],

	.arg3_type	= ARG_PTR_TO_MAP_VALUE_OR_NULL,

	.arg4_type	= ARG_ANYTHING,
@@ -240,6 +240,6 @@ const struct bpf_func_proto bpf_inode_storage_delete_proto = { 
	.gpl_only	= false,

	.ret_type	= RET_INTEGER,

	.arg1_type	= ARG_CONST_MAP_PTR,

	.arg2_type	= ARG_PTR_TO_BTF_ID,

	.arg2_type	= ARG_PTR_TO_BTF_ID_OR_NULL,

	.arg2_btf_id	= &bpf_inode_storage_btf_ids[0],

};

kernel/bpf/bpf_task_storage.c

+4 −4
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ const struct bpf_func_proto bpf_task_storage_get_recur_proto = { 
	.gpl_only = false,

	.ret_type = RET_PTR_TO_MAP_VALUE_OR_NULL,

	.arg1_type = ARG_CONST_MAP_PTR,

	.arg2_type = ARG_PTR_TO_BTF_ID,

	.arg2_type = ARG_PTR_TO_BTF_ID_OR_NULL,

	.arg2_btf_id = &btf_tracing_ids[BTF_TRACING_TYPE_TASK],

	.arg3_type = ARG_PTR_TO_MAP_VALUE_OR_NULL,

	.arg4_type = ARG_ANYTHING,
@@ -349,7 +349,7 @@ const struct bpf_func_proto bpf_task_storage_get_proto = { 
	.gpl_only = false,

	.ret_type = RET_PTR_TO_MAP_VALUE_OR_NULL,

	.arg1_type = ARG_CONST_MAP_PTR,

	.arg2_type = ARG_PTR_TO_BTF_ID,

	.arg2_type = ARG_PTR_TO_BTF_ID_OR_NULL,

	.arg2_btf_id = &btf_tracing_ids[BTF_TRACING_TYPE_TASK],

	.arg3_type = ARG_PTR_TO_MAP_VALUE_OR_NULL,

	.arg4_type = ARG_ANYTHING,
@@ -360,7 +360,7 @@ const struct bpf_func_proto bpf_task_storage_delete_recur_proto = { 
	.gpl_only = false,

	.ret_type = RET_INTEGER,

	.arg1_type = ARG_CONST_MAP_PTR,

	.arg2_type = ARG_PTR_TO_BTF_ID,

	.arg2_type = ARG_PTR_TO_BTF_ID_OR_NULL,

	.arg2_btf_id = &btf_tracing_ids[BTF_TRACING_TYPE_TASK],

};
@@ -369,6 +369,6 @@ const struct bpf_func_proto bpf_task_storage_delete_proto = { 
	.gpl_only = false,

	.ret_type = RET_INTEGER,

	.arg1_type = ARG_CONST_MAP_PTR,

	.arg2_type = ARG_PTR_TO_BTF_ID,

	.arg2_type = ARG_PTR_TO_BTF_ID_OR_NULL,

	.arg2_btf_id = &btf_tracing_ids[BTF_TRACING_TYPE_TASK],

};