Commit 30025e8b authored by Yonghong Song's avatar Yonghong Song Committed by Alexei Starovoitov
Browse files

libbpf: Rename btf_{hash,equal}_int to btf_{hash,equal}_int_tag 



This patch renames functions btf_{hash,equal}_int() to
btf_{hash,equal}_int_tag() so they can be reused for
BTF_KIND_TAG support. There is no functionality change for
this patch.

Signed-off-by: default avatarYonghong Song <yhs@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210914223020.245829-1-yhs@fb.com
parent b5ea834d

tools/lib/bpf/btf.c

+8 −8
Original line number Diff line number Diff line
@@ -3256,8 +3256,8 @@ static bool btf_equal_common(struct btf_type *t1, struct btf_type *t2) 
	       t1->size == t2->size;

}



/* Calculate type signature hash of INT. */

static long btf_hash_int(struct btf_type *t)

/* Calculate type signature hash of INT or TAG. */

static long btf_hash_int_tag(struct btf_type *t)

{

	__u32 info = *(__u32 *)(t + 1);

	long h;
@@ -3267,8 +3267,8 @@ static long btf_hash_int(struct btf_type *t) 
	return h;

}



/* Check structural equality of two INTs. */

static bool btf_equal_int(struct btf_type *t1, struct btf_type *t2)

/* Check structural equality of two INTs or TAGs. */

static bool btf_equal_int_tag(struct btf_type *t1, struct btf_type *t2)

{

	__u32 info1, info2;
@@ -3535,7 +3535,7 @@ static int btf_dedup_prep(struct btf_dedup *d) 
			h = btf_hash_common(t);

			break;

		case BTF_KIND_INT:

			h = btf_hash_int(t);

			h = btf_hash_int_tag(t);

			break;

		case BTF_KIND_ENUM:

			h = btf_hash_enum(t);
@@ -3593,11 +3593,11 @@ static int btf_dedup_prim_type(struct btf_dedup *d, __u32 type_id) 
		return 0;



	case BTF_KIND_INT:

		h = btf_hash_int(t);

		h = btf_hash_int_tag(t);

		for_each_dedup_cand(d, hash_entry, h) {

			cand_id = (__u32)(long)hash_entry->value;

			cand = btf_type_by_id(d->btf, cand_id);

			if (btf_equal_int(t, cand)) {

			if (btf_equal_int_tag(t, cand)) {

				new_id = cand_id;

				break;

			}
@@ -3881,7 +3881,7 @@ static int btf_dedup_is_equiv(struct btf_dedup *d, __u32 cand_id, 


	switch (cand_kind) {

	case BTF_KIND_INT:

		return btf_equal_int(cand_type, canon_type);

		return btf_equal_int_tag(cand_type, canon_type);



	case BTF_KIND_ENUM:

		if (d->opts.dont_resolve_fwds)