From patchwork Wed Jan 15 23:00:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin KaFai Lau X-Patchwork-Id: 1223934 Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none 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=VebRCj4q; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47yjTc6J1cz9sR8 for ; Thu, 16 Jan 2020 10:00:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730988AbgAOXAU (ORCPT ); Wed, 15 Jan 2020 18:00:20 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:9888 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729714AbgAOXAU (ORCPT ); Wed, 15 Jan 2020 18:00:20 -0500 Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 00FMrV68017545 for ; Wed, 15 Jan 2020 15:00:19 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=facebook; bh=lZeZ+9S5D5ij5e8g/kjcmYul2QOI8FpbXGXVWn9iJ9Y=; b=VebRCj4qxCPpSr0wFW/jAs4iHascF5JuPudn9zyi2sMk8fxPybaTkfQWyLi1+kcG8Zov 1x873i/FycFDIqyfwU7H4bbfii1tIGOfEhjZ3sq0NO1hFOJhaBGxrfVLKHSQ2ooHuBCc OWvR+kFwONAc/PvZAxlJ3RM1i6cgBkJFows= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 2xhahps7m0-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 15 Jan 2020 15:00:19 -0800 Received: from intmgw005.03.ash8.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 15 Jan 2020 15:00:18 -0800 Received: by devbig005.ftw2.facebook.com (Postfix, from userid 6611) id F2B462941680; Wed, 15 Jan 2020 15:00:12 -0800 (PST) Smtp-Origin-Hostprefix: devbig From: Martin KaFai Lau Smtp-Origin-Hostname: devbig005.ftw2.facebook.com To: CC: Alexei Starovoitov , Daniel Borkmann , David Miller , , Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH v3 bpf-next 0/5] bpftool: Support dumping a map with btf_vmlinux_value_type_id Date: Wed, 15 Jan 2020 15:00:12 -0800 Message-ID: <20200115230012.1100525-1-kafai@fb.com> X-Mailer: git-send-email 2.17.1 X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-01-15_03:2020-01-15,2020-01-15 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 priorityscore=1501 bulkscore=0 mlxscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 mlxlogscore=508 malwarescore=0 suspectscore=13 spamscore=0 adultscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-2001150172 X-FB-Internal: deliver Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org When a map is storing a kernel's struct, its map_info->btf_vmlinux_value_type_id is set. The first map type supporting it is BPF_MAP_TYPE_STRUCT_OPS. This series adds support to dump this kind of map with BTF. The first two patches are bug fixes which are only applicable to bpf-next. Please see individual patches for details. v3: - Remove unnecessary #include "libbpf_internal.h" from patch 5 v2: - Expose bpf_find_kernel_btf() as a LIBBPF_API in patch 3 (Andrii) - Cache btf_vmlinux in bpftool/map.c (Andrii) Martin KaFai Lau (5): bpftool: Fix a leak of btf object bpftool: Fix missing BTF output for json during map dump libbpf: Expose bpf_find_kernel_btf as a LIBBPF_API bpftool: Add struct_ops map name bpftool: Support dumping a map with btf_vmlinux_value_type_id tools/bpf/bpftool/map.c | 102 ++++++++++++++++++++++++--------------- tools/lib/bpf/btf.c | 102 ++++++++++++++++++++++++++++++++++++--- tools/lib/bpf/btf.h | 2 + tools/lib/bpf/libbpf.c | 93 ++--------------------------------- tools/lib/bpf/libbpf.map | 1 + 5 files changed, 166 insertions(+), 134 deletions(-)