* Warning with next-20210121 on s390
@ 2021-01-21 14:39 Sven Schnelle
2021-01-21 14:39 ` [PATCH] s390: allow reschedule on syscall restart Sven Schnelle
0 siblings, 1 reply; 9+ messages in thread
From: Sven Schnelle @ 2021-01-21 14:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Heiko Carstens, Vasily Gorbik, Christian Borntraeger,
Thomas Gleixner, Frederic Weisbecker
there's a warning with linux-next on s390:
[ 33.893818] systemd-xdg-autostart-generator[544]: Not generating service for XDG autostart app-at\x2dspi\x2ddbus\x2dbus-autostart.service, startup phases are not supported.
[ 54.613344] ------------[ cut here ]------------
[ 54.613702] Late current task rescheduling may be lost
[ 54.613709] WARNING: CPU: 0 PID: 574 at linux/kernel/sched/core.c:628 sched_resched_local_assert_allowed+0x86/0x90
[ 54.613714] Modules linked in:
[ 54.613717] CPU: 0 PID: 574 Comm: qemu-system-s39 Not tainted 5.11.0-rc4-next-20210121 #2601
[ 54.613721] Hardware name: IBM 3906 M04 704 (z/VM 7.1.0)
[ 54.613724] Krnl PSW : 0404e00180000000 0000000000d86bea (sched_resched_local_assert_allowed+0x8a/0x90)
[ 54.613730] R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:3 CC:2 PM:0 RI:0 EA:3
This is because of a non-obvious merge conflict between 56e62a737028
("s390: convert to generic entry") and 845f44e8ef28 ("sched: Report local
wake up on resched blind zone within idle loop"). Can you include the attached patch
into linux-next?
Thanks,
Sven
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH] s390: allow reschedule on syscall restart
2021-01-21 14:39 Warning with next-20210121 on s390 Sven Schnelle
@ 2021-01-21 14:39 ` Sven Schnelle
2021-01-21 21:32 ` Stephen Rothwell
2021-01-26 6:59 ` Christian Borntraeger
0 siblings, 2 replies; 9+ messages in thread
From: Sven Schnelle @ 2021-01-21 14:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Heiko Carstens, Vasily Gorbik, Christian Borntraeger,
Thomas Gleixner, Frederic Weisbecker, Sven Schnelle
Commit 845f44e8ef28 ("sched: Report local wake up on resched blind zone
within idle loop") from next-20210121 causes a warning because s390
doesn't call sched_resched_local_allow() when restarting a syscall.
Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
---
arch/s390/kernel/syscall.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/s390/kernel/syscall.c b/arch/s390/kernel/syscall.c
index bc8e650e377d..2b39ac40f970 100644
--- a/arch/s390/kernel/syscall.c
+++ b/arch/s390/kernel/syscall.c
@@ -162,6 +162,7 @@ void noinstr __do_syscall(struct pt_regs *regs, int per_trap)
do_syscall(regs);
if (!test_pt_regs_flag(regs, PIF_SYSCALL_RESTART))
break;
+ sched_resched_local_allow();
local_irq_enable();
}
exit_to_user_mode();
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] s390: allow reschedule on syscall restart
2021-01-21 14:39 ` [PATCH] s390: allow reschedule on syscall restart Sven Schnelle
@ 2021-01-21 21:32 ` Stephen Rothwell
2021-01-21 21:43 ` Paul E. McKenney
2021-01-21 22:31 ` Stephen Rothwell
2021-01-26 6:59 ` Christian Borntraeger
1 sibling, 2 replies; 9+ messages in thread
From: Stephen Rothwell @ 2021-01-21 21:32 UTC (permalink / raw)
To: Sven Schnelle
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Heiko Carstens, Vasily Gorbik, Christian Borntraeger,
Thomas Gleixner, Frederic Weisbecker, Paul E. McKenney
[-- Attachment #1: Type: text/plain, Size: 1130 bytes --]
Hi all,
On Thu, 21 Jan 2021 15:39:26 +0100 Sven Schnelle <svens@linux.ibm.com> wrote:
>
> Commit 845f44e8ef28 ("sched: Report local wake up on resched blind zone
> within idle loop") from next-20210121 causes a warning because s390
> doesn't call sched_resched_local_allow() when restarting a syscall.
>
> Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
> ---
> arch/s390/kernel/syscall.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/s390/kernel/syscall.c b/arch/s390/kernel/syscall.c
> index bc8e650e377d..2b39ac40f970 100644
> --- a/arch/s390/kernel/syscall.c
> +++ b/arch/s390/kernel/syscall.c
> @@ -162,6 +162,7 @@ void noinstr __do_syscall(struct pt_regs *regs, int per_trap)
> do_syscall(regs);
> if (!test_pt_regs_flag(regs, PIF_SYSCALL_RESTART))
> break;
> + sched_resched_local_allow();
> local_irq_enable();
> }
> exit_to_user_mode();
I add that today as a merge fixup patch to the merge of the rcu tree
(which contains commit 845f44e8ef28 ("sched: Report local wake up on
resched blind zone within idle loop") ).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] s390: allow reschedule on syscall restart
2021-01-21 21:32 ` Stephen Rothwell
@ 2021-01-21 21:43 ` Paul E. McKenney
2021-01-21 22:31 ` Stephen Rothwell
1 sibling, 0 replies; 9+ messages in thread
From: Paul E. McKenney @ 2021-01-21 21:43 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Sven Schnelle, Linux Next Mailing List,
Linux Kernel Mailing List, Heiko Carstens, Vasily Gorbik,
Christian Borntraeger, Thomas Gleixner, Frederic Weisbecker
On Fri, Jan 22, 2021 at 08:32:49AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 21 Jan 2021 15:39:26 +0100 Sven Schnelle <svens@linux.ibm.com> wrote:
> >
> > Commit 845f44e8ef28 ("sched: Report local wake up on resched blind zone
> > within idle loop") from next-20210121 causes a warning because s390
> > doesn't call sched_resched_local_allow() when restarting a syscall.
> >
> > Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
> > ---
> > arch/s390/kernel/syscall.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/arch/s390/kernel/syscall.c b/arch/s390/kernel/syscall.c
> > index bc8e650e377d..2b39ac40f970 100644
> > --- a/arch/s390/kernel/syscall.c
> > +++ b/arch/s390/kernel/syscall.c
> > @@ -162,6 +162,7 @@ void noinstr __do_syscall(struct pt_regs *regs, int per_trap)
> > do_syscall(regs);
> > if (!test_pt_regs_flag(regs, PIF_SYSCALL_RESTART))
> > break;
> > + sched_resched_local_allow();
> > local_irq_enable();
> > }
> > exit_to_user_mode();
>
> I add that today as a merge fixup patch to the merge of the rcu tree
> (which contains commit 845f44e8ef28 ("sched: Report local wake up on
> resched blind zone within idle loop") ).
If Frederic has no objections, I will fold this in with attribution.
Either way, good catch!
Thanx, Paul
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] s390: allow reschedule on syscall restart
2021-01-21 21:32 ` Stephen Rothwell
2021-01-21 21:43 ` Paul E. McKenney
@ 2021-01-21 22:31 ` Stephen Rothwell
1 sibling, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2021-01-21 22:31 UTC (permalink / raw)
To: Sven Schnelle
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Heiko Carstens, Vasily Gorbik, Christian Borntraeger,
Thomas Gleixner, Frederic Weisbecker, Paul E. McKenney
[-- Attachment #1: Type: text/plain, Size: 448 bytes --]
Hi all,
On Fri, 22 Jan 2021 08:32:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I add that today as a merge fixup patch to the merge of the rcu tree
> (which contains commit 845f44e8ef28 ("sched: Report local wake up on
> resched blind zone within idle loop") ).
That is now commit
0932934fd95e ("sched: Report local wake up on resched blind zone within idle loop")
in the rcu tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] s390: allow reschedule on syscall restart
2021-01-21 14:39 ` [PATCH] s390: allow reschedule on syscall restart Sven Schnelle
2021-01-21 21:32 ` Stephen Rothwell
@ 2021-01-26 6:59 ` Christian Borntraeger
2021-01-26 9:39 ` Sven Schnelle
2021-01-26 10:25 ` Stephen Rothwell
1 sibling, 2 replies; 9+ messages in thread
From: Christian Borntraeger @ 2021-01-26 6:59 UTC (permalink / raw)
To: Sven Schnelle, Stephen Rothwell
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Heiko Carstens, Vasily Gorbik, Thomas Gleixner,
Frederic Weisbecker, Paul E. McKenney
On 21.01.21 15:39, Sven Schnelle wrote:
> Commit 845f44e8ef28 ("sched: Report local wake up on resched blind zone
> within idle loop") from next-20210121 causes a warning because s390
> doesn't call sched_resched_local_allow() when restarting a syscall.
>
> Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
> ---
> arch/s390/kernel/syscall.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/s390/kernel/syscall.c b/arch/s390/kernel/syscall.c
> index bc8e650e377d..2b39ac40f970 100644
> --- a/arch/s390/kernel/syscall.c
> +++ b/arch/s390/kernel/syscall.c
> @@ -162,6 +162,7 @@ void noinstr __do_syscall(struct pt_regs *regs, int per_trap)
> do_syscall(regs);
> if (!test_pt_regs_flag(regs, PIF_SYSCALL_RESTART))
> break;
> + sched_resched_local_allow();
> local_irq_enable();
> }
> exit_to_user_mode();
Yesterdays next now fails with
arch/s390/kernel/syscall.c: In function '__do_syscall':
arch/s390/kernel/syscall.c:165:3: error: implicit declaration of function 'sched_resched_local_allow' [-Werror=implicit-function-declaration]
165 | sched_resched_local_allow();
| ^~~~~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:288: arch/s390/kernel/syscall.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:530: arch/s390/kernel] Error 2
make[1]: *** Waiting for unfinished jobs....
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] s390: allow reschedule on syscall restart
2021-01-26 6:59 ` Christian Borntraeger
@ 2021-01-26 9:39 ` Sven Schnelle
2021-01-26 10:25 ` Stephen Rothwell
1 sibling, 0 replies; 9+ messages in thread
From: Sven Schnelle @ 2021-01-26 9:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Christian Borntraeger, Linux Next Mailing List,
Linux Kernel Mailing List, Heiko Carstens, Vasily Gorbik,
Thomas Gleixner, Frederic Weisbecker, Paul E. McKenney
Christian Borntraeger <borntraeger@de.ibm.com> writes:
> On 21.01.21 15:39, Sven Schnelle wrote:
>> Commit 845f44e8ef28 ("sched: Report local wake up on resched blind zone
>> within idle loop") from next-20210121 causes a warning because s390
>> doesn't call sched_resched_local_allow() when restarting a syscall.
>>
>> Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
>> ---
>> arch/s390/kernel/syscall.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/s390/kernel/syscall.c b/arch/s390/kernel/syscall.c
>> index bc8e650e377d..2b39ac40f970 100644
>> --- a/arch/s390/kernel/syscall.c
>> +++ b/arch/s390/kernel/syscall.c
>> @@ -162,6 +162,7 @@ void noinstr __do_syscall(struct pt_regs *regs, int per_trap)
>> do_syscall(regs);
>> if (!test_pt_regs_flag(regs, PIF_SYSCALL_RESTART))
>> break;
>> + sched_resched_local_allow();
>> local_irq_enable();
>> }
>> exit_to_user_mode();
>
> Yesterdays next now fails with
>
>
> arch/s390/kernel/syscall.c: In function '__do_syscall':
> arch/s390/kernel/syscall.c:165:3: error: implicit declaration of function 'sched_resched_local_allow' [-Werror=implicit-function-declaration]
> 165 | sched_resched_local_allow();
> | ^~~~~~~~~~~~~~~~~~~~~~~~~
> cc1: some warnings being treated as errors
> make[2]: *** [scripts/Makefile.build:288: arch/s390/kernel/syscall.o] Error 1
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [scripts/Makefile.build:530: arch/s390/kernel] Error 2
> make[1]: *** Waiting for unfinished jobs....
Looks to me like 845f44e8ef28 ("sched: Report local wake up on resched
blind zone") was removed from linux-next. Stephen, can you remove my
commit as well? It is no longer needed.
Thanks
Sven
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] s390: allow reschedule on syscall restart
2021-01-26 6:59 ` Christian Borntraeger
2021-01-26 9:39 ` Sven Schnelle
@ 2021-01-26 10:25 ` Stephen Rothwell
2021-01-26 15:12 ` Paul E. McKenney
1 sibling, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2021-01-26 10:25 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Sven Schnelle, Linux Next Mailing List,
Linux Kernel Mailing List, Heiko Carstens, Vasily Gorbik,
Thomas Gleixner, Frederic Weisbecker, Paul E. McKenney
[-- Attachment #1: Type: text/plain, Size: 1787 bytes --]
Hi all,
On Tue, 26 Jan 2021 07:59:51 +0100 Christian Borntraeger <borntraeger@de.ibm.com> wrote:
>
> On 21.01.21 15:39, Sven Schnelle wrote:
> > Commit 845f44e8ef28 ("sched: Report local wake up on resched blind zone
> > within idle loop") from next-20210121 causes a warning because s390
> > doesn't call sched_resched_local_allow() when restarting a syscall.
> >
> > Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
> > ---
> > arch/s390/kernel/syscall.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/arch/s390/kernel/syscall.c b/arch/s390/kernel/syscall.c
> > index bc8e650e377d..2b39ac40f970 100644
> > --- a/arch/s390/kernel/syscall.c
> > +++ b/arch/s390/kernel/syscall.c
> > @@ -162,6 +162,7 @@ void noinstr __do_syscall(struct pt_regs *regs, int per_trap)
> > do_syscall(regs);
> > if (!test_pt_regs_flag(regs, PIF_SYSCALL_RESTART))
> > break;
> > + sched_resched_local_allow();
> > local_irq_enable();
> > }
> > exit_to_user_mode();
>
> Yesterdays next now fails with
>
>
> arch/s390/kernel/syscall.c: In function '__do_syscall':
> arch/s390/kernel/syscall.c:165:3: error: implicit declaration of function 'sched_resched_local_allow' [-Werror=implicit-function-declaration]
> 165 | sched_resched_local_allow();
> | ^~~~~~~~~~~~~~~~~~~~~~~~~
> cc1: some warnings being treated as errors
> make[2]: *** [scripts/Makefile.build:288: arch/s390/kernel/syscall.o] Error 1
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [scripts/Makefile.build:530: arch/s390/kernel] Error 2
> make[1]: *** Waiting for unfinished jobs....
I have now removed the merge fix up for tomorrow. It seems that the
commits that needed it have been removed :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] s390: allow reschedule on syscall restart
2021-01-26 10:25 ` Stephen Rothwell
@ 2021-01-26 15:12 ` Paul E. McKenney
0 siblings, 0 replies; 9+ messages in thread
From: Paul E. McKenney @ 2021-01-26 15:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Christian Borntraeger, Sven Schnelle, Linux Next Mailing List,
Linux Kernel Mailing List, Heiko Carstens, Vasily Gorbik,
Thomas Gleixner, Frederic Weisbecker
On Tue, Jan 26, 2021 at 09:25:53PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 26 Jan 2021 07:59:51 +0100 Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> >
> > On 21.01.21 15:39, Sven Schnelle wrote:
> > > Commit 845f44e8ef28 ("sched: Report local wake up on resched blind zone
> > > within idle loop") from next-20210121 causes a warning because s390
> > > doesn't call sched_resched_local_allow() when restarting a syscall.
> > >
> > > Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
> > > ---
> > > arch/s390/kernel/syscall.c | 1 +
> > > 1 file changed, 1 insertion(+)
> > >
> > > diff --git a/arch/s390/kernel/syscall.c b/arch/s390/kernel/syscall.c
> > > index bc8e650e377d..2b39ac40f970 100644
> > > --- a/arch/s390/kernel/syscall.c
> > > +++ b/arch/s390/kernel/syscall.c
> > > @@ -162,6 +162,7 @@ void noinstr __do_syscall(struct pt_regs *regs, int per_trap)
> > > do_syscall(regs);
> > > if (!test_pt_regs_flag(regs, PIF_SYSCALL_RESTART))
> > > break;
> > > + sched_resched_local_allow();
> > > local_irq_enable();
> > > }
> > > exit_to_user_mode();
> >
> > Yesterdays next now fails with
> >
> >
> > arch/s390/kernel/syscall.c: In function '__do_syscall':
> > arch/s390/kernel/syscall.c:165:3: error: implicit declaration of function 'sched_resched_local_allow' [-Werror=implicit-function-declaration]
> > 165 | sched_resched_local_allow();
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~
> > cc1: some warnings being treated as errors
> > make[2]: *** [scripts/Makefile.build:288: arch/s390/kernel/syscall.o] Error 1
> > make[2]: *** Waiting for unfinished jobs....
> > make[1]: *** [scripts/Makefile.build:530: arch/s390/kernel] Error 2
> > make[1]: *** Waiting for unfinished jobs....
>
> I have now removed the merge fix up for tomorrow. It seems that the
> commits that needed it have been removed :-(
Review comments mean that they need rework, apologies for the hassle!
Thanx, Paul
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-01-26 15:13 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-21 14:39 Warning with next-20210121 on s390 Sven Schnelle
2021-01-21 14:39 ` [PATCH] s390: allow reschedule on syscall restart Sven Schnelle
2021-01-21 21:32 ` Stephen Rothwell
2021-01-21 21:43 ` Paul E. McKenney
2021-01-21 22:31 ` Stephen Rothwell
2021-01-26 6:59 ` Christian Borntraeger
2021-01-26 9:39 ` Sven Schnelle
2021-01-26 10:25 ` Stephen Rothwell
2021-01-26 15:12 ` Paul E. McKenney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).