[v3,0/7] extend branch tracing to use ARM CoreSight traces

Message ID 20210331025234.518688-1-zied.guermazi@trande.de
Headers show
Series
  • extend branch tracing to use ARM CoreSight traces
Related show

Message

Zied Guermazi March 31, 2021, 2:52 a.m.
This patch set adds support for branch tracing in GDB on arm platforms
 using coresight etm traces
 Branch tracing offers instructions and functions histories as well as
 execution record and replay (forwards and reverse debugging)
 this patch set was tested using the gdb.btrace testsuite on ARMv7 and ARMv8
 cortex A processors running linux operating system with coresight drivers.
 
 test results of gdb.btrace testsuite on ARMv8, variation unix
 # of expected passes		595
 # of unexpected failures	1
 # of unsupported tests	1

 test results of gdb.btrace testsuite on ARMv8 variation native-gdbserver
 # of expected passes		582
 # of unexpected failures	4
 # of unsupported tests	2
 
 test results of gdb.btrace testsuite  on ARMv7, variation unix
 
 test results of gdb.btrace testsuite on ARMv7 variation native-gdbserver

 
 known limitations:
 for arm v7 only
- some registers needed for breakpoint address calculation in forwards
  executions may be missing.
 for arm v7 and arm v8
- sometimes trace buffers are not flushed properly or flushed in
  the buffer of a different thread. this was observed
  in test scripts only.
- sometimes, in non-stop mode, while executing "stepi n" for two threads
  in parallel, a thread is hitting breakpoints intended for stepping
  the other one.
  Gdb recognizes that it is intended for the second thread,
  but decreases the step counter. leading to a stepping less than "n"
  times.
 patches are:

Zied Guermazi (7):
  configure gdb build system for supporting btrace on arm processors
  add btrace coresight related commands
  start/stop btrace with coresight etm and parse etm buffer. nat
    independant
  start/stop btrace with coresight etm and collect etm buffer on linux
    os
  fix issue: gdb hangs in the command following a commad returning with
    TARGET_WAITKIND_NO_HISTORY
  add support for coresight btrace via remote protocol
  adapt btrace testcases for arm target

 gdb/ChangeLog                                 | 139 +++
 gdb/Makefile.in                               |   5 +-
 gdb/NEWS                                      |  30 +
 gdb/aarch64-linux-nat.c                       |  68 ++
 gdb/arch/arm.h                                |  33 +
 gdb/arm-linux-nat.c                           |  68 ++
 gdb/btrace.c                                  | 977 +++++++++++++++++-
 gdb/btrace.h                                  |  16 +-
 gdb/config.in                                 |   3 +
 gdb/configure                                 | 545 ++++++++++
 gdb/configure.nat                             |   4 +-
 gdb/doc/gdb.texinfo                           | 115 ++-
 gdb/features/btrace-conf.dtd                  |  10 +-
 gdb/features/btrace.dtd                       |  38 +-
 gdb/infrun.c                                  |   3 +-
 gdb/nat/linux-btrace.c                        | 400 ++++++-
 gdb/nat/linux-btrace.h                        |  19 +
 gdb/record-btrace.c                           | 168 ++-
 gdb/record.c                                  |   2 +
 gdb/remote.c                                  |  66 +-
 .../gdb.btrace/aarch64-instruction_history.S  |  31 +
 .../gdb.btrace/aarch64-record_goto.S          | 400 +++++++
 .../gdb.btrace/aarch64-tailcall-only.S        | 517 +++++++++
 gdb/testsuite/gdb.btrace/aarch64-tailcall.S   | 409 ++++++++
 .../gdb.btrace/arm-instruction_history.S      |  31 +
 gdb/testsuite/gdb.btrace/arm-record_goto.S    | 433 ++++++++
 gdb/testsuite/gdb.btrace/arm-tailcall-only.S  | 504 +++++++++
 gdb/testsuite/gdb.btrace/arm-tailcall.S       | 391 +++++++
 gdb/testsuite/gdb.btrace/buffer-size.exp      |  15 +-
 gdb/testsuite/gdb.btrace/delta.exp            |  10 +
 .../gdb.btrace/instruction_history.exp        | 107 +-
 gdb/testsuite/gdb.btrace/non-stop.exp         |  60 +-
 gdb/testsuite/gdb.btrace/record_goto.exp      | 241 +++--
 gdb/testsuite/gdb.btrace/stepi.exp            |  95 +-
 gdb/testsuite/gdb.btrace/tailcall-only.exp    |   8 +
 gdb/testsuite/gdb.btrace/tailcall.exp         |  46 +-
 ...on_history.S => x86-instruction_history.S} |   0
 gdb/testsuite/lib/gdb.exp                     |   2 +-
 gdb/top.c                                     |  10 +-
 gdbserver/ChangeLog                           |  16 +
 gdbserver/config.in                           |   3 +
 gdbserver/configure                           | 545 ++++++++++
 gdbserver/configure.srv                       |   4 +
 gdbserver/linux-low.cc                        | 104 +-
 gdbserver/server.cc                           |  34 +-
 gdbsupport/ChangeLog                          |  29 +
 gdbsupport/Makefile.in                        |   3 +
 gdbsupport/btrace-common.cc                   |  46 +
 gdbsupport/btrace-common.h                    | 115 ++-
 gdbsupport/common.m4                          |  39 +
 gdbsupport/config.in                          |   3 +
 gdbsupport/configure                          | 545 ++++++++++
 52 files changed, 7347 insertions(+), 158 deletions(-)
 create mode 100644 gdb/testsuite/gdb.btrace/aarch64-instruction_history.S
 create mode 100644 gdb/testsuite/gdb.btrace/aarch64-record_goto.S
 create mode 100644 gdb/testsuite/gdb.btrace/aarch64-tailcall-only.S
 create mode 100644 gdb/testsuite/gdb.btrace/aarch64-tailcall.S
 create mode 100644 gdb/testsuite/gdb.btrace/arm-instruction_history.S
 create mode 100644 gdb/testsuite/gdb.btrace/arm-record_goto.S
 create mode 100644 gdb/testsuite/gdb.btrace/arm-tailcall-only.S
 create mode 100644 gdb/testsuite/gdb.btrace/arm-tailcall.S
 rename gdb/testsuite/gdb.btrace/{instruction_history.S => x86-instruction_history.S} (100%)

-- 
2.25.1

Comments

Tankut Baris Aktemur via Gdb-patches April 2, 2021, 4:02 p.m. | #1
On 2021-03-30 10:52 p.m., Zied Guermazi wrote:
>  This patch set adds support for branch tracing in GDB on arm platforms

>  using coresight etm traces

>  Branch tracing offers instructions and functions histories as well as

>  execution record and replay (forwards and reverse debugging)

>  this patch set was tested using the gdb.btrace testsuite on ARMv7 and ARMv8

>  cortex A processors running linux operating system with coresight drivers.

>  

>  test results of gdb.btrace testsuite on ARMv8, variation unix

>  # of expected passes		595

>  # of unexpected failures	1

>  # of unsupported tests	1

> 

>  test results of gdb.btrace testsuite on ARMv8 variation native-gdbserver

>  # of expected passes		582

>  # of unexpected failures	4

>  # of unsupported tests	2

>  

>  test results of gdb.btrace testsuite  on ARMv7, variation unix

>  

>  test results of gdb.btrace testsuite on ARMv7 variation native-gdbserver

> 

>  

>  known limitations:

>  for arm v7 only

> - some registers needed for breakpoint address calculation in forwards

>   executions may be missing.

>  for arm v7 and arm v8

> - sometimes trace buffers are not flushed properly or flushed in

>   the buffer of a different thread. this was observed

>   in test scripts only.

> - sometimes, in non-stop mode, while executing "stepi n" for two threads

>   in parallel, a thread is hitting breakpoints intended for stepping

>   the other one.

>   Gdb recognizes that it is intended for the second thread,

>   but decreases the step counter. leading to a stepping less than "n"

>   times.

>  patches are:

> 

> Zied Guermazi (7):

>   configure gdb build system for supporting btrace on arm processors

>   add btrace coresight related commands

>   start/stop btrace with coresight etm and parse etm buffer. nat

>     independant

>   start/stop btrace with coresight etm and collect etm buffer on linux

>     os

>   fix issue: gdb hangs in the command following a commad returning with

>     TARGET_WAITKIND_NO_HISTORY

>   add support for coresight btrace via remote protocol

>   adapt btrace testcases for arm target

> 

>  gdb/ChangeLog                                 | 139 +++

>  gdb/Makefile.in                               |   5 +-

>  gdb/NEWS                                      |  30 +

>  gdb/aarch64-linux-nat.c                       |  68 ++

>  gdb/arch/arm.h                                |  33 +

>  gdb/arm-linux-nat.c                           |  68 ++

>  gdb/btrace.c                                  | 977 +++++++++++++++++-

>  gdb/btrace.h                                  |  16 +-

>  gdb/config.in                                 |   3 +

>  gdb/configure                                 | 545 ++++++++++

>  gdb/configure.nat                             |   4 +-

>  gdb/doc/gdb.texinfo                           | 115 ++-

>  gdb/features/btrace-conf.dtd                  |  10 +-

>  gdb/features/btrace.dtd                       |  38 +-

>  gdb/infrun.c                                  |   3 +-

>  gdb/nat/linux-btrace.c                        | 400 ++++++-

>  gdb/nat/linux-btrace.h                        |  19 +

>  gdb/record-btrace.c                           | 168 ++-

>  gdb/record.c                                  |   2 +

>  gdb/remote.c                                  |  66 +-

>  .../gdb.btrace/aarch64-instruction_history.S  |  31 +

>  .../gdb.btrace/aarch64-record_goto.S          | 400 +++++++

>  .../gdb.btrace/aarch64-tailcall-only.S        | 517 +++++++++

>  gdb/testsuite/gdb.btrace/aarch64-tailcall.S   | 409 ++++++++

>  .../gdb.btrace/arm-instruction_history.S      |  31 +

>  gdb/testsuite/gdb.btrace/arm-record_goto.S    | 433 ++++++++

>  gdb/testsuite/gdb.btrace/arm-tailcall-only.S  | 504 +++++++++

>  gdb/testsuite/gdb.btrace/arm-tailcall.S       | 391 +++++++

>  gdb/testsuite/gdb.btrace/buffer-size.exp      |  15 +-

>  gdb/testsuite/gdb.btrace/delta.exp            |  10 +

>  .../gdb.btrace/instruction_history.exp        | 107 +-

>  gdb/testsuite/gdb.btrace/non-stop.exp         |  60 +-

>  gdb/testsuite/gdb.btrace/record_goto.exp      | 241 +++--

>  gdb/testsuite/gdb.btrace/stepi.exp            |  95 +-

>  gdb/testsuite/gdb.btrace/tailcall-only.exp    |   8 +

>  gdb/testsuite/gdb.btrace/tailcall.exp         |  46 +-

>  ...on_history.S => x86-instruction_history.S} |   0

>  gdb/testsuite/lib/gdb.exp                     |   2 +-

>  gdb/top.c                                     |  10 +-

>  gdbserver/ChangeLog                           |  16 +

>  gdbserver/config.in                           |   3 +

>  gdbserver/configure                           | 545 ++++++++++

>  gdbserver/configure.srv                       |   4 +

>  gdbserver/linux-low.cc                        | 104 +-

>  gdbserver/server.cc                           |  34 +-

>  gdbsupport/ChangeLog                          |  29 +

>  gdbsupport/Makefile.in                        |   3 +

>  gdbsupport/btrace-common.cc                   |  46 +

>  gdbsupport/btrace-common.h                    | 115 ++-

>  gdbsupport/common.m4                          |  39 +

>  gdbsupport/config.in                          |   3 +

>  gdbsupport/configure                          | 545 ++++++++++

>  52 files changed, 7347 insertions(+), 158 deletions(-)

>  create mode 100644 gdb/testsuite/gdb.btrace/aarch64-instruction_history.S

>  create mode 100644 gdb/testsuite/gdb.btrace/aarch64-record_goto.S

>  create mode 100644 gdb/testsuite/gdb.btrace/aarch64-tailcall-only.S

>  create mode 100644 gdb/testsuite/gdb.btrace/aarch64-tailcall.S

>  create mode 100644 gdb/testsuite/gdb.btrace/arm-instruction_history.S

>  create mode 100644 gdb/testsuite/gdb.btrace/arm-record_goto.S

>  create mode 100644 gdb/testsuite/gdb.btrace/arm-tailcall-only.S

>  create mode 100644 gdb/testsuite/gdb.btrace/arm-tailcall.S

>  rename gdb/testsuite/gdb.btrace/{instruction_history.S => x86-instruction_history.S} (100%)

> 


Hi Zied,

I'd like to take a quick look, but I am not able to apply your patchset,
it seems you weren't on the latest master at the time you sent it.  Do
you know which sha1 your patchset applies on?

Simon
Zied Guermazi April 2, 2021, 4:05 p.m. | #2
hi Simon

the patchset applies to this commit

commit 39b07596938e4c2a7251d77ea01981d475747599 (*origin/master*, 
*origin/HEAD*, *master*)
Author: GDB Administrator <gdbadmin@sourceware.org>
Date:   Thu Feb 25 00:00:20 2021 +0000

     Automatic date update in version.in

Kind Regards
Zied Guermazi

On 02.04.21 18:02, Simon Marchi wrote:
> On 2021-03-30 10:52 p.m., Zied Guermazi wrote:

>>   This patch set adds support for branch tracing in GDB on arm platforms

>>   using coresight etm traces

>>   Branch tracing offers instructions and functions histories as well as

>>   execution record and replay (forwards and reverse debugging)

>>   this patch set was tested using the gdb.btrace testsuite on ARMv7 and ARMv8

>>   cortex A processors running linux operating system with coresight drivers.

>>   

>>   test results of gdb.btrace testsuite on ARMv8, variation unix

>>   # of expected passes		595

>>   # of unexpected failures	1

>>   # of unsupported tests	1

>>

>>   test results of gdb.btrace testsuite on ARMv8 variation native-gdbserver

>>   # of expected passes		582

>>   # of unexpected failures	4

>>   # of unsupported tests	2

>>   

>>   test results of gdb.btrace testsuite  on ARMv7, variation unix

>>   

>>   test results of gdb.btrace testsuite on ARMv7 variation native-gdbserver

>>

>>   

>>   known limitations:

>>   for arm v7 only

>> - some registers needed for breakpoint address calculation in forwards

>>    executions may be missing.

>>   for arm v7 and arm v8

>> - sometimes trace buffers are not flushed properly or flushed in

>>    the buffer of a different thread. this was observed

>>    in test scripts only.

>> - sometimes, in non-stop mode, while executing "stepi n" for two threads

>>    in parallel, a thread is hitting breakpoints intended for stepping

>>    the other one.

>>    Gdb recognizes that it is intended for the second thread,

>>    but decreases the step counter. leading to a stepping less than "n"

>>    times.

>>   patches are:

>>

>> Zied Guermazi (7):

>>    configure gdb build system for supporting btrace on arm processors

>>    add btrace coresight related commands

>>    start/stop btrace with coresight etm and parse etm buffer. nat

>>      independant

>>    start/stop btrace with coresight etm and collect etm buffer on linux

>>      os

>>    fix issue: gdb hangs in the command following a commad returning with

>>      TARGET_WAITKIND_NO_HISTORY

>>    add support for coresight btrace via remote protocol

>>    adapt btrace testcases for arm target

>>

>>   gdb/ChangeLog                                 | 139 +++

>>   gdb/Makefile.in                               |   5 +-

>>   gdb/NEWS                                      |  30 +

>>   gdb/aarch64-linux-nat.c                       |  68 ++

>>   gdb/arch/arm.h                                |  33 +

>>   gdb/arm-linux-nat.c                           |  68 ++

>>   gdb/btrace.c                                  | 977 +++++++++++++++++-

>>   gdb/btrace.h                                  |  16 +-

>>   gdb/config.in                                 |   3 +

>>   gdb/configure                                 | 545 ++++++++++

>>   gdb/configure.nat                             |   4 +-

>>   gdb/doc/gdb.texinfo                           | 115 ++-

>>   gdb/features/btrace-conf.dtd                  |  10 +-

>>   gdb/features/btrace.dtd                       |  38 +-

>>   gdb/infrun.c                                  |   3 +-

>>   gdb/nat/linux-btrace.c                        | 400 ++++++-

>>   gdb/nat/linux-btrace.h                        |  19 +

>>   gdb/record-btrace.c                           | 168 ++-

>>   gdb/record.c                                  |   2 +

>>   gdb/remote.c                                  |  66 +-

>>   .../gdb.btrace/aarch64-instruction_history.S  |  31 +

>>   .../gdb.btrace/aarch64-record_goto.S          | 400 +++++++

>>   .../gdb.btrace/aarch64-tailcall-only.S        | 517 +++++++++

>>   gdb/testsuite/gdb.btrace/aarch64-tailcall.S   | 409 ++++++++

>>   .../gdb.btrace/arm-instruction_history.S      |  31 +

>>   gdb/testsuite/gdb.btrace/arm-record_goto.S    | 433 ++++++++

>>   gdb/testsuite/gdb.btrace/arm-tailcall-only.S  | 504 +++++++++

>>   gdb/testsuite/gdb.btrace/arm-tailcall.S       | 391 +++++++

>>   gdb/testsuite/gdb.btrace/buffer-size.exp      |  15 +-

>>   gdb/testsuite/gdb.btrace/delta.exp            |  10 +

>>   .../gdb.btrace/instruction_history.exp        | 107 +-

>>   gdb/testsuite/gdb.btrace/non-stop.exp         |  60 +-

>>   gdb/testsuite/gdb.btrace/record_goto.exp      | 241 +++--

>>   gdb/testsuite/gdb.btrace/stepi.exp            |  95 +-

>>   gdb/testsuite/gdb.btrace/tailcall-only.exp    |   8 +

>>   gdb/testsuite/gdb.btrace/tailcall.exp         |  46 +-

>>   ...on_history.S => x86-instruction_history.S} |   0

>>   gdb/testsuite/lib/gdb.exp                     |   2 +-

>>   gdb/top.c                                     |  10 +-

>>   gdbserver/ChangeLog                           |  16 +

>>   gdbserver/config.in                           |   3 +

>>   gdbserver/configure                           | 545 ++++++++++

>>   gdbserver/configure.srv                       |   4 +

>>   gdbserver/linux-low.cc                        | 104 +-

>>   gdbserver/server.cc                           |  34 +-

>>   gdbsupport/ChangeLog                          |  29 +

>>   gdbsupport/Makefile.in                        |   3 +

>>   gdbsupport/btrace-common.cc                   |  46 +

>>   gdbsupport/btrace-common.h                    | 115 ++-

>>   gdbsupport/common.m4                          |  39 +

>>   gdbsupport/config.in                          |   3 +

>>   gdbsupport/configure                          | 545 ++++++++++

>>   52 files changed, 7347 insertions(+), 158 deletions(-)

>>   create mode 100644 gdb/testsuite/gdb.btrace/aarch64-instruction_history.S

>>   create mode 100644 gdb/testsuite/gdb.btrace/aarch64-record_goto.S

>>   create mode 100644 gdb/testsuite/gdb.btrace/aarch64-tailcall-only.S

>>   create mode 100644 gdb/testsuite/gdb.btrace/aarch64-tailcall.S

>>   create mode 100644 gdb/testsuite/gdb.btrace/arm-instruction_history.S

>>   create mode 100644 gdb/testsuite/gdb.btrace/arm-record_goto.S

>>   create mode 100644 gdb/testsuite/gdb.btrace/arm-tailcall-only.S

>>   create mode 100644 gdb/testsuite/gdb.btrace/arm-tailcall.S

>>   rename gdb/testsuite/gdb.btrace/{instruction_history.S => x86-instruction_history.S} (100%)

>>

> Hi Zied,

>

> I'd like to take a quick look, but I am not able to apply your patchset,

> it seems you weren't on the latest master at the time you sent it.  Do

> you know which sha1 your patchset applies on?

>

> Simon
Tankut Baris Aktemur via Gdb-patches April 5, 2021, 12:09 a.m. | #3
On 2021-04-02 12:05 p.m., Zied Guermazi wrote:
> hi Simon

> 

> the patchset applies to this commit

> 

> commit 39b07596938e4c2a7251d77ea01981d475747599 (*origin/master*, *origin/HEAD*, *master*)

> Author: GDB Administrator <gdbadmin@sourceware.org>

> Date:   Thu Feb 25 00:00:20 2021 +0000

> 

>     Automatic date update in version.in

> 

> Kind Regards

> Zied Guermazi 


Hmm, so I get this when applying patch 2:


    $ git am -3 ~/patches/\[PATCH\ v3\ 2_7\]\ add\ btrace\ coresight\ related\ commands.eml 
    Applying: add btrace coresight related commands
    Using index info to reconstruct a base tree...
    /home/simark/src/binutils-gdb/.git/worktrees/avr/rebase-apply/patch:394: trailing whitespace.
            * btrace-common.h (btrace_format): add BTRACE_FORMAT_ETM 
    error: patch failed: gdb/record-btrace.c:2950
    error: gdb/record-btrace.c: patch does not apply
    error: patch failed: gdbsupport/btrace-common.cc:36
    error: gdbsupport/btrace-common.cc: patch does not apply
    error: Did you hand edit your patch?
    It does not apply to blobs recorded in its index.
    Patch failed at 0001 add btrace coresight related commands
    hint: Use 'git am --show-current-patch=diff' to see the failed patch
    When you have resolved this problem, run "git am --continue".
    If you prefer to skip this patch, run "git am --skip" instead.
    To restore the original branch and stop patching, run "git am --abort".

Are you able to successfully apply the patches from the mail?

Simon
Zied Guermazi April 5, 2021, 7:38 a.m. | #4
hi Simon,

the first error message looks related to the change log.

I am adding the change logs manually to the mail, is this fine? how 
shall the change logs be provided? shall I change the ChangeLog files 
located under gdb, gdbserver and gdbsupport folder? is it enough to put 
the change logs in the mail header?

Kind Regards

Zied


On 05.04.21 02:09, Simon Marchi wrote:
> On 2021-04-02 12:05 p.m., Zied Guermazi wrote:

>> hi Simon

>>

>> the patchset applies to this commit

>>

>> commit 39b07596938e4c2a7251d77ea01981d475747599 (*origin/master*, *origin/HEAD*, *master*)

>> Author: GDB Administrator <gdbadmin@sourceware.org>

>> Date:   Thu Feb 25 00:00:20 2021 +0000

>>

>>      Automatic date update in version.in

>>

>> Kind Regards

>> Zied Guermazi

> Hmm, so I get this when applying patch 2:

>

>

>      $ git am -3 ~/patches/\[PATCH\ v3\ 2_7\]\ add\ btrace\ coresight\ related\ commands.eml

>      Applying: add btrace coresight related commands

>      Using index info to reconstruct a base tree...

>      /home/simark/src/binutils-gdb/.git/worktrees/avr/rebase-apply/patch:394: trailing whitespace.

>              * btrace-common.h (btrace_format): add BTRACE_FORMAT_ETM

>      error: patch failed: gdb/record-btrace.c:2950

>      error: gdb/record-btrace.c: patch does not apply

>      error: patch failed: gdbsupport/btrace-common.cc:36

>      error: gdbsupport/btrace-common.cc: patch does not apply

>      error: Did you hand edit your patch?

>      It does not apply to blobs recorded in its index.

>      Patch failed at 0001 add btrace coresight related commands

>      hint: Use 'git am --show-current-patch=diff' to see the failed patch

>      When you have resolved this problem, run "git am --continue".

>      If you prefer to skip this patch, run "git am --skip" instead.

>      To restore the original branch and stop patching, run "git am --abort".

>

> Are you able to successfully apply the patches from the mail?

>

> Simon
Tankut Baris Aktemur via Gdb-patches April 6, 2021, 4:25 p.m. | #5
On 2021-04-05 3:38 a.m., Zied Guermazi wrote:
> hi Simon,

> 

> the first error message looks related to the change log.


Yeah, this:

     /home/simark/src/binutils-gdb/.git/worktrees/avr/rebase-apply/patch:394: trailing whitespace.
             * btrace-common.h (btrace_format): add BTRACE_FORMAT_ETM 

This is just a warning (which should be addressed, removing the
offending trailing whitespace).  But this isn't the main issue, this is:

     error: patch failed: gdb/record-btrace.c:2950
     error: gdb/record-btrace.c: patch does not apply
     error: patch failed: gdbsupport/btrace-common.cc:36
     error: gdbsupport/btrace-common.cc: patch does not apply
     error: Did you hand edit your patch? 

The hunks for the source files don't apply.  Did you send your patch
using git-send-email?

> I am adding the change logs manually to the mail, is this fine? how shall the change logs be provided? shall I change the ChangeLog files located under gdb, gdbserver and gdbsupport folder? is it enough to put the change logs in the mail header?


Most people put the ChangeLog entries only in the commit message when
sending the patch for review, and only move them to the actual ChangeLog
files when pushing.  This is a habit to avoid unnecessary conflicts in
ChangeLog files, where the top lines change all the time (this can also
be mitigated using git-merge-changelog).

But since you gave me the exact commit, on which to apply the series,
it should work regardless.  So the patch's formatting has likely been
altered in the process of sending it.

Simon