From patchwork Tue May 5 21:17:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 186219 Delivered-To: patch@linaro.org Received: by 2002:a92:8d81:0:0:0:0:0 with SMTP id w1csp1514813ill; Tue, 5 May 2020 14:18:21 -0700 (PDT) X-Google-Smtp-Source: APiQypKVHbqKfvFsmsLE2S93Bs3+YtAv6zaS1pkMMFsvzd2UKxvdiQqUlIoy+DeL6fdaInc5/Ha/ X-Received: by 2002:a50:b285:: with SMTP id p5mr4583586edd.150.1588713501706; Tue, 05 May 2020 14:18:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588713501; cv=none; d=google.com; s=arc-20160816; b=RWuT+EJ/sGZfhIVzuEjmZT1o9ytfPa8KD8ZISrpIl2Ks8nuiNX3oM/k6CwsA5cP3xa 42dYtXaDKxn5hLG8PMJLH7uliaCGJTkiLIl7HRbfOqM+fi/hOEpRNHEI+/LiogCUEhjx LVtUNufReaA0jUMjiR1cfph3EAOQKAvDZRE5YSGQ4r80NqI7oT1kecS3xpcah27ks+da J6S5qH7tttZBkbskax82lG8NWzd/7vVCgVfyvzGMep+dzPhReTsNiCFm4dn1oBLgkWvt xXajWZewATb2KrAljHBhL0y/grDqO1L2xroKLiCbLG/Qzmqm1kwj0bkA+wtu9U5JVf/P SY7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=+I3gQUqe1Iw9ncUVl5t13KZpHzNMcFr/8zp3Cf5wgQ0=; b=f3IFK2yx/tgpCUBKGBGEm7EvtkJogd9+MQeRfl/ZDlnlqEe5eAc+x3YREnYyQX9rja 5jbejn12hgxHZkjl2QXf2yW/5l0ZJ5OsgJI2er1PmR7v3yRaK/xeItDKrFQ2IepXwLcV mGrHPl+DJQgIG2KE6aPBYdKOJ597mp1BNEDeFM96PY3HfXPrJnyli2lIRVyeC6CG6aKP rC8GtgAig2TGIFIIRiKXq0kfAFa0JuJEQIl8wS4JnFJINWlctLySt83DxunzjeItca6u zyzySCQ90K56J/TXRlVgsd3QZCjIYnys4u1lXDPbQdbZXCB9SIELlm9NBiM5iRLElqsG rrWA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id ox5si1914474ejb.530.2020.05.05.14.18.21; Tue, 05 May 2020 14:18:21 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 00EB31D6F5; Tue, 5 May 2020 23:17:56 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 16AF31D6F2 for ; Tue, 5 May 2020 23:17:55 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9535630E; Tue, 5 May 2020 14:17:54 -0700 (PDT) Received: from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com [10.118.14.48]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 82A973F305; Tue, 5 May 2020 14:17:54 -0700 (PDT) From: Honnappa Nagarahalli To: dev@dpdk.org, phil.yang@arm.com, harry.van.haaren@intel.com Cc: thomas@monjalon.net, david.marchand@redhat.com, konstantin.ananyev@intel.com, jerinj@marvell.com, hemant.agrawal@nxp.com, gage.eads@intel.com, bruce.richardson@intel.com, honnappa.nagarahalli@arm.com, nd@arm.com Date: Tue, 5 May 2020 16:17:30 -0500 Message-Id: <20200505211732.25291-5-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200505211732.25291-1-honnappa.nagarahalli@arm.com> References: <1587659482-27133-1-git-send-email-phil.yang@arm.com> <20200505211732.25291-1-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v4 4/6] service: remove redundant code X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Phil Yang The service id validation is duplicated, remove the redundant code in the calling functions. Signed-off-by: Phil Yang Reviewed-by: Honnappa Nagarahalli Acked-by: Harry van Haaren --- lib/librte_eal/common/rte_service.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) -- 2.17.1 diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c index 62ea9cbd6..37c16c4bc 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;