From patchwork Wed Jul 1 06:45:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 1320274 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=fb.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=fb.com header.i=@fb.com header.a=rsa-sha256 header.s=facebook header.b=E0npFcxz; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49xWvW52cNz9s1x for ; Wed, 1 Jul 2020 16:45:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727884AbgGAGpn (ORCPT ); Wed, 1 Jul 2020 02:45:43 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:1564 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727867AbgGAGpm (ORCPT ); Wed, 1 Jul 2020 02:45:42 -0400 Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0616eZFh007317 for ; Tue, 30 Jun 2020 23:45:42 -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=vAHBLGpOVUwOQXdD0cEV6M/wKY+RusFgBv1vVqg4USk=; b=E0npFcxz8oxkzEVstWEQafiLi376BMl3LsvcTjNxxLFNWcYHkFKlI9lcozpeI4we3K/3 O4FtTOvkHW25PcSUSaQPnLePhPJ6jGYqzol6ZuzEoOypgiM/Df5QSZPpTkgkqZhxSAC6 L6zbf3eFV21lMztCN73Op4nTqmy3rAq7olg= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 320bcdta19-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 30 Jun 2020 23:45:41 -0700 Received: from intmgw001.03.ash8.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 30 Jun 2020 23:45:40 -0700 Received: by devbig012.ftw2.facebook.com (Postfix, from userid 137359) id 865992EC3A2B; Tue, 30 Jun 2020 23:45:35 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Andrii Nakryiko Smtp-Origin-Hostname: devbig012.ftw2.facebook.com To: , , , CC: , , Andrii Nakryiko , Anton Protopopov Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH bpf-next 2/3] selftests/bpf: add selftest validating btf_dump's mod-stripping output Date: Tue, 30 Jun 2020 23:45:25 -0700 Message-ID: <20200701064527.3158178-4-andriin@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200701064527.3158178-1-andriin@fb.com> References: <20200701064527.3158178-1-andriin@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-07-01_03:2020-07-01,2020-07-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 lowpriorityscore=0 malwarescore=0 bulkscore=0 mlxlogscore=565 impostorscore=0 adultscore=0 cotscore=-2147483648 spamscore=0 suspectscore=9 phishscore=0 clxscore=1015 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2007010047 X-FB-Internal: deliver Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Add selftest validating that .strip_mods=true mode works correctly. Signed-off-by: Andrii Nakryiko --- .../selftests/bpf/prog_tests/btf_dump.c | 5 +- .../bpf/progs/btf_dump_test_case_strip_mods.c | 50 +++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_strip_mods.c diff --git a/tools/testing/selftests/bpf/prog_tests/btf_dump.c b/tools/testing/selftests/bpf/prog_tests/btf_dump.c index cb33a7ee4e04..112b653b9c80 100644 --- a/tools/testing/selftests/bpf/prog_tests/btf_dump.c +++ b/tools/testing/selftests/bpf/prog_tests/btf_dump.c @@ -21,6 +21,8 @@ static struct btf_dump_test_case { {"btf_dump: bitfields", "btf_dump_test_case_bitfields", {}}, {"btf_dump: multidim", "btf_dump_test_case_multidim", {}}, {"btf_dump: namespacing", "btf_dump_test_case_namespacing", {}}, + {"btf_dump: strip mods", "btf_dump_test_case_strip_mods", + { .strip_mods = true }}, }; static int btf_dump_all_types(const struct btf *btf, @@ -125,6 +127,7 @@ void test_btf_dump() { if (!test__start_subtest(t->name)) continue; - test_btf_dump_case(i, &btf_dump_test_cases[i]); + t->opts.sz = sizeof(t->opts); + test_btf_dump_case(i, t); } } diff --git a/tools/testing/selftests/bpf/progs/btf_dump_test_case_strip_mods.c b/tools/testing/selftests/bpf/progs/btf_dump_test_case_strip_mods.c new file mode 100644 index 000000000000..1a6ba26d5d75 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/btf_dump_test_case_strip_mods.c @@ -0,0 +1,50 @@ +// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) +/* Copyright (c) 2020 Facebook */ + +struct s { + const int a; + volatile int * const b; + const volatile struct { + int * const volatile c1; + const int (* const c2)(volatile int x, const void * const y); + const volatile int c3[10]; + } c; + const union { + const int * restrict d1; + const volatile int * const volatile restrict d2; + } d[2]; + const struct { + const volatile int *e1[5]; + } e; + const volatile int * const * volatile * restrict *f; + const void * volatile * (*g)(const int x, const void * restrict y); +}; + +/* ----- START-EXPECTED-OUTPUT ----- */ +/* + *struct s { + * int a; + * int *b; + * struct { + * int *c1; + * int (*c2)(int, void *); + * int c3[10]; + * } c; + * union { + * int *d1; + * int *d2; + * } d[2]; + * struct { + * int *e1[5]; + * } e; + * int ****f; + * void ** (*g)(int, void *); + *}; + * + */ +/* ------ END-EXPECTED-OUTPUT ------ */ + +int f(struct s *s) +{ + return 0; +}