[v3,4/6] service: remove redundant code

Message ID 20200502000245.11071-5-honnappa.nagarahalli@arm.com
State Superseded
Headers show
Series
  • use c11 atomics for service core lib
Related show

Commit Message

Honnappa Nagarahalli May 2, 2020, 12:02 a.m.
From: Phil Yang <phil.yang@arm.com>


The service id validation is duplicated, remove the redundant code
in the calling functions.

Signed-off-by: Phil Yang <phil.yang@arm.com>

Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>

---
 lib/librte_eal/common/rte_service.c | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

-- 
2.17.1

Comments

Van Haaren, Harry May 5, 2020, 2:48 p.m. | #1
> -----Original Message-----

> From: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>

> Sent: Saturday, May 2, 2020 1:03 AM

> To: dev@dpdk.org; phil.yang@arm.com; Van Haaren, Harry

> <harry.van.haaren@intel.com>

> Cc: thomas@monjalon.net; david.marchand@redhat.com; Ananyev, Konstantin

> <konstantin.ananyev@intel.com>; jerinj@marvell.com;

> hemant.agrawal@nxp.com; Eads, Gage <gage.eads@intel.com>; Richardson,

> Bruce <bruce.richardson@intel.com>; honnappa.nagarahalli@arm.com;

> nd@arm.com

> Subject: [PATCH v3 4/6] service: remove redundant code

> 

> From: Phil Yang <phil.yang@arm.com>

> 

> The service id validation is duplicated, remove the redundant code

> in the calling functions.

> 

> Signed-off-by: Phil Yang <phil.yang@arm.com>

> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>


Acked-by: Harry van Haaren <harry.van.haaren@intel.com>


<snip diff>

Patch

diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c
index ed2070267..9c1a1d5cd 100644
--- a/lib/librte_eal/common/rte_service.c
+++ b/lib/librte_eal/common/rte_service.c
@@ -541,24 +541,12 @@  rte_service_start_with_defaults(void)
 }
 
 static int32_t
-service_update(struct rte_service_spec *service, uint32_t lcore,
+service_update(uint32_t sid, uint32_t lcore,
 		uint32_t *set, uint32_t *enabled)
 {
-	uint32_t i;
-	int32_t sid = -1;
-
-	for (i = 0; i < RTE_SERVICE_NUM_MAX; i++) {
-		if ((struct rte_service_spec *)&rte_services[i] == service &&
-				service_valid(i)) {
-			sid = i;
-			break;
-		}
-	}
-
-	if (sid == -1 || lcore >= RTE_MAX_LCORE)
-		return -EINVAL;
-
-	if (!lcore_states[lcore].is_service_core)
+	/* validate ID, or return error value */
+	if (sid >= RTE_SERVICE_NUM_MAX || !service_valid(sid) ||
+	    lcore >= RTE_MAX_LCORE || !lcore_states[lcore].is_service_core)
 		return -EINVAL;
 
 	uint64_t sid_mask = UINT64_C(1) << sid;
@@ -587,19 +575,15 @@  service_update(struct rte_service_spec *service, uint32_t lcore,
 int32_t
 rte_service_map_lcore_set(uint32_t id, uint32_t lcore, uint32_t enabled)
 {
-	struct rte_service_spec_impl *s;
-	SERVICE_VALID_GET_OR_ERR_RET(id, s, -EINVAL);
 	uint32_t on = enabled > 0;
-	return service_update(&s->spec, lcore, &on, 0);
+	return service_update(id, lcore, &on, 0);
 }
 
 int32_t
 rte_service_map_lcore_get(uint32_t id, uint32_t lcore)
 {
-	struct rte_service_spec_impl *s;
-	SERVICE_VALID_GET_OR_ERR_RET(id, s, -EINVAL);
 	uint32_t enabled;
-	int ret = service_update(&s->spec, lcore, 0, &enabled);
+	int ret = service_update(id, lcore, 0, &enabled);
 	if (ret == 0)
 		return enabled;
 	return ret;