Skip to content

Commit 394d0c9

Browse files
masahir0ygregkh
authored andcommitted
coccinelle: fix parallel build with CHECK=scripts/coccicheck
[ Upstream commit d7059ca0147adcd495f3c5b41f260e1ac55bb679 ] The command "make -j8 C=1 CHECK=scripts/coccicheck" produces lots of "coccicheck failed" error messages. Julia Lawall explained the Coccinelle behavior as follows: "The problem on the Coccinelle side is that it uses a subdirectory with the name of the semantic patch to store standard output and standard error for the different threads. I didn't want to use a name with the pid, so that one could easily find this information while Coccinelle is running. Normally the subdirectory is cleaned up when Coccinelle completes, so there is only one of them at a time. Maybe it is best to just add the pid. There is the risk that these subdirectories will accumulate if Coccinelle crashes in a way such that they don't get cleaned up, but Coccinelle could print a warning if it detects this case, rather than failing." When scripts/coccicheck is used as CHECK tool and -j option is given to Make, the whole of build process runs in parallel. So, multiple processes try to get access to the same subdirectory. I notice spatch creates the subdirectory only when it runs in parallel (i.e. --jobs <N> is given and <N> is greater than 1). Setting NPROC=1 is a reasonable solution; spatch does not create the subdirectory. Besides, ONLINE=1 mode takes a single file input for each spatch invocation, so there is no reason to parallelize it in the first place. Signed-off-by: Masahiro Yamada <[email protected]> Acked-by: Julia Lawall <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 54a13eb commit 394d0c9

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

Diff for: scripts/coccicheck

+9-6
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ else
3030
VERBOSE=0
3131
fi
3232

33-
if [ -z "$J" ]; then
34-
NPROC=$(getconf _NPROCESSORS_ONLN)
35-
else
36-
NPROC="$J"
37-
fi
38-
3933
FLAGS="--very-quiet"
4034

4135
# You can use SPFLAGS to append extra arguments to coccicheck or override any
@@ -70,13 +64,22 @@ if [ "$C" = "1" -o "$C" = "2" ]; then
7064
# Take only the last argument, which is the C file to test
7165
shift $(( $# - 1 ))
7266
OPTIONS="$COCCIINCLUDE $1"
67+
68+
# No need to parallelize Coccinelle since this mode takes one input file.
69+
NPROC=1
7370
else
7471
ONLINE=0
7572
if [ "$KBUILD_EXTMOD" = "" ] ; then
7673
OPTIONS="--dir $srctree $COCCIINCLUDE"
7774
else
7875
OPTIONS="--dir $KBUILD_EXTMOD $COCCIINCLUDE"
7976
fi
77+
78+
if [ -z "$J" ]; then
79+
NPROC=$(getconf _NPROCESSORS_ONLN)
80+
else
81+
NPROC="$J"
82+
fi
8083
fi
8184

8285
if [ "$KBUILD_EXTMOD" != "" ] ; then

0 commit comments

Comments
 (0)