From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F502C49EA5 for ; Sat, 26 Jun 2021 19:55:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA4A061423 for ; Sat, 26 Jun 2021 19:55:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230249AbhFZT5f (ORCPT ); Sat, 26 Jun 2021 15:57:35 -0400 Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:62501 "EHLO mail2-relais-roc.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230107AbhFZT5e (ORCPT ); Sat, 26 Jun 2021 15:57:34 -0400 IronPort-HdrOrdr: =?us-ascii?q?A9a23=3AWCpddK7gk3eYPT+84APXwNPXdLJyesId70hD?= =?us-ascii?q?6qkXc3xom62j9vxG885w6faZskdyZJhCo7690de7MBDhHPdOiOF7AV7IZmXbUQ?= =?us-ascii?q?WTQb2KobGM/wHd?= X-IronPort-AV: E=Sophos;i="5.83,302,1616454000"; d="scan'208";a="516829491" Received: from 173.121.68.85.rev.sfr.net (HELO hadrien) ([85.68.121.173]) by mail2-relais-roc.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2021 21:55:10 +0200 Date: Sat, 26 Jun 2021 21:55:10 +0200 (CEST) From: Julia Lawall X-X-Sender: jll@hadrien To: Christophe JAILLET cc: Julia.Lawall@inria.fr, Gilles.Muller@inria.fr, nicolas.palix@imag.fr, michal.lkml@markovi.net, cocci@systeme.lip6.fr, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] Coccinelle: Update and rename api/alloc/pci_free_consistent.cocci In-Reply-To: Message-ID: References: User-Agent: Alpine 2.22 (DEB 394 2020-01-19) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: kernel-janitors@vger.kernel.org On Wed, 16 Jun 2021, Christophe JAILLET wrote: > 'pci_alloc_consistent()' is about to be removed from the kernel. > It is now more useful to check for dma_alloc_coherent/dma_free_coherent. dma_alloc_coherent has four arguments, and in the script there are only three. Is the number of arguments to dma_alloc_coherent going to change? julia > > So change the script accordingly and rename it. > > Signed-off-by: Christophe JAILLET > --- > Not sure that the script works. > There are 718 'dma_alloc_coherent' calls in 5.13-rc6. It is surprising > to have no match at all, not even a single false positive. > --- > ..._consistent.cocci => dma_free_coherent.cocci} | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > rename scripts/coccinelle/free/{pci_free_consistent.cocci => dma_free_coherent.cocci} (52%) > > diff --git a/scripts/coccinelle/free/pci_free_consistent.cocci b/scripts/coccinelle/free/dma_free_coherent.cocci > similarity index 52% > rename from scripts/coccinelle/free/pci_free_consistent.cocci > rename to scripts/coccinelle/free/dma_free_coherent.cocci > index d51e92556b42..75f159e7b6d7 100644 > --- a/scripts/coccinelle/free/pci_free_consistent.cocci > +++ b/scripts/coccinelle/free/dma_free_coherent.cocci > @@ -1,10 +1,10 @@ > // SPDX-License-Identifier: GPL-2.0-only > -/// Find missing pci_free_consistent for every pci_alloc_consistent. > +/// Find missing dma_free_coherent for every dma_alloc_coherent. > /// > // Confidence: Moderate > // Copyright: (C) 2013 Petr Strnad. > // URL: http://coccinelle.lip6.fr/ > -// Keywords: pci_free_consistent, pci_alloc_consistent > +// Keywords: dma_free_coherent, dma_alloc_coherent > // Options: --no-includes --include-headers > > virtual report > @@ -17,12 +17,12 @@ position p1,p2; > type T; > @@ > > -id = pci_alloc_consistent@p1(x,y,&z) > +id = dma_alloc_coherent@p1(x,y,&z) > ... when != e = id > if (id == NULL || ...) { ... return ...; } > -... when != pci_free_consistent(x,y,id,z) > - when != if (id) { ... pci_free_consistent(x,y,id,z) ... } > - when != if (y) { ... pci_free_consistent(x,y,id,z) ... } > +... when != dma_free_coherent(x,y,id,z) > + when != if (id) { ... dma_free_coherent(x,y,id,z) ... } > + when != if (y) { ... dma_free_coherent(x,y,id,z) ... } > when != e = (T)id > when exists > ( > @@ -40,7 +40,7 @@ p1 << search.p1; > p2 << search.p2; > @@ > > -msg = "ERROR: missing pci_free_consistent; pci_alloc_consistent on line %s and return without freeing on line %s" % (p1[0].line,p2[0].line) > +msg = "ERROR: missing dma_free_coherent; dma_alloc_coherent on line %s and return without freeing on line %s" % (p1[0].line,p2[0].line) > coccilib.report.print_report(p2[0],msg) > > @script:python depends on org@ > @@ -48,6 +48,6 @@ p1 << search.p1; > p2 << search.p2; > @@ > > -msg = "ERROR: missing pci_free_consistent; pci_alloc_consistent on line %s and return without freeing on line %s" % (p1[0].line,p2[0].line) > +msg = "ERROR: missing dma_free_coherent; dma_alloc_coherent on line %s and return without freeing on line %s" % (p1[0].line,p2[0].line) > cocci.print_main(msg,p1) > cocci.print_secs("",p2) > -- > 2.30.2 > >