Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Song Liu <songliubraving@fb.com>
To:     Arnaldo Carvalho de Melo <acme@redhat.com>
CC:     Jiri Olsa <jolsa@kernel.org>, Netdev <netdev@vger.kernel.org>,
        linux-kernel <linux-kernel@vger.kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        "daniel@iogearbox.net" <daniel@iogearbox.net>,
        Kernel Team <Kernel-team@fb.com>,
        "peterz@infradead.org" <peterz@infradead.org>,
        "namhyung@kernel.org" <namhyung@kernel.org>,
        "acme@kernel.org" <acme@kernel.org>
Subject: Re: [PATCH v2 perf,bpf 08/11] perf, bpf: save btf information as
 headers to perf.data
Thread-Topic: [PATCH v2 perf,bpf 08/11] perf, bpf: save btf information as
 headers to perf.data
Thread-Index: AQHUxMGQlShe9E029kWf9/H0QeuOj6Xg626AgAAx0AA=
Date:   Fri, 15 Feb 2019 17:25:01 +0000
Message-ID: <164D19ED-EA72-4A56-8259-FCF13894B183@fb.com>
References: <20190214235624.2579307-1-songliubraving@fb.com>
 <20190215000010.2590505-1-songliubraving@fb.com>
 <20190215000010.2590505-7-songliubraving@fb.com>
 <20190215142643.GC5784@redhat.com>
In-Reply-To: <20190215142643.GC5784@redhat.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: fb.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-ID: <D55CEC35F3438C4B8AFD17F1746CCC19@namprd15.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 53698d56-c5b3-4e2e-79e0-08d6936a8470
X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Feb 2019 17:25:01.5792
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR15MB1390
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-02-15_13:,,
 signatures=0
X-Proofpoint-Spam-Reason: safe
X-FB-Internal: Safe
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On Feb 15, 2019, at 6:26 AM, Arnaldo Carvalho de Melo <acme@redhat.com> w=
rote:
>=20
> Em Thu, Feb 14, 2019 at 04:00:09PM -0800, Song Liu escreveu:
>> This patch enables perf-record to save btf information as headers to
>> perf.data A new header type HEADER_BTF is introduced for this data.
>=20
> Jiri,
>=20
> 	Wouldn't it be better for this HEADER_BTF to be introduced
> already as an user space event, Song, see:
>=20
>  tools/perf/util/event.h
>=20
> and:
>=20
>  tools/perf/util/event.c
>=20
> perf_event__synthesize_cpu_map()
>=20
> - Arnaldo
>=20

BTF would be short living for short living BPF programs. I guess=20
saving them as header is easier than merging them with samples.=20

What's the benefit of saving them as user space events?

Thanks,
Song


>=20
>> Signed-off-by: Song Liu <songliubraving@fb.com>
>> ---
>> tools/perf/util/header.c | 99 +++++++++++++++++++++++++++++++++++++++-
>> tools/perf/util/header.h |  1 +
>> 2 files changed, 99 insertions(+), 1 deletion(-)
>>=20
>> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
>> index 2ae76a9d06f6..3f1562afe8e5 100644
>> --- a/tools/perf/util/header.c
>> +++ b/tools/perf/util/header.c
>> @@ -1125,6 +1125,45 @@ static int write_bpf_prog_info(struct feat_fd *ff=
,
>> 	return ret;
>> }
>>=20
>> +static int write_btf(struct feat_fd *ff,
>> +		     struct perf_evlist *evlist __maybe_unused)
>> +{
>> +	struct perf_env *env =3D &ff->ph->env;
>> +	struct rb_root *root;
>> +	struct rb_node *next;
>> +	u32 count =3D 0;
>> +	int ret;
>> +
>> +	down_read(&env->bpf_info_lock);
>> +
>> +	root =3D &env->btfs;
>> +	next =3D rb_first(root);
>> +	while (next) {
>> +		++count;
>> +		next =3D rb_next(next);
>> +	}
>> +
>> +	ret =3D do_write(ff, &count, sizeof(count));
>> +
>> +	if (ret < 0)
>> +		goto out;
>> +
>> +	next =3D rb_first(root);
>> +	while (next) {
>> +		struct btf_node *node;
>> +
>> +		node =3D rb_entry(next, struct btf_node, rb_node);
>> +		next =3D rb_next(&node->rb_node);
>> +		ret =3D do_write(ff, node,
>> +			       sizeof(struct btf_node) + node->data_size);
>> +		if (ret < 0)
>> +			goto out;
>> +	}
>> +out:
>> +	up_read(&env->bpf_info_lock);
>> +	return ret;
>> +}
>> +
>> static int cpu_cache_level__sort(const void *a, const void *b)
>> {
>> 	struct cpu_cache_level *cache_a =3D (struct cpu_cache_level *)a;
>> @@ -1628,6 +1667,28 @@ static void print_bpf_prog_info(struct feat_fd *f=
f, FILE *fp)
>> 	up_read(&env->bpf_info_lock);
>> }
>>=20
>> +static void print_btf(struct feat_fd *ff, FILE *fp)
>> +{
>> +	struct perf_env *env =3D &ff->ph->env;
>> +	struct rb_root *root;
>> +	struct rb_node *next;
>> +
>> +	down_read(&env->bpf_info_lock);
>> +
>> +	root =3D &env->btfs;
>> +	next =3D rb_first(root);
>> +
>> +	while (next) {
>> +		struct btf_node *node;
>> +
>> +		node =3D rb_entry(next, struct btf_node, rb_node);
>> +		next =3D rb_next(&node->rb_node);
>> +		fprintf(fp, "# bpf_prog_info of id %u\n", node->id);
>> +	}
>> +
>> +	up_read(&env->bpf_info_lock);
>> +}
>> +
>> static void free_event_desc(struct perf_evsel *events)
>> {
>> 	struct perf_evsel *evsel;
>> @@ -2723,6 +2784,41 @@ static int process_bpf_prog_info(struct feat_fd *=
ff,
>> 	return err;
>> }
>>=20
>> +static int process_btf(struct feat_fd *ff, void *data __maybe_unused)
>> +{
>> +	struct perf_env *env =3D &ff->ph->env;
>> +	u32 count, i;
>> +
>> +	if (do_read_u32(ff, &count))
>> +		return -1;
>> +
>> +	down_write(&env->bpf_info_lock);
>> +
>> +	for (i =3D 0; i < count; ++i) {
>> +		struct btf_node btf_node;
>> +		struct btf_node *node;
>> +
>> +		if (__do_read(ff, &btf_node, sizeof(struct btf_node)))
>> +			return -1;
>> +
>> +		node =3D malloc(sizeof(struct btf_node) + btf_node.data_size);
>> +		if (!node)
>> +			return -1;
>> +
>> +		node->id =3D btf_node.id;
>> +		node->data_size =3D btf_node.data_size;
>> +
>> +		if (__do_read(ff, node->data, btf_node.data_size)) {
>> +			free(node);
>> +			return -1;
>> +		}
>> +		perf_env__insert_btf(env, node);
>> +	}
>> +
>> +	up_write(&env->bpf_info_lock);
>> +	return 0;
>> +}
>> +
>> struct feature_ops {
>> 	int (*write)(struct feat_fd *ff, struct perf_evlist *evlist);
>> 	void (*print)(struct feat_fd *ff, FILE *fp);
>> @@ -2783,7 +2879,8 @@ static const struct feature_ops feat_ops[HEADER_LA=
ST_FEATURE] =3D {
>> 	FEAT_OPR(SAMPLE_TIME,	sample_time,	false),
>> 	FEAT_OPR(MEM_TOPOLOGY,	mem_topology,	true),
>> 	FEAT_OPR(CLOCKID,       clockid,        false),
>> -	FEAT_OPR(BPF_PROG_INFO, bpf_prog_info,  false)
>> +	FEAT_OPR(BPF_PROG_INFO, bpf_prog_info,  false),
>> +	FEAT_OPR(BTF,           btf,            false)
>> };
>>=20
>> struct header_print_data {
>> diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
>> index 0785c91b4c3a..ba51d8e43c53 100644
>> --- a/tools/perf/util/header.h
>> +++ b/tools/perf/util/header.h
>> @@ -40,6 +40,7 @@ enum {
>> 	HEADER_MEM_TOPOLOGY,
>> 	HEADER_CLOCKID,
>> 	HEADER_BPF_PROG_INFO,
>> +	HEADER_BTF,
>> 	HEADER_LAST_FEATURE,
>> 	HEADER_FEAT_BITS	=3D 256,
>> };
>> --=20
>> 2.17.1