From patchwork Sat Aug 29 04:21:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 52839 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id 63FF820503 for ; Sat, 29 Aug 2015 04:28:35 +0000 (UTC) Received: by wibvo5 with SMTP id vo5sf8819007wib.0 for ; Fri, 28 Aug 2015 21:28:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=pP6Wt3ScGQpIDNdmj7cwxyKXPVvwv/uQCYiIYF7tm1k=; b=UgT9ikQ38POpMnQEF9HX8H68FXPHplj3R3fW+gb2ORvww8UWDctkBtq3aSEaWaR24O F2x2egWjVg+kw2Yse9vuXQUVAlQh0zW1V1DX6ZufqIquQ8ehYhbiHOqufAF8IrCBCQFN zrfesT+Gg1+giKAUVisW200H2vd+fSEEsu8eziAyLEGjxw96v+tu/1N+sLPi+SwSabPJ uR/1vuAcDfPuHgGCRq12Z/xMOuYQOH/gvQu0BwH7w5E/uefptVjyPpeK7T4lAjGNKhrj MrWSzld09jNhcdpP7BRmnkTBlb2xbN9TH+9gt3nCqIuqRnCm8elRMKGgrD6BjgCvT1Q4 S7hA== X-Gm-Message-State: ALoCoQmII0eclTtiqNU/TOgqTJ5XFmbd43RA91jQROqw9r35fu8CQKQC9jTGmQPtufu1Xzi/JEfn X-Received: by 10.112.189.105 with SMTP id gh9mr3576245lbc.16.1440822514716; Fri, 28 Aug 2015 21:28:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.4.1 with SMTP id g1ls243855lag.46.gmail; Fri, 28 Aug 2015 21:28:34 -0700 (PDT) X-Received: by 10.152.170.130 with SMTP id am2mr6193088lac.54.1440822514548; Fri, 28 Aug 2015 21:28:34 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id o1si7685765lbc.8.2015.08.28.21.28.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Aug 2015 21:28:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by laboe4 with SMTP id oe4so17440092lab.0 for ; Fri, 28 Aug 2015 21:28:34 -0700 (PDT) X-Received: by 10.112.63.138 with SMTP id g10mr6304349lbs.106.1440822514341; Fri, 28 Aug 2015 21:28:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.151.194 with SMTP id us2csp268844lbb; Fri, 28 Aug 2015 21:28:33 -0700 (PDT) X-Received: by 10.67.6.73 with SMTP id cs9mr1659459pad.130.1440822513285; Fri, 28 Aug 2015 21:28:33 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g3si13366603pdd.135.2015.08.28.21.28.32; Fri, 28 Aug 2015 21:28:33 -0700 (PDT) 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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753341AbbH2E2a (ORCPT + 28 others); Sat, 29 Aug 2015 00:28:30 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:6353 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752596AbbH2EX6 (ORCPT ); Sat, 29 Aug 2015 00:23:58 -0400 Received: from 172.24.1.50 (EHLO szxeml431-hub.china.huawei.com) ([172.24.1.50]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CRK01368; Sat, 29 Aug 2015 12:23:09 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.235.1; Sat, 29 Aug 2015 12:23:00 +0800 From: Wang Nan To: , , CC: , , , Wang Nan , Brendan Gregg , Daniel Borkmann , David Ahern , "He Kuang" , Jiri Olsa , Kaixu Xia , Masami Hiramatsu , Namhyung Kim , Paul Mackerras , Peter Zijlstra Subject: [PATCH 09/31] perf bpf: Collect 'struct perf_probe_event' for bpf_program Date: Sat, 29 Aug 2015 04:21:43 +0000 Message-ID: <1440822125-52691-10-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1440822125-52691-1-git-send-email-wangnan0@huawei.com> References: <1440822125-52691-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangnan0@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch utilizes bpf_program__set_private(), binding perf_probe_event with bpf program by private field. Saving those information so 'perf record' knows which kprobe point a program should be attached. Since data in 'struct perf_probe_event' is build by 2 stages, tev_ready is used to mark whether the information (especially tevs) in 'struct perf_probe_event' is valid or not. It is false at first, and set to true by sync_bpf_program_pev(), which copy all pointers in original pev into a program specific memory region. sync_bpf_program_pev() is called after add_perf_probe_events() to make sure ready of data. Remove code which clean 'struct perf_probe_event' after bpf__probe() because pointers in pevs are copied to program's private field, calling clear_perf_probe_event() becomes unsafe. Signed-off-by: Wang Nan Cc: Arnaldo Carvalho de Melo Cc: Alexei Starovoitov Cc: Brendan Gregg Cc: Daniel Borkmann Cc: David Ahern Cc: He Kuang Cc: Jiri Olsa Cc: Kaixu Xia Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/n/1436445342-1402-21-git-send-email-wangnan0@huawei.com [Splitted from a larger patch] --- tools/perf/util/bpf-loader.c | 90 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c index 435f52e..ae23f6f 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -30,9 +30,35 @@ DEFINE_PRINT_FN(debug, 1) static bool libbpf_initialized; +struct bpf_prog_priv { + /* + * If pev_ready is false, ppev pointes to a local memory which + * is only valid inside bpf__probe(). + * pev is valid only when pev_ready. + */ + bool pev_ready; + union { + struct perf_probe_event *ppev; + struct perf_probe_event pev; + }; +}; + +static void +bpf_prog_priv__clear(struct bpf_program *prog __maybe_unused, + void *_priv) +{ + struct bpf_prog_priv *priv = _priv; + + /* check if pev is initialized */ + if (priv && priv->pev_ready) + clear_perf_probe_event(&priv->pev); + free(priv); +} + static int config_bpf_program(struct bpf_program *prog, struct perf_probe_event *pev) { + struct bpf_prog_priv *priv = NULL; const char *config_str; int err; @@ -74,14 +100,58 @@ config_bpf_program(struct bpf_program *prog, struct perf_probe_event *pev) pr_debug("bpf: config '%s' is ok\n", config_str); + priv = calloc(1, sizeof(*priv)); + if (!priv) { + pr_debug("bpf: failed to alloc memory\n"); + err = -ENOMEM; + goto errout; + } + + /* + * At this very early stage, tevs inside pev are not ready. + * It becomes usable after add_perf_probe_events() is called. + * set pev_ready to false so further access read priv->ppev + * only. + */ + priv->pev_ready = false; + priv->ppev = pev; + + err = bpf_program__set_private(prog, priv, + bpf_prog_priv__clear); + if (err) { + pr_debug("bpf: set program private failed\n"); + err = -ENOMEM; + goto errout; + } return 0; errout: if (pev) clear_perf_probe_event(pev); + if (priv) + free(priv); return err; } +static int +sync_bpf_program_pev(struct bpf_program *prog) +{ + int err; + struct bpf_prog_priv *priv; + struct perf_probe_event *ppev; + + err = bpf_program__get_private(prog, (void **)&priv); + if (err || !priv || priv->pev_ready) { + pr_debug("Internal error: sync_bpf_program_pev\n"); + return -EINVAL; + } + + ppev = priv->ppev; + memcpy(&priv->pev, ppev, sizeof(*ppev)); + priv->pev_ready = true; + return 0; +} + int bpf__prepare_load(const char *filename) { struct bpf_object *obj; @@ -172,11 +242,27 @@ int bpf__probe(void) /* add_perf_probe_events return negative when fail */ if (err < 0) { pr_debug("bpf probe: failed to probe events\n"); + goto out; } else is_probed = true; + + /* + * After add_perf_probe_events, 'struct perf_probe_event' is ready. + * Until now copying program's priv->pev field and freeing + * the big array allocated before become safe. + */ + bpf_object__for_each_safe(obj, tmp) { + bpf_object__for_each_program(prog, obj) { + err = sync_bpf_program_pev(prog); + if (err) + goto out; + } + } out: - while (nr_events > 0) - clear_perf_probe_event(&pevs[--nr_events]); + /* + * Don't call clear_perf_probe_event() for entries of pevs: + * they are used by prog's private field. + */ free(pevs); return err < 0 ? err : 0; }