From patchwork Tue Dec 6 07:13:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 86693 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1880638qgi; Mon, 5 Dec 2016 23:16:25 -0800 (PST) X-Received: by 10.99.44.84 with SMTP id s81mr109436333pgs.153.1481008585338; Mon, 05 Dec 2016 23:16:25 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s10si18274170pgn.194.2016.12.05.23.16.24; Mon, 05 Dec 2016 23:16:25 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753025AbcLFHQH (ORCPT + 25 others); Tue, 6 Dec 2016 02:16:07 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:46183 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752315AbcLFHOp (ORCPT ); Tue, 6 Dec 2016 02:14:45 -0500 Received: from 172.24.1.137 (EHLO szxeml431-hub.china.huawei.com) ([172.24.1.137]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DRT24860; Tue, 06 Dec 2016 15:14:19 +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; Tue, 6 Dec 2016 15:14:10 +0800 From: Wang Nan To: CC: , , Wang Nan , Arnaldo Carvalho de Melo , "Alexei Starovoitov" , He Kuang , Jiri Olsa , Zefan Li , Subject: [PATCH v4 09/18] perf clang jit: Export functions for jitted code Date: Tue, 6 Dec 2016 07:13:47 +0000 Message-ID: <20161206071356.5312-10-wangnan0@huawei.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161206071356.5312-1-wangnan0@huawei.com> References: <20161206071356.5312-1-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: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After this patch functions attached on perf hooks is allowed to invoke external functions. Add a testcase for this feature. Signed-off-by: Wang Nan Cc: Arnaldo Carvalho de Melo Cc: Alexei Starovoitov Cc: He Kuang Cc: Jiri Olsa Cc: Zefan Li Cc: pi3orama@163.com --- tools/perf/tests/Build | 2 +- tools/perf/tests/bpf-script-example.c | 4 ++++ tools/perf/util/c++/clang-c.h | 2 ++ tools/perf/util/c++/clang-test.cpp | 9 +++++++++ tools/perf/util/c++/clang.cpp | 17 ++++++++++++++++- 5 files changed, 32 insertions(+), 2 deletions(-) -- 2.10.1 diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build index 6676c2d..d6e6e00 100644 --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -49,7 +49,7 @@ $(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c tests/Build $(call rule_mkdir) $(Q)echo '#include ' > $@ $(Q)echo 'const char test_llvm__bpf_base_prog[] =' >> $@ - $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@ + $(Q)sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@ $(Q)echo ';' >> $@ $(OUTPUT)tests/llvm-src-kbuild.c: tests/bpf-script-test-kbuild.c tests/Build diff --git a/tools/perf/tests/bpf-script-example.c b/tools/perf/tests/bpf-script-example.c index 265036e..ccbc19c 100644 --- a/tools/perf/tests/bpf-script-example.c +++ b/tools/perf/tests/bpf-script-example.c @@ -48,9 +48,13 @@ char _license[] SEC("license") = "GPL"; int _version SEC("version") = LINUX_VERSION_CODE; #ifdef TEST_PERF_HOOK +extern int printf(const char *fmt, ...); +extern void test__clang_callback(int x); SEC("perfhook:test") void hook_test(void) { + printf("Hello, hook_test\n"); + test__clang_callback(1234); return; } #endif diff --git a/tools/perf/util/c++/clang-c.h b/tools/perf/util/c++/clang-c.h index 5ebcb41..9f75e41 100644 --- a/tools/perf/util/c++/clang-c.h +++ b/tools/perf/util/c++/clang-c.h @@ -16,6 +16,8 @@ extern int test__clang_to_IR(void); extern int test__clang_to_obj(void); extern int test__clang_jit(void); +extern void test__clang_callback(int x); + extern int perf_clang__compile_bpf(const char *filename, void **p_obj_buf, size_t *p_obj_buf_sz); diff --git a/tools/perf/util/c++/clang-test.cpp b/tools/perf/util/c++/clang-test.cpp index 2b4aa8d..0bdb807 100644 --- a/tools/perf/util/c++/clang-test.cpp +++ b/tools/perf/util/c++/clang-test.cpp @@ -68,6 +68,13 @@ int test__clang_to_obj(void) return 0; } +static int callback_flag; + +void test__clang_callback(int x) +{ + callback_flag = x; +} + int test__clang_jit(void) { perf_clang_scope _scope; @@ -84,6 +91,8 @@ int test__clang_jit(void) perf_hooks__set_hook(i.first.c_str(), i.second, NULL); perf_hooks__invoke_test(); + if (callback_flag != 1234) + return -1; return 0; } diff --git a/tools/perf/util/c++/clang.cpp b/tools/perf/util/c++/clang.cpp index b996ec6..3ce2e0e 100644 --- a/tools/perf/util/c++/clang.cpp +++ b/tools/perf/util/c++/clang.cpp @@ -30,6 +30,8 @@ #include "llvm/Target/TargetOptions.h" #include #include +#include +#include #include "clang.h" #include "clang-c.h" @@ -197,6 +199,15 @@ PerfModule::toBPFObject(void) return std::move(Buffer); } +static std::map exported_funcs = +{ +#define EXPORT(f) {#f, (const void *)&f} + EXPORT(test__clang_callback), + EXPORT(printf), + EXPORT(puts), +#undef EXPORT +}; + /* * Use a global memory manager so allocated code and data won't be released * when object destroy. @@ -223,7 +234,11 @@ int PerfModule::doJIT(void) auto Resolver = createLambdaResolver( [](const std::string &Name) { - return RuntimeDyld::SymbolInfo(nullptr); + auto i = exported_funcs.find(Name); + if (i == exported_funcs.end()) + return RuntimeDyld::SymbolInfo(nullptr); + return RuntimeDyld::SymbolInfo((uint64_t)(i->second), + JITSymbolFlags::Exported); }, [](const std::string &Name) { return RuntimeDyld::SymbolInfo(nullptr);