From patchwork Fri Jul 10 19:37:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Olsa X-Patchwork-Id: 1327079 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=none dis=none) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B3NcX0kX4z9sRR for ; Sat, 11 Jul 2020 05:38:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728329AbgGJTiD convert rfc822-to-8bit (ORCPT ); Fri, 10 Jul 2020 15:38:03 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:29228 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726867AbgGJTiD (ORCPT ); Fri, 10 Jul 2020 15:38:03 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-323-MWjP_NGwNwSGjV9xeEjMGA-1; Fri, 10 Jul 2020 15:37:58 -0400 X-MC-Unique: MWjP_NGwNwSGjV9xeEjMGA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E66761DE1; Fri, 10 Jul 2020 19:37:56 +0000 (UTC) Received: from krava.redhat.com (unknown [10.40.192.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id 406A31002391; Fri, 10 Jul 2020 19:37:55 +0000 (UTC) From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH v6 bpf-next 0/9] bpf: Add d_path helper - preparation changes Date: Fri, 10 Jul 2020 21:37:45 +0200 Message-Id: <20200710193754.3821104-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kernel.org Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org hi, this patchset does preparation work for adding d_path helper, which still needs more work, but the initial set of patches is ready and useful to have. This patchset adds: - support to generate BTF ID lists that are resolved during kernel linking and usable within kernel code with following macros: BTF_ID_LIST(bpf_skb_output_btf_ids) BTF_ID(struct, sk_buff) and access it in kernel code via: extern u32 bpf_skb_output_btf_ids[]; - resolve_btfids tool that scans elf object for .BTF_ids section and resolves its symbols with BTF ID values - resolving of bpf_ctx_convert struct and several other objects with BTF_ID_LIST v6 changes: - added acks - added general make rule to resolve_btfids Build [Andrii] - renamed .BTF.ids to .BTF_ids [Andrii] - added --no-fail option to resolve_btfids [Andrii] - changed resolve_btfids test to work over BTF from object file, so we don't depend on vmlinux BTF [Andrii] - fixed few typos [Andrii] - fixed the out of tree build [Andrii] Also available at: https://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git bpf/d_path thanks, jirka Acked-by: Andrii Nakryiko Tested-by: Andrii Nakryiko --- Jiri Olsa (9): bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object bpf: Compile resolve_btfids tool at kernel compilation start bpf: Add BTF_ID_LIST/BTF_ID/BTF_ID_UNUSED macros bpf: Resolve BTF IDs in vmlinux image bpf: Remove btf_id helpers resolving bpf: Use BTF_ID to resolve bpf_ctx_convert struct bpf: Add info about .BTF_ids section to btf.rst tools headers: Adopt verbatim copy of btf_ids.h from kernel sources selftests/bpf: Add test for resolve_btfids Documentation/bpf/btf.rst | 36 +++++ Makefile | 25 +++- include/asm-generic/vmlinux.lds.h | 4 + include/linux/btf_ids.h | 87 ++++++++++++ kernel/bpf/btf.c | 103 ++------------ kernel/trace/bpf_trace.c | 9 +- net/core/filter.c | 9 +- scripts/link-vmlinux.sh | 6 + tools/Makefile | 3 + tools/bpf/Makefile | 9 +- tools/bpf/resolve_btfids/Build | 10 ++ tools/bpf/resolve_btfids/Makefile | 77 +++++++++++ tools/bpf/resolve_btfids/main.c | 721 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/include/linux/btf_ids.h | 87 ++++++++++++ tools/include/linux/compiler.h | 4 + tools/testing/selftests/bpf/Makefile | 14 +- tools/testing/selftests/bpf/prog_tests/resolve_btfids.c | 107 ++++++++++++++ tools/testing/selftests/bpf/progs/btf_data.c | 26 ++++ 18 files changed, 1234 insertions(+), 103 deletions(-) create mode 100644 include/linux/btf_ids.h create mode 100644 tools/bpf/resolve_btfids/Build create mode 100644 tools/bpf/resolve_btfids/Makefile create mode 100644 tools/bpf/resolve_btfids/main.c create mode 100644 tools/include/linux/btf_ids.h create mode 100644 tools/testing/selftests/bpf/prog_tests/resolve_btfids.c create mode 100644 tools/testing/selftests/bpf/progs/btf_data.c