public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/4] Add a Coccinelle front-end script
@ 2010-05-10 16:19 Nicolas Palix
  2010-05-10 16:24 ` Nicolas Palix
  0 siblings, 1 reply; 24+ messages in thread
From: Nicolas Palix @ 2010-05-10 16:19 UTC (permalink / raw)
  To: kernel-janitors

New targets are added (coccicheck-<mode>) to call the 'coccinelle.sh' front-end
in the 'scripts' directory with the <mode> argument.

Four modes are defined: report, patch, context, and org.

'report' mode generates a list in the following format:
  file:line:column-column: message

'patch' mode proposes a generic fix, when possible.

'context' mode highlights lines of interest and their context
in a diff-like style.

'org' mode generates a report in the Org mode format of Emacs.

Three semantic patches, with a low rate of false positives, are also
included.  Other semantic patches will be provided later. Note that a
semantic patch does not need to define all four modes. As many semantic
patches may be proposed later, they are organized under sub-directories
of 'scripts/coccinelle/'.

We add a reference to the tool in the proposed changelog because it will
make the changelog easier to understand for someone who is not aware of
the tool.

To apply a single semantic patch, the user can define the COCCI environment
variable which gives the path to the semantic patch.

Nicolas Palix (4):
  Add targets to use the Coccinelle checker
  Add scripts/coccinelle/drop_kmalloc_cast.cocci
  Add scripts/coccinelle/kzalloc-simple.cocci
  Add scripts/coccinelle/resource_size.cocci

 MAINTAINERS                                |   10 +++
 Makefile                                   |   20 +++++-
 scripts/coccinelle.sh                      |   28 ++++++++
 scripts/coccinelle/drop_kmalloc_cast.cocci |   68 ++++++++++++++++++++
 scripts/coccinelle/kzalloc-simple.cocci    |   83 ++++++++++++++++++++++++
 scripts/coccinelle/resource_size.cocci     |   94 ++++++++++++++++++++++++++++
 6 files changed, 301 insertions(+), 2 deletions(-)
 create mode 100755 scripts/coccinelle.sh
 create mode 100644 scripts/coccinelle/drop_kmalloc_cast.cocci
 create mode 100644 scripts/coccinelle/kzalloc-simple.cocci
 create mode 100644 scripts/coccinelle/resource_size.cocci


^ permalink raw reply	[flat|nested] 24+ messages in thread
* [PATCH 1/4] Add targets to use the Coccinelle checker
@ 2010-05-10 16:19 Nicolas Palix
  0 siblings, 0 replies; 24+ messages in thread
From: Nicolas Palix @ 2010-05-10 16:19 UTC (permalink / raw)
  To: kernel-janitors

Four targets are added. Each one generates a different
output kind: context, patch, org, report.
Every SmPL file in 'scripts/coccinelle' is given to the spatch frontend
(located in the 'scripts' directory), and applied to the entire
source tree.

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
 MAINTAINERS           |   10 ++++++++++
 Makefile              |   20 ++++++++++++++++++--
 scripts/coccinelle.sh |   28 ++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100755 scripts/coccinelle.sh

diff --git a/MAINTAINERS b/MAINTAINERS
index d5b0b1b..84f527a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1543,6 +1543,16 @@ L:	platform-driver-x86@vger.kernel.org
 S:	Supported
 F:	drivers/platform/x86/classmate-laptop.c
 
+COCCINELLE/Semantic Patches (SmPL)
+M:	Julia Lawall <julia@diku.dk>
+M:	Gilles Muller <Gilles.Muller@lip6.fr>
+M:	Nicolas Palix <npalix@diku.dk>
+L:	cocci@diku.dk (moderated for non-subscribers)
+W:	http://coccinelle.lip6.fr/
+S:	Supported
+F:	scripts/coccinelle/
+F:	scripts/coccinelle.sh
+
 CODA FILE SYSTEM
 M:	Jan Harkes <jaharkes@cs.cmu.edu>
 M:	coda@cs.cmu.edu
diff --git a/Makefile b/Makefile
index 701bc65..7bf168f 100644
--- a/Makefile
+++ b/Makefile
@@ -325,6 +325,7 @@ INSTALLKERNEL  := installkernel
 DEPMOD		= /sbin/depmod
 KALLSYMS	= scripts/kallsyms
 PERL		= perl
+COCCINELLE      = spatch
 CHECK		= sparse
 
 CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
@@ -411,7 +412,8 @@ endif
 no-dot-config-targets := clean mrproper distclean \
 			 cscope TAGS tags help %docs check% \
 			 include/linux/version.h headers_% \
-			 kernelrelease kernelversion
+			 kernelrelease kernelversion        \
+			 coccicheck-%
 
 config-targets := 0
 mixed-targets  := 0
@@ -1264,7 +1266,8 @@ help:
 	@echo  '  includecheck    - Check for duplicate included header files'
 	@echo  '  export_report   - List the usages of all exported symbols'
 	@echo  '  headers_check   - Sanity check on exported headers'
-	@echo  '  headerdep       - Detect inclusion cycles in headers'; \
+	@echo  '  headerdep       - Detect inclusion cycles in headers'
+	@echo  '  coccicheck-<m>  - Check with Coccinelle in <m> mode (report, context, patch, org)'; \
 	 echo  ''
 	@echo  'Kernel packaging:'
 	@$(MAKE) $(build)=$(package-dir) help
@@ -1424,6 +1427,19 @@ versioncheck:
 		-name '*.[hcS]' -type f -print | sort \
 		| xargs $(PERL) -w $(srctree)/scripts/checkversion.pl
 
+coccicheck-context coccicheck-patch coccicheck-org coccicheck-report:
+	@echo ''
+	@echo 'Please check for false positives in the output before submitting a patch.'
+	@echo 'When using "patch" mode, carefully review the patch before submitting it.'
+	@echo ''
+	@if [ "$(COCCI)" = "" ] ; then                         \
+	find $(srctree)/scripts/coccinelle/                    \
+		-name '*.cocci' -type f                        \
+		-exec $(srctree)/scripts/coccinelle.sh $(COCCINELLE) $(@:coccicheck-%=%) \{} $(srctree) \; ; \
+	else                                                                                                 \
+		$(srctree)/scripts/coccinelle.sh $(COCCINELLE) $(@:coccicheck-%=%) $(COCCI) $(srctree)     ; \
+	fi
+
 namespacecheck:
 	$(PERL) $(srctree)/scripts/namespace.pl
 
diff --git a/scripts/coccinelle.sh b/scripts/coccinelle.sh
new file mode 100755
index 0000000..0d29e93
--- /dev/null
+++ b/scripts/coccinelle.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+SPATCH="`which $1`"
+MODE="$2"
+COCCI="$3"
+DIR="$4"
+
+OPT=`grep "Option" $COCCI | cut -d':' -f2`
+FILE=`echo $COCCI | sed "s|$DIR/||"`
+
+if [ -x "$SPATCH" ]; then
+
+    echo "Processing `basename $COCCI` with option(s) \"$(OPT)\""
+    echo 'Message example to submit a patch:'
+    sed -e '/\/\/\//!d' -e 's|^///||' $COCCI
+
+    echo ' The semantic patch that makes this change is available'
+    echo " in $FILE."
+    echo ''
+    echo ' More information about semantic patching is available at'
+    echo ' http://coccinelle.lip6.fr/'
+    echo ''
+
+    $SPATCH -D $MODE -very_quiet -sp_file $COCCI $OPT -dir $DIR
+
+else
+    echo 'spatch is part of the Coccinelle project and is available at http://coccinelle.lip6.fr/'
+fi
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2010-06-04 10:38 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-10 16:19 [PATCH 0/4] Add a Coccinelle front-end script Nicolas Palix
2010-05-10 16:24 ` Nicolas Palix
2010-05-10 16:24   ` [PATCH 1/4] Add targets to use the Coccinelle checker Nicolas Palix
2010-05-12  6:42     ` Américo Wang
2010-05-28  7:04       ` Joerg Roedel
2010-06-03  9:50     ` Michal Marek
2010-06-03 10:23     ` Sam Ravnborg
2010-06-04  9:56       ` Nicolas Palix
2010-06-04 10:38         ` Sam Ravnborg
2010-05-10 16:24   ` [PATCH 2/4] Add scripts/coccinelle/drop_kmalloc_cast.cocci Nicolas Palix
2010-05-10 16:24   ` [PATCH 3/4] Add scripts/coccinelle/kzalloc-simple.cocci Nicolas Palix
2010-06-03  9:51     ` Michal Marek
2010-06-03 10:11       ` Nicolas Palix
2010-05-10 16:24   ` [PATCH 4/4] Add scripts/coccinelle/resource_size.cocci Nicolas Palix
2010-05-10 16:52     ` Pekka Enberg
2010-05-27 11:48       ` Nicolas Palix
2010-05-11  2:14   ` [PATCH 0/4] Add a Coccinelle front-end script Andy Isaacson
2010-05-17  9:31     ` Wolfram Sang
2010-05-28  7:09   ` Joerg Roedel
2010-05-28  7:25     ` Wolfram Sang
2010-05-28  7:31       ` Julia Lawall
2010-05-28  7:39         ` walter harms
2010-05-28  9:15         ` Joerg Roedel
  -- strict thread matches above, loose matches on Subject: below --
2010-05-10 16:19 [PATCH 1/4] Add targets to use the Coccinelle checker Nicolas Palix

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox