From: Yonghong Song <yhs@fb.com>
To: Ilya Leoshkevich <iii@linux.ibm.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: John Fastabend <john.fastabend@gmail.com>, <bpf@vger.kernel.org>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>
Subject: Re: [PATCH v2 bpf-next 5/6] selftest/bpf: Add BTF_KIND_FLOAT tests
Date: Thu, 18 Feb 2021 21:38:10 -0800
Message-ID: <ccf4174e-f574-59f5-1edc-8ab8306dc269@fb.com> (raw)
In-Reply-To: <20210219022543.20893-6-iii@linux.ibm.com>
On 2/18/21 6:25 PM, Ilya Leoshkevich wrote:
> Test the good variants as well as the potential malformed ones.
>
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
> tools/testing/selftests/bpf/btf_helpers.c | 4 +
> tools/testing/selftests/bpf/prog_tests/btf.c | 122 +++++++++++++++++++
> tools/testing/selftests/bpf/test_btf.h | 3 +
> 3 files changed, 129 insertions(+)
>
> diff --git a/tools/testing/selftests/bpf/btf_helpers.c b/tools/testing/selftests/bpf/btf_helpers.c
> index 48f90490f922..b692e6ead9b5 100644
> --- a/tools/testing/selftests/bpf/btf_helpers.c
> +++ b/tools/testing/selftests/bpf/btf_helpers.c
> @@ -23,6 +23,7 @@ static const char * const btf_kind_str_mapping[] = {
> [BTF_KIND_FUNC_PROTO] = "FUNC_PROTO",
> [BTF_KIND_VAR] = "VAR",
> [BTF_KIND_DATASEC] = "DATASEC",
> + [BTF_KIND_FLOAT] = "FLOAT",
> };
>
> static const char *btf_kind_str(__u16 kind)
> @@ -173,6 +174,9 @@ int fprintf_btf_type_raw(FILE *out, const struct btf *btf, __u32 id)
> }
> break;
> }
> + case BTF_KIND_FLOAT:
> + fprintf(out, " size=%u", t->size);
> + break;
> default:
> break;
> }
> diff --git a/tools/testing/selftests/bpf/prog_tests/btf.c b/tools/testing/selftests/bpf/prog_tests/btf.c
> index 6a7ee7420701..4be14d853cc3 100644
> --- a/tools/testing/selftests/bpf/prog_tests/btf.c
> +++ b/tools/testing/selftests/bpf/prog_tests/btf.c
> @@ -3531,6 +3531,127 @@ static struct btf_raw_test raw_tests[] = {
> .max_entries = 1,
> },
>
> +{
> + .descr = "float test #1, well-formed",
> + .raw_types = {
> + BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
> + BTF_TYPE_FLOAT_ENC(1, 2), /* [2] */
> + BTF_TYPE_FLOAT_ENC(10, 4), /* [3] */
> + BTF_TYPE_FLOAT_ENC(16, 8), /* [4] */
> + BTF_TYPE_FLOAT_ENC(23, 16), /* [5] */
> + BTF_STRUCT_ENC(35, 4, 32), /* [6] */
> + BTF_MEMBER_ENC(NAME_TBD, 2, 0),
> + BTF_MEMBER_ENC(NAME_TBD, 3, 32),
> + BTF_MEMBER_ENC(NAME_TBD, 4, 64),
> + BTF_MEMBER_ENC(NAME_TBD, 5, 128),
> + BTF_END_RAW,
> + },
> + BTF_STR_SEC("\0_Float16\0float\0double\0long_double\0floats"),
> + .map_type = BPF_MAP_TYPE_ARRAY,
> + .map_name = "float_type_check_btf",
> + .key_size = sizeof(int),
> + .value_size = 32,
> + .key_type_id = 1,
> + .value_type_id = 6,
> + .max_entries = 1,
> +},
> +{
> + .descr = "float test #2, invalid vlen",
> + .raw_types = {
> + BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
> + BTF_TYPE_ENC(1, BTF_INFO_ENC(BTF_KIND_FLOAT, 0, 1), 4),
> + /* [2] */
> + BTF_END_RAW,
> + },
> + BTF_STR_SEC("\0float"),
> + .map_type = BPF_MAP_TYPE_ARRAY,
> + .map_name = "float_type_check_btf",
> + .key_size = sizeof(int),
> + .value_size = 4,
> + .key_type_id = 1,
> + .value_type_id = 2,
> + .max_entries = 1,
> + .btf_load_err = true,
> + .err_str = "vlen != 0",
> +},
> +{
> + .descr = "float test #3, invalid kind_flag",
> + .raw_types = {
> + BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
> + BTF_TYPE_ENC(1, BTF_INFO_ENC(BTF_KIND_FLOAT, 1, 0), 4),
> + /* [2] */
> + BTF_END_RAW,
> + },
> + BTF_STR_SEC("\0float"),
> + .map_type = BPF_MAP_TYPE_ARRAY,
> + .map_name = "float_type_check_btf",
> + .key_size = sizeof(int),
> + .value_size = 4,
> + .key_type_id = 1,
> + .value_type_id = 2,
> + .max_entries = 1,
> + .btf_load_err = true,
> + .err_str = "Invalid btf_info kind_flag",
> +},
> +{
> + .descr = "float test #4, member does not fit",
> + .raw_types = {
> + BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
> + BTF_TYPE_FLOAT_ENC(1, 4), /* [2] */
> + BTF_STRUCT_ENC(7, 1, 2), /* [3] */
> + BTF_MEMBER_ENC(NAME_TBD, 2, 0),
> + BTF_END_RAW,
> + },
> + BTF_STR_SEC("\0float\0floats"),
> + .map_type = BPF_MAP_TYPE_ARRAY,
> + .map_name = "float_type_check_btf",
> + .key_size = sizeof(int),
> + .value_size = 4,
> + .key_type_id = 1,
> + .value_type_id = 3,
> + .max_entries = 1,
> + .btf_load_err = true,
> + .err_str = "Member exceeds struct_size",
> +},
> +{
> + .descr = "float test #5, member is not properly aligned",
> + .raw_types = {
> + BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
> + BTF_TYPE_FLOAT_ENC(1, 4), /* [2] */
> + BTF_STRUCT_ENC(7, 1, 8), /* [3] */
> + BTF_MEMBER_ENC(NAME_TBD, 2, 8),
> + BTF_END_RAW,
> + },
> + BTF_STR_SEC("\0float\0floats"),
> + .map_type = BPF_MAP_TYPE_ARRAY,
> + .map_name = "float_type_check_btf",
> + .key_size = sizeof(int),
> + .value_size = 4,
> + .key_type_id = 1,
> + .value_type_id = 3,
> + .max_entries = 1,
> + .btf_load_err = true,
> + .err_str = "Member is not properly aligned",
> +},
> +{
> + .descr = "float test #6, invalid size",
> + .raw_types = {
> + BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
> + BTF_TYPE_FLOAT_ENC(1, 6), /* [2] */
> + BTF_END_RAW,
> + },
> + BTF_STR_SEC("\0float"),
> + .map_type = BPF_MAP_TYPE_ARRAY,
> + .map_name = "float_type_check_btf",
> + .key_size = sizeof(int),
> + .value_size = 6,
> + .key_type_id = 1,
> + .value_type_id = 2,
> + .max_entries = 1,
> + .btf_load_err = true,
> + .err_str = "Invalid type_size",
> +},
> +
> }; /* struct btf_raw_test raw_tests[] */
>
> static const char *get_next_str(const char *start, const char *end)
> @@ -6632,6 +6753,7 @@ static int btf_type_size(const struct btf_type *t)
> case BTF_KIND_FUNC:
> return base_size;
> case BTF_KIND_INT:
> + case BTF_KIND_FLOAT:
> return base_size + sizeof(__u32);
This is not correct.
> case BTF_KIND_ENUM:
> return base_size + vlen * sizeof(struct btf_enum);
> diff --git a/tools/testing/selftests/bpf/test_btf.h b/tools/testing/selftests/bpf/test_btf.h
> index 2023725f1962..e2394eea4b7f 100644
> --- a/tools/testing/selftests/bpf/test_btf.h
> +++ b/tools/testing/selftests/bpf/test_btf.h
> @@ -66,4 +66,7 @@
> #define BTF_FUNC_ENC(name, func_proto) \
> BTF_TYPE_ENC(name, BTF_INFO_ENC(BTF_KIND_FUNC, 0, 0), func_proto)
>
> +#define BTF_TYPE_FLOAT_ENC(name, sz) \
> + BTF_TYPE_ENC(name, BTF_INFO_ENC(BTF_KIND_FLOAT, 0, 0), sz)
> +
> #endif /* _TEST_BTF_H */
>
next prev parent reply index
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-19 2:25 [PATCH v2 bpf-next 0/6] Add BTF_KIND_FLOAT support Ilya Leoshkevich
2021-02-19 2:25 ` [PATCH v2 bpf-next 1/6] bpf: Add BTF_KIND_FLOAT to uapi Ilya Leoshkevich
2021-02-19 2:25 ` [PATCH v2 bpf-next 2/6] libbpf: Add BTF_KIND_FLOAT support Ilya Leoshkevich
2021-02-19 4:22 ` Yonghong Song
2021-02-19 23:01 ` Ilya Leoshkevich
2021-02-19 23:35 ` Yonghong Song
2021-02-19 23:43 ` Ilya Leoshkevich
2021-02-19 2:25 ` [PATCH v2 bpf-next 3/6] tools/bpftool: " Ilya Leoshkevich
2021-02-19 2:25 ` [PATCH v2 bpf-next 4/6] bpf: " Ilya Leoshkevich
2021-02-19 4:04 ` kernel test robot
2021-02-19 4:13 ` kernel test robot
2021-02-19 2:25 ` [PATCH v2 bpf-next 5/6] selftest/bpf: Add BTF_KIND_FLOAT tests Ilya Leoshkevich
2021-02-19 5:38 ` Yonghong Song [this message]
2021-02-19 5:44 ` Yonghong Song
2021-02-19 2:25 ` [PATCH v2 bpf-next 6/6] bpf: Document BTF_KIND_FLOAT in btf.rst Ilya Leoshkevich
2021-02-19 5:41 ` Yonghong Song
2021-02-19 13:00 ` Ilya Leoshkevich
2021-02-19 15:26 ` Yonghong Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ccf4174e-f574-59f5-1edc-8ab8306dc269@fb.com \
--to=yhs@fb.com \
--cc=acme@redhat.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=gor@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=iii@linux.ibm.com \
--cc=john.fastabend@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
BPF Archive on lore.kernel.org
Archives are clonable:
git clone --mirror https://lore.kernel.org/bpf/0 bpf/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 bpf bpf/ https://lore.kernel.org/bpf \
bpf@vger.kernel.org
public-inbox-index bpf
Example config snippet for mirrors
Newsgroup available over NNTP:
nntp://nntp.lore.kernel.org/org.kernel.vger.bpf
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git