bpftool: bpf skeletons assert type sizes

[kernel-patches-bot]

Pull request for series with
subject: bpftool: bpf skeletons assert type sizes
version: 4
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=617326

[kernel-patches-bot]

Master branch: a19df71
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=617326
version: 4

[kernel-patches-bot]

Master branch: 08894d9
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=617326
version: 4

[kernel-patches-bot]

Master branch: c561d11
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=617326
version: 4

[kernel-patches-bot]

Master branch: 08d4dba
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=617326
version: 4

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=617326
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: bpftool: bpf skeletons assert type sizes
Using index info to reconstruct a base tree...
M	tools/bpf/bpftool/gen.c
Falling back to patching base and 3-way merge...
Auto-merging tools/bpf/bpftool/gen.c
CONFLICT (content): Merge conflict in tools/bpf/bpftool/gen.c
Patch failed at 0001 bpftool: bpf skeletons assert type sizes
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc tools/bpf/bpftool/gen.c
index 145734b4fe41,a42545bcb12d..000000000000
--- a/tools/bpf/bpftool/gen.c
+++ b/tools/bpf/bpftool/gen.c
@@@ -209,8 -209,10 +209,15 @@@ static int codegen_datasec_def(struct b
  	return 0;
  }
  
++<<<<<<< HEAD
 +static const struct btf_type *find_type_for_map(struct btf *btf, const char *map_ident)
 +{
++=======
+ static const struct btf_type *find_type_for_map(struct bpf_object *obj,
+ 						const char *map_ident)
+ {
+ 	struct btf *btf = bpf_object__btf(obj);
++>>>>>>> bpftool: bpf skeletons assert type sizes
  	int n = btf__type_cnt(btf), i;
  	char sec_ident[256];
  
@@@ -255,7 -257,7 +262,11 @@@ static int codegen_datasecs(struct bpf_
  		if (!get_map_ident(map, map_ident, sizeof(map_ident)))
  			continue;
  
++<<<<<<< HEAD
 +		sec = find_type_for_map(btf, map_ident);
++=======
+ 		sec = find_type_for_map(obj, map_ident);
++>>>>>>> bpftool: bpf skeletons assert type sizes
  
  		/* In some cases (e.g., sections like .rodata.cst16 containing
  		 * compiler allocated string constants only) there will be
@@@ -368,7 -370,8 +379,12 @@@ static size_t bpf_map_mmap_sz(const str
  	return map_sz;
  }
  
++<<<<<<< HEAD
 +/* Emit type size asserts for all top-level fields in memory-mapped internal maps. */
++=======
+ /* Emit type size asserts for all top-level fields in memory-mapped internal maps.
+  */
++>>>>>>> bpftool: bpf skeletons assert type sizes
  static void codegen_asserts(struct bpf_object *obj, const char *obj_name)
  {
  	struct btf *btf = bpf_object__btf(obj);
@@@ -380,12 -383,14 +396,23 @@@
  
  	codegen("\
  		\n\
++<<<<<<< HEAD
 +		__attribute__((unused)) static void			    \n\
 +		%1$s__assert(struct %1$s *s)				    \n\
 +		{							    \n\
 +		#ifdef __cplusplus					    \n\
 +		#define _Static_assert static_assert			    \n\
 +		#endif							    \n\
++=======
+ 									    \n\
+ 		#ifdef __cplusplus					    \n\
+ 		#define _Static_assert static_assert			    \n\
+ 		#endif							    \n\
+ 									    \n\
+ 		__attribute__((unused)) static void			    \n\
+ 		%1$s__type_asserts(struct %1$s *s)			    \n\
+ 		{							    \n\
++>>>>>>> bpftool: bpf skeletons assert type sizes
  		", obj_name);
  
  	bpf_object__for_each_map(map, obj) {
@@@ -396,7 -401,7 +423,11 @@@
  		if (!get_map_ident(map, map_ident, sizeof(map_ident)))
  			continue;
  
++<<<<<<< HEAD
 +		sec = find_type_for_map(btf, map_ident);
++=======
+ 		sec = find_type_for_map(obj, map_ident);
++>>>>>>> bpftool: bpf skeletons assert type sizes
  		if (!sec) {
  			/* best effort, couldn't find the type for this map */
  			continue;
@@@ -408,33 -413,35 +439,61 @@@
  		for (i = 0; i < vlen; i++, sec_var++) {
  			const struct btf_type *var = btf__type_by_id(btf, sec_var->type);
  			const char *var_name = btf__name_by_offset(btf, var->name_off);
++<<<<<<< HEAD
 +			long var_size;
 +
 +			/* static variables are not exposed through BPF skeleton */
 +			if (btf_var(var)->linkage == BTF_VAR_STATIC)
 +				continue;
 +
 +			var_size = btf__resolve_size(btf, var->type);
 +			if (var_size < 0)
++=======
+ 			__u32 var_type_id = var->type;
+ 			__s64 var_size = btf__resolve_size(btf, var_type_id);
+ 
+ 			if (var_size < 0)
+ 				continue;
+ 
+ 			/* static variables are not exposed through BPF skeleton */
+ 			if (btf_var(var)->linkage == BTF_VAR_STATIC)
++>>>>>>> bpftool: bpf skeletons assert type sizes
  				continue;
  
  			var_ident[0] = '\0';
  			strncat(var_ident, var_name, sizeof(var_ident) - 1);
  			sanitize_identifier(var_ident);
  
++<<<<<<< HEAD
 +			printf("\t_Static_assert(sizeof(s->%s->%s) == %ld, \"unexpected size of '%s'\");\n",
 +			       map_ident, var_ident, var_size, var_ident);
++=======
+ 			printf("\t_Static_assert(sizeof(s->%1$s->%2$s) == %3$lld, \"unexpected size of '%2$s'\");\n",
+ 			       map_ident, var_ident, var_size);
++>>>>>>> bpftool: bpf skeletons assert type sizes
  		}
  	}
  	codegen("\
  		\n\
++<<<<<<< HEAD
 +		#ifdef __cplusplus					    \n\
 +		#undef _Static_assert					    \n\
 +		#endif							    \n\
 +		}							    \n\
 +		");
 +}
 +
++=======
+ 		}							    \n\
+ 									    \n\
+ 		#ifdef __cplusplus					    \n\
+ 		#undef _Static_assert					    \n\
+ 		#endif							    \n\
+ 		");
+ }
+ 
+ 
++>>>>>>> bpftool: bpf skeletons assert type sizes
  static void codegen_attach_detach(struct bpf_object *obj, const char *obj_name)
  {
  	struct bpf_program *prog;

[kernel-patches-bot]

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=617326 irrelevant now. Closing PR.