From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE5DAC433F5 for ; Sat, 14 May 2022 03:13:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231124AbiENDNt (ORCPT ); Fri, 13 May 2022 23:13:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230393AbiENDNs (ORCPT ); Fri, 13 May 2022 23:13:48 -0400 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2A0E34A954 for ; Fri, 13 May 2022 20:13:46 -0700 (PDT) Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24DNXLeA028895 for ; Fri, 13 May 2022 20:13:46 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=3vZT8mG2RWHgRGMNaQvtIqIpkHcDgjJNRasCkkDT4a4=; b=PvKuH1XBPbZoWmYbHaV8cQMqR4iAv1gTYXH1/H+Jh2a9hYf842Nks/RAq1pSsJyK4bQc 81M9ukZXTu7csE/xbsFqL8zXjNFmCJsqwY++6Xf8avYnXy2GaScvnPAesckiPANZt4CG GP1+aRvx8sDVam9rUOLy6SK+jbyhuefCvOk= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3g1nyv57kb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 13 May 2022 20:13:46 -0700 Received: from twshared10276.08.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 13 May 2022 20:13:44 -0700 Received: by devbig309.ftw3.facebook.com (Postfix, from userid 128203) id F3710A45F679; Fri, 13 May 2022 20:13:29 -0700 (PDT) From: Yonghong Song To: CC: Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Subject: [PATCH bpf-next v2 13/18] selftests/bpf: Test new enum kflag and enum64 API functions Date: Fri, 13 May 2022 20:13:29 -0700 Message-ID: <20220514031329.3245856-1-yhs@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514031221.3240268-1-yhs@fb.com> References: <20220514031221.3240268-1-yhs@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: AHXArwjIOVdeBY_J0PMoNPO38HY41k0i X-Proofpoint-ORIG-GUID: AHXArwjIOVdeBY_J0PMoNPO38HY41k0i X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-05-13_11,2022-05-13_01,2022-02-23_01 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Add tests to use the new enum kflag and enum64 API functions in selftest btf_write. Signed-off-by: Yonghong Song --- tools/testing/selftests/bpf/btf_helpers.c | 21 +++- .../selftests/bpf/prog_tests/btf_write.c | 114 +++++++++++++----- 2 files changed, 105 insertions(+), 30 deletions(-) diff --git a/tools/testing/selftests/bpf/btf_helpers.c b/tools/testing/se= lftests/bpf/btf_helpers.c index b5941d514e17..335ddd485f26 100644 --- a/tools/testing/selftests/bpf/btf_helpers.c +++ b/tools/testing/selftests/bpf/btf_helpers.c @@ -26,11 +26,12 @@ static const char * const btf_kind_str_mapping[] =3D = { [BTF_KIND_FLOAT] =3D "FLOAT", [BTF_KIND_DECL_TAG] =3D "DECL_TAG", [BTF_KIND_TYPE_TAG] =3D "TYPE_TAG", + [BTF_KIND_ENUM64] =3D "ENUM64", }; =20 static const char *btf_kind_str(__u16 kind) { - if (kind > BTF_KIND_TYPE_TAG) + if (kind > BTF_KIND_ENUM64) return "UNKNOWN"; return btf_kind_str_mapping[kind]; } @@ -139,14 +140,30 @@ int fprintf_btf_type_raw(FILE *out, const struct bt= f *btf, __u32 id) } case BTF_KIND_ENUM: { const struct btf_enum *v =3D btf_enum(t); + const char *fmt_str; =20 + fmt_str =3D btf_kflag(t) ? "\n\t'%s' val=3D%d" : "\n\t'%s' val=3D%u"; fprintf(out, " size=3D%u vlen=3D%u", t->size, vlen); for (i =3D 0; i < vlen; i++, v++) { - fprintf(out, "\n\t'%s' val=3D%u", + fprintf(out, fmt_str, btf_str(btf, v->name_off), v->val); } break; } + case BTF_KIND_ENUM64: { + const struct btf_enum64 *v =3D btf_enum64(t); + const char *fmt_str; + + fmt_str =3D btf_kflag(t) ? "\n\t'%s' val=3D%lld" : "\n\t'%s' val=3D%ll= u"; + + fprintf(out, " size=3D%u vlen=3D%u", t->size, vlen); + for (i =3D 0; i < vlen; i++, v++) { + fprintf(out, fmt_str, + btf_str(btf, v->name_off), + ((__u64)v->val_hi32 << 32) | v->val_lo32); + } + break; + } case BTF_KIND_FWD: fprintf(out, " fwd_kind=3D%s", btf_kflag(t) ? "union" : "struct"); break; diff --git a/tools/testing/selftests/bpf/prog_tests/btf_write.c b/tools/t= esting/selftests/bpf/prog_tests/btf_write.c index addf99c05896..b4a6b78e94f2 100644 --- a/tools/testing/selftests/bpf/prog_tests/btf_write.c +++ b/tools/testing/selftests/bpf/prog_tests/btf_write.c @@ -9,6 +9,7 @@ static void gen_btf(struct btf *btf) const struct btf_var_secinfo *vi; const struct btf_type *t; const struct btf_member *m; + const struct btf_enum64 *v64; const struct btf_enum *v; const struct btf_param *p; int id, err, str_off; @@ -307,6 +308,48 @@ static void gen_btf(struct btf *btf) ASSERT_EQ(t->type, 1, "tag_type"); ASSERT_STREQ(btf_type_raw_dump(btf, 20), "[20] TYPE_TAG 'tag1' type_id=3D1", "raw_dump"); + + /* ENUM64 */ + id =3D btf__add_enum64(btf, "e1", 8, true); + ASSERT_EQ(id, 21, "enum64_id"); + err =3D btf__add_enum64_value(btf, "v1", -1); + ASSERT_OK(err, "v1_res"); + err =3D btf__add_enum64_value(btf, "v2", 0x123456789); /* 4886718345 */ + ASSERT_OK(err, "v2_res"); + t =3D btf__type_by_id(btf, 21); + ASSERT_STREQ(btf__str_by_offset(btf, t->name_off), "e1", "enum64_name")= ; + ASSERT_EQ(btf_kind(t), BTF_KIND_ENUM64, "enum64_kind"); + ASSERT_EQ(btf_vlen(t), 2, "enum64_vlen"); + ASSERT_EQ(t->size, 8, "enum64_sz"); + v64 =3D btf_enum64(t) + 0; + ASSERT_STREQ(btf__str_by_offset(btf, v64->name_off), "v1", "v1_name"); + ASSERT_EQ(v64->val_hi32, 0xffffffff, "v1_val"); + ASSERT_EQ(v64->val_lo32, 0xffffffff, "v1_val"); + v64 =3D btf_enum64(t) + 1; + ASSERT_STREQ(btf__str_by_offset(btf, v64->name_off), "v2", "v2_name"); + ASSERT_EQ(v64->val_hi32, 0x1, "v2_val"); + ASSERT_EQ(v64->val_lo32, 0x23456789, "v2_val"); + ASSERT_STREQ(btf_type_raw_dump(btf, 21), + "[21] ENUM64 'e1' size=3D8 vlen=3D2\n" + "\t'v1' val=3D-1\n" + "\t'v2' val=3D4886718345", "raw_dump"); + + id =3D btf__add_enum64(btf, "e1", 8, false); + ASSERT_EQ(id, 22, "enum64_id"); + err =3D btf__add_enum64_value(btf, "v1", 0xffffffffFFFFFFFF); /* 184467= 44073709551615 */ + ASSERT_OK(err, "v1_res"); + t =3D btf__type_by_id(btf, 22); + ASSERT_STREQ(btf__str_by_offset(btf, t->name_off), "e1", "enum64_name")= ; + ASSERT_EQ(btf_kind(t), BTF_KIND_ENUM64, "enum64_kind"); + ASSERT_EQ(btf_vlen(t), 1, "enum64_vlen"); + ASSERT_EQ(t->size, 8, "enum64_sz"); + v64 =3D btf_enum64(t) + 0; + ASSERT_STREQ(btf__str_by_offset(btf, v64->name_off), "v1", "v1_name"); + ASSERT_EQ(v64->val_hi32, 0xffffffff, "v1_val"); + ASSERT_EQ(v64->val_lo32, 0xffffffff, "v1_val"); + ASSERT_STREQ(btf_type_raw_dump(btf, 22), + "[22] ENUM64 'e1' size=3D8 vlen=3D1\n" + "\t'v1' val=3D18446744073709551615", "raw_dump"); } =20 static void test_btf_add() @@ -348,7 +391,12 @@ static void test_btf_add() "\ttype_id=3D1 offset=3D4 size=3D8", "[18] DECL_TAG 'tag1' type_id=3D16 component_idx=3D-1", "[19] DECL_TAG 'tag2' type_id=3D14 component_idx=3D1", - "[20] TYPE_TAG 'tag1' type_id=3D1"); + "[20] TYPE_TAG 'tag1' type_id=3D1", + "[21] ENUM64 'e1' size=3D8 vlen=3D2\n" + "\t'v1' val=3D-1\n" + "\t'v2' val=3D4886718345", + "[22] ENUM64 'e1' size=3D8 vlen=3D1\n" + "\t'v1' val=3D18446744073709551615"); =20 btf__free(btf); } @@ -370,7 +418,7 @@ static void test_btf_add_btf() gen_btf(btf2); =20 id =3D btf__add_btf(btf1, btf2); - if (!ASSERT_EQ(id, 21, "id")) + if (!ASSERT_EQ(id, 23, "id")) goto cleanup; =20 VALIDATE_RAW_BTF( @@ -403,36 +451,46 @@ static void test_btf_add_btf() "[18] DECL_TAG 'tag1' type_id=3D16 component_idx=3D-1", "[19] DECL_TAG 'tag2' type_id=3D14 component_idx=3D1", "[20] TYPE_TAG 'tag1' type_id=3D1", + "[21] ENUM64 'e1' size=3D8 vlen=3D2\n" + "\t'v1' val=3D-1\n" + "\t'v2' val=3D4886718345", + "[22] ENUM64 'e1' size=3D8 vlen=3D1\n" + "\t'v1' val=3D18446744073709551615", =20 /* types appended from the second BTF */ - "[21] INT 'int' size=3D4 bits_offset=3D0 nr_bits=3D32 encoding=3DSIGNE= D", - "[22] PTR '(anon)' type_id=3D21", - "[23] CONST '(anon)' type_id=3D25", - "[24] VOLATILE '(anon)' type_id=3D23", - "[25] RESTRICT '(anon)' type_id=3D24", - "[26] ARRAY '(anon)' type_id=3D22 index_type_id=3D21 nr_elems=3D10", - "[27] STRUCT 's1' size=3D8 vlen=3D2\n" - "\t'f1' type_id=3D21 bits_offset=3D0\n" - "\t'f2' type_id=3D21 bits_offset=3D32 bitfield_size=3D16", - "[28] UNION 'u1' size=3D8 vlen=3D1\n" - "\t'f1' type_id=3D21 bits_offset=3D0 bitfield_size=3D16", - "[29] ENUM 'e1' size=3D4 vlen=3D2\n" + "[23] INT 'int' size=3D4 bits_offset=3D0 nr_bits=3D32 encoding=3DSIGNE= D", + "[24] PTR '(anon)' type_id=3D23", + "[25] CONST '(anon)' type_id=3D27", + "[26] VOLATILE '(anon)' type_id=3D25", + "[27] RESTRICT '(anon)' type_id=3D26", + "[28] ARRAY '(anon)' type_id=3D24 index_type_id=3D23 nr_elems=3D10", + "[29] STRUCT 's1' size=3D8 vlen=3D2\n" + "\t'f1' type_id=3D23 bits_offset=3D0\n" + "\t'f2' type_id=3D23 bits_offset=3D32 bitfield_size=3D16", + "[30] UNION 'u1' size=3D8 vlen=3D1\n" + "\t'f1' type_id=3D23 bits_offset=3D0 bitfield_size=3D16", + "[31] ENUM 'e1' size=3D4 vlen=3D2\n" "\t'v1' val=3D1\n" "\t'v2' val=3D2", - "[30] FWD 'struct_fwd' fwd_kind=3Dstruct", - "[31] FWD 'union_fwd' fwd_kind=3Dunion", - "[32] ENUM 'enum_fwd' size=3D4 vlen=3D0", - "[33] TYPEDEF 'typedef1' type_id=3D21", - "[34] FUNC 'func1' type_id=3D35 linkage=3Dglobal", - "[35] FUNC_PROTO '(anon)' ret_type_id=3D21 vlen=3D2\n" - "\t'p1' type_id=3D21\n" - "\t'p2' type_id=3D22", - "[36] VAR 'var1' type_id=3D21, linkage=3Dglobal-alloc", - "[37] DATASEC 'datasec1' size=3D12 vlen=3D1\n" - "\ttype_id=3D21 offset=3D4 size=3D8", - "[38] DECL_TAG 'tag1' type_id=3D36 component_idx=3D-1", - "[39] DECL_TAG 'tag2' type_id=3D34 component_idx=3D1", - "[40] TYPE_TAG 'tag1' type_id=3D21"); + "[32] FWD 'struct_fwd' fwd_kind=3Dstruct", + "[33] FWD 'union_fwd' fwd_kind=3Dunion", + "[34] ENUM 'enum_fwd' size=3D4 vlen=3D0", + "[35] TYPEDEF 'typedef1' type_id=3D23", + "[36] FUNC 'func1' type_id=3D37 linkage=3Dglobal", + "[37] FUNC_PROTO '(anon)' ret_type_id=3D23 vlen=3D2\n" + "\t'p1' type_id=3D23\n" + "\t'p2' type_id=3D24", + "[38] VAR 'var1' type_id=3D23, linkage=3Dglobal-alloc", + "[39] DATASEC 'datasec1' size=3D12 vlen=3D1\n" + "\ttype_id=3D23 offset=3D4 size=3D8", + "[40] DECL_TAG 'tag1' type_id=3D38 component_idx=3D-1", + "[41] DECL_TAG 'tag2' type_id=3D36 component_idx=3D1", + "[42] TYPE_TAG 'tag1' type_id=3D23", + "[43] ENUM64 'e1' size=3D8 vlen=3D2\n" + "\t'v1' val=3D-1\n" + "\t'v2' val=3D4886718345", + "[44] ENUM64 'e1' size=3D8 vlen=3D1\n" + "\t'v1' val=3D18446744073709551615"); =20 cleanup: btf__free(btf1); --=20 2.30.2