[PATCH 1/2] rib: mark error checks with unlikely

[Medvedkin, Vladimir]

On 13/04/2022 03:09, Stephen Hemminger wrote:
> Also mark some conditional functions as const.
> 
> Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
> ---
>   lib/rib/rte_rib.c | 26 +++++++++++++-------------
>   1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c
> index cd9e823068d2..2a3de5065a31 100644
> --- a/lib/rib/rte_rib.c
> +++ b/lib/rib/rte_rib.c
> @@ -48,13 +48,13 @@ struct rte_rib {
>   };
>   
>   static inline bool
> -is_valid_node(struct rte_rib_node *node)
> +is_valid_node(const struct rte_rib_node *node)
>   {
>   	return (node->flag & RTE_RIB_VALID_NODE) == RTE_RIB_VALID_NODE;
>   }
>   
>   static inline bool
> -is_right_node(struct rte_rib_node *node)
> +is_right_node(const struct rte_rib_node *node)
>   {
>   	return node->parent->right == node;
>   }
> @@ -99,7 +99,7 @@ rte_rib_lookup(struct rte_rib *rib, uint32_t ip)
>   {
>   	struct rte_rib_node *cur, *prev = NULL;
>   
> -	if (rib == NULL) {
> +	if (unlikely(rib == NULL)) {
>   		rte_errno = EINVAL;
>   		return NULL;
>   	}
> @@ -147,7 +147,7 @@ __rib_lookup_exact(struct rte_rib *rib, uint32_t ip, uint8_t depth)
>   struct rte_rib_node *
>   rte_rib_lookup_exact(struct rte_rib *rib, uint32_t ip, uint8_t depth)
>   {
> -	if ((rib == NULL) || (depth > RIB_MAXDEPTH)) {
> +	if (unlikely(rib == NULL || depth > RIB_MAXDEPTH)) {
>   		rte_errno = EINVAL;
>   		return NULL;
>   	}
> @@ -167,7 +167,7 @@ rte_rib_get_nxt(struct rte_rib *rib, uint32_t ip,
>   {
>   	struct rte_rib_node *tmp, *prev = NULL;
>   
> -	if ((rib == NULL) || (depth > RIB_MAXDEPTH)) {
> +	if (unlikely(rib == NULL || depth > RIB_MAXDEPTH)) {
>   		rte_errno = EINVAL;
>   		return NULL;
>   	}
> @@ -244,7 +244,7 @@ rte_rib_insert(struct rte_rib *rib, uint32_t ip, uint8_t depth)
>   	uint32_t common_prefix;
>   	uint8_t common_depth;
>   
> -	if ((rib == NULL) || (depth > RIB_MAXDEPTH)) {
> +	if (unlikely(rib == NULL || depth > RIB_MAXDEPTH)) {
>   		rte_errno = EINVAL;
>   		return NULL;
>   	}
> @@ -342,7 +342,7 @@ rte_rib_insert(struct rte_rib *rib, uint32_t ip, uint8_t depth)
>   int
>   rte_rib_get_ip(const struct rte_rib_node *node, uint32_t *ip)
>   {
> -	if ((node == NULL) || (ip == NULL)) {
> +	if (unlikely(node == NULL || ip == NULL)) {
>   		rte_errno = EINVAL;
>   		return -1;
>   	}
> @@ -353,7 +353,7 @@ rte_rib_get_ip(const struct rte_rib_node *node, uint32_t *ip)
>   int
>   rte_rib_get_depth(const struct rte_rib_node *node, uint8_t *depth)
>   {
> -	if ((node == NULL) || (depth == NULL)) {
> +	if (unlikely(node == NULL || depth == NULL)) {
>   		rte_errno = EINVAL;
>   		return -1;
>   	}
> @@ -370,7 +370,7 @@ rte_rib_get_ext(struct rte_rib_node *node)
>   int
>   rte_rib_get_nh(const struct rte_rib_node *node, uint64_t *nh)
>   {
> -	if ((node == NULL) || (nh == NULL)) {
> +	if (unlikely(node == NULL || nh == NULL)) {
>   		rte_errno = EINVAL;
>   		return -1;
>   	}
> @@ -381,7 +381,7 @@ rte_rib_get_nh(const struct rte_rib_node *node, uint64_t *nh)
>   int
>   rte_rib_set_nh(struct rte_rib_node *node, uint64_t nh)
>   {
> -	if (node == NULL) {
> +	if (unlikely(node == NULL)) {
>   		rte_errno = EINVAL;
>   		return -1;
>   	}
> @@ -399,7 +399,7 @@ rte_rib_create(const char *name, int socket_id, const struct rte_rib_conf *conf)
>   	struct rte_mempool *node_pool;
>   
>   	/* Check user arguments. */
> -	if (name == NULL || conf == NULL || conf->max_nodes <= 0) {
> +	if (unlikely(name == NULL || conf == NULL || conf->max_nodes <= 0)) {
>   		rte_errno = EINVAL;
>   		return NULL;
>   	}
> @@ -434,7 +434,7 @@ rte_rib_create(const char *name, int socket_id, const struct rte_rib_conf *conf)
>   
>   	/* allocate tailq entry */
>   	te = rte_zmalloc("RIB_TAILQ_ENTRY", sizeof(*te), 0);
> -	if (te == NULL) {
> +	if (unlikely(te == NULL)) {
>   		RTE_LOG(ERR, LPM,
>   			"Can not allocate tailq entry for RIB %s\n", name);
>   		rte_errno = ENOMEM;
> @@ -444,7 +444,7 @@ rte_rib_create(const char *name, int socket_id, const struct rte_rib_conf *conf)
>   	/* Allocate memory to store the RIB data structures. */
>   	rib = rte_zmalloc_socket(mem_name,
>   		sizeof(struct rte_rib),	RTE_CACHE_LINE_SIZE, socket_id);
> -	if (rib == NULL) {
> +	if (unlikely(rib == NULL)) {
>   		RTE_LOG(ERR, LPM, "RIB %s memory allocation failed\n", name);
>   		rte_errno = ENOMEM;
>   		goto free_te;

Acked-by: Vladimir Medvedkin <vladimir.medvedkin at intel.com>

-- 
Regards,
Vladimir