Message-ID: <b6548098-de01-4ee1-87c8-6036cb1e3073@oracle.com>
Date: Fri, 14 Jun 2024 14:10:26 +0530
From: Harshit Mogalapalli <harshit.m.mogalapalli@...cle.com>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, stable@...r.kernel.org
Cc: patches@...ts.linux.dev, linux-kernel@...r.kernel.org,
        torvalds@...ux-foundation.org, akpm@...ux-foundation.org,
        linux@...ck-us.net, shuah@...nel.org, patches@...nelci.org,
        lkft-triage@...ts.linaro.org,
        Kamalesh Babulal
 <kamalesh.babulal@...cle.com>, pavel@...x.de,
        jonathanh@...dia.com, f.fainelli@...il.com, sudipm.mukherjee@...il.com,
        srw@...dewatkins.net, rwarsow@....de, conor@...nel.org,
        allen.lkml@...il.com, broonie@...nel.org, acme@...hat.com,
        namhyung@...nel.org, gpavithrasha@...il.com, irogers@...gle.com,
        Vegard Nossum <vegard.nossum@...cle.com>,
        Darren Kenny <darren.kenny@...cle.com>
Subject: Re: [PATCH 5.15 000/402] 5.15.161-rc1 review

Hello Greg and Sasha,

On 13/06/24 16:59, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 5.15.161 release.
> There are 402 patches in this series, all will be posted as a response
> to this one.  If anyone has any issues with these being applied, please
> let me know.
> 
> Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000.
> Anything received after that time might be too late.
> 

perf build breaks on 5.15.161:(and on 5.4.278, 5.10.219)


In file included from util/cache.h:7,
                  from builtin-annotate.c:13:
util/../ui/ui.h:5:10: fatal error: ../util/mutex.h: No such file or 
directory
     5 | #include "../util/mutex.h"
       |          ^~~~~~~~~~~~~~~~~
compilation terminated.
make[3]: *** [/home/linux-stable-rc/tools/build/Makefile.build:97: 
builtin-annotate.o] Error 1
make[2]: *** [Makefile.perf:658: perf-in.o] Error 2
make[2]: *** Waiting for unfinished jobs....



 From the git log:

commit 83185fafbd143274c0313897fd8fda41aecffc93
Author: Ian Rogers <irogers@...gle.com>
Date:   Fri Aug 26 09:42:33 2022 -0700

     perf ui: Update use of pthread mutex

     [ Upstream commit 82aff6cc070417f26f9b02b26e63c17ff43b4044 ]

     Switch to the use of mutex wrappers that provide better error checking.


I think building perf while adding perf patches would help us prevent 
from running into this issue. cd tools/perf/ ; make -j$(nproc) all

We can choose one of the three ways to solve this :

1. Drop this patch and resolve conflicts in the next patch by keeping 
pthread_mutex_*, but this might not help future backports.

2. Add another dependency patch which introduces header file in util 
folder, that is also not clean backport due to a missing commit, but I 
have tried preparing a backport. I am not sure if that is a preferred 
way but with the backport inserted before: commit 
83185fafbd143274c0313897fd8fda41aecffc93 (between PATCH 224 and 225 in 
this series). Attached the backport. [ 
0001-perf-mutex-Wrapped-usage-of-mutex-and-cond.patch ]

3. Clean cherry-pick way: instead of resolving conflict add one more 
prerequisite patch:
just before commit 83185fafbd14 in 5.15.y: Cherry-pick:
	a. git cherry-pick -s 92ec3cc94c2c  // list_sort.h addition
	b. git cherry-pick -s e57d897703c3  // mutex.h addition

tools/perf builds with option 2/3, tested it.

For 5.10.y: Option 2 and 3 works.

For 5.4.y we need other way to fix this.

Thanks,
Harshit

> The whole patch series can be found in one patch at:
> 	https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.161-rc1.gz
> or in the git tree and branch at:
> 	git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
> and the diffstat can be found below.
> 
> thanks,
> 
> greg k-h
>
View attachment "0001-perf-mutex-Wrapped-usage-of-mutex-and-cond.patch" of type "text/plain" (7682 bytes)

Powered by blists - more mailing lists