GitHub pull request #3202 of commit 78a18ec891a14c10c51b4c3c4923e16eeac5cfab, has merge conflicts.sha178a18ec891a14c10c51b4c3c4923e16eeac5cfabghprbActualCommit78a18ec891a14c10c51b4c3c4923e16eeac5cfabghprbActualCommitAuthorghprbActualCommitAuthorEmailghprbAuthorRepoGitUrlhttps://github.com/MaskRay/bcc.gitghprbTriggerAuthorghprbTriggerAuthorEmailghprbTriggerAuthorLoginyonghong-songghprbTriggerAuthorLoginMention@yonghong-songghprbPullId3202ghprbTargetBranchmasterghprbSourceBranchclangGIT_BRANCHclangghprbPullAuthorEmaili@maskray.meghprbPullAuthorLoginMaskRayghprbPullAuthorLoginMention@MaskRayghprbPullDescriptionGitHub pull request #3202 of commit 78a18ec891a14c10c51b4c3c4923e16eeac5cfab, has merge conflicts.ghprbPullTitleCMake: Refactor clang include/library pathsghprbPullLinkhttps://github.com/iovisor/bcc/pull/3202ghprbPullLongDescriptionghprbCommentBody[buildbot, test this please]ghprbGhRepositoryiovisor/bccghprbCredentialsId6d3daf13-69b8-48b1-9c8f-ec535326411377478a18ec891a14c10c51b4c3c4923e16eeac5cfab78a18ec891a14c10c51b4c3c4923e16eeac5cfabdetached78a18ec891a14c10c51b4c3c4923e16eeac5cfab78a18ec891a14c10c51b4c3c4923e16eeac5cfabdetached78a18ec891a14c10c51b4c3c4923e16eeac5cfab78a18ec891a14c10c51b4c3c4923e16eeac5cfabdetachedhttps://github.com/iovisor/bcc.gitfalse<a title="CMake: Refactor clang include/library paths" href="https://github.com/iovisor/bcc/pull/3202">PR #3202</a>: CMake: Refactor clang inclu...#77411806917460664bcc-pr #774774false7746159FAILURE1609278687110https://buildbot.iovisor.org/jenkins/user/danobi/my-views/view/all/job/bcc-pr/774/src/cc/frontends/clang/b_frontend_action.ccsrc/cc/bpf_module.ccsrc/cc/bpf_module_rw_engine.cc8e807dc23c4455728a77a810e48f116770b349f61604473395000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comfix compilation issues with latest llvm12 trunk With latest llvm12 trunk, we got two compilation bugs. Bug #1: /home/yhs/work/bcc/src/cc/frontends/clang/b_frontend_action.cc: In member function ‘void ebpf::BFrontendAction::DoMiscWorkAround()’: /home/yhs/work/bcc/src/cc/frontends/clang/b_frontend_action.cc:1706:31: error: ‘class clang::SourceManage’ has no member named ‘getBuffer’; did you mean ‘getBufferData’? rewriter_->getSourceMgr().getBuffer(rewriter_->getSourceMgr().getMainFileID())->getBufferSize(), ^~~~~~~~~ getBufferData This is due to upstream change https://reviews.llvm.org/D89394. To fix, follow upstream examples in https://reviews.llvm.org/D89394. Bug #2: /home/yhs/work/bcc/src/cc/bpf_module.cc: In member function ‘int ebpf::BPFModule::finalize()’: /home/yhs/work/bcc/src/cc/bpf_module.cc:470:11: error: ‘class llvm::EngineBuilder’ has no member named ‘setUseOrcMCJITReplacement’ builder.setUseOrcMCJITReplacement(false); ^~~~~~~~~~~~~~~~~~~~~~~~~ This is due to upstream https://github.com/llvm/llvm-project/commit/6154c4115cd4b78d0171892aac21e340e72e32bd It seems builder.setUseOrcMCJITReplacement() is not needed any more. So just remove it from bcc. Signed-off-by: Yonghong Song <yhs@fb.com> 2020-11-03 23:03:15 -08008e807dc23c4455728a77a810e48f116770b349f6fix compilation issues with latest llvm12 trunkeditsrc/cc/frontends/clang/b_frontend_action.cceditsrc/cc/bpf_module.cceditsrc/cc/bpf_module_rw_engine.cctools/offcputime.py57975a1e80fb61d317309984221f78a529c840921604602546000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comtools/offcputime: Fix python3 string output When using non-folded output, some of the strings would be printed as raw byte arrays on python3, like this: b'finish_task_switch' b'__schedule' b'schedule' b'worker_thread' b'kthread' b'ret_from_fork' - kworker/u16:1 (22022) 2267942 This commit updates the code to treat these as utf8 strings, consistent with all the other strings printed from this tool. 2020-11-05 10:55:46 -080057975a1e80fb61d317309984221f78a529c84092tools/offcputime: Fix python3 string outputedittools/offcputime.pyexamples/cpp/KFuncExample.ccexamples/cpp/CMakeLists.txt6ef5ce27f4bbbe13848d909ef5e4e6c739f7a8181604609072000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comadd a C++ kfunc/kretfunc example This patch added a kfunc/kretfunc C++ example to show how the new trampoline based kprobe/kretprobe can be used in C++ based applications. Signed-off-by: Yonghong Song <yhs@fb.com> 2020-11-05 12:44:32 -08006ef5ce27f4bbbe13848d909ef5e4e6c739f7a818add a C++ kfunc/kretfunc exampleeditexamples/cpp/CMakeLists.txtaddexamples/cpp/KFuncExample.ccsrc/cc/export/helpers.hc23448e34ecd3cc9bfc19f0b43f4325f77c2e4cc1604627210000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comAdd PT_REGS_PARMx_SYSCALL helpers for all archs 2020-11-05 17:46:50 -0800c23448e34ecd3cc9bfc19f0b43f4325f77c2e4ccAdd PT_REGS_PARMx_SYSCALL helpers for all archseditsrc/cc/export/helpers.hsrc/cc/export/helpers.h2c61168a59e6590bf5f540a96045bb9d74771df41604627210000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comReduce code duplication, and add PT_REGS_SYSCALL_CTX 2020-11-05 17:46:50 -08002c61168a59e6590bf5f540a96045bb9d74771df4Reduce code duplication, and add PT_REGS_SYSCALL_CTXeditsrc/cc/export/helpers.h.github/workflows/publish.ymlfb9b4dbd0719e9004109c8ee768bd56d6b742c9a1605070249000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comDrop ubuntu xenial from release process, it is EOL 2020-11-10 20:50:49 -0800fb9b4dbd0719e9004109c8ee768bd56d6b742c9aDrop ubuntu xenial from release process, it is EOLedit.github/workflows/publish.ymlDockerfile.ubuntuc9aff55ff1db2db23d4ec5c64b659ef4ddbe498d1605070249000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comInstall python dependencies via pip 2020-11-10 20:50:49 -0800c9aff55ff1db2db23d4ec5c64b659ef4ddbe498dInstall python dependencies via pipeditDockerfile.ubuntudocs/kernel-versions.mdfefde13ee4411b2cbb87b3d138f3cbd727535a0a1605109368000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comAdd sk_lookup to kernel-versions.md sk_lookup programs allow intercepting socket lookup per namespace. 2020-11-11 07:42:48 -0800fefde13ee4411b2cbb87b3d138f3cbd727535a0aAdd sk_lookup to kernel-versions.mdeditdocs/kernel-versions.mddocs/kernel-versions.mdca2d4124ce0b478fffe6ca451ca7d484d8af53d11605206831000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comDocument XDP support for igb driver in Linux 5.10 2020-11-12 10:47:11 -0800ca2d4124ce0b478fffe6ca451ca7d484d8af53d1Document XDP support for igb driver in Linux 5.10editdocs/kernel-versions.mdtools/biolatpcts.pyb2d363271681e3f6bf78eb43636b921d54d737c71605287497000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comtools/biolatpcts: Support measuring overall latencies between two events * Interpret negative interval as infinite and output once as soon as init is complete to indicate readiness. * Output on SIGUSR1. * When exit is requested through SIGINT, TERM or HUP, output the latency distribution one more time before exiting. Combined, this allows using biolatpcts to measure the overall latency distribution between two events. 2020-11-13 09:11:37 -0800b2d363271681e3f6bf78eb43636b921d54d737c7tools/biolatpcts: Support measuring overall latencies between two eventsedittools/biolatpcts.pytools/biolatpcts.py783c0ea89ca856dcf1e4a2e452434bca650c93251605293860000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comtools/biolatpcts: Add accumulative reporting on SIGUSR2 SIGUSR1's behavior is the same - print and start a new interval. SIGUSR2 triggers output without starting a new interval and can be used to monitor progress without affecting the accumulation of data points. 2020-11-13 10:57:40 -0800783c0ea89ca856dcf1e4a2e452434bca650c9325tools/biolatpcts: Add accumulative reporting on SIGUSR2edittools/biolatpcts.pyINSTALL.md1294ec6bd3cd9b514ae02fc4a3a1cc8bce772d951605418593000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comAdd build-from-source instructions for Arch Linux 2020-11-14 21:36:33 -08001294ec6bd3cd9b514ae02fc4a3a1cc8bce772d95Add build-from-source instructions for Arch LinuxeditINSTALL.mddocs/reference_guide.mdcf183b53d2f12e3960d42995fa21ea0763e27c101606231314000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comdoc: adjust bpf_ktime_get_ns() document description 2020-11-24 07:21:54 -0800cf183b53d2f12e3960d42995fa21ea0763e27c10doc: adjust bpf_ktime_get_ns() document descriptioneditdocs/reference_guide.mddocs/tutorial.md846559647265b45a659ae33eabdb83ff226bf1321606462629000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comUpdate the link and title of the linked blog post The new link is also https. 2020-11-26 23:37:09 -0800846559647265b45a659ae33eabdb83ff226bf132Update the link and title of the linked blog posteditdocs/tutorial.mddocs/kernel-versions.md043478d664003738a11043b81005f623e4b4910a1607571390000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.com4.18 - Pass map values to map helpers 2020-12-09 19:36:30 -0800043478d664003738a11043b81005f623e4b4910a4.18 - Pass map values to map helperseditdocs/kernel-versions.mddocs/kernel-versions.md9e7b7b04d5444eae25a5766f730413c2882e119a1607571390000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comUpdate kernel-versions.md 2020-12-09 19:36:30 -08009e7b7b04d5444eae25a5766f730413c2882e119aUpdate kernel-versions.mdeditdocs/kernel-versions.mdlibbpf-tools/syscall_helpers.cee2e88d46f7344c904cca1ac482908f97014a1df1607624013000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comlibbpf-tools: syscall_helpers: fix a warning Fix the following warning when building libbpf-tools: syscall_helpers.c: In function ‘init_syscall_names’: syscall_helpers.c:63:2: warning: ignoring return value of ‘fgets’, declared with attribute warn_unused_result [-Wunused-result] 63 | fgets(buf, sizeof(buf), f); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ We're not interested in the return value of the first call to fgets, because we want to skip the first line and in the case of error it will be caught by the following call to fgets. A funny note is that we can't say just "(void) f()" to suppress the warning, so I wrote it as "(void) !!f()", which works. Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com> 2020-12-10 10:13:33 -0800ee2e88d46f7344c904cca1ac482908f97014a1dflibbpf-tools: syscall_helpers: fix a warningeditlibbpf-tools/syscall_helpers.clibbpf-tools/README.md39eb601562cc39d16786bfd941c3be8344eb234e1608181766000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comlibbpf-tools: update README add a blog link Signed-off-by: Wenbo Zhang <ethercflow@gmail.com> 2020-12-16 21:09:26 -080039eb601562cc39d16786bfd941c3be8344eb234elibbpf-tools: update README add a blog linkeditlibbpf-tools/README.mdlibbpf-tools/execsnoop.bpf.c3e0089368bd7fd48dee1c685360375fd7870e9d71608181782000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.combcc/libbpf-tools: Fix user probe read references of execsnoop Signed-off-by: Kenta Tada <Kenta.Tada@sony.com> 2020-12-16 21:09:42 -08003e0089368bd7fd48dee1c685360375fd7870e9d7bcc/libbpf-tools: Fix user probe read references of execsnoopeditlibbpf-tools/execsnoop.bpf.ctools/opensnoop.py24f4759eb547d283cd9c5bd5fbb01ef3d72f42081608225378000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comtools/opensnoop: Use bpf_probe_read_user explicitly 2020-12-17 09:16:18 -080024f4759eb547d283cd9c5bd5fbb01ef3d72f4208tools/opensnoop: Use bpf_probe_read_user explicitlyedittools/opensnoop.pyREADME.md297512a31ecc9ceebf79bda169350dace0f367571608530077000https://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songys114321@gmail.comThe README file in this repo has some bad links - [404:NotFound] The markup version of the readme that is displayed for the main page in this repo contains the following bad links: Status code [404:NotFound] - Link: https://github.com/iovisor/bcc/blob/master/tools/swapin_example.txt Status code [404:NotFound] - Link: https://github.com/iovisor/bcc/blob/master/tools/vfscount.c Status code [404:NotFound] - Link: https://github.com/iovisor/bcc/blob/master/tools/vfsstat.c @yonghong-song requested removing stale links. I was unable to find any actual matching files to link to so removed these. However possible the vfsstat.c one could be re-adding pointing to "libbpf-tools/vfsstat.c" ?? Should resolve issue #3189 2020-12-20 21:54:37 -0800297512a31ecc9ceebf79bda169350dace0f36757The README file in this repo has some bad links - [404:NotFound]editREADME.mdCMakeLists.txtcmake/clang_libs.cmake78a18ec891a14c10c51b4c3c4923e16eeac5cfab1608771211000https://buildbot.iovisor.org/jenkins/user/maskrayFangrui Songi@maskray.meCMake: Refactor clang include/library paths 2020-12-23 16:53:31 -080078a18ec891a14c10c51b4c3c4923e16eeac5cfabCMake: Refactor clang include/library pathseditCMakeLists.txteditcmake/clang_libs.cmakegithttps://buildbot.iovisor.org/jenkins/user/yonghong-songyonghong-songhttps://buildbot.iovisor.org/jenkins/user/ii774https://buildbot.iovisor.org/jenkins/user/danobi/my-views/view/all/job/bcc-pr/label=fc25/774/774https://buildbot.iovisor.org/jenkins/user/danobi/my-views/view/all/job/bcc-pr/label=fc26/774/774https://buildbot.iovisor.org/jenkins/user/danobi/my-views/view/all/job/bcc-pr/label=fc27/774/774https://buildbot.iovisor.org/jenkins/user/danobi/my-views/view/all/job/bcc-pr/label=fc28/774/774https://buildbot.iovisor.org/jenkins/user/danobi/my-views/view/all/job/bcc-pr/label=ubuntu1604/774/774https://buildbot.iovisor.org/jenkins/user/danobi/my-views/view/all/job/bcc-pr/label=ubuntu1710/774/774https://buildbot.iovisor.org/jenkins/user/danobi/my-views/view/all/job/bcc-pr/label=ubuntu1804/774/