ACK: [SRU][B][PATCH 1/1] recordmcount.pl: fix typo in s390 mcount regex

[Stefan Bader]

On 03.02.22 02:50, Luke Nowakowski-Krijger wrote:
> From: Heiko Carstens <hca at linux.ibm.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1959752
> 
> commit 4eb1782eaa9fa1c224ad1fa0d13a9f09c3ab2d80 upstream.
> 
> Commit 85bf17b28f97 ("recordmcount.pl: look for jgnop instruction as well
> as bcrl on s390") added a new alternative mnemonic for the existing brcl
> instruction. This is required for the combination old gcc version (pre 9.0)
> and binutils since version 2.37.
> However at the same time this commit introduced a typo, replacing brcl with
> bcrl. As a result no mcount locations are detected anymore with old gcc
> versions (pre 9.0) and binutils before version 2.37.
> Fix this by using the correct mnemonic again.
> 
> Reported-by: Miroslav Benes <mbenes at suse.cz>
> Cc: Jerome Marchand <jmarchan at redhat.com>
> Cc: <stable at vger.kernel.org>
> Fixes: 85bf17b28f97 ("recordmcount.pl: look for jgnop instruction as well as bcrl on s390")
> Link: https://lore.kernel.org/r/alpine.LSU.2.21.2112230949520.19849@pobox.suse.cz
> Signed-off-by: Heiko Carstens <hca at linux.ibm.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> [cherry picked from commit 200b63a1727ec31735a894b4ce8378de96bdb9b1 stable/linux-4.19.y]
> Signed-off-by: Luke Nowakowski-Krijger <luke.nowakowskikrijger at canonical.com>
Acked-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>   scripts/recordmcount.pl | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
> index 037805131edb..6a4cd8df2d97 100755
> --- a/scripts/recordmcount.pl
> +++ b/scripts/recordmcount.pl
> @@ -252,7 +252,7 @@ if ($arch eq "x86_64") {
>   
>   } elsif ($arch eq "s390" && $bits == 64) {
>       if ($cc =~ /-DCC_USING_HOTPATCH/) {
> -	$mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*(bcrl\\s*0,|jgnop\\s*)[0-9a-f]+ <([^\+]*)>\$";
> +	$mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*(brcl\\s*0,|jgnop\\s*)[0-9a-f]+ <([^\+]*)>\$";
>   	$mcount_adjust = 0;
>       } else {
>   	$mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_390_(PC|PLT)32DBL\\s+_mcount\\+0x2\$";

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20220203/05caf11c/attachment.sig>