[PATCH] devtools/cocci: update cocci for ethdev namespace

[PATCH] devtools/cocci: update cocci for ethdev namespace

[Aman Singh]

Added two specific execptions for ETH_SPEED_10G
and ETH_SPEED_25G to avoid there name change.

Signed-off-by: Aman Singh <aman.deep.singh@intel.com>
---
 devtools/cocci/namespace_ethdev.cocci | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/devtools/cocci/namespace_ethdev.cocci b/devtools/cocci/namespace_ethdev.cocci
index d5de41e117..3afa1fb386 100644
--- a/devtools/cocci/namespace_ethdev.cocci
+++ b/devtools/cocci/namespace_ethdev.cocci
@@ -16,7 +16,8 @@ exception_matches = ["ETH_VLAN_FILTER_CLASSIFY","ETH_VLAN_FILTER_ANY",
 "RTE_FDIR_NO","RTE_FDIR_REPORT","ETH_MAX_RX_CLIENTS_E1H",
 "ETH_MAX_AGGREGATION_QUEUES_E1","ETH_RSS_ENGINE_NUM","ETH_NUM_MAC_FILTERS",
 "ETH_MAX_NUM_RX_QUEUES_PER_VF_QUAD","ETH_RSS_IND_TABLE_ENTRIES_NUM",
-"ETH_RSS_KEY_SIZE_REGS","ETH_NUM_STATISTIC_COUNTERS","ETH_SPEED_"]
+"ETH_RSS_KEY_SIZE_REGS","ETH_NUM_STATISTIC_COUNTERS","ETH_SPEED_10G",
+"ETH_SPEED_25G"]
 
 if any(x in I for x in exception_matches):
         coccinelle .J= I;
-- 
2.25.1

Re: [PATCH] devtools/cocci: update cocci for ethdev namespace

[Ferruh Yigit]

On 12/8/2021 11:45 AM, Aman Singh wrote:
> Added two specific execptions for ETH_SPEED_10G
> and ETH_SPEED_25G to avoid there name change.
> 
> Signed-off-by: Aman Singh <aman.deep.singh@intel.com>
> ---
>   devtools/cocci/namespace_ethdev.cocci | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/devtools/cocci/namespace_ethdev.cocci b/devtools/cocci/namespace_ethdev.cocci
> index d5de41e117..3afa1fb386 100644
> --- a/devtools/cocci/namespace_ethdev.cocci
> +++ b/devtools/cocci/namespace_ethdev.cocci
> @@ -16,7 +16,8 @@ exception_matches = ["ETH_VLAN_FILTER_CLASSIFY","ETH_VLAN_FILTER_ANY",
>   "RTE_FDIR_NO","RTE_FDIR_REPORT","ETH_MAX_RX_CLIENTS_E1H",
>   "ETH_MAX_AGGREGATION_QUEUES_E1","ETH_RSS_ENGINE_NUM","ETH_NUM_MAC_FILTERS",
>   "ETH_MAX_NUM_RX_QUEUES_PER_VF_QUAD","ETH_RSS_IND_TABLE_ENTRIES_NUM",
> -"ETH_RSS_KEY_SIZE_REGS","ETH_NUM_STATISTIC_COUNTERS","ETH_SPEED_"]
> +"ETH_RSS_KEY_SIZE_REGS","ETH_NUM_STATISTIC_COUNTERS","ETH_SPEED_10G",
> +"ETH_SPEED_25G"]
>   
>   if any(x in I for x in exception_matches):
>           coccinelle .J= I;
> 

Thanks Aman,

I confirm 'ETH_SPEED_NUM_*' issue is resolved.


There are a few more quirks, can you please check if they are fixable,
if so they can be in v2 of this patch:

1) 'ETH_TUNNEL_FILTER_' ones seems not updated, like:
ETH_TUNNEL_FILTER_OMAC -> RTE_ETH_TUNNEL_FILTER_OMAC
ETH_TUNNEL_FILTER_OIP  -> RTE_ETH_TUNNEL_FILTER_OIP

But need to be careful some of the already has RTE_ prefix, like:
RTE_TUNNEL_FILTER_IMAC_IVLAN
RTE_TUNNEL_FILTER_IMAC_IVLAN_TENID
...


2) Script seems not updating the ones with macro defines with line
continuation, there are a few different instance of them, if it is
easy we can update script, else they can be ignored. Samples:

drivers/net/ice/ice_ethdev.c:
        #define ICE_RSS_HF_ALL ( \
                ETH_RSS_IPV4 | \
                ETH_RSS_IPV6 | \
                ETH_RSS_NONFRAG_IPV4_UDP | \
                ETH_RSS_NONFRAG_IPV6_UDP | \
                ETH_RSS_NONFRAG_IPV4_TCP | \
                ETH_RSS_NONFRAG_IPV6_TCP | \
                ETH_RSS_NONFRAG_IPV4_SCTP | \
                ETH_RSS_NONFRAG_IPV6_SCTP | \
                ETH_RSS_FRAG_IPV4 | \
                ETH_RSS_FRAG_IPV6)

drivers/net/hns3/hns3_rxtx.c:
        #define HNS3_DEV_TX_CSKUM_TSO_OFFLOAD_MASK (\
                        DEV_TX_OFFLOAD_IPV4_CKSUM | \
                        DEV_TX_OFFLOAD_TCP_CKSUM | \
                        DEV_TX_OFFLOAD_UDP_CKSUM | \
                        DEV_TX_OFFLOAD_SCTP_CKSUM | \
                        DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | \
                        DEV_TX_OFFLOAD_OUTER_UDP_CKSUM | \
                        DEV_TX_OFFLOAD_TCP_TSO | \
                        DEV_TX_OFFLOAD_VXLAN_TNL_TSO | \
                        DEV_TX_OFFLOAD_GRE_TNL_TSO | \
                        DEV_TX_OFFLOAD_GENEVE_TNL_TSO)


3) in bonding (eth_bond_private.h),
RTE_RETA_GROUP_SIZE & ETH_RSS_RETA_SIZE_512 seems not updated,
bonding on its own doesn't matter much, but may be good to investigate
why it is not updated, what is missed.


4) Similarly, in 'mlx5/mlx5_rxq.c', ETH_MQ_RX_RSS seems not updated,
not much matter on its own, but may be good to investigate


5) This is optional but script updates old 'ETH_MIRROR_*' too, but
those macros are removed from latest upstream, so may be excluded.

Re: [PATCH] devtools/cocci: update cocci for ethdev namespace

[Singh, Aman Deep]

On 12/10/2021 6:48 PM, Ferruh Yigit wrote:
> On 12/8/2021 11:45 AM, Aman Singh wrote:
>> Added two specific execptions for ETH_SPEED_10G
>> and ETH_SPEED_25G to avoid there name change.
>>
>> Signed-off-by: Aman Singh <aman.deep.singh@intel.com>
>> ---
>>   devtools/cocci/namespace_ethdev.cocci | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/devtools/cocci/namespace_ethdev.cocci 
>> b/devtools/cocci/namespace_ethdev.cocci
>> index d5de41e117..3afa1fb386 100644
>> --- a/devtools/cocci/namespace_ethdev.cocci
>> +++ b/devtools/cocci/namespace_ethdev.cocci
>> @@ -16,7 +16,8 @@ exception_matches = 
>> ["ETH_VLAN_FILTER_CLASSIFY","ETH_VLAN_FILTER_ANY",
>>   "RTE_FDIR_NO","RTE_FDIR_REPORT","ETH_MAX_RX_CLIENTS_E1H",
>> "ETH_MAX_AGGREGATION_QUEUES_E1","ETH_RSS_ENGINE_NUM","ETH_NUM_MAC_FILTERS",
>> "ETH_MAX_NUM_RX_QUEUES_PER_VF_QUAD","ETH_RSS_IND_TABLE_ENTRIES_NUM",
>> -"ETH_RSS_KEY_SIZE_REGS","ETH_NUM_STATISTIC_COUNTERS","ETH_SPEED_"]
>> +"ETH_RSS_KEY_SIZE_REGS","ETH_NUM_STATISTIC_COUNTERS","ETH_SPEED_10G",
>> +"ETH_SPEED_25G"]
>>     if any(x in I for x in exception_matches):
>>           coccinelle .J= I;
>>
>
> Thanks Aman,
>
> I confirm 'ETH_SPEED_NUM_*' issue is resolved.
>
>
> There are a few more quirks, can you please check if they are fixable,
> if so they can be in v2 of this patch:
>
> 1) 'ETH_TUNNEL_FILTER_' ones seems not updated, like:
> ETH_TUNNEL_FILTER_OMAC -> RTE_ETH_TUNNEL_FILTER_OMAC
> ETH_TUNNEL_FILTER_OIP  -> RTE_ETH_TUNNEL_FILTER_OIP
>
> But need to be careful some of the already has RTE_ prefix, like:
> RTE_TUNNEL_FILTER_IMAC_IVLAN
> RTE_TUNNEL_FILTER_IMAC_IVLAN_TENID
> ...
>
Will add 'ETH_TUNNEL_FILTER_' in V2
>
> 2) Script seems not updating the ones with macro defines with line
> continuation, there are a few different instance of them, if it is
> easy we can update script, else they can be ignored. Samples:
>
> drivers/net/ice/ice_ethdev.c:
>        #define ICE_RSS_HF_ALL ( \
>                ETH_RSS_IPV4 | \
>                ETH_RSS_IPV6 | \
>                ETH_RSS_NONFRAG_IPV4_UDP | \
>                ETH_RSS_NONFRAG_IPV6_UDP | \
>                ETH_RSS_NONFRAG_IPV4_TCP | \
>                ETH_RSS_NONFRAG_IPV6_TCP | \
>                ETH_RSS_NONFRAG_IPV4_SCTP | \
>                ETH_RSS_NONFRAG_IPV6_SCTP | \
>                ETH_RSS_FRAG_IPV4 | \
>                ETH_RSS_FRAG_IPV6)
>
> drivers/net/hns3/hns3_rxtx.c:
>        #define HNS3_DEV_TX_CSKUM_TSO_OFFLOAD_MASK (\
>                        DEV_TX_OFFLOAD_IPV4_CKSUM | \
>                        DEV_TX_OFFLOAD_TCP_CKSUM | \
>                        DEV_TX_OFFLOAD_UDP_CKSUM | \
>                        DEV_TX_OFFLOAD_SCTP_CKSUM | \
>                        DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | \
>                        DEV_TX_OFFLOAD_OUTER_UDP_CKSUM | \
>                        DEV_TX_OFFLOAD_TCP_TSO | \
>                        DEV_TX_OFFLOAD_VXLAN_TNL_TSO | \
>                        DEV_TX_OFFLOAD_GRE_TNL_TSO | \
>                        DEV_TX_OFFLOAD_GENEVE_TNL_TSO)
>
These are '# defines' so script will not modify these.
As no rule present for these.
>
> 3) in bonding (eth_bond_private.h),
> RTE_RETA_GROUP_SIZE & ETH_RSS_RETA_SIZE_512 seems not updated,
> bonding on its own doesn't matter much, but may be good to investigate
> why it is not updated, what is missed.
>
Will add 'ETH_RSS_RETA_SIZE' in v2. For RTE_RETA_GROUP_SIZEI saw only
one #define instance.
>
> 4) Similarly, in 'mlx5/mlx5_rxq.c', ETH_MQ_RX_RSS seems not updated,
> not much matter on its own, but may be good to investigate
ETH_MQ_ is there in search pattern. Will check.
>
>
> 5) This is optional but script updates old 'ETH_MIRROR_*' too, but
> those macros are removed from latest upstream, so may be excluded.
Removed 'ETH_MIRROR_' in v2