From: Anton Eliasson <antone@axis.com>
To: Julia Lawall <julia.lawall@inria.fr>,
Anton Eliasson <anton.eliasson@axis.com>
Cc: nicolas palix <nicolas.palix@imag.fr>, cocci <cocci@inria.fr>,
linux-kernel <linux-kernel@vger.kernel.org>,
kernel@axis.com
Subject: Re: [cocci] [PATCH 1/2] scripts: coccicheck: Return error from run_cmd_parmap
Date: Fri, 17 Nov 2023 17:36:43 +0100 [thread overview]
Message-ID: <0cee25a2-29f7-4481-8ab9-618f8491bf5b@axis.com> (raw)
In-Reply-To: <978265928.4471013.1698960475973.JavaMail.zimbra@inria.fr>
On 02/11/2023 22.27, Julia Lawall wrote:
>
> ----- Mail original -----
>> De: "Anton Eliasson" <anton.eliasson@axis.com>
>> À: "Julia Lawall" <Julia.Lawall@inria.fr>, "nicolas palix" <nicolas.palix@imag.fr>
>> Cc: "cocci" <cocci@inria.fr>, "linux-kernel" <linux-kernel@vger.kernel.org>, "Anton Eliasson" <anton.eliasson@axis.com>,
>> kernel@axis.com
>> Envoyé: Mardi 3 Octobre 2023 16:25:14
>> Objet: [cocci] [PATCH 1/2] scripts: coccicheck: Return error from run_cmd_parmap
>> Exiting on error breaks the chain mode. Return the error instead in
>> order for the caller to propagate it or in the case of chain, try the
>> next mode.
>>
>> Signed-off-by: Anton Eliasson <anton.eliasson@axis.com>
>> ---
>> scripts/coccicheck | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/scripts/coccicheck b/scripts/coccicheck
>> index e52cb43fede6..95a312730e98 100755
>> --- a/scripts/coccicheck
>> +++ b/scripts/coccicheck
>> @@ -153,7 +153,7 @@ run_cmd_parmap() {
>> err=$?
>> if [[ $err -ne 0 ]]; then
>> echo "coccicheck failed"
>> - exit $err
>> + return $err
>> fi
>> }
>>
> I tried disabling OCaml in my version of Coccinelle and then ran make coccicheck with this patch. But I didn't see any improvement. On the other hand, it keeps going if I just remove the exit line entirely. Is that what is wanted? One can still see the coccicheck failed message.
>
> julia
>
Hi again!
It only makes a difference in chain mode, I think. Without my change
coccicheck stops after encountering the first semantic patch that
doesn't support the patch rule (see the console output below). With the
change coccicheck keeps going with the next semantic patch which is what
I expect. Do you see a different behavior?
However, I found now that with the change it gets harder to cancel
coccicheck. A single ctrl-c is no longer enough. I basically have to
hold down ctrl-c until all the script layers have returned and exited.
So that's maybe not ideal.
> $ git describe
> v6.6
> $ make coccicheck MODE=chain
> You have selected the "chain" mode.
> All available modes will be tried (in that order): patch, report,
> context, org
>
> Please check for false positives in the output before submitting a patch.
> When using "patch" mode, carefully review the patch before submitting it.
>
> /usr/bin/spatch -D patch --very-quiet --cocci-file
> ./scripts/coccinelle/api/alloc/alloc_cast.cocci --no-includes
> --include-headers --dir . -I ./arch/x86/include -I
> ./arch/x86/include/generated -I ./include -I ./arch/x86/include/uapi
> -I ./arch/x86/include/generated/uapi -I ./include/uapi -I
> ./include/generated/uapi --include ./include/linux/compiler-version.h
> --include ./include/linux/kconfig.h --jobs 16 --chunksize 1
> 14406 files match
> /usr/bin/spatch -D patch --very-quiet --cocci-file
> ./scripts/coccinelle/api/alloc/pool_zalloc-simple.cocci --no-includes
> --include-headers --dir . -I ./arch/x86/include -I
> ./arch/x86/include/generated -I ./include -I ./arch/x86/include/uapi
> -I ./arch/x86/include/generated/uapi -I ./include/uapi -I
> ./include/generated/uapi --include ./include/linux/compiler-version.h
> --include ./include/linux/kconfig.h --jobs 16 --chunksize 1
> 44 files match
> /usr/bin/spatch -D patch --very-quiet --cocci-file
> ./scripts/coccinelle/api/alloc/zalloc-simple.cocci --no-includes
> --include-headers --dir . -I ./arch/x86/include -I
> ./arch/x86/include/generated -I ./include -I ./arch/x86/include/uapi
> -I ./arch/x86/include/generated/uapi -I ./include/uapi -I
> ./include/generated/uapi --include ./include/linux/compiler-version.h
> --include ./include/linux/kconfig.h --jobs 16 --chunksize 1
> 2146 files match
> diff -u -p a/fs/direct-io.c b/fs/direct-io.c
> --- a/fs/direct-io.c
> +++ b/fs/direct-io.c
> @@ -1128,15 +1128,9 @@ ssize_t __blockdev_direct_IO(struct kioc
> if (iov_iter_rw(iter) == READ && !count)
> return 0;
>
> - dio = kmem_cache_alloc(dio_cache, GFP_KERNEL);
> + dio = kmem_cache_zalloc(dio_cache, GFP_KERNEL);
> if (!dio)
> return -ENOMEM;
> - /*
> - * Believe it or not, zeroing out the page array caused a .5%
> - * performance regression in a database benchmark. So, we take
> - * care to only zero out what's needed.
> - */
> - memset(dio, 0, offsetof(struct dio, pages));
>
> dio->flags = flags;
> if (dio->flags & DIO_LOCKING && iov_iter_rw(iter) == READ) {
> /usr/bin/spatch -D patch --very-quiet --cocci-file
> ./scripts/coccinelle/api/atomic_as_refcounter.cocci --include-headers
> --very-quiet --dir . -I ./arch/x86/include -I
> ./arch/x86/include/generated -I ./include -I ./arch/x86/include/uapi
> -I ./arch/x86/include/generated/uapi -I ./include/uapi -I
> ./include/generated/uapi --include ./include/linux/compiler-version.h
> --include ./include/linux/kconfig.h --jobs 16 --chunksize 1
> virtual rule patch not supported
> coccicheck failed
> make[1]: *** [/home/antone/git/linux/Makefile:2005: coccicheck] Error 255
> make: *** [Makefile:234: __sub-make] Error 2
next prev parent reply other threads:[~2023-11-27 19:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-03 14:25 [cocci] [PATCH 0/2] coccicheck bugfix and CI improvement Anton Eliasson
2023-10-03 14:25 ` [cocci] [PATCH 1/2] scripts: coccicheck: Return error from run_cmd_parmap Anton Eliasson
2023-11-02 21:27 ` Julia Lawall
2023-11-17 16:36 ` Anton Eliasson [this message]
2023-10-03 14:25 ` [cocci] [PATCH 2/2] scripts: coccicheck: Separate spatch stdout and stderr Anton Eliasson
2023-10-07 19:41 ` Julia Lawall
2023-10-10 15:59 ` Anton Eliasson
2023-10-10 16:11 ` Julia Lawall
2023-10-11 13:19 ` Anton Eliasson
2023-10-11 13:46 ` Julia Lawall
2023-10-11 13:57 ` Anton Eliasson
2023-10-12 7:30 ` [cocci] Detecting differences according to source code analysis warnings Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0cee25a2-29f7-4481-8ab9-618f8491bf5b@axis.com \
--to=antone@axis.com \
--cc=anton.eliasson@axis.com \
--cc=cocci@inria.fr \
--cc=julia.lawall@inria.fr \
--cc=kernel@axis.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.palix@imag.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).