GitHub pull request #3338 of commit 2aa2f0acb1478fa7c3b84c3f237ed5fdc4749f8f, no merge conflicts.sha1origin/pr/3338/mergeghprbActualCommit2aa2f0acb1478fa7c3b84c3f237ed5fdc4749f8fghprbActualCommitAuthorghprbActualCommitAuthorEmailghprbAuthorRepoGitUrlhttps://github.com/chenhengqi/bcc.gitghprbTriggerAuthorghprbTriggerAuthorEmailghprbTriggerAuthorLoginyonghong-songghprbTriggerAuthorLoginMention@yonghong-songghprbPullId3338ghprbTargetBranchmasterghprbSourceBranchfix/blk-io-tp-changedGIT_BRANCHfix/blk-io-tp-changedghprbPullAuthorEmailchenhengqi@outlook.comghprbPullAuthorLoginchenhengqighprbPullAuthorLoginMention@chenhengqighprbPullDescriptionGitHub pull request #3338 of commit 2aa2f0acb1478fa7c3b84c3f237ed5fdc4749f8f, no merge conflicts.ghprbPullTitlelibbpf-tools: fix for block io tracepoints changedghprbPullLinkhttps://github.com/iovisor/bcc/pull/3338ghprbPullLongDescriptionBlock IO tracepoints block_rq_insert and block_rq_issue are changed by this [commit](https://github.com/torvalds/linux/commit/a54895fa057c67700270777f7661d8d3c7fda88a).\r\n\r\nFor linux 5.10:\r\nhttps://github.com/torvalds/linux/blob/v5.10/include/trace/events/block.h#L209\r\n\r\nFor > linux 5.10\r\nhttps://github.com/torvalds/linux/blob/v5.11-rc1/include/trace/events/block.h#L206\r\n\r\nThis change break the libbpf-tools `biolatency`, `biosnoop` and `bitesize`:\r\n```\r\nlibbpf: load bpf program failed: Permission denied\r\nlibbpf: -- BEGIN DUMP LOG ---\r\nlibbpf: \r\narg#0 type is not a struct\r\nUnrecognized arg#0 type PTR\r\n; int BPF_PROG(block_rq_insert, struct request_queue *q, struct request *rq)\r\n0: (79) r6 = *(u64 *)(r1 +8)\r\nfunc 'block_rq_insert' doesn't have 2-th argument\r\ninvalid bpf_context access off=8 size=8\r\nprocessed 1 insns (limit 1000000) max_states_per_insn 0 total_states 0 peak_states 0 mark_read 0\r\n\r\nlibbpf: -- END LOG --\r\nlibbpf: failed to load program 'block_rq_insert'\r\nlibbpf: failed to load object 'biolatency_bpf'\r\nlibbpf: failed to load BPF skeleton 'biolatency_bpf': -4007\r\nfailed to load BPF object: -4007\r\n```\r\n\r\nThe pending PR #3317 DON'T work on old kernel, so I send a new PR with two other tools fixed together.\r\n\r\nSigned-off-by: Hengqi Chen <chenhengqi@outlook.com>ghprbCommentBody[buildbot, test this please]ghprbGhRepositoryiovisor/bccghprbCredentialsId6d3daf13-69b8-48b1-9c8f-ec5353264113false<a title="libbpf-tools: fix for block io tracepoints changed" href="https://github.com/iovisor/bcc/pull/3338">PR #3338</a>: libbpf-tools: fix for block...#91811879977460664bcc-pr #918918false9187353SUCCESS1617678999743https://buildbot.iovisor.org/jenkins/user/tdecacqu/my-views/view/all/job/bcc-pr/918/git918https://buildbot.iovisor.org/jenkins/user/tdecacqu/my-views/view/all/job/bcc-pr/label=fc25/918/918https://buildbot.iovisor.org/jenkins/user/tdecacqu/my-views/view/all/job/bcc-pr/label=fc26/918/918https://buildbot.iovisor.org/jenkins/user/tdecacqu/my-views/view/all/job/bcc-pr/label=fc27/918/918https://buildbot.iovisor.org/jenkins/user/tdecacqu/my-views/view/all/job/bcc-pr/label=fc28/918/918https://buildbot.iovisor.org/jenkins/user/tdecacqu/my-views/view/all/job/bcc-pr/label=ubuntu1604/918/918https://buildbot.iovisor.org/jenkins/user/tdecacqu/my-views/view/all/job/bcc-pr/label=ubuntu1710/918/918https://buildbot.iovisor.org/jenkins/user/tdecacqu/my-views/view/all/job/bcc-pr/label=ubuntu1804/918/