From patchwork Mon Jul 31 16:38:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Van Haaren, Harry" X-Patchwork-Id: 27289 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id BDF5E99A2; Mon, 31 Jul 2017 18:38:50 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id E7F80915D for ; Mon, 31 Jul 2017 18:38:48 +0200 (CEST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Jul 2017 09:38:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,304,1498546800"; d="scan'208";a="134117589" Received: from silpixa00398672.ir.intel.com ([10.237.223.128]) by fmsmga006.fm.intel.com with ESMTP; 31 Jul 2017 09:38:46 -0700 From: Harry van Haaren To: dev@dpdk.org Cc: gaetan.rivet@6wind.com, Harry van Haaren Date: Mon, 31 Jul 2017 17:38:55 +0100 Message-Id: <1501519135-122347-1-git-send-email-harry.van.haaren@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501516707-87024-1-git-send-email-harry.van.haaren@intel.com> References: <1501516707-87024-1-git-send-email-harry.van.haaren@intel.com> Subject: [dpdk-dev] [PATCH v2] service: fix shifts to operate on 64 bit integers 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" This commit fixes shifts to an integer (1 << shift) which is assumed to be a 32-bit integer. In this case, the shift is variable and expected to be valid for 64-bit integers. Given that the expectation to work with 64 bits exists, we must ensure that the (1 << shift) one in that formula is actually a uin64_t. The UINT64_C() macro portably adds the correct suffix to a constant, informing the compiler that the value is to be assigned 64 bits. The issue would only manifests when there were greater than 31 services registered. Fixes: 21698354c832 ("service: introduce service cores concept") Signed-off-by: Harry van Haaren --- v2: - Use UINT64_C() instead of const uint64_t method (Gaetan) - Refactored to keep checkpatch happy with line-lenghts --- lib/librte_eal/common/rte_service.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c index e82b9ad..7efb76d 100644 --- a/lib/librte_eal/common/rte_service.c +++ b/lib/librte_eal/common/rte_service.c @@ -286,7 +286,7 @@ rte_service_unregister(struct rte_service_spec *spec) s->internal_flags &= ~(SERVICE_F_REGISTERED); for (i = 0; i < RTE_MAX_LCORE; i++) - lcore_states[i].service_mask &= ~(1 << service_id); + lcore_states[i].service_mask &= ~(UINT64_C(1) << service_id); memset(&rte_services[service_id], 0, sizeof(struct rte_service_spec_impl)); @@ -327,7 +327,7 @@ rte_service_runner_func(void *arg) for (i = 0; i < rte_service_count; i++) { struct rte_service_spec_impl *s = &rte_services[i]; if (s->runstate != RUNSTATE_RUNNING || - !(service_mask & (1 << i))) + !(service_mask & (UINT64_C(1) << i))) continue; /* check do we need cmpset, if MT safe or <= 1 core @@ -463,18 +463,19 @@ service_update(struct rte_service_spec *service, uint32_t lcore, if (!lcore_states[lcore].is_service_core) return -EINVAL; + uint64_t sid_mask = UINT64_C(1) << sid; if (set) { if (*set) { - lcore_states[lcore].service_mask |= (1 << sid); + lcore_states[lcore].service_mask |= sid_mask; rte_services[sid].num_mapped_cores++; } else { - lcore_states[lcore].service_mask &= ~(1 << sid); + lcore_states[lcore].service_mask &= ~(sid_mask); rte_services[sid].num_mapped_cores--; } } if (enabled) - *enabled = (lcore_states[lcore].service_mask & (1 << sid)); + *enabled = (lcore_states[lcore].service_mask & (sid_mask)); rte_smp_wmb(); @@ -607,7 +608,8 @@ rte_service_lcore_stop(uint32_t lcore) uint32_t i; for (i = 0; i < RTE_SERVICE_NUM_MAX; i++) { - int32_t enabled = lcore_states[i].service_mask & (1 << i); + int32_t enabled = + lcore_states[i].service_mask & (UINT64_C(1) << i); int32_t service_running = rte_services[i].runstate != RUNSTATE_STOPPED; int32_t only_core = rte_services[i].num_mapped_cores == 1;