From: Petr Mladek <pmladek@suse•com>
To: Randy Dunlap <rdunlap@infradead•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Michael Ellerman <mpe@ellerman•id.au>,
Andrew Morton <akpm@linux-foundation•org>,
Douglas Anderson <dianders@chromium•org>
Subject: Re: linux-next: Tree for Jun 28 (arch/powerpc/platforms/pseries/mobility.c)
Date: Thu, 29 Jun 2023 10:40:14 +0200 [thread overview]
Message-ID: <ZJ1Dborac_Kj4Qbw@alley> (raw)
In-Reply-To: <af19b76d-aa4b-6c88-9cac-eae4b2072497@infradead.org>
On Wed 2023-06-28 22:07:17, Randy Dunlap wrote:
>
>
> On 6/27/23 21:27, Stephen Rothwell wrote:
> > Hi all,
> >
> > Please do *not* add any v5.6 related stuff to your linux-next included
> > branches until after v5.5-rc1 has been released.
> >
> > Changes since 20230627:
> >
>
> on powerpc64, when
> # CONFIG_HARDLOCKUP_DETECTOR is not set:
>
> ../arch/powerpc/platforms/pseries/mobility.c: In function 'pseries_migrate_partition':
> ../arch/powerpc/platforms/pseries/mobility.c:753:17: error: implicit declaration of function 'watchdog_hardlockup_set_timeout_pct'; did you mean 'watchdog_hardlockup_stop'? [-Werror=implicit-function-declaration]
> 753 | watchdog_hardlockup_set_timeout_pct(factor);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> | watchdog_hardlockup_stop
> cc1: all warnings being treated as errors
>
>
> Full randconfig file is attached.
>
>
> If I blatantly modify include/linux/nmi.h with these comments, it builds OK:
>
> //#if defined(CONFIG_HARDLOCKUP_DETECTOR_ARCH) || defined(CONFIG_HARDLOCKUP_DETECTOR_SPARC64)
> #include <asm/nmi.h>
> //#endif
This is well describes the probem.
The decision whether to include asm/nmi.h should not depend only on
CONFIG_HARDLOCKUP_DETECTOR_* when it is needed also for other stuff.
Well, it could not be always included because it exists only
on 4 architectures:
$> ls -1 arch/*/include/asm/nmi.h
arch/powerpc/include/asm/nmi.h
arch/s390/include/asm/nmi.h
arch/sparc/include/asm/nmi.h
arch/x86/include/asm/nmi.h
and include/asm-generic/nmi.h. does not exist.
I see two reasonable solutions:
1. We either create an empty "include/asm-generic/nmi.h" and
always include asm/nmi.h in linux/nmi.h.
It looks is a bit weird but it might be the easiest solution
unless it creates another problems elsewhere.
2. Explicitely include asm/nmi.h where needed, in
arch/powerpc/platforms/pseries/mobility.c and maybe somewhere as
well.
It is already done in many cases:
$> git grep asm/nmi.h
arch/Kconfig: asm/nmi.h, and defines its own arch_touch_nmi_watchdog().
arch/powerpc/kernel/mce.c:#include <asm/nmi.h>
arch/powerpc/kernel/traps.c:#include <asm/nmi.h>
arch/powerpc/kernel/watchdog.c:#include <asm/nmi.h>
arch/s390/kernel/entry.S:#include <asm/nmi.h>
arch/s390/kernel/idle.c:#include <asm/nmi.h>
arch/s390/kernel/machine_kexec.c:#include <asm/nmi.h>
arch/s390/kernel/nmi.c:#include <asm/nmi.h>
arch/s390/kernel/process.c:#include <asm/nmi.h>
arch/s390/kernel/setup.c:#include <asm/nmi.h>
arch/s390/kernel/smp.c:#include <asm/nmi.h>
arch/s390/kvm/interrupt.c:#include <asm/nmi.h>
arch/s390/kvm/kvm-s390.c:#include <asm/nmi.h>
arch/s390/kvm/vsie.c:#include <asm/nmi.h>
arch/sparc/kernel/pcr.c:#include <asm/nmi.h>
arch/sparc/kernel/perf_event.c:#include <asm/nmi.h>
arch/x86/events/amd/core.c:#include <asm/nmi.h>
arch/x86/events/amd/ibs.c:#include <asm/nmi.h>
arch/x86/events/core.c:#include <asm/nmi.h>
arch/x86/kernel/alternative.c:#include <asm/nmi.h>
arch/x86/kernel/apic/hw_nmi.c:#include <asm/nmi.h>
arch/x86/kernel/cpu/mce/inject.c:#include <asm/nmi.h>
arch/x86/kernel/cpu/mshyperv.c:#include <asm/nmi.h>
arch/x86/kernel/cpu/perfctr-watchdog.c:#include <asm/nmi.h>
arch/x86/kernel/crash.c:#include <asm/nmi.h>
arch/x86/kernel/kgdb.c:#include <asm/nmi.h>
arch/x86/kernel/nmi.c:#include <asm/nmi.h>
arch/x86/kernel/nmi_selftest.c:#include <asm/nmi.h>
arch/x86/kernel/process.c:#include <asm/nmi.h>
arch/x86/kernel/reboot.c:#include <asm/nmi.h>
arch/x86/kernel/smp.c:#include <asm/nmi.h>
arch/x86/kernel/smpboot.c:#include <asm/nmi.h>
arch/x86/kernel/tsc.c:#include <asm/nmi.h>
arch/x86/platform/uv/uv_nmi.c:#include <asm/nmi.h>
drivers/char/ipmi/ipmi_watchdog.c:#include <asm/nmi.h>
drivers/edac/igen6_edac.c:#include <asm/nmi.h>
drivers/s390/cio/cio.c:#include <asm/nmi.h>
drivers/watchdog/hpwdt.c:#include <asm/nmi.h>
include/linux/nmi.h:#include <asm/nmi.h>
include/linux/nmi.h:#include <asm/nmi.h>
kernel/sysctl.c:#include <asm/nmi.h>
I would personally prefer the 2nd variant.
I am going to check other locations where it might be needed.
Best Regards,
Petr
next prev parent reply other threads:[~2023-06-29 8:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-28 4:27 linux-next: Tree for Jun 28 Stephen Rothwell
2023-06-29 5:07 ` linux-next: Tree for Jun 28 (arch/powerpc/platforms/pseries/mobility.c) Randy Dunlap
2023-06-29 8:40 ` Petr Mladek [this message]
2023-06-29 19:51 ` Doug Anderson
2023-06-30 14:33 ` Petr Mladek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZJ1Dborac_Kj4Qbw@alley \
--to=pmladek@suse$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dianders@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=rdunlap@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox