From patchwork Wed Feb 26 13:03:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiri Olsa X-Patchwork-Id: 1245028 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=fail (p=none dis=none) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48SGG63zK5z9sPK for ; Thu, 27 Feb 2020 00:03:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726917AbgBZND5 convert rfc822-to-8bit (ORCPT ); Wed, 26 Feb 2020 08:03:57 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:47283 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726700AbgBZND5 (ORCPT ); Wed, 26 Feb 2020 08:03:57 -0500 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-35-Ybz6d5PlP-mlRj41it5Mow-1; Wed, 26 Feb 2020 08:03:52 -0500 X-MC-Unique: Ybz6d5PlP-mlRj41it5Mow-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8E1F190B2A0; Wed, 26 Feb 2020 13:03:49 +0000 (UTC) Received: from krava.redhat.com (unknown [10.43.17.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id A985619C7F; Wed, 26 Feb 2020 13:03:46 +0000 (UTC) From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, Andrii Nakryiko , Yonghong Song , Song Liu , Martin KaFai Lau , Jakub Kicinski , David Miller , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , John Fastabend , Jesper Dangaard Brouer , Arnaldo Carvalho de Melo Subject: [PATCHv3 00/18] bpf: Add trampoline and dispatcher to /proc/kallsyms Date: Wed, 26 Feb 2020 14:03:27 +0100 Message-Id: <20200226130345.209469-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 adds trampoline and dispatcher objects to be visible in /proc/kallsyms. The last patch also adds sorting for all bpf objects in /proc/kallsyms. $ sudo cat /proc/kallsyms | tail -20 ... ffffffffa050f000 t bpf_prog_5a2b06eab81b8f51 [bpf] ffffffffa0511000 t bpf_prog_6deef7357e7b4530 [bpf] ffffffffa0542000 t bpf_trampoline_13832 [bpf] ffffffffa0548000 t bpf_prog_96f1b5bf4e4cc6dc_mutex_lock [bpf] ffffffffa0572000 t bpf_prog_d1c63e29ad82c4ab_bpf_prog1 [bpf] ffffffffa0585000 t bpf_prog_e314084d332a5338__dissect [bpf] ffffffffa0587000 t bpf_prog_59785a79eac7e5d2_mutex_unlock [bpf] ffffffffa0589000 t bpf_prog_d0db6e0cac050163_mutex_lock [bpf] ffffffffa058d000 t bpf_prog_d8f047721e4d8321_bpf_prog2 [bpf] ffffffffa05df000 t bpf_trampoline_25637 [bpf] ffffffffa05e3000 t bpf_prog_d8f047721e4d8321_bpf_prog2 [bpf] ffffffffa05e5000 t bpf_prog_3b185187f1855c4c [bpf] ffffffffa05e7000 t bpf_prog_d8f047721e4d8321_bpf_prog2 [bpf] ffffffffa05eb000 t bpf_prog_93cebb259dd5c4b2_do_sys_open [bpf] ffffffffa0677000 t bpf_dispatcher_xdp [bpf] v3 changes: - use container_of directly in bpf_get_ksym_start [Daniel] - add more changelog explanations for ksym addresses [Daniel] v2 changes: - omit extra condition in __bpf_ksym_add for sorting code (Andrii) - rename bpf_kallsyms_tree_ops to bpf_ksym_tree (Andrii) - expose only executable code in kallsyms (Andrii) - use full trampoline key as its kallsyms id (Andrii) - explained the BPF_TRAMP_REPLACE case (Andrii) - small format changes in bpf_trampoline_link_prog/bpf_trampoline_unlink_prog (Andrii) - propagate error value in bpf_dispatcher_update and update kallsym if it's successful (Andrii) - get rid of __always_inline for bpf_ksym_tree callbacks (Andrii) - added KSYMBOL notification for bpf_image add/removal - added perf tools changes to properly display trampoline/dispatcher For perf tool to properly display trampoline/dispatcher you need also Arnaldo's perf/urgent branch changes. I merged everything into following branch: git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git bpf/kallsyms thanks, jirka --- Björn Töpel (1): bpf: Add bpf_trampoline_ name prefix for DECLARE_BPF_DISPATCHER Jiri Olsa (17): x86/mm: Rename is_kernel_text to __is_kernel_text bpf: Add struct bpf_ksym bpf: Add name to struct bpf_ksym bpf: Add lnode list node to struct bpf_ksym bpf: Add bpf_ksym_tree tree bpf: Move bpf_tree add/del from bpf_prog_ksym_node_add/del bpf: Separate kallsyms add/del functions bpf: Add bpf_ksym_add/del functions bpf: Re-initialize lnode in bpf_ksym_del bpf: Rename bpf_tree to bpf_progs_tree bpf: Add trampolines to kallsyms bpf: Return error value in bpf_dispatcher_update bpf: Add dispatchers to kallsyms bpf: Sort bpf kallsyms symbols perf tools: Synthesize bpf_trampoline/dispatcher ksymbol event perf tools: Set ksymbol dso as loaded on arrival perf annotate: Add base support for bpf_image arch/x86/mm/init_32.c | 14 +++++++++----- include/linux/bpf.h | 55 ++++++++++++++++++++++++++++++++++++++----------------- include/linux/filter.h | 13 +++---------- kernel/bpf/core.c | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------- kernel/bpf/dispatcher.c | 19 ++++++++++++++----- kernel/bpf/trampoline.c | 38 +++++++++++++++++++++++++++++++++++++- kernel/events/core.c | 9 ++++----- net/core/filter.c | 5 ++--- tools/perf/util/annotate.c | 20 ++++++++++++++++++++ tools/perf/util/bpf-event.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/dso.c | 1 + tools/perf/util/dso.h | 1 + tools/perf/util/machine.c | 12 ++++++++++++ tools/perf/util/symbol.c | 1 + 14 files changed, 371 insertions(+), 91 deletions(-)