Skip to contentSkip to conversation

small RIB optimizations

PATCH In review Stephen Hemminger 4 participants 7 messages Apr 13, 2022 – Jun 1, 2022

lore
Share & tools
lore
#0 lore raw

cover small RIB optimizations

A couple of small micro optimizations on the RIB code.

Stephen Hemminger (2):
rib: mark error checks with unlikely
rib6: mark error tests with unlikely

 lib/rib/rte_rib.c  | 26 +++++++++++++-------------
 lib/rib/rte_rib6.c | 25 ++++++++++++-------------
 2 files changed, 25 insertions(+), 26 deletions(-)
Signature · 1 line
2.35.1
#1 lore raw

PATCH 1/2 rib: mark error checks with unlikely

Also mark some conditional functions as const.

---
 lib/rib/rte_rib.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
lib/rib/rte_rib.c +13 -13
index cd9e823068d2..2a3de5065a31 100644
@@ -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;
Signature · 1 line
2.35.1
Acked-by on v1 1/2
#2 lore raw

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

Quoted 118 lines · Stephen Hemminger

Also mark some conditional functions as const.

---
  lib/rib/rte_rib.c | 26 +++++++++++++-------------
  1 file changed, 13 insertions(+), 13 deletions(-)
lib/rib/rte_rib.c +12 -12
index cd9e823068d2..2a3de5065a31 100644
@@ -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;

lib/rib/rte_rib.c rte_rib_create(const char *name, int socket_id, const struct rte_rib_conf *conf) · line 450

Quoted 8 lines
lib/rib/rte_rib.c +1 -1
@@ -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;
Signature · 2 lines
Regards,
Vladimir
#3 lore raw

PATCH 2/2 rib6: mark error tests with unlikely

In reply to Stephen Hemminger

Also mark some conditional functions as const.

---
 lib/rib/rte_rib6.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)
lib/rib/rte_rib6.c +12 -13
index 042ac1f090bf..650bf1b8f681 100644
@@ -47,13 +47,13 @@ struct rte_rib6 {
 };
 
 static inline bool
-is_valid_node(struct rte_rib6_node *node)
+is_valid_node(const struct rte_rib6_node *node)
 {
 	return (node->flag & RTE_RIB_VALID_NODE) == RTE_RIB_VALID_NODE;
 }
 
 static inline bool
-is_right_node(struct rte_rib6_node *node)
+is_right_node(const struct rte_rib6_node *node)
 {
 	return node->parent->right == node;
 }
@@ -171,7 +171,7 @@ rte_rib6_lookup_exact(struct rte_rib6 *rib,
 	uint8_t tmp_ip[RTE_RIB6_IPV6_ADDR_SIZE];
 	int i;
 
-	if ((rib == NULL) || (ip == NULL) || (depth > RIB6_MAXDEPTH)) {
+	if (unlikely(rib == NULL || ip == NULL || depth > RIB6_MAXDEPTH)) {
 		rte_errno = EINVAL;
 		return NULL;
 	}
@@ -210,7 +210,7 @@ rte_rib6_get_nxt(struct rte_rib6 *rib,
 	uint8_t tmp_ip[RTE_RIB6_IPV6_ADDR_SIZE];
 	int i;
 
-	if ((rib == NULL) || (ip == NULL) || (depth > RIB6_MAXDEPTH)) {
+	if (unlikely(rib == NULL || ip == NULL || depth > RIB6_MAXDEPTH)) {
 		rte_errno = EINVAL;
 		return NULL;
 	}
@@ -293,8 +293,7 @@ rte_rib6_insert(struct rte_rib6 *rib,
 	int i, d;
 	uint8_t common_depth, ip_xor;
 
-	if (unlikely((rib == NULL) || (ip == NULL) ||
-			(depth > RIB6_MAXDEPTH))) {
+	if (unlikely((rib == NULL || ip == NULL || depth > RIB6_MAXDEPTH))) {
 		rte_errno = EINVAL;
 		return NULL;
 	}
@@ -413,7 +412,7 @@ int
 rte_rib6_get_ip(const struct rte_rib6_node *node,
 		uint8_t ip[RTE_RIB6_IPV6_ADDR_SIZE])
 {
-	if ((node == NULL) || (ip == NULL)) {
+	if (unlikely(node == NULL || ip == NULL)) {
 		rte_errno = EINVAL;
 		return -1;
 	}
@@ -424,7 +423,7 @@ rte_rib6_get_ip(const struct rte_rib6_node *node,
 int
 rte_rib6_get_depth(const struct rte_rib6_node *node, uint8_t *depth)
 {
-	if ((node == NULL) || (depth == NULL)) {
+	if (unlikely(node == NULL || depth == NULL)) {
 		rte_errno = EINVAL;
 		return -1;
 	}
@@ -441,7 +440,7 @@ rte_rib6_get_ext(struct rte_rib6_node *node)
 int
 rte_rib6_get_nh(const struct rte_rib6_node *node, uint64_t *nh)
 {
-	if ((node == NULL) || (nh == NULL)) {
+	if (unlikely(node == NULL || nh == NULL)) {
 		rte_errno = EINVAL;
 		return -1;
 	}
@@ -452,7 +451,7 @@ rte_rib6_get_nh(const struct rte_rib6_node *node, uint64_t *nh)
 int
 rte_rib6_set_nh(struct rte_rib6_node *node, uint64_t nh)
 {
-	if (node == NULL) {
+	if (unlikely(node == NULL)) {
 		rte_errno = EINVAL;
 		return -1;
 	}
@@ -471,7 +470,7 @@ rte_rib6_create(const char *name, int socket_id,
 	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;
 	}
@@ -506,7 +505,7 @@ rte_rib6_create(const char *name, int socket_id,
 
 	/* allocate tailq entry */
 	te = rte_zmalloc("RIB6_TAILQ_ENTRY", sizeof(*te), 0);
-	if (te == NULL) {
+	if (unlikely(te == NULL)) {
 		RTE_LOG(ERR, LPM,
 			"Can not allocate tailq entry for RIB6 %s\n", name);
 		rte_errno = ENOMEM;
@@ -516,7 +515,7 @@ rte_rib6_create(const char *name, int socket_id,
 	/* Allocate memory to store the RIB6 data structures. */
 	rib = rte_zmalloc_socket(mem_name,
 		sizeof(struct rte_rib6), RTE_CACHE_LINE_SIZE, socket_id);
-	if (rib == NULL) {
+	if (unlikely(rib == NULL)) {
 		RTE_LOG(ERR, LPM, "RIB6 %s memory allocation failed\n", name);
 		rte_errno = ENOMEM;
 		goto free_te;
Signature · 1 line
2.35.1
Acked-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] rib6: mark error tests with unlikely

Quoted 110 lines · Stephen Hemminger

Also mark some conditional functions as const.

---
  lib/rib/rte_rib6.c | 25 ++++++++++++-------------
  1 file changed, 12 insertions(+), 13 deletions(-)
lib/rib/rte_rib6.c +11 -12
index 042ac1f090bf..650bf1b8f681 100644
@@ -47,13 +47,13 @@ struct rte_rib6 {
  };
 
  static inline bool
-is_valid_node(struct rte_rib6_node *node)
+is_valid_node(const struct rte_rib6_node *node)
  {
  	return (node->flag & RTE_RIB_VALID_NODE) == RTE_RIB_VALID_NODE;
  }
 
  static inline bool
-is_right_node(struct rte_rib6_node *node)
+is_right_node(const struct rte_rib6_node *node)
  {
  	return node->parent->right == node;
  }
@@ -171,7 +171,7 @@ rte_rib6_lookup_exact(struct rte_rib6 *rib,
  	uint8_t tmp_ip[RTE_RIB6_IPV6_ADDR_SIZE];
  	int i;
 
-	if ((rib == NULL) || (ip == NULL) || (depth > RIB6_MAXDEPTH)) {
+	if (unlikely(rib == NULL || ip == NULL || depth > RIB6_MAXDEPTH)) {
  		rte_errno = EINVAL;
  		return NULL;
  	}
@@ -210,7 +210,7 @@ rte_rib6_get_nxt(struct rte_rib6 *rib,
  	uint8_t tmp_ip[RTE_RIB6_IPV6_ADDR_SIZE];
  	int i;
 
-	if ((rib == NULL) || (ip == NULL) || (depth > RIB6_MAXDEPTH)) {
+	if (unlikely(rib == NULL || ip == NULL || depth > RIB6_MAXDEPTH)) {
  		rte_errno = EINVAL;
  		return NULL;
  	}
@@ -293,8 +293,7 @@ rte_rib6_insert(struct rte_rib6 *rib,
  	int i, d;
  	uint8_t common_depth, ip_xor;
 
-	if (unlikely((rib == NULL) || (ip == NULL) ||
-			(depth > RIB6_MAXDEPTH))) {
+	if (unlikely((rib == NULL || ip == NULL || depth > RIB6_MAXDEPTH))) {
  		rte_errno = EINVAL;
  		return NULL;
  	}
@@ -413,7 +412,7 @@ int
  rte_rib6_get_ip(const struct rte_rib6_node *node,
  		uint8_t ip[RTE_RIB6_IPV6_ADDR_SIZE])
  {
-	if ((node == NULL) || (ip == NULL)) {
+	if (unlikely(node == NULL || ip == NULL)) {
  		rte_errno = EINVAL;
  		return -1;
  	}
@@ -424,7 +423,7 @@ rte_rib6_get_ip(const struct rte_rib6_node *node,
  int
  rte_rib6_get_depth(const struct rte_rib6_node *node, uint8_t *depth)
  {
-	if ((node == NULL) || (depth == NULL)) {
+	if (unlikely(node == NULL || depth == NULL)) {
  		rte_errno = EINVAL;
  		return -1;
  	}
@@ -441,7 +440,7 @@ rte_rib6_get_ext(struct rte_rib6_node *node)
  int
  rte_rib6_get_nh(const struct rte_rib6_node *node, uint64_t *nh)
  {
-	if ((node == NULL) || (nh == NULL)) {
+	if (unlikely(node == NULL || nh == NULL)) {
  		rte_errno = EINVAL;
  		return -1;
  	}
@@ -452,7 +451,7 @@ rte_rib6_get_nh(const struct rte_rib6_node *node, uint64_t *nh)
  int
  rte_rib6_set_nh(struct rte_rib6_node *node, uint64_t nh)
  {
-	if (node == NULL) {
+	if (unlikely(node == NULL)) {
  		rte_errno = EINVAL;
  		return -1;
  	}
@@ -471,7 +470,7 @@ rte_rib6_create(const char *name, int socket_id,
  	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;
  	}
@@ -506,7 +505,7 @@ rte_rib6_create(const char *name, int socket_id,
 
  	/* allocate tailq entry */
  	te = rte_zmalloc("RIB6_TAILQ_ENTRY", sizeof(*te), 0);
-	if (te == NULL) {
+	if (unlikely(te == NULL)) {
  		RTE_LOG(ERR, LPM,
  			"Can not allocate tailq entry for RIB6 %s\n", name);
  		rte_errno = ENOMEM;

lib/rib/rte_rib6.c rte_rib6_create(const char *name, int socket_id, · line 521

Quoted 8 lines
lib/rib/rte_rib6.c +1 -1
@@ -516,7 +515,7 @@ rte_rib6_create(const char *name, int socket_id,
  	/* Allocate memory to store the RIB6 data structures. */
  	rib = rte_zmalloc_socket(mem_name,
  		sizeof(struct rte_rib6), RTE_CACHE_LINE_SIZE, socket_id);
-	if (rib == NULL) {
+	if (unlikely(rib == NULL)) {
  		RTE_LOG(ERR, LPM, "RIB6 %s memory allocation failed\n", name);
  		rte_errno = ENOMEM;
  		goto free_te;
Signature · 2 lines
Regards,
Vladimir
#5 lore raw
In reply to Stephen Hemminger
Quoted 9 lines

From: Stephen Hemminger [mailto:[email protected]]
Sent: Wednesday, 13 April 2022 04.10

A couple of small micro optimizations on the RIB code.

Stephen Hemminger (2):
rib: mark error checks with unlikely
rib6: mark error tests with unlikely

Quoted 7 lines
 lib/rib/rte_rib.c  | 26 +++++++++++++-------------
 lib/rib/rte_rib6.c | 25 ++++++++++++-------------
 2 files changed, 25 insertions(+), 26 deletions(-)

--
2.35.1

#6 lore raw

13/04/2022 08:45, Morten Brørup:

Quoted 10 lines
Quoted 8 lines

From: Stephen Hemminger [mailto:[email protected]]
Sent: Wednesday, 13 April 2022 04.10

A couple of small micro optimizations on the RIB code.

Stephen Hemminger (2):
rib: mark error checks with unlikely
rib6: mark error tests with unlikely

Squashed and applied, thanks.