Re: [PATCHv2] Coccinelle: remove pci_alloc_consistent semantic to detect in zalloc-simple.cocci
2018-08-18 22:51 GMT+09:00 zhong jiang : > Because pci_alloc_consistent has been deprecated. We prefer to use > dma_alloc_coherent directly. Therefore, we should remove pci_alloc_consistent > to increase the confidence. > > Acked-by: Julia Lawall > Acked-by: Himanshu Jha > Signed-off-by: zhong jiang > --- > v1->v2: > - fix some spelling mistakes. Applied to linux-kbuild. Thanks! > scripts/coccinelle/api/alloc/zalloc-simple.cocci | 41 > +--- > 1 file changed, 1 insertion(+), 40 deletions(-) > > diff --git a/scripts/coccinelle/api/alloc/zalloc-simple.cocci > b/scripts/coccinelle/api/alloc/zalloc-simple.cocci > index 92b2091..d819275 100644 > --- a/scripts/coccinelle/api/alloc/zalloc-simple.cocci > +++ b/scripts/coccinelle/api/alloc/zalloc-simple.cocci > @@ -35,8 +35,7 @@ statement S; > > * x = (T)\(kmalloc(E1, ...)\|vmalloc(E1)\|dma_alloc_coherent(...,E1,...)\| >kmalloc_node(E1, ...)\|kmem_cache_alloc(...)\|kmem_alloc(E1, ...)\| > - devm_kmalloc(...,E1,...)\|kvmalloc(E1, > ...)\|pci_alloc_consistent(...,E1,...)\| > - kvmalloc_node(E1,...)\); > + devm_kmalloc(...,E1,...)\|kvmalloc(E1, ...)\|kvmalloc_node(E1,...)\); >if ((x==NULL) || ...) S > * memset((T2)x,0,E1); > > @@ -124,15 +123,6 @@ statement S; > - x = (T)kvmalloc(E1,E2); > + x = (T)kvzalloc(E1,E2); > | > -- x = pci_alloc_consistent(E2,E1,E3); > -+ x = pci_zalloc_consistent(E2,E1,E3); > -| > -- x = (T *)pci_alloc_consistent(E2,E1,E3); > -+ x = pci_zalloc_consistent(E2,E1,E3); > -| > -- x = (T)pci_alloc_consistent(E2,E1,E3); > -+ x = (T)pci_zalloc_consistent(E2,E1,E3); > -| > - x = kvmalloc_node(E1,E2,E3); > + x = kvzalloc_node(E1,E2,E3); > | > @@ -389,35 +379,6 @@ msg="WARNING: kvzalloc should be used for %s, instead of > kvmalloc/memset" % (x) > coccilib.report.print_report(p[0], msg) > > //- > -@r8 depends on org || report@ > -type T, T2; > -expression x; > -expression E1,E2,E3; > -statement S; > -position p; > -@@ > - > - x = (T)pci_alloc_consistent@p(E2,E1,E3); > - if ((x==NULL) || ...) S > - memset((T2)x,0,E1); > - > -@script:python depends on org@ > -p << r8.p; > -x << r8.x; > -@@ > - > -msg="%s" % (x) > -msg_safe=msg.replace("[","@(").replace("]",")") > -coccilib.org.print_todo(p[0], msg_safe) > - > -@script:python depends on report@ > -p << r8.p; > -x << r8.x; > -@@ > - > -msg="WARNING: pci_zalloc_consistent should be used for %s, instead of > pci_alloc_consistent/memset" % (x) > -coccilib.report.print_report(p[0], msg) > -//- > @r9 depends on org || report@ > type T, T2; > expression x; > -- > 1.7.12.4 > -- Best Regards Masahiro Yamada
Re: [PATCHv2] Coccinelle: remove pci_alloc_consistent semantic to detect in zalloc-simple.cocci
2018-08-18 22:51 GMT+09:00 zhong jiang : > Because pci_alloc_consistent has been deprecated. We prefer to use > dma_alloc_coherent directly. Therefore, we should remove pci_alloc_consistent > to increase the confidence. > > Acked-by: Julia Lawall > Acked-by: Himanshu Jha > Signed-off-by: zhong jiang > --- > v1->v2: > - fix some spelling mistakes. Applied to linux-kbuild. Thanks! > scripts/coccinelle/api/alloc/zalloc-simple.cocci | 41 > +--- > 1 file changed, 1 insertion(+), 40 deletions(-) > > diff --git a/scripts/coccinelle/api/alloc/zalloc-simple.cocci > b/scripts/coccinelle/api/alloc/zalloc-simple.cocci > index 92b2091..d819275 100644 > --- a/scripts/coccinelle/api/alloc/zalloc-simple.cocci > +++ b/scripts/coccinelle/api/alloc/zalloc-simple.cocci > @@ -35,8 +35,7 @@ statement S; > > * x = (T)\(kmalloc(E1, ...)\|vmalloc(E1)\|dma_alloc_coherent(...,E1,...)\| >kmalloc_node(E1, ...)\|kmem_cache_alloc(...)\|kmem_alloc(E1, ...)\| > - devm_kmalloc(...,E1,...)\|kvmalloc(E1, > ...)\|pci_alloc_consistent(...,E1,...)\| > - kvmalloc_node(E1,...)\); > + devm_kmalloc(...,E1,...)\|kvmalloc(E1, ...)\|kvmalloc_node(E1,...)\); >if ((x==NULL) || ...) S > * memset((T2)x,0,E1); > > @@ -124,15 +123,6 @@ statement S; > - x = (T)kvmalloc(E1,E2); > + x = (T)kvzalloc(E1,E2); > | > -- x = pci_alloc_consistent(E2,E1,E3); > -+ x = pci_zalloc_consistent(E2,E1,E3); > -| > -- x = (T *)pci_alloc_consistent(E2,E1,E3); > -+ x = pci_zalloc_consistent(E2,E1,E3); > -| > -- x = (T)pci_alloc_consistent(E2,E1,E3); > -+ x = (T)pci_zalloc_consistent(E2,E1,E3); > -| > - x = kvmalloc_node(E1,E2,E3); > + x = kvzalloc_node(E1,E2,E3); > | > @@ -389,35 +379,6 @@ msg="WARNING: kvzalloc should be used for %s, instead of > kvmalloc/memset" % (x) > coccilib.report.print_report(p[0], msg) > > //- > -@r8 depends on org || report@ > -type T, T2; > -expression x; > -expression E1,E2,E3; > -statement S; > -position p; > -@@ > - > - x = (T)pci_alloc_consistent@p(E2,E1,E3); > - if ((x==NULL) || ...) S > - memset((T2)x,0,E1); > - > -@script:python depends on org@ > -p << r8.p; > -x << r8.x; > -@@ > - > -msg="%s" % (x) > -msg_safe=msg.replace("[","@(").replace("]",")") > -coccilib.org.print_todo(p[0], msg_safe) > - > -@script:python depends on report@ > -p << r8.p; > -x << r8.x; > -@@ > - > -msg="WARNING: pci_zalloc_consistent should be used for %s, instead of > pci_alloc_consistent/memset" % (x) > -coccilib.report.print_report(p[0], msg) > -//- > @r9 depends on org || report@ > type T, T2; > expression x; > -- > 1.7.12.4 > -- Best Regards Masahiro Yamada
[PATCHv2] Coccinelle: remove pci_alloc_consistent semantic to detect in zalloc-simple.cocci
Because pci_alloc_consistent has been deprecated. We prefer to use dma_alloc_coherent directly. Therefore, we should remove pci_alloc_consistent to increase the confidence. Acked-by: Julia Lawall Acked-by: Himanshu Jha Signed-off-by: zhong jiang --- v1->v2: - fix some spelling mistakes. scripts/coccinelle/api/alloc/zalloc-simple.cocci | 41 +--- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/scripts/coccinelle/api/alloc/zalloc-simple.cocci b/scripts/coccinelle/api/alloc/zalloc-simple.cocci index 92b2091..d819275 100644 --- a/scripts/coccinelle/api/alloc/zalloc-simple.cocci +++ b/scripts/coccinelle/api/alloc/zalloc-simple.cocci @@ -35,8 +35,7 @@ statement S; * x = (T)\(kmalloc(E1, ...)\|vmalloc(E1)\|dma_alloc_coherent(...,E1,...)\| kmalloc_node(E1, ...)\|kmem_cache_alloc(...)\|kmem_alloc(E1, ...)\| - devm_kmalloc(...,E1,...)\|kvmalloc(E1, ...)\|pci_alloc_consistent(...,E1,...)\| - kvmalloc_node(E1,...)\); + devm_kmalloc(...,E1,...)\|kvmalloc(E1, ...)\|kvmalloc_node(E1,...)\); if ((x==NULL) || ...) S * memset((T2)x,0,E1); @@ -124,15 +123,6 @@ statement S; - x = (T)kvmalloc(E1,E2); + x = (T)kvzalloc(E1,E2); | -- x = pci_alloc_consistent(E2,E1,E3); -+ x = pci_zalloc_consistent(E2,E1,E3); -| -- x = (T *)pci_alloc_consistent(E2,E1,E3); -+ x = pci_zalloc_consistent(E2,E1,E3); -| -- x = (T)pci_alloc_consistent(E2,E1,E3); -+ x = (T)pci_zalloc_consistent(E2,E1,E3); -| - x = kvmalloc_node(E1,E2,E3); + x = kvzalloc_node(E1,E2,E3); | @@ -389,35 +379,6 @@ msg="WARNING: kvzalloc should be used for %s, instead of kvmalloc/memset" % (x) coccilib.report.print_report(p[0], msg) //- -@r8 depends on org || report@ -type T, T2; -expression x; -expression E1,E2,E3; -statement S; -position p; -@@ - - x = (T)pci_alloc_consistent@p(E2,E1,E3); - if ((x==NULL) || ...) S - memset((T2)x,0,E1); - -@script:python depends on org@ -p << r8.p; -x << r8.x; -@@ - -msg="%s" % (x) -msg_safe=msg.replace("[","@(").replace("]",")") -coccilib.org.print_todo(p[0], msg_safe) - -@script:python depends on report@ -p << r8.p; -x << r8.x; -@@ - -msg="WARNING: pci_zalloc_consistent should be used for %s, instead of pci_alloc_consistent/memset" % (x) -coccilib.report.print_report(p[0], msg) -//- @r9 depends on org || report@ type T, T2; expression x; -- 1.7.12.4
[PATCHv2] Coccinelle: remove pci_alloc_consistent semantic to detect in zalloc-simple.cocci
Because pci_alloc_consistent has been deprecated. We prefer to use dma_alloc_coherent directly. Therefore, we should remove pci_alloc_consistent to increase the confidence. Acked-by: Julia Lawall Acked-by: Himanshu Jha Signed-off-by: zhong jiang --- v1->v2: - fix some spelling mistakes. scripts/coccinelle/api/alloc/zalloc-simple.cocci | 41 +--- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/scripts/coccinelle/api/alloc/zalloc-simple.cocci b/scripts/coccinelle/api/alloc/zalloc-simple.cocci index 92b2091..d819275 100644 --- a/scripts/coccinelle/api/alloc/zalloc-simple.cocci +++ b/scripts/coccinelle/api/alloc/zalloc-simple.cocci @@ -35,8 +35,7 @@ statement S; * x = (T)\(kmalloc(E1, ...)\|vmalloc(E1)\|dma_alloc_coherent(...,E1,...)\| kmalloc_node(E1, ...)\|kmem_cache_alloc(...)\|kmem_alloc(E1, ...)\| - devm_kmalloc(...,E1,...)\|kvmalloc(E1, ...)\|pci_alloc_consistent(...,E1,...)\| - kvmalloc_node(E1,...)\); + devm_kmalloc(...,E1,...)\|kvmalloc(E1, ...)\|kvmalloc_node(E1,...)\); if ((x==NULL) || ...) S * memset((T2)x,0,E1); @@ -124,15 +123,6 @@ statement S; - x = (T)kvmalloc(E1,E2); + x = (T)kvzalloc(E1,E2); | -- x = pci_alloc_consistent(E2,E1,E3); -+ x = pci_zalloc_consistent(E2,E1,E3); -| -- x = (T *)pci_alloc_consistent(E2,E1,E3); -+ x = pci_zalloc_consistent(E2,E1,E3); -| -- x = (T)pci_alloc_consistent(E2,E1,E3); -+ x = (T)pci_zalloc_consistent(E2,E1,E3); -| - x = kvmalloc_node(E1,E2,E3); + x = kvzalloc_node(E1,E2,E3); | @@ -389,35 +379,6 @@ msg="WARNING: kvzalloc should be used for %s, instead of kvmalloc/memset" % (x) coccilib.report.print_report(p[0], msg) //- -@r8 depends on org || report@ -type T, T2; -expression x; -expression E1,E2,E3; -statement S; -position p; -@@ - - x = (T)pci_alloc_consistent@p(E2,E1,E3); - if ((x==NULL) || ...) S - memset((T2)x,0,E1); - -@script:python depends on org@ -p << r8.p; -x << r8.x; -@@ - -msg="%s" % (x) -msg_safe=msg.replace("[","@(").replace("]",")") -coccilib.org.print_todo(p[0], msg_safe) - -@script:python depends on report@ -p << r8.p; -x << r8.x; -@@ - -msg="WARNING: pci_zalloc_consistent should be used for %s, instead of pci_alloc_consistent/memset" % (x) -coccilib.report.print_report(p[0], msg) -//- @r9 depends on org || report@ type T, T2; expression x; -- 1.7.12.4