GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/lint/checkpatch.pl: Use "perl_version_ok" 

Also use '$minimum_perl_version'.
This is to reduce difference with linux v5.16.

Change-Id: I7c2f5d5c9853dc8ddc8f89a5e2edd6c8613ba790
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61466
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Elyes HAOUAS 2022-01-29 07:42:58 +01:00 committed by Martin Roth
parent 96771bf92c
commit 48cb78b6d9
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
util/lint/checkpatch.pl
View File

@ -250,11 +250,11 @@ $check_orig = $check;
my $exit = 0; my $exit = 0;
my $perl_version_ok = 1;
if ($^V && $^V lt $minimum_perl_version) { if ($^V && $^V lt $minimum_perl_version) {
$perl_version_ok = 0;
printf "$P: requires at least perl version %vd\n", $minimum_perl_version; printf "$P: requires at least perl version %vd\n", $minimum_perl_version;
if (!$ignore_perl_version) { exit(1) if (!$ignore_perl_version);
exit(1);
}
} }
#if no filenames are given, push '-' to read patch from stdin #if no filenames are given, push '-' to read patch from stdin
@ -1040,11 +1040,11 @@ if (!$quiet) {
hash_show_words(\%use_type, "Used"); hash_show_words(\%use_type, "Used");
hash_show_words(\%ignore_type, "Ignored"); hash_show_words(\%ignore_type, "Ignored");
if ($^V lt 5.10.0) { if (!$perl_version_ok) {
print << "EOM" print << "EOM"
NOTE: perl $^V is not modern enough to detect all possible issues. NOTE: perl $^V is not modern enough to detect all possible issues.
An upgrade to at least perl v5.10.0 is suggested. An upgrade to at least perl $minimum_perl_version is suggested.
EOM EOM
} }
if ($exit) { if ($exit) {
@ -3112,7 +3112,7 @@ sub process {
} }
# check indentation starts on a tab stop # check indentation starts on a tab stop
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
$sline =~ /^\+\t+( +)(?:$c90_Keywords\b|\{\s*$|\}\s*(?:else\b|while\b|\s*$)|$Declare\s*$Ident\s*[;=])/) { $sline =~ /^\+\t+( +)(?:$c90_Keywords\b|\{\s*$|\}\s*(?:else\b|while\b|\s*$)|$Declare\s*$Ident\s*[;=])/) {
my $indent = length($1); my $indent = length($1);
if ($indent % $tabsize) { if ($indent % $tabsize) {
@ -3125,7 +3125,7 @@ sub process {
} }
# check multi-line statement indentation matches previous line # check multi-line statement indentation matches previous line
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
$prevline =~ /^\+([ \t]*)((?:$c90_Keywords(?:\s+if)\s*)|(?:$Declare\s*)?(?:$Ident|\(\s*\*\s*$Ident\s*\))\s*|(?:\*\s*)*$Lval\s*=\s*$Ident\s*)\(.*(\&\&|\|\||,)\s*$/) { $prevline =~ /^\+([ \t]*)((?:$c90_Keywords(?:\s+if)\s*)|(?:$Declare\s*)?(?:$Ident|\(\s*\*\s*$Ident\s*\))\s*|(?:\*\s*)*$Lval\s*=\s*$Ident\s*)\(.*(\&\&|\|\||,)\s*$/) {
$prevline =~ /^\+(\t*)(.*)$/; $prevline =~ /^\+(\t*)(.*)$/;
my $oldindent = $1; my $oldindent = $1;
@ -4044,7 +4044,7 @@ sub process {
# function brace can't be on same line, except for #defines of do while, # function brace can't be on same line, except for #defines of do while,
# or if closed on same line # or if closed on same line
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
$sline =~ /$Type\s*$Ident\s*$balanced_parens\s*\{/ && $sline =~ /$Type\s*$Ident\s*$balanced_parens\s*\{/ &&
$sline !~ /\#\s*define\b.*do\s*\{/ && $sline !~ /\#\s*define\b.*do\s*\{/ &&
$sline !~ /}/) { $sline !~ /}/) {
@ -4657,7 +4657,7 @@ sub process {
# check for unnecessary parentheses around comparisons in if uses # check for unnecessary parentheses around comparisons in if uses
# when !drivers/staging or command-line uses --strict # when !drivers/staging or command-line uses --strict
if (($realfile !~ m@^(?:drivers/staging/)@ || $check_orig) && if (($realfile !~ m@^(?:drivers/staging/)@ || $check_orig) &&
$^V && $^V ge 5.10.0 && defined($stat) && $perl_version_ok && defined($stat) &&
$stat =~ /(^.\s*if\s*($balanced_parens))/) { $stat =~ /(^.\s*if\s*($balanced_parens))/) {
my $if_stat = $1; my $if_stat = $1;
my $test = substr($2, 1, -1); my $test = substr($2, 1, -1);
@ -4694,7 +4694,7 @@ sub process {
# return is not a function # return is not a function
if (defined($stat) && $stat =~ /^.\s*return(\s*)\(/s) { if (defined($stat) && $stat =~ /^.\s*return(\s*)\(/s) {
my $spacing = $1; my $spacing = $1;
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
$stat =~ /^.\s*return\s*($balanced_parens)\s*;\s*$/) { $stat =~ /^.\s*return\s*($balanced_parens)\s*;\s*$/) {
my $value = $1; my $value = $1;
$value = deparenthesize($value); $value = deparenthesize($value);
@ -4721,7 +4721,7 @@ sub process {
} }
# if statements using unnecessary parentheses - ie: if ((foo == bar)) # if statements using unnecessary parentheses - ie: if ((foo == bar))
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
$line =~ /\bif\s*((?:\(\s*){2,})/) { $line =~ /\bif\s*((?:\(\s*){2,})/) {
my $openparens = $1; my $openparens = $1;
my $count = $openparens =~ tr@\(@\(@; my $count = $openparens =~ tr@\(@\(@;
@ -4738,7 +4738,7 @@ sub process {
# avoid cases like "foo + BAR < baz" # avoid cases like "foo + BAR < baz"
# only fix matches surrounded by parentheses to avoid incorrect # only fix matches surrounded by parentheses to avoid incorrect
# conversions like "FOO < baz() + 5" being "misfixed" to "baz() > FOO + 5" # conversions like "FOO < baz() + 5" being "misfixed" to "baz() > FOO + 5"
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
$line =~ /^\+(.*)\b($Constant|[A-Z_][A-Z0-9_]*)\s*($Compare)\s*($LvalOrFunc)/) { $line =~ /^\+(.*)\b($Constant|[A-Z_][A-Z0-9_]*)\s*($Compare)\s*($LvalOrFunc)/) {
my $lead = $1; my $lead = $1;
my $const = $2; my $const = $2;
@ -5163,7 +5163,7 @@ sub process {
# do {} while (0) macro tests: # do {} while (0) macro tests:
# single-statement macros do not need to be enclosed in do while (0) loop, # single-statement macros do not need to be enclosed in do while (0) loop,
# macro should not end with a semicolon # macro should not end with a semicolon
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
$realfile !~ m@/vmlinux.lds.h$@ && $realfile !~ m@/vmlinux.lds.h$@ &&
$line =~ /^.\s*\#\s*define\s+$Ident(\()?/) { $line =~ /^.\s*\#\s*define\s+$Ident(\()?/) {
my $ln = $linenr; my $ln = $linenr;
@ -5526,7 +5526,7 @@ sub process {
} }
# check for mask then right shift without a parentheses # check for mask then right shift without a parentheses
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
$line =~ /$LvalOrFunc\s*\&\s*($LvalOrFunc)\s*>>/ && $line =~ /$LvalOrFunc\s*\&\s*($LvalOrFunc)\s*>>/ &&
$4 !~ /^\&/) { # $LvalOrFunc may be &foo, ignore if so $4 !~ /^\&/) { # $LvalOrFunc may be &foo, ignore if so
WARN("MASK_THEN_SHIFT", WARN("MASK_THEN_SHIFT",
@ -5534,7 +5534,7 @@ sub process {
} }
# check for pointer comparisons to NULL # check for pointer comparisons to NULL
if ($^V && $^V ge 5.10.0) { if ($perl_version_ok) {
while ($line =~ /\b$LvalOrFunc\s*(==|\!=)\s*NULL\b/g) { while ($line =~ /\b$LvalOrFunc\s*(==|\!=)\s*NULL\b/g) {
my $val = $1; my $val = $1;
my $equal = "!"; my $equal = "!";
@ -5806,7 +5806,7 @@ sub process {
} }
# Check for __attribute__ weak, or __weak declarations (may have link issues) # Check for __attribute__ weak, or __weak declarations (may have link issues)
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
$line =~ /(?:$Declare|$DeclareMisordered)\s*$Ident\s*$balanced_parens\s*(?:$Attribute)?\s*;/ && $line =~ /(?:$Declare|$DeclareMisordered)\s*$Ident\s*$balanced_parens\s*(?:$Attribute)?\s*;/ &&
($line =~ /\b__attribute__\s*\(\s*\(.*\bweak\b/ || ($line =~ /\b__attribute__\s*\(\s*\(.*\bweak\b/ ||
$line =~ /\b__weak\b/)) { $line =~ /\b__weak\b/)) {
@ -5888,7 +5888,7 @@ sub process {
} }
# check for vsprintf extension %p<foo> misuses # check for vsprintf extension %p<foo> misuses
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
defined $stat && defined $stat &&
$stat =~ /^\+(?![^\{]*\{\s*).*\b(\w+)\s*\(.*$String\s*,/s && $stat =~ /^\+(?![^\{]*\{\s*).*\b(\w+)\s*\(.*$String\s*,/s &&
$1 !~ /^_*volatile_*$/) { $1 !~ /^_*volatile_*$/) {
@ -5935,7 +5935,7 @@ sub process {
} }
# Check for misused memsets # Check for misused memsets
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
defined $stat && defined $stat &&
$stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*$FuncArg\s*\)/) { $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*$FuncArg\s*\)/) {
@ -5953,7 +5953,7 @@ sub process {
} }
# Check for memcpy(foo, bar, ETH_ALEN) that could be ether_addr_copy(foo, bar) # Check for memcpy(foo, bar, ETH_ALEN) that could be ether_addr_copy(foo, bar)
# if ($^V && $^V ge 5.10.0 && # if ($perl_version_ok &&
# defined $stat && # defined $stat &&
# $stat =~ /^\+(?:.*?)\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) { # $stat =~ /^\+(?:.*?)\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) {
# if (WARN("PREFER_ETHER_ADDR_COPY", # if (WARN("PREFER_ETHER_ADDR_COPY",
@ -5964,7 +5964,7 @@ sub process {
# } # }
# Check for memcmp(foo, bar, ETH_ALEN) that could be ether_addr_equal*(foo, bar) # Check for memcmp(foo, bar, ETH_ALEN) that could be ether_addr_equal*(foo, bar)
# if ($^V && $^V ge 5.10.0 && # if ($perl_version_ok &&
# defined $stat && # defined $stat &&
# $stat =~ /^\+(?:.*?)\bmemcmp\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) { # $stat =~ /^\+(?:.*?)\bmemcmp\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) {
# WARN("PREFER_ETHER_ADDR_EQUAL", # WARN("PREFER_ETHER_ADDR_EQUAL",
@ -5973,7 +5973,7 @@ sub process {
# check for memset(foo, 0x0, ETH_ALEN) that could be eth_zero_addr # check for memset(foo, 0x0, ETH_ALEN) that could be eth_zero_addr
# check for memset(foo, 0xFF, ETH_ALEN) that could be eth_broadcast_addr # check for memset(foo, 0xFF, ETH_ALEN) that could be eth_broadcast_addr
# if ($^V && $^V ge 5.10.0 && # if ($perl_version_ok &&
# defined $stat && # defined $stat &&
# $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) { # $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) {
# #
@ -5995,7 +5995,7 @@ sub process {
# } # }
# typecasts on min/max could be min_t/max_t # typecasts on min/max could be min_t/max_t
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
defined $stat && defined $stat &&
$stat =~ /^\+(?:.*?)\b(min|max)\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\)/) { $stat =~ /^\+(?:.*?)\b(min|max)\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\)/) {
if (defined $2 || defined $7) { if (defined $2 || defined $7) {
@ -6019,7 +6019,7 @@ sub process {
} }
# check usleep_range arguments # check usleep_range arguments
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
defined $stat && defined $stat &&
$stat =~ /^\+(?:.*?)\busleep_range\s*\(\s*($FuncArg)\s*,\s*($FuncArg)\s*\)/) { $stat =~ /^\+(?:.*?)\busleep_range\s*\(\s*($FuncArg)\s*,\s*($FuncArg)\s*\)/) {
my $min = $1; my $min = $1;
@ -6035,7 +6035,7 @@ sub process {
} }
# check for naked sscanf # check for naked sscanf
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
defined $stat && defined $stat &&
$line =~ /\bsscanf\b/ && $line =~ /\bsscanf\b/ &&
($stat !~ /$Ident\s*=\s*sscanf\s*$balanced_parens/ && ($stat !~ /$Ident\s*=\s*sscanf\s*$balanced_parens/ &&
@ -6049,7 +6049,7 @@ sub process {
} }
# check for simple sscanf that should be kstrto<foo> # check for simple sscanf that should be kstrto<foo>
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
defined $stat && defined $stat &&
$line =~ /\bsscanf\b/) { $line =~ /\bsscanf\b/) {
my $lc = $stat =~ tr@\n@@; my $lc = $stat =~ tr@\n@@;
@ -6121,7 +6121,7 @@ sub process {
} }
# check for function definitions # check for function definitions
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
defined $stat && defined $stat &&
$stat =~ /^.\s*(?:$Storage\s+)?$Type\s*($Ident)\s*$balanced_parens\s*{/s) { $stat =~ /^.\s*(?:$Storage\s+)?$Type\s*($Ident)\s*$balanced_parens\s*{/s) {
$context_function = $1; $context_function = $1;
@ -6161,14 +6161,14 @@ sub process {
# alloc style # alloc style
# p = alloc(sizeof(struct foo), ...) should be p = alloc(sizeof(*p), ...) # p = alloc(sizeof(struct foo), ...) should be p = alloc(sizeof(*p), ...)
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
$line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*([kv][mz]alloc(?:_node)?)\s*\(\s*(sizeof\s*\(\s*struct\s+$Lval\s*\))/) { $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*([kv][mz]alloc(?:_node)?)\s*\(\s*(sizeof\s*\(\s*struct\s+$Lval\s*\))/) {
CHK("ALLOC_SIZEOF_STRUCT", CHK("ALLOC_SIZEOF_STRUCT",
"Prefer $3(sizeof(*$1)...) over $3($4...)\n" . $herecurr); "Prefer $3(sizeof(*$1)...) over $3($4...)\n" . $herecurr);
} }
# check for k[mz]alloc with multiplies that could be kmalloc_array/kcalloc # check for k[mz]alloc with multiplies that could be kmalloc_array/kcalloc
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
defined $stat && defined $stat &&
$stat =~ /^\+\s*($Lval)\s*\=\s*(?:$balanced_parens)?\s*(k[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)\s*,/) { $stat =~ /^\+\s*($Lval)\s*\=\s*(?:$balanced_parens)?\s*(k[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)\s*,/) {
my $oldfunc = $3; my $oldfunc = $3;
@ -6197,7 +6197,7 @@ sub process {
} }
# check for krealloc arg reuse # check for krealloc arg reuse
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
$line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*krealloc\s*\(\s*\1\s*,/) { $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*krealloc\s*\(\s*\1\s*,/) {
WARN("KREALLOC_ARG_REUSE", WARN("KREALLOC_ARG_REUSE",
"Reusing the krealloc arg is almost always a bug\n" . $herecurr); "Reusing the krealloc arg is almost always a bug\n" . $herecurr);
@ -6256,7 +6256,7 @@ sub process {
} }
# check for switch/default statements without a break; # check for switch/default statements without a break;
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
defined $stat && defined $stat &&
$stat =~ /^\+[$;\s]*(?:case[$;\s]+\w+[$;\s]*:[$;\s]*|)*[$;\s]*\bdefault[$;\s]*:[$;\s]*;/g) { $stat =~ /^\+[$;\s]*(?:case[$;\s]+\w+[$;\s]*:[$;\s]*|)*[$;\s]*\bdefault[$;\s]*:[$;\s]*;/g) {
my $cnt = statement_rawlines($stat); my $cnt = statement_rawlines($stat);
@ -6366,7 +6366,7 @@ sub process {
} }
# likely/unlikely comparisons similar to "(likely(foo) > 0)" # likely/unlikely comparisons similar to "(likely(foo) > 0)"
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
$line =~ /\b((?:un)?likely)\s*\(\s*$FuncArg\s*\)\s*$Compare/) { $line =~ /\b((?:un)?likely)\s*\(\s*$FuncArg\s*\)\s*$Compare/) {
WARN("LIKELY_MISUSE", WARN("LIKELY_MISUSE",
"Using $1 should generally have parentheses around the comparison\n" . $herecurr); "Using $1 should generally have parentheses around the comparison\n" . $herecurr);
@ -6409,7 +6409,7 @@ sub process {
# check for DEVICE_ATTR uses that could be DEVICE_ATTR_<FOO> # check for DEVICE_ATTR uses that could be DEVICE_ATTR_<FOO>
# and whether or not function naming is typical and if # and whether or not function naming is typical and if
# DEVICE_ATTR permissions uses are unusual too # DEVICE_ATTR permissions uses are unusual too
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
defined $stat && defined $stat &&
$stat =~ /\bDEVICE_ATTR\s*\(\s*(\w+)\s*,\s*\(?\s*(\s*(?:${multi_mode_perms_string_search}|0[0-7]{3,3})\s*)\s*\)?\s*,\s*(\w+)\s*,\s*(\w+)\s*\)/) { $stat =~ /\bDEVICE_ATTR\s*\(\s*(\w+)\s*,\s*\(?\s*(\s*(?:${multi_mode_perms_string_search}|0[0-7]{3,3})\s*)\s*\)?\s*,\s*(\w+)\s*,\s*(\w+)\s*\)/) {
my $var = $1; my $var = $1;
@ -6469,7 +6469,7 @@ sub process {
# specific definition of not visible in sysfs. # specific definition of not visible in sysfs.
# o Ignore proc_create*(...) uses with a decimal 0 permission as that means # o Ignore proc_create*(...) uses with a decimal 0 permission as that means
# use the default permissions # use the default permissions
if ($^V && $^V ge 5.10.0 && if ($perl_version_ok &&
defined $stat && defined $stat &&
$line =~ /$mode_perms_search/) { $line =~ /$mode_perms_search/) {
foreach my $entry (@mode_permission_funcs) { foreach my $entry (@mode_permission_funcs) {