Because the kbuild function if_changed writes the command line to a
.cmd file for later tests, multiple calls of that function within a
target would result in overwrites of previous values and effectively
render the command line test meaningless, resulting in flip-flop
behaviour.
Produce an error for targets with multiple calls to if_changed.
Three examples that would now be detected:
98f78525371b55ccd (x86/boot: Refuse to build with data relocations)
6a8dfe1cac5c591ae (microblaze: support U-BOOT image format)
684151a75bf25f5ae (sparc32: added U-Boot build target: uImage)
Suggested-by: Masahiro Yamada <[email protected]>
Signed-off-by: Dirk Gouders <[email protected]>
---
scripts/checkpatch.pl | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 447857ffaf6b..b0aadf23148e 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2911,6 +2911,14 @@ sub process {
"Use of $flag is deprecated, please use \`$replacement->{$flag} instead.\n" . $herecurr) if ($replacement->{$flag});
}
+ # Check for multiple calls of if_changed within a target in Makefiles
+ if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
+ ($prevline =~ /^[ +]\t\$\(call if_changed,/) &&
+ ($line =~ /^[ +]\t\$\(call if_changed,/)) {
+ ERROR("MULTIPLE_IF_CHANGED",
+ "Multiple calls of if_changed within a target.\n" . $herecurr);
+ }
+
# check for DT compatible documentation
if (defined $root &&
(($realfile =~ /\.dtsi?$/ && $line =~ /^\+\s*compatible\s*=\s*\"/) ||
--
2.17.1
On Mon, 2018-07-16 at 14:39 +0200, Dirk Gouders wrote:
> Because the kbuild function if_changed writes the command line to a
> .cmd file for later tests, multiple calls of that function within a
> target would result in overwrites of previous values and effectively
> render the command line test meaningless, resulting in flip-flop
> behaviour.
>
> Produce an error for targets with multiple calls to if_changed.
Hi. Some questions:
How is the existing use in arch/microblaze/boot/Makefile incorrect?
$(obj)/simpleImage.%: vmlinux FORCE
$(call if_changed,cp,.unstrip)
$(call if_changed,objcopy)
$(call if_changed,uimage)
$(call if_changed,strip,.strip)
@echo 'Kernel: $(UIMAGE_OUT) is ready' ' (#'`cat .version`')'
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
[]
> @@ -2911,6 +2911,14 @@ sub process {
> "Use of $flag is deprecated, please use \`$replacement->{$flag} instead.\n" . $herecurr) if ($replacement->{$flag});
> }
> i
> + # Check for multiple calls of if_changed within a target in Makefiles
> + if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
Why is any Kbuild file check useful?
> + ($prevline =~ /^[ +]\t\$\(call if_changed,/) &&
> + ($line =~ /^[ +]\t\$\(call if_changed,/)) {
What about if_changed_dep and if_changed_rule?
> + ERROR("MULTIPLE_IF_CHANGED",
> + "Multiple calls of if_changed within a target.\n" . $herecurr);
> + }
And some more style things:
There are instances with multiple tabs so probably
these should use '\t*' or '\s*' and not '\t'.
This should probably not require a single space after
if_changed so likely:
'call\s+if_changed'
Joe Perches <[email protected]> writes:
> On Mon, 2018-07-16 at 14:39 +0200, Dirk Gouders wrote:
>> Because the kbuild function if_changed writes the command line to a
>> .cmd file for later tests, multiple calls of that function within a
>> target would result in overwrites of previous values and effectively
>> render the command line test meaningless, resulting in flip-flop
>> behaviour.
>>
>> Produce an error for targets with multiple calls to if_changed.
>
> Hi. Some questions:
>
> How is the existing use in arch/microblaze/boot/Makefile incorrect?
>
> $(obj)/simpleImage.%: vmlinux FORCE
> $(call if_changed,cp,.unstrip)
> $(call if_changed,objcopy)
> $(call if_changed,uimage)
> $(call if_changed,strip,.strip)
> @echo 'Kernel: $(UIMAGE_OUT) is ready' ' (#'`cat .version`')'
Hi Joe,
thank you for the review.
Perhaps I should have started the commit message with:
"The kbuild function if_changed should not be called more than once for a
target." and then the explanatory text.
In case you are interested in the thread where Masahiro explained in detail the
real issues with those Makefiles that made them use if_changed too often:
https://marc.info/?l=linux-kernel&m=153149389303034&w=2
>> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> []
>> @@ -2911,6 +2911,14 @@ sub process {
>> "Use of $flag is deprecated, please use \`$replacement->{$flag} instead.\n" . $herecurr) if ($replacement->{$flag});
>> }
>> i
>> + # Check for multiple calls of if_changed within a target in Makefiles
>> + if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
>
> Why is any Kbuild file check useful?
Because Kbuild files are makefiles and if we want to check makefiles
they are also meant.
>> + ($prevline =~ /^[ +]\t\$\(call if_changed,/) &&
>> + ($line =~ /^[ +]\t\$\(call if_changed,/)) {
>
> What about if_changed_dep and if_changed_rule?
This patch tries to avoid just one single issue that actually showed
up and caused irritation.
>
>> + ERROR("MULTIPLE_IF_CHANGED",
>> + "Multiple calls of if_changed within a target.\n" . $herecurr);
>> + }
>
> And some more style things:
>
> There are instances with multiple tabs so probably
> these should use '\t*' or '\s*' and not '\t'.
Oh yes, I missed that.
I guess, you mean e.g. arch/x86/purgatory/Makefile:
$(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
$(call if_changed,ld)
I did not check the log but it seems there was one commit that for some
reason used \t\t for the recipes.
Anyway, the first TAB is mandatory, because we want to check recipes,
only.
> This should probably not require a single space after
> if_changed so likely:
>
> 'call\s+if_changed'
Treewide, I did not find a single call of if_changed that uses other than
a single space but you are right, me might see variations.
So, according to your remarks, I would change the pattern to:
/^[ +]\t\s*\$\(call\s+if_changed,/
Dirk
The kbuild function if_changed should not be called more than once for
a target.
Because that function writes the command line to a .cmd file for later
tests, multiple calls of it within a target would result in overwrites
of previous values and effectively render the command line test
meaningless, resulting in flip-flop behaviour.
Add a check for makefiles and kbuild files and produce an error for
targets with multiple calls to if_changed.
Three examples that now could be detected:
98f78525371b55ccd (x86/boot: Refuse to build with data relocations)
6a8dfe1cac5c591ae (microblaze: support U-BOOT image format)
684151a75bf25f5ae (sparc32: added U-Boot build target: uImage)
Reviewed-by: Joe Perches <[email protected]>
Suggested-by: Masahiro Yamada <[email protected]>
Signed-off-by: Dirk Gouders <[email protected]>
---
v2: rework commit message and regular expression
---
scripts/checkpatch.pl | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 447857ffaf6b..437e98414f74 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2911,6 +2911,14 @@ sub process {
"Use of $flag is deprecated, please use \`$replacement->{$flag} instead.\n" . $herecurr) if ($replacement->{$flag});
}
+ # Check for multiple calls of if_changed within a target in Makefiles
+ if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
+ ($prevline =~ /^[ +]\t\s*\$\(call\s+if_changed,/) &&
+ ($line =~ /^[ +]\t\s*\$\(call\s+if_changed,/)) {
+ ERROR("MULTIPLE_IF_CHANGED",
+ "Multiple calls of if_changed within a target.\n" . $herecurr);
+ }
+
# check for DT compatible documentation
if (defined $root &&
(($realfile =~ /\.dtsi?$/ && $line =~ /^\+\s*compatible\s*=\s*\"/) ||
--
2.16.1
On Fri, 2018-07-20 at 09:48 +0200, Dirk Gouders wrote:
> The kbuild function if_changed should not be called more than once for
> a target.
>
> Because that function writes the command line to a .cmd file for later
> tests, multiple calls of it within a target would result in overwrites
> of previous values and effectively render the command line test
> meaningless, resulting in flip-flop behaviour.
>
> Add a check for makefiles and kbuild files and produce an error for
> targets with multiple calls to if_changed.
>
> Three examples that now could be detected:
>
> 98f78525371b55ccd (x86/boot: Refuse to build with data relocations)
> 6a8dfe1cac5c591ae (microblaze: support U-BOOT image format)
> 684151a75bf25f5ae (sparc32: added U-Boot build target: uImage)
>
> Reviewed-by: Joe Perches <[email protected]>
I didn't review this. I gave you feedback
but didn't add a signature.
For anything other than "Suggested-by:",
please don't add signatures to patches unless
the person gives directly gives you one.
> Suggested-by: Masahiro Yamada <[email protected]>
> Signed-off-by: Dirk Gouders <[email protected]>
> ---
> v2: rework commit message and regular expression
> ---
> scripts/checkpatch.pl | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 447857ffaf6b..437e98414f74 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -2911,6 +2911,14 @@ sub process {
> "Use of $flag is deprecated, please use \`$replacement->{$flag} instead.\n" . $herecurr) if ($replacement->{$flag});
> }
>
> + # Check for multiple calls of if_changed within a target in Makefiles
> + if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
The uses of .* here are superfluous.
> + ($prevline =~ /^[ +]\t\s*\$\(call\s+if_changed,/) &&
> + ($line =~ /^[ +]\t\s*\$\(call\s+if_changed,/)) {
> + ERROR("MULTIPLE_IF_CHANGED",
> + "Multiple calls of if_changed within a target.\n" . $herecurr);
> + }
> +
> # check for DT compatible documentation
> if (defined $root &&
> (($realfile =~ /\.dtsi?$/ && $line =~ /^\+\s*compatible\s*=\s*\"/) ||
On Fri, 2018-07-20 at 10:21 -0500, Segher Boessenkool wrote:
> On Fri, Jul 20, 2018 at 03:06:37AM -0700, Joe Perches wrote:
> > On Fri, 2018-07-20 at 09:48 +0200, Dirk Gouders wrote:
> > > + # Check for multiple calls of if_changed within a target in Makefiles
> > > + if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
> >
> > The uses of .* here are superfluous.
>
> And it looks like you wanted to match this only at the beginning of the
> string, which would be /^Makefile/ etc.
Nope.
$realfile includes path and /^Makefile/ matches only the
top level Makefile and none of the ones in subdirectories.
On Fri, Jul 20, 2018 at 03:06:37AM -0700, Joe Perches wrote:
> On Fri, 2018-07-20 at 09:48 +0200, Dirk Gouders wrote:
> > + # Check for multiple calls of if_changed within a target in Makefiles
> > + if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
>
> The uses of .* here are superfluous.
And it looks like you wanted to match this only at the beginning of the
string, which would be /^Makefile/ etc.
Segher
On Fri, Jul 20, 2018 at 08:33:56AM -0700, Joe Perches wrote:
> On Fri, 2018-07-20 at 10:21 -0500, Segher Boessenkool wrote:
> > On Fri, Jul 20, 2018 at 03:06:37AM -0700, Joe Perches wrote:
> > > On Fri, 2018-07-20 at 09:48 +0200, Dirk Gouders wrote:
> > > > + # Check for multiple calls of if_changed within a target in Makefiles
> > > > + if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
> > >
> > > The uses of .* here are superfluous.
> >
> > And it looks like you wanted to match this only at the beginning of the
> > string, which would be /^Makefile/ etc.
>
> Nope.
>
> $realfile includes path and /^Makefile/ matches only the
> top level Makefile and none of the ones in subdirectories.
Then the .* is more mysterious :-)
(Maybe the script should use File::Basename).
Segher