linux-next: manual merge of the perf tree with Linus' tree

linux-next: manual merge of the perf tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1499 bytes --]

Hi all,

Today's linux-next merge of the perf tree got a conflict in:

  tools/perf/util/syscalltbl.c

between commit:

  5d35634ecc2d ("perf trace: Fix non-listed archs in the syscalltbl routines")

from Linus' tree and commit:

  8c0d1202bad3 ("perf, riscv: Wire up perf trace support for RISC-V")

from the perf tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/perf/util/syscalltbl.c
index 6c45ded922b6,349986f6e5f5..000000000000
--- a/tools/perf/util/syscalltbl.c
+++ b/tools/perf/util/syscalltbl.c
@@@ -46,11 -46,10 +46,15 @@@ static const char *const *syscalltbl_na
  #include <asm/syscalls.c>
  const int syscalltbl_native_max_id = SYSCALLTBL_LOONGARCH_MAX_ID;
  static const char *const *syscalltbl_native = syscalltbl_loongarch;
+ #elif defined(__riscv)
+ #include <asm/syscalls.c>
+ const int syscalltbl_native_max_id = SYSCALLTBL_RISCV_MAX_ID;
+ static const char *const *syscalltbl_native = syscalltbl_riscv;
 +#else
 +const int syscalltbl_native_max_id = 0;
 +static const char *const syscalltbl_native[] = {
 +	[0] = "unknown",
 +};
  #endif
  
  struct syscall {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the perf tree with Linus' tree

[Namhyung Kim]

Hello,

On Fri, Nov 01, 2024 at 10:33:45AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the perf tree got a conflict in:
> 
>   tools/perf/util/syscalltbl.c
> 
> between commit:
> 
>   5d35634ecc2d ("perf trace: Fix non-listed archs in the syscalltbl routines")
> 
> from Linus' tree and commit:
> 
>   8c0d1202bad3 ("perf, riscv: Wire up perf trace support for RISC-V")
> 
> from the perf tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks for reporting this.  I expected the conflict when I applied the
RISC-V change and now I've merged the perf-tools branch into the
perf-tools-next with the resolution like yours.  So it won't hit the
mainline tree.

Thanks,
Namhyung

linux-next: manual merge of the perf tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1770 bytes --]

Hi all,

Today's linux-next merge of the perf tree got a conflict in:

  tools/perf/Makefile.perf

between commit:

  e2bdd172e665 ("perf build: Generate arm64's sysreg-defs.h and add to include path")

from Lius' tree and commit:

  1638b11ef815 ("perf tools: Add perf binary dependent rule for shellcheck log in Makefile.perf")

from the perf tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/perf/Makefile.perf
index 058c9aecf608,824cbc0af7d7..000000000000
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@@ -1150,7 -1151,8 +1168,8 @@@ endif # CONFIG_PERF_BPF_SKE
  bpf-skel-clean:
  	$(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS)
  
 -clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean
 +clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean arm64-sysreg-defs-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean
+ 	$(Q)$(MAKE) -f $(srctree)/tools/perf/tests/Makefile.tests clean
  	$(call QUIET_CLEAN, core-objs)  $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive $(OUTPUT)perf-iostat $(LANG_BINDINGS)
  	$(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
  	$(Q)$(RM) $(OUTPUT).config-detected

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the perf tree with Linus' tree

[Namhyung Kim]

Hello,

On Tue, Nov 28, 2023 at 1:53 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the perf tree got a conflict in:
>
>   tools/perf/Makefile.perf
>
> between commit:
>
>   e2bdd172e665 ("perf build: Generate arm64's sysreg-defs.h and add to include path")
>
> from Lius' tree and commit:
>
>   1638b11ef815 ("perf tools: Add perf binary dependent rule for shellcheck log in Makefile.perf")
>
> from the perf tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks for letting us know.  I think Arnaldo can resolve the
conflict when he merges perf-tools into perf-tools-next later
(but before sending the changes for v6.8) as you did.

Thanks,
Namhyung

>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc tools/perf/Makefile.perf
> index 058c9aecf608,824cbc0af7d7..000000000000
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@@ -1150,7 -1151,8 +1168,8 @@@ endif # CONFIG_PERF_BPF_SKE
>   bpf-skel-clean:
>         $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS)
>
>  -clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean
>  +clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean arm64-sysreg-defs-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean
> +       $(Q)$(MAKE) -f $(srctree)/tools/perf/tests/Makefile.tests clean
>         $(call QUIET_CLEAN, core-objs)  $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive $(OUTPUT)perf-iostat $(LANG_BINDINGS)
>         $(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
>         $(Q)$(RM) $(OUTPUT).config-detected

linux-next: manual merge of the perf tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

Hi all,

Today's linux-next merge of the perf tree got a conflict in:

  tools/perf/util/evsel.c

between commit:

  49c692b7dfc9 ("perf offcpu: Accept allowed sample types only")

from Linus' tree and commit:

  9ab95b0b15a0 ("perf record ibs: Warn about sampling period skew")

from the perf tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/perf/util/evsel.c
index 094b0a9c0bc0,8fea51a9cd90..000000000000
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@@ -1373,8 -1372,7 +1378,10 @@@ void evsel__config(struct evsel *evsel
  	if (evsel__is_dummy_event(evsel))
  		evsel__reset_sample_bit(evsel, BRANCH_STACK);
  
 +	if (evsel__is_offcpu_event(evsel))
 +		evsel->core.attr.sample_type &= OFFCPU_SAMPLE_TYPES;
++
+ 	arch__post_evsel_config(evsel, attr);
  }
  
  int evsel__set_filter(struct evsel *evsel, const char *filter)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the perf tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]

Hi all,

Today's linux-next merge of the perf tree got a conflict in:

  tools/perf/util/session.c

between commit:

  8e820f962345 ("perf report: Output non-zero offset for decompressed records")

from Linus' tree and commit:

  3a3535e67dfd ("perf session: Introduce decompressor in reader object")

from the perf tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/perf/util/session.c
index 352f16076e01,51bf2efceb7f..000000000000
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@@ -2116,8 -2122,8 +2122,8 @@@ fetch_decomp_event(u64 head, size_t mma
  static int __perf_session__process_decomp_events(struct perf_session *session)
  {
  	s64 skip;
 -	u64 size, file_pos = 0;
 +	u64 size;
- 	struct decomp *decomp = session->decomp_last;
+ 	struct decomp *decomp = session->active_decomp->decomp_last;
  
  	if (!decomp)
  		return 0;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the perf tree with Linus' tree

[Arnaldo Carvalho de Melo]

On October 26, 2021 7:17:05 PM GMT-03:00, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>Hi all,
>
>Today's linux-next merge of the perf tree got a conflict in:
>
>  tools/perf/util/session.c
>
>between commit:
>
>  8e820f962345 ("perf report: Output non-zero offset for decompressed records")
>
>from Linus' tree and commit:
>
>  3a3535e67dfd ("perf session: Introduce decompressor in reader object")
>
>from the perf tree.
>
>I fixed it up (see below) and can carry the fix as necessary. This
>is now fixed as far as linux-next is concerned, but any non trivial
>conflicts should be mentioned to your upstream maintainer when your tree
>is submitted for merging.  You may also want to consider cooperating
>with the maintainer of the conflicting tree to minimise any particularly
>complex conflicts.
>


Fixed locally, will publish tomorrow after regression tests finish.

- Arnaldo