net/ring: driver fixes
cover net/ring: driver fixes
Minor fixes for the net/ring driver.
Stephen Hemminger (4):
net/ring: fix coding style
net/ring: use sizeof() with snprintf
net/ring: use rte_calloc_socket
net/ring: check length of ring name
drivers/net/ring/rte_eth_ring.c | 90 ++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 35 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/4 net/ring: fix coding style
Whitespace fixes to bring inline with current DPDK style.
--- drivers/net/ring/rte_eth_ring.c | 58 ++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 26 deletions(-)
drivers/net/ring/rte_eth_ring.c +32 -26
@@ -45,8 +45,8 @@ struct ring_queue { };struct pmd_internals { -unsigned max_rx_queues; -unsigned max_tx_queues; +unsigned int max_rx_queues; +unsigned int max_tx_queues;struct ring_queue rx_ring_queues[RTE_PMD_RING_MAX_RX_RINGS ];struct ring_queue tx_ring_queues[RTE_PMD_RING_MAX_TX_RINGS ];
@@ -55,12 +55,11 @@ struct pmd_internals {enum dev_action action; }; -static struct rte_eth_link pmd_link = { - .link_speed =ETH_SPEED_NUM_10G , - .link_duplex =ETH_LINK_FULL_DUPLEX , - .link_status =ETH_LINK_DOWN , - .link_autoneg =ETH_LINK_FIXED , + .link_speed =ETH_SPEED_NUM_10G , + .link_duplex =ETH_LINK_FULL_DUPLEX , + .link_status =ETH_LINK_DOWN , + .link_autoneg =ETH_LINK_FIXED , };static int eth_ring_logtype;
@@ -138,6 +137,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, struct rte_mempool *mb_pool __rte_unused) {struct pmd_internals *internals = dev->data->dev_private; + dev->data->rx_queues[rx_queue_id] = &internals->rx_ring_queues[rx_queue_id];return 0 ; }
@@ -149,6 +149,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, const struct rte_eth_txconf *tx_conf __rte_unused) {struct pmd_internals *internals = dev->data->dev_private; + dev->data->tx_queues[tx_queue_id] = &internals->tx_ring_queues[tx_queue_id];return 0 ; }
@@ -156,9 +157,10 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,static void eth_dev_info (struct rte_eth_dev *dev, -struct rte_eth_dev_info *dev_info) +struct rte_eth_dev_info *dev_info) {struct pmd_internals *internals = dev->data->dev_private; + dev_info->max_mac_addrs =1 ; dev_info->max_rx_pktlen = (uint32_t )-1 ; dev_info->max_rx_queues = (uint16_t )internals->max_rx_queues;
@@ -169,7 +171,7 @@ eth_dev_info(struct rte_eth_dev *dev,static int eth_stats_get (struct rte_eth_dev *dev,struct rte_eth_stats *stats) { -unsigned i; +unsigned int i;unsigned long rx_total =0 , tx_total =0 , tx_err_total =0 ;const struct pmd_internals *internal = dev->data->dev_private;
@@ -197,8 +199,9 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)static void eth_stats_reset (struct rte_eth_dev *dev) { -unsigned i; +unsigned int i;struct pmd_internals *internal = dev->data->dev_private; +for (i =0 ; i < dev->data->nb_rx_queues; i++) internal->rx_ring_queues[i].rx_pkts.cnt =0 ;for (i =0 ; i < dev->data->nb_tx_queues; i++) {
@@ -250,8 +253,10 @@ static struct rte_vdev_driver pmd_ring_drv;static int do_eth_dev_ring_create (const char *name, -struct rte_ring *const rx_queues[],const unsigned nb_rx_queues, -struct rte_ring *const tx_queues[],const unsigned nb_tx_queues, +struct rte_ring *const rx_queues[], +const unsigned int nb_rx_queues, +struct rte_ring *const tx_queues[], +const unsigned int nb_tx_queues,const unsigned int numa_node,enum dev_action action,struct rte_eth_dev **eth_dev_p) {
@@ -260,7 +265,7 @@ do_eth_dev_ring_create(const char *name,struct rte_eth_dev *eth_dev =NULL ;void **rx_queues_local =NULL ;void **tx_queues_local =NULL ; -unsigned i; +unsigned int i;PMD_LOG (INFO ,"Creating rings-backed ethdev on numa socket %u" , numa_node);
@@ -344,10 +349,10 @@ do_eth_dev_ring_create(const char *name,int rte_eth_from_rings (const char *name,struct rte_ring *const rx_queues[], -const unsigned nb_rx_queues, +const unsigned int nb_rx_queues,struct rte_ring *const tx_queues[], -const unsigned nb_tx_queues, -const unsigned numa_node) +const unsigned int nb_tx_queues, +const unsigned int numa_node) {struct ring_internal_args args = { .rx_queues = rx_queues,
@@ -398,16 +403,16 @@ rte_eth_from_ring(struct rte_ring *r) }static int -eth_dev_ring_create (const char *name,const unsigned numa_node, +eth_dev_ring_create (const char *name,const unsigned int numa_node,enum dev_action action,struct rte_eth_dev **eth_dev) {/* rx and tx are so-called from point of view of first port. * They are inverted from the point of view of second port */ struct rte_ring *rxtx[RTE_PMD_RING_MAX_RX_RINGS ]; -unsigned i; +unsigned int i;char rng_name[RTE_RING_NAMESIZE ]; -unsigned num_rings =RTE_MIN (RTE_PMD_RING_MAX_RX_RINGS , +unsigned int num_rings =RTE_MIN (RTE_PMD_RING_MAX_RX_RINGS ,RTE_PMD_RING_MAX_TX_RINGS );for (i =0 ; i < num_rings; i++) {
@@ -429,17 +434,18 @@ eth_dev_ring_create(const char *name, const unsigned numa_node,struct node_action_pair {char name[PATH_MAX ]; -unsigned node; +unsigned int node;enum dev_action action; };struct node_action_list { -unsigned total; -unsigned count; +unsigned int total; +unsigned int count;struct node_action_pair *list; }; -static int parse_kvlist (const char *key __rte_unused, const char *value, void *data) +static int parse_kvlist(const char *key __rte_unused, +const char *value,void *data) {struct node_action_list *info = data;int ret;
@@ -553,8 +559,8 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) kvlist =rte_kvargs_parse (params, valid_arguments);if (!kvlist) { -PMD_LOG (INFO ,"Ignoring unsupported parameters when creating" -" rings-backed ethernet device" ); +PMD_LOG (INFO , +"Ignoring unsupported parameters when creatingrings-backed ethernet device" ); ret =eth_dev_ring_create (name,rte_socket_id (),DEV_CREATE , ð_dev);if (ret ==-1 ) {
@@ -598,7 +604,7 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) goto out_free; info->total = ret; - info->list = (struct node_action_pair *)(info +1 ); + info->list = (struct node_action_pair *)(info +1 ); ret =rte_kvargs_process (kvlist,ETH_RING_NUMA_NODE_ACTION_ARG , parse_kvlist, info);
Signature · 1 line
2.20.1
PATCH 2/4 net/ring: use sizeof() with snprintf
In reply to Stephen HemmingerDon't hard code string length in two place; use sizeof() instead. Ring name shoudl use RTE_RING_NAMESIZE.
--- drivers/net/ring/rte_eth_ring.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/ring/rte_eth_ring.c +5 -4
@@ -362,8 +362,8 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], .numa_node = numa_node, .addr = &args, }; -char args_str[32 ] = {0 }; -char ring_name[32 ] = {0 }; +char args_str[32 ]; +char ring_name[RTE_RING_NAMESIZE ];uint16_t port_id =RTE_MAX_ETHPORTS ;int ret;
@@ -381,8 +381,9 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],return -1 ; } -snprintf (args_str,32 ,"%s=%p" ,ETH_RING_INTERNAL_ARG , &args); -snprintf (ring_name,32 ,"net_ring_%s" , name); +snprintf (args_str,sizeof (args_str),"%s=%p" , +ETH_RING_INTERNAL_ARG , &args); +snprintf (ring_name,sizeof (ring_name),"net_ring_%s" , name); ret =rte_vdev_init (ring_name, args_str);if (ret) {
Signature · 1 line
2.20.1
PATCH 3/4 net/ring: use rte_calloc_socket
In reply to Stephen HemmingerUse rte_calloc_socket instead of computing size.
--- drivers/net/ring/rte_eth_ring.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ring/rte_eth_ring.c +4 -4
@@ -270,15 +270,15 @@ do_eth_dev_ring_create(const char *name,PMD_LOG (INFO ,"Creating rings-backed ethdev on numa socket %u" , numa_node); - rx_queues_local =rte_zmalloc_socket (name, -sizeof (void *) * nb_rx_queues,0 , numa_node); + rx_queues_local =rte_calloc_socket (name, nb_rx_queues, +sizeof (void *),0 , numa_node);if (rx_queues_local ==NULL ) { rte_errno =ENOMEM ; goto error; } - tx_queues_local =rte_zmalloc_socket (name, -sizeof (void *) * nb_tx_queues,0 , numa_node); + tx_queues_local =rte_calloc_socket (name, nb_tx_queues, +sizeof (void *),0 , numa_node);if (tx_queues_local ==NULL ) { rte_errno =ENOMEM ; goto error;
Signature · 1 line
2.20.1
PATCH 4/4 net/ring: check length of ring name
In reply to Stephen HemmingerThe ring name is passed in as part of this drivers API, but it doesn't check that the name is not truncated.
--- drivers/net/ring/rte_eth_ring.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/net/ring/rte_eth_ring.c +15 -2
@@ -383,7 +383,12 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],snprintf (args_str,sizeof (args_str),"%s=%p" ,ETH_RING_INTERNAL_ARG , &args); -snprintf (ring_name,sizeof (ring_name),"net_ring_%s" , name); + + ret =snprintf (ring_name,sizeof (ring_name),"net_ring_%s" , name); +if (ret >= (int )sizeof (ring_name)) { + rte_errno =ENAMETOOLONG ; +return -1 ; + } ret =rte_vdev_init (ring_name, args_str);if (ret) {
@@ -417,7 +422,15 @@ eth_dev_ring_create(const char *name, const unsigned int numa_node, RTE_PMD_RING_MAX_TX_RINGS);for (i =0 ; i < num_rings; i++) { -snprintf (rng_name,sizeof (rng_name),"ETH_RXTX%u_%s" , i, name); +int cc; + + cc =snprintf (rng_name,sizeof (rng_name), +"ETH_RXTX%u_%s" , i, name); +if (cc >= (int )sizeof (rng_name)) { + rte_errno =ENAMETOOLONG ; +return -1 ; + } + rxtx[i] = (action ==DEV_CREATE ) ?rte_ring_create (rng_name,1024 , numa_node, RING_F_SP_ENQ|RING_F_SC_DEQ) :
Signature · 1 line
2.20.1
v2 cover net/ring: driver fixes
In reply to Stephen HemmingerMinor fixes and cleanups for the net/ring driver.
Stephen Hemminger (4):
net/ring: fix coding style
net/ring: use sizeof() with snprintf
net/ring: use rte_calloc_socket
net/ring: check length of ring name
drivers/net/ring/rte_eth_ring.c | 90 ++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 35 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/4 net/ring: fix coding style
Whitespace fixes to bring inline with current DPDK style.
---
v2 - fix signoff line
drivers/net/ring/rte_eth_ring.c | 58 ++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 26 deletions(-)
drivers/net/ring/rte_eth_ring.c +32 -26
@@ -45,8 +45,8 @@ struct ring_queue { };struct pmd_internals { -unsigned max_rx_queues; -unsigned max_tx_queues; +unsigned int max_rx_queues; +unsigned int max_tx_queues;struct ring_queue rx_ring_queues[RTE_PMD_RING_MAX_RX_RINGS ];struct ring_queue tx_ring_queues[RTE_PMD_RING_MAX_TX_RINGS ];
@@ -55,12 +55,11 @@ struct pmd_internals {enum dev_action action; }; -static struct rte_eth_link pmd_link = { - .link_speed =ETH_SPEED_NUM_10G , - .link_duplex =ETH_LINK_FULL_DUPLEX , - .link_status =ETH_LINK_DOWN , - .link_autoneg =ETH_LINK_FIXED , + .link_speed =ETH_SPEED_NUM_10G , + .link_duplex =ETH_LINK_FULL_DUPLEX , + .link_status =ETH_LINK_DOWN , + .link_autoneg =ETH_LINK_FIXED , };static int eth_ring_logtype;
@@ -138,6 +137,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, struct rte_mempool *mb_pool __rte_unused) {struct pmd_internals *internals = dev->data->dev_private; + dev->data->rx_queues[rx_queue_id] = &internals->rx_ring_queues[rx_queue_id];return 0 ; }
@@ -149,6 +149,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, const struct rte_eth_txconf *tx_conf __rte_unused) {struct pmd_internals *internals = dev->data->dev_private; + dev->data->tx_queues[tx_queue_id] = &internals->tx_ring_queues[tx_queue_id];return 0 ; }
@@ -156,9 +157,10 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,static void eth_dev_info (struct rte_eth_dev *dev, -struct rte_eth_dev_info *dev_info) +struct rte_eth_dev_info *dev_info) {struct pmd_internals *internals = dev->data->dev_private; + dev_info->max_mac_addrs =1 ; dev_info->max_rx_pktlen = (uint32_t )-1 ; dev_info->max_rx_queues = (uint16_t )internals->max_rx_queues;
@@ -169,7 +171,7 @@ eth_dev_info(struct rte_eth_dev *dev,static int eth_stats_get (struct rte_eth_dev *dev,struct rte_eth_stats *stats) { -unsigned i; +unsigned int i;unsigned long rx_total =0 , tx_total =0 , tx_err_total =0 ;const struct pmd_internals *internal = dev->data->dev_private;
@@ -197,8 +199,9 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)static void eth_stats_reset (struct rte_eth_dev *dev) { -unsigned i; +unsigned int i;struct pmd_internals *internal = dev->data->dev_private; +for (i =0 ; i < dev->data->nb_rx_queues; i++) internal->rx_ring_queues[i].rx_pkts.cnt =0 ;for (i =0 ; i < dev->data->nb_tx_queues; i++) {
@@ -250,8 +253,10 @@ static struct rte_vdev_driver pmd_ring_drv;static int do_eth_dev_ring_create (const char *name, -struct rte_ring *const rx_queues[],const unsigned nb_rx_queues, -struct rte_ring *const tx_queues[],const unsigned nb_tx_queues, +struct rte_ring *const rx_queues[], +const unsigned int nb_rx_queues, +struct rte_ring *const tx_queues[], +const unsigned int nb_tx_queues,const unsigned int numa_node,enum dev_action action,struct rte_eth_dev **eth_dev_p) {
@@ -260,7 +265,7 @@ do_eth_dev_ring_create(const char *name,struct rte_eth_dev *eth_dev =NULL ;void **rx_queues_local =NULL ;void **tx_queues_local =NULL ; -unsigned i; +unsigned int i;PMD_LOG (INFO ,"Creating rings-backed ethdev on numa socket %u" , numa_node);
@@ -344,10 +349,10 @@ do_eth_dev_ring_create(const char *name,int rte_eth_from_rings (const char *name,struct rte_ring *const rx_queues[], -const unsigned nb_rx_queues, +const unsigned int nb_rx_queues,struct rte_ring *const tx_queues[], -const unsigned nb_tx_queues, -const unsigned numa_node) +const unsigned int nb_tx_queues, +const unsigned int numa_node) {struct ring_internal_args args = { .rx_queues = rx_queues,
@@ -398,16 +403,16 @@ rte_eth_from_ring(struct rte_ring *r) }static int -eth_dev_ring_create (const char *name,const unsigned numa_node, +eth_dev_ring_create (const char *name,const unsigned int numa_node,enum dev_action action,struct rte_eth_dev **eth_dev) {/* rx and tx are so-called from point of view of first port. * They are inverted from the point of view of second port */ struct rte_ring *rxtx[RTE_PMD_RING_MAX_RX_RINGS ]; -unsigned i; +unsigned int i;char rng_name[RTE_RING_NAMESIZE ]; -unsigned num_rings =RTE_MIN (RTE_PMD_RING_MAX_RX_RINGS , +unsigned int num_rings =RTE_MIN (RTE_PMD_RING_MAX_RX_RINGS ,RTE_PMD_RING_MAX_TX_RINGS );for (i =0 ; i < num_rings; i++) {
@@ -429,17 +434,18 @@ eth_dev_ring_create(const char *name, const unsigned numa_node,struct node_action_pair {char name[PATH_MAX ]; -unsigned node; +unsigned int node;enum dev_action action; };struct node_action_list { -unsigned total; -unsigned count; +unsigned int total; +unsigned int count;struct node_action_pair *list; }; -static int parse_kvlist (const char *key __rte_unused, const char *value, void *data) +static int parse_kvlist(const char *key __rte_unused, +const char *value,void *data) {struct node_action_list *info = data;int ret;
@@ -553,8 +559,8 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) kvlist =rte_kvargs_parse (params, valid_arguments);if (!kvlist) { -PMD_LOG (INFO ,"Ignoring unsupported parameters when creating" -" rings-backed ethernet device" ); +PMD_LOG (INFO , +"Ignoring unsupported parameters when creatingrings-backed ethernet device" ); ret =eth_dev_ring_create (name,rte_socket_id (),DEV_CREATE , ð_dev);if (ret ==-1 ) {
@@ -598,7 +604,7 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) goto out_free; info->total = ret; - info->list = (struct node_action_pair *)(info +1 ); + info->list = (struct node_action_pair *)(info +1 ); ret =rte_kvargs_process (kvlist,ETH_RING_NUMA_NODE_ACTION_ARG , parse_kvlist, info);
Signature · 1 line
2.20.1
PATCH v2 2/4 net/ring: use sizeof() with snprintf
In reply to Stephen HemmingerDon't hard code string length in two place; use sizeof() instead. Ring name shoudl use RTE_RING_NAMESIZE.
--- drivers/net/ring/rte_eth_ring.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/ring/rte_eth_ring.c +5 -4
@@ -362,8 +362,8 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], .numa_node = numa_node, .addr = &args, }; -char args_str[32 ] = {0 }; -char ring_name[32 ] = {0 }; +char args_str[32 ]; +char ring_name[RTE_RING_NAMESIZE ];uint16_t port_id =RTE_MAX_ETHPORTS ;int ret;
@@ -381,8 +381,9 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],return -1 ; } -snprintf (args_str,32 ,"%s=%p" ,ETH_RING_INTERNAL_ARG , &args); -snprintf (ring_name,32 ,"net_ring_%s" , name); +snprintf (args_str,sizeof (args_str),"%s=%p" , +ETH_RING_INTERNAL_ARG , &args); +snprintf (ring_name,sizeof (ring_name),"net_ring_%s" , name); ret =rte_vdev_init (ring_name, args_str);if (ret) {
Signature · 1 line
2.20.1
PATCH v2 3/4 net/ring: use rte_calloc_socket
In reply to Stephen HemmingerUse rte_calloc_socket instead of computing size.
--- drivers/net/ring/rte_eth_ring.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ring/rte_eth_ring.c +4 -4
@@ -270,15 +270,15 @@ do_eth_dev_ring_create(const char *name,PMD_LOG (INFO ,"Creating rings-backed ethdev on numa socket %u" , numa_node); - rx_queues_local =rte_zmalloc_socket (name, -sizeof (void *) * nb_rx_queues,0 , numa_node); + rx_queues_local =rte_calloc_socket (name, nb_rx_queues, +sizeof (void *),0 , numa_node);if (rx_queues_local ==NULL ) { rte_errno =ENOMEM ; goto error; } - tx_queues_local =rte_zmalloc_socket (name, -sizeof (void *) * nb_tx_queues,0 , numa_node); + tx_queues_local =rte_calloc_socket (name, nb_tx_queues, +sizeof (void *),0 , numa_node);if (tx_queues_local ==NULL ) { rte_errno =ENOMEM ; goto error;
Signature · 1 line
2.20.1
PATCH v2 4/4 net/ring: check length of ring name
In reply to Stephen HemmingerThe ring name is passed in as part of this drivers API, but it doesn't check that the name is not truncated.
---
v2 - fix whitespace creep
drivers/net/ring/rte_eth_ring.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/net/ring/rte_eth_ring.c +15 -2
@@ -383,7 +383,12 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],snprintf (args_str,sizeof (args_str),"%s=%p" ,ETH_RING_INTERNAL_ARG , &args); -snprintf (ring_name,sizeof (ring_name),"net_ring_%s" , name); + + ret =snprintf (ring_name,sizeof (ring_name),"net_ring_%s" , name); +if (ret >= (int )sizeof (ring_name)) { + rte_errno =ENAMETOOLONG ; +return -1 ; + } ret =rte_vdev_init (ring_name, args_str);if (ret) {
@@ -417,7 +422,15 @@ eth_dev_ring_create(const char *name, const unsigned int numa_node, RTE_PMD_RING_MAX_TX_RINGS);for (i =0 ; i < num_rings; i++) { -snprintf (rng_name,sizeof (rng_name),"ETH_RXTX%u_%s" , i, name); +int cc; + + cc =snprintf (rng_name,sizeof (rng_name), +"ETH_RXTX%u_%s" , i, name); +if (cc >= (int )sizeof (rng_name)) { + rte_errno =ENAMETOOLONG ; +return -1 ; + } + rxtx[i] = (action ==DEV_CREATE ) ?rte_ring_create (rng_name,1024 , numa_node, RING_F_SP_ENQ|RING_F_SC_DEQ) :
Signature · 1 line
2.20.1
Quoted 7 lines · Stephen Hemminger
Minor fixes and cleanups for the net/ring driver.
Stephen Hemminger (4):
net/ring: fix coding style
net/ring: usesizeof()with snprintf
net/ring: userte_calloc_socket
net/ring: check length of ring name
For series,
Series applied to dpdk-next-net/master, thanks.