[dpdk-dev] [PATCH v3] librte_ether: use RTE_ETH_VALID_PORTID_OR_ERR_RET to check port_id

[Thomas Monjalon]

2016-05-18 21:15, Mauricio Vasquez B:
> The RTE_ETH_VALID_PORTID_OR_ERR_RET macro is used in some places
> to check if a port id is valid or not. This commit makes use of it in
> some new parts of the code.
> 
> Signed-off-by: Mauricio Vasquez B  studenti.polito.it>
> ---
> v3:
>  - use it also in rte_eth_add_rx_callback and rte_eth_add_tx_callback 
> v2:
>  - add missed case
>  - change also cases in examples/ethtool/lib/rte_ethtool.c
>  examples/ethtool/lib/rte_ethtool.c | 15 ++-
>  lib/librte_ether/rte_ethdev.c  | 51 
> +-
>  2 files changed, 24 insertions(+), 42 deletions(-)

I've fixed also 2 bond functions and removed some whitespace changes.
Applied, thanks

[dpdk-dev] [PATCH v3] librte_ether: use RTE_ETH_VALID_PORTID_OR_ERR_RET to check port_id

[Mauricio Vasquez B]

The RTE_ETH_VALID_PORTID_OR_ERR_RET macro is used in some places
to check if a port id is valid or not. This commit makes use of it in
some new parts of the code.

Signed-off-by: Mauricio Vasquez B 
---
v3:
 - use it also in rte_eth_add_rx_callback and rte_eth_add_tx_callback 
v2:
 - add missed case
 - change also cases in examples/ethtool/lib/rte_ethtool.c
 examples/ethtool/lib/rte_ethtool.c | 15 ++-
 lib/librte_ether/rte_ethdev.c  | 51 +-
 2 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/examples/ethtool/lib/rte_ethtool.c 
b/examples/ethtool/lib/rte_ethtool.c
index 42e05f1..9b18e46 100644
--- a/examples/ethtool/lib/rte_ethtool.c
+++ b/examples/ethtool/lib/rte_ethtool.c
@@ -51,8 +51,7 @@ rte_ethtool_get_drvinfo(uint8_t port_id, struct 
ethtool_drvinfo *drvinfo)
if (drvinfo == NULL)
return -EINVAL;

-   if (!rte_eth_dev_is_valid_port(port_id))
-   return -ENODEV;
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);

memset(_info, 0, sizeof(dev_info));
rte_eth_dev_info_get(port_id, _info);
@@ -120,8 +119,8 @@ rte_ethtool_get_link(uint8_t port_id)
 {
struct rte_eth_link link;

-   if (!rte_eth_dev_is_valid_port(port_id))
-   return -ENODEV;
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
rte_eth_link_get(port_id, );
return link.link_status;
 }
@@ -267,8 +266,8 @@ rte_ethtool_net_open(uint8_t port_id)
 int
 rte_ethtool_net_stop(uint8_t port_id)
 {
-   if (!rte_eth_dev_is_valid_port(port_id))
-   return -ENODEV;
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
rte_eth_dev_stop(port_id);

return 0;
@@ -277,8 +276,8 @@ rte_ethtool_net_stop(uint8_t port_id)
 int
 rte_ethtool_net_get_mac_addr(uint8_t port_id, struct ether_addr *addr)
 {
-   if (!rte_eth_dev_is_valid_port(port_id))
-   return -ENODEV;
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
if (addr == NULL)
return -EINVAL;
rte_eth_macaddr_get(port_id, addr);
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index a31018e..80adbd3 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -369,8 +369,8 @@ rte_eth_dev_is_valid_port(uint8_t port_id)
 int
 rte_eth_dev_socket_id(uint8_t port_id)
 {
-   if (!rte_eth_dev_is_valid_port(port_id))
-   return -1;
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -1);
+
return rte_eth_devices[port_id].data->numa_node;
 }

@@ -383,8 +383,8 @@ rte_eth_dev_count(void)
 static enum rte_eth_dev_type
 rte_eth_dev_get_device_type(uint8_t port_id)
 {
-   if (!rte_eth_dev_is_valid_port(port_id))
-   return RTE_ETH_DEV_UNKNOWN;
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, RTE_ETH_DEV_UNKNOWN);
+
return rte_eth_devices[port_id].dev_type;
 }

@@ -479,10 +479,7 @@ rte_eth_dev_is_detachable(uint8_t port_id)
 {
uint32_t dev_flags;

-   if (!rte_eth_dev_is_valid_port(port_id)) {
-   RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-   return -EINVAL;
-   }
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);

switch (rte_eth_devices[port_id].data->kdrv) {
case RTE_KDRV_IGB_UIO:
@@ -1994,10 +1991,7 @@ rte_eth_dev_rss_reta_query(uint8_t port_id,
struct rte_eth_dev *dev;
int ret;

-   if (port_id >= nb_ports) {
-   RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-   return -ENODEV;
-   }
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);

/* Check mask bits */
ret = rte_eth_check_reta_mask(reta_conf, reta_size);
@@ -2641,10 +2635,7 @@ rte_eth_dev_rx_intr_ctl(uint8_t port_id, int epfd, int 
op, void *data)
uint16_t qid;
int rc;

-   if (!rte_eth_dev_is_valid_port(port_id)) {
-   RTE_PMD_DEBUG_TRACE("Invalid port_id=%u\n", port_id);
-   return -ENODEV;
-   }
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);

dev = _eth_devices[port_id];
intr_handle = >pci_dev->intr_handle;
@@ -2699,10 +2690,7 @@ rte_eth_dev_rx_intr_ctl_q(uint8_t port_id, uint16_t 
queue_id,
struct rte_intr_handle *intr_handle;
int rc;

-   if (!rte_eth_dev_is_valid_port(port_id)) {
-   RTE_PMD_DEBUG_TRACE("Invalid port_id=%u\n", port_id);
-   return -ENODEV;
-   }
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);

dev = _eth_devices[port_id];
if (queue_id >= dev->data->nb_rx_queues) {
@@ -2734,10 +2722,7 @@ rte_eth_dev_rx_intr_enable(uint8_t port_id,
 {
struct rte_eth_dev *dev;

-   if (!rte_eth_dev_is_valid_port(port_id)) {
-   RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-   return -ENODEV;
-   }
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);