Message ID | 20190311195555.889995-1-songliubraving@fb.com |
---|---|
Headers | show |
Series | perf annotation of BPF programs | expand |
Em Mon, Mar 11, 2019 at 12:55:40PM -0700, Song Liu escreveu: > ===================== Note on patch dependency ======================== > This set has dependency in both bpf-next tree and tip/perf/core. Current > version is developed on bpf-next tree with the following commits > cherry-picked from tip/perf/core (or acme/perf/core): > > (from 1/11 to 11/11) > commit 76193a94522f ("perf, bpf: Introduce PERF_RECORD_KSYMBOL") > commit d764ac646491 ("tools headers uapi: Sync tools/include/uapi/linux/perf_event.h") > commit 6ee52e2a3fe4 ("perf, bpf: Introduce PERF_RECORD_BPF_EVENT") > commit df063c83aa2c ("tools headers uapi: Sync tools/include/uapi/linux/perf_event.h") > commit 9aa0bfa370b2 ("perf tools: Handle PERF_RECORD_KSYMBOL") > commit 45178a928a4b ("perf tools: Handle PERF_RECORD_BPF_EVENT") > commit 7b612e291a5a ("perf tools: Synthesize PERF_RECORD_* for loaded BPF programs") > commit a40b95bcd30c ("perf top: Synthesize BPF events for pre-existing loaded BPF programs") > commit 6934058d9fb6 ("bpf: Add module name [bpf] to ksymbols for bpf programs") > commit 811184fb6977 ("perf bpf: Fix synthesized PERF_RECORD_KSYMBOL/BPF_EVENT") > comimt 94816add0005 ("perf tools: Add perf_exe() helper to find perf binary") > ======================================================================== These csets are already upstream, i.e. already hit torvalds/master, i.e. will be in 5.1, can you check that we still need doing this cherry-picking? - Arnaldo
> On Mar 11, 2019, at 1:24 PM, Arnaldo Carvalho de Melo <acme@redhat.com> wrote: > > Em Mon, Mar 11, 2019 at 12:55:40PM -0700, Song Liu escreveu: >> ===================== Note on patch dependency ======================== >> This set has dependency in both bpf-next tree and tip/perf/core. Current >> version is developed on bpf-next tree with the following commits >> cherry-picked from tip/perf/core (or acme/perf/core): >> >> (from 1/11 to 11/11) >> commit 76193a94522f ("perf, bpf: Introduce PERF_RECORD_KSYMBOL") >> commit d764ac646491 ("tools headers uapi: Sync tools/include/uapi/linux/perf_event.h") >> commit 6ee52e2a3fe4 ("perf, bpf: Introduce PERF_RECORD_BPF_EVENT") >> commit df063c83aa2c ("tools headers uapi: Sync tools/include/uapi/linux/perf_event.h") >> commit 9aa0bfa370b2 ("perf tools: Handle PERF_RECORD_KSYMBOL") >> commit 45178a928a4b ("perf tools: Handle PERF_RECORD_BPF_EVENT") >> commit 7b612e291a5a ("perf tools: Synthesize PERF_RECORD_* for loaded BPF programs") >> commit a40b95bcd30c ("perf top: Synthesize BPF events for pre-existing loaded BPF programs") >> commit 6934058d9fb6 ("bpf: Add module name [bpf] to ksymbols for bpf programs") >> commit 811184fb6977 ("perf bpf: Fix synthesized PERF_RECORD_KSYMBOL/BPF_EVENT") >> comimt 94816add0005 ("perf tools: Add perf_exe() helper to find perf binary") >> ======================================================================== > > These csets are already upstream, i.e. already hit torvalds/master, i.e. > will be in 5.1, can you check that we still need doing this > cherry-picking? > > - Arnaldo I just checked that 02-15 of the set could apply to torvalds/master (with some minor conflicts), and it works as expected. Thanks, Song
Em Mon, Mar 11, 2019 at 09:01:48PM +0000, Song Liu escreveu: > > > > On Mar 11, 2019, at 1:24 PM, Arnaldo Carvalho de Melo <acme@redhat.com> wrote: > > > > Em Mon, Mar 11, 2019 at 12:55:40PM -0700, Song Liu escreveu: > >> ===================== Note on patch dependency ======================== > >> This set has dependency in both bpf-next tree and tip/perf/core. Current > >> version is developed on bpf-next tree with the following commits > >> cherry-picked from tip/perf/core (or acme/perf/core): > >> > >> (from 1/11 to 11/11) > >> commit 76193a94522f ("perf, bpf: Introduce PERF_RECORD_KSYMBOL") > >> commit d764ac646491 ("tools headers uapi: Sync tools/include/uapi/linux/perf_event.h") > >> commit 6ee52e2a3fe4 ("perf, bpf: Introduce PERF_RECORD_BPF_EVENT") > >> commit df063c83aa2c ("tools headers uapi: Sync tools/include/uapi/linux/perf_event.h") > >> commit 9aa0bfa370b2 ("perf tools: Handle PERF_RECORD_KSYMBOL") > >> commit 45178a928a4b ("perf tools: Handle PERF_RECORD_BPF_EVENT") > >> commit 7b612e291a5a ("perf tools: Synthesize PERF_RECORD_* for loaded BPF programs") > >> commit a40b95bcd30c ("perf top: Synthesize BPF events for pre-existing loaded BPF programs") > >> commit 6934058d9fb6 ("bpf: Add module name [bpf] to ksymbols for bpf programs") > >> commit 811184fb6977 ("perf bpf: Fix synthesized PERF_RECORD_KSYMBOL/BPF_EVENT") > >> comimt 94816add0005 ("perf tools: Add perf_exe() helper to find perf binary") > >> ======================================================================== > > > > These csets are already upstream, i.e. already hit torvalds/master, i.e. > > will be in 5.1, can you check that we still need doing this > > cherry-picking? > > > > - Arnaldo > > I just checked that 02-15 of the set could apply to torvalds/master (with > some minor conflicts), and it works as expected. So no need to cherrypick, just use torvalds/master as a base, ok. - Arnaldo
> On Mar 11, 2019, at 2:05 PM, Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> wrote: > > Em Mon, Mar 11, 2019 at 09:01:48PM +0000, Song Liu escreveu: >> >> >>> On Mar 11, 2019, at 1:24 PM, Arnaldo Carvalho de Melo <acme@redhat.com> wrote: >>> >>> Em Mon, Mar 11, 2019 at 12:55:40PM -0700, Song Liu escreveu: >>>> ===================== Note on patch dependency ======================== >>>> This set has dependency in both bpf-next tree and tip/perf/core. Current >>>> version is developed on bpf-next tree with the following commits >>>> cherry-picked from tip/perf/core (or acme/perf/core): >>>> >>>> (from 1/11 to 11/11) >>>> commit 76193a94522f ("perf, bpf: Introduce PERF_RECORD_KSYMBOL") >>>> commit d764ac646491 ("tools headers uapi: Sync tools/include/uapi/linux/perf_event.h") >>>> commit 6ee52e2a3fe4 ("perf, bpf: Introduce PERF_RECORD_BPF_EVENT") >>>> commit df063c83aa2c ("tools headers uapi: Sync tools/include/uapi/linux/perf_event.h") >>>> commit 9aa0bfa370b2 ("perf tools: Handle PERF_RECORD_KSYMBOL") >>>> commit 45178a928a4b ("perf tools: Handle PERF_RECORD_BPF_EVENT") >>>> commit 7b612e291a5a ("perf tools: Synthesize PERF_RECORD_* for loaded BPF programs") >>>> commit a40b95bcd30c ("perf top: Synthesize BPF events for pre-existing loaded BPF programs") >>>> commit 6934058d9fb6 ("bpf: Add module name [bpf] to ksymbols for bpf programs") >>>> commit 811184fb6977 ("perf bpf: Fix synthesized PERF_RECORD_KSYMBOL/BPF_EVENT") >>>> comimt 94816add0005 ("perf tools: Add perf_exe() helper to find perf binary") >>>> ======================================================================== >>> >>> These csets are already upstream, i.e. already hit torvalds/master, i.e. >>> will be in 5.1, can you check that we still need doing this >>> cherry-picking? >>> >>> - Arnaldo >> >> I just checked that 02-15 of the set could apply to torvalds/master (with >> some minor conflicts), and it works as expected. > > So no need to cherrypick, just use torvalds/master as a base, ok. > > - Arnaldo Do you want me to resend the set with the conflict resolved? Thanks, Song
Em Mon, Mar 11, 2019 at 09:08:31PM +0000, Song Liu escreveu: > > On Mar 11, 2019, at 2:05 PM, Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> wrote: > > Em Mon, Mar 11, 2019 at 09:01:48PM +0000, Song Liu escreveu: > >>> On Mar 11, 2019, at 1:24 PM, Arnaldo Carvalho de Melo <acme@redhat.com> wrote: > >>> These csets are already upstream, i.e. already hit torvalds/master, i.e. > >>> will be in 5.1, can you check that we still need doing this > >>> cherry-picking? > >> I just checked that 02-15 of the set could apply to torvalds/master (with > >> some minor conflicts), and it works as expected. > > So no need to cherrypick, just use torvalds/master as a base, ok. > Do you want me to resend the set with the conflict resolved? No need for today, I think Jiri is looking at that branch I saw you guys chatting today, so if he has some new comments, you can then address and repost, fixing the conflicts then. - Arnaldo
> On Mar 11, 2019, at 2:18 PM, Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> wrote: > > Em Mon, Mar 11, 2019 at 09:08:31PM +0000, Song Liu escreveu: >>> On Mar 11, 2019, at 2:05 PM, Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> wrote: >>> Em Mon, Mar 11, 2019 at 09:01:48PM +0000, Song Liu escreveu: >>>>> On Mar 11, 2019, at 1:24 PM, Arnaldo Carvalho de Melo <acme@redhat.com> wrote: >>>>> These csets are already upstream, i.e. already hit torvalds/master, i.e. >>>>> will be in 5.1, can you check that we still need doing this >>>>> cherry-picking? > >>>> I just checked that 02-15 of the set could apply to torvalds/master (with >>>> some minor conflicts), and it works as expected. > >>> So no need to cherrypick, just use torvalds/master as a base, ok. > >> Do you want me to resend the set with the conflict resolved? > > No need for today, I think Jiri is looking at that branch I saw you guys > chatting today, so if he has some new comments, you can then address and > repost, fixing the conflicts then. > > - Arnaldo Got it. I will include the --bpf-event option change and repost later. Thanks, Song