Re: [PATCH 5.15 00/71] 5.15.157-rc1 review

Peter Oberparleiter
2024-04-24T09:48:54Z

On 24.04.2024 09:57, Naresh Kamboju wrote:
> On Wed, 24 Apr 2024 at 03:16, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
>>
>> This is the start of the stable review cycle for the 5.15.157 release.
>> There are 71 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 Thu, 25 Apr 2024 21:38:28 +0000.
>> Anything received after that time might be too late.
>>
>> 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.157-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
>
>
> The s390 defconfig build failed with gcc-12 and clang-17 on the Linux
> stable-rc linux.5.15.y branch.
>
> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
>
> Build log:
> ---
> drivers/s390/cio/qdio_main.c: In function 'qdio_int_handler':
> drivers/s390/cio/qdio_main.c:761:52: error: incompatible type for
> argument 2 of 'ccw_device_start'
> 761 | rc = ccw_device_start(cdev, irq_ptr->ccw,
> intparm, 0, 0);
> | ~~~~~~~^~~~~
> | |
> | struct ccw1
> In file included from arch/s390/include/asm/qdio.h:13,
> from drivers/s390/cio/qdio_main.c:18:
> arch/s390/include/asm/ccwdev.h:172:50: note: expected 'struct ccw1 *'
> but argument is of type 'struct ccw1'
> 172 | extern int ccw_device_start(struct ccw_device *, struct ccw1 *,
> | ^~~~~~~~~~~~~
> make[3]: *** [scripts/Makefile.build:289: drivers/s390/cio/qdio_main.o] Error 1
>
>
> Suspected commit:
> --------
> s390/qdio: handle deferred cc1
> [ Upstream commit 607638faf2ff1cede37458111496e7cc6c977f6f ]

This is due to a type change of field 'ccw' in 'struct qdio_irq' that
was introduced in v5.17 via commit 718ce9e10171 ("s390/qdio: avoid
allocating the qdio_irq with GFP_DMA").

The following change to commit 607638faf2ff ("s390/qdio: handle deferred
cc1") fixes the compile error on v5.15:

--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -758,7 +758,7 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,

if (rc == -EAGAIN) {
DBF_DEV_EVENT(DBF_INFO, irq_ptr, "qint retry");
- rc = ccw_device_start(cdev, irq_ptr->ccw, intparm, 0, 0);
+ rc = ccw_device_start(cdev, &irq_ptr->ccw, intparm, 0, 0);
if (!rc)
return;
DBF_ERROR("%4x RETRY ERR", irq_ptr->schid.sch_no);