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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A634C282CC for ; Tue, 5 Feb 2019 19:49:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D281D2080F for ; Tue, 5 Feb 2019 19:49:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="f6ixlDaZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729893AbfBETtG (ORCPT ); Tue, 5 Feb 2019 14:49:06 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:45964 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729622AbfBETtF (ORCPT ); Tue, 5 Feb 2019 14:49:05 -0500 Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x15JjL7E013879 for ; Tue, 5 Feb 2019 11:49:04 -0800 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-type; s=facebook; bh=c1JmVHcX4Vqe1QdG3thCZwrlrSojthCJb7TfEABaqQ8=; b=f6ixlDaZxJ9+T4ww1jf8OI0ZzmUInZXQUwFRDe2+6I3qmGeLmGF5CYQ9sZHhDaPR+5E9 o1N4TmpI/s71vpr4ETczSudfckAbdOf83kEXsY/wKylVxGDBwqV4aTaPOVGV6yomejen RWQpa0wrvG5/Gp1P9VEIrtghG9q2JUUP/uk= Received: from maileast.thefacebook.com ([199.201.65.23]) by mx0a-00082601.pphosted.com with ESMTP id 2qffnjrbka-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 05 Feb 2019 11:49:04 -0800 Received: from mx-out.facebook.com (2620:10d:c0a1:3::13) by mail.thefacebook.com (2620:10d:c021:18::174) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.1.1531.3; Tue, 5 Feb 2019 11:48:59 -0800 Received: by devvm7221.prn2.facebook.com (Postfix, from userid 137359) id BE9A8A00C218; Tue, 5 Feb 2019 11:48:58 -0800 (PST) Smtp-Origin-Hostprefix: devvm From: Andrii Nakryiko Smtp-Origin-Hostname: devvm7221.prn2.facebook.com To: , , , , , , CC: Andrii Nakryiko Smtp-Origin-Cluster: prn2c23 Subject: [PATCH bpf-next 2/2] btf: expose API to work with raw btf data Date: Tue, 5 Feb 2019 11:48:56 -0800 Message-ID: <20190205194856.967463-3-andriin@fb.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190205194856.967463-1-andriin@fb.com> References: <20190205194856.967463-1-andriin@fb.com> X-FB-Internal: Safe MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-02-05_08:,, signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch exposes two new APIs btf__get_raw_data_size() and btf__get_raw_data() that allows to get a copy of raw BTF data out of struct btf. This is useful for external programs that need to manipulate raw data, e.g., pahole using btf__dedup() to deduplicate BTF type info and then writing it back to file. Signed-off-by: Andrii Nakryiko Acked-by: Song Liu --- tools/lib/bpf/btf.c | 10 ++++++++++ tools/lib/bpf/btf.h | 2 ++ tools/lib/bpf/libbpf.map | 2 ++ 3 files changed, 14 insertions(+) diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index 065d51fa63e5..6491d440c9a7 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -437,6 +437,16 @@ int btf__fd(const struct btf *btf) return btf->fd; } +__u32 btf__get_raw_data_size(const struct btf *btf) +{ + return btf->data_size; +} + +void btf__get_raw_data(const struct btf *btf, char *data) +{ + memcpy(data, btf->data, btf->data_size); +} + void btf__get_strings(const struct btf *btf, const char **strings, __u32 *str_len) { diff --git a/tools/lib/bpf/btf.h b/tools/lib/bpf/btf.h index e8410887f93a..d46f680b9416 100644 --- a/tools/lib/bpf/btf.h +++ b/tools/lib/bpf/btf.h @@ -66,6 +66,8 @@ LIBBPF_API const struct btf_type *btf__type_by_id(const struct btf *btf, LIBBPF_API __s64 btf__resolve_size(const struct btf *btf, __u32 type_id); LIBBPF_API int btf__resolve_type(const struct btf *btf, __u32 type_id); LIBBPF_API int btf__fd(const struct btf *btf); +LIBBPF_API __u32 btf__get_raw_data_size(const struct btf *btf); +LIBBPF_API void btf__get_raw_data(const struct btf *btf, char *data); LIBBPF_API void btf__get_strings(const struct btf *btf, const char **strings, __u32 *str_len); LIBBPF_API const char *btf__name_by_offset(const struct btf *btf, __u32 offset); diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index ffa1fe044f6a..873a26cd714d 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -137,6 +137,8 @@ LIBBPF_0.0.2 { btf__load; btf__get_map_kv_tids; btf__get_nr_types; + btf__get_raw_data; + btf__get_raw_data_size; btf__get_strings; btf_ext__free; btf_ext__func_info_rec_size; -- 2.17.1