[AUTOSEL,for,4.9,02/33] coccinelle: fix parallel build with CHECK=scripts/coccicheck

Message ID 20171202155204.7691-2-alexander.levin@verizon.com
State New
Headers show
  • [AUTOSEL,for,4.9,01/33] kbuild: pkg: use --transform option to prefix paths in tar
Related show

Commit Message

Levin, Alexander (Sasha Levin) Dec. 2, 2017, 3:52 p.m.
From: Masahiro Yamada <yamada.masahiro@socionext.com>

[ 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 <yamada.masahiro@socionext.com>

Acked-by: Julia Lawall <Julia.Lawall@lip6.fr>

Signed-off-by: Sasha Levin <alexander.levin@verizon.com>

 scripts/coccicheck | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)



diff --git a/scripts/coccicheck b/scripts/coccicheck
index ec487b8e7051..c36b04b41686 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -29,12 +29,6 @@  else
-if [ -z "$J" ]; then
-	NPROC="$J"
 # You can use SPFLAGS to append extra arguments to coccicheck or override any
@@ -69,6 +63,9 @@  if [ "$C" = "1" -o "$C" = "2" ]; then
     # Take only the last argument, which is the C file to test
     shift $(( $# - 1 ))
+    # No need to parallelize Coccinelle since this mode takes one input file.
+    NPROC=1
     if [ "$KBUILD_EXTMOD" = "" ] ; then
@@ -76,6 +73,12 @@  else
+    if [ -z "$J" ]; then
+        NPROC=$(getconf _NPROCESSORS_ONLN)
+    else
+        NPROC="$J"
+    fi
 if [ "$KBUILD_EXTMOD" != "" ] ; then