From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 21922A0093 for ; Tue, 19 May 2020 15:14:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 160A61D702; Tue, 19 May 2020 15:14:27 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 1B3081D915 for ; Tue, 19 May 2020 15:14:26 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id l18so15869218wrn.6 for ; Tue, 19 May 2020 06:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZP4zIkrrI+5YrLalC8QPpHCb8JwMn37h3uF5HSD8J0A=; b=C9QmT5O0+UxtLns7ZrDQGemM7cBBRDY3OeVpazgDTB0Ms+iGUXtASRSVae6fVYbfyv Ul0Jg4+wvFbr60P4LiRPtcttEJ4D5RIPTHH5D79Wc+jxCh1nhiatKo2iLmKNoNFbYj+w J/+oDq0mMLSJoGXTOUOnGlcNgf5OMgCa9LSGAf4TY/6CMDM/yy5JEPzrNKQ7xQy+leaZ 9xmmrcPhjo4VhFteTDj5I4dkwy8OqS+kbc+/RP4DBJe9I4Qzn+mc1lbVErZN2sHCAM/N GDN+ZP9EUR46MXe6piYwmYAIBsXJ+Imw+M+dhPwZpqw6bfucoO/lsbdXMk2rFT5OB//T X/pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZP4zIkrrI+5YrLalC8QPpHCb8JwMn37h3uF5HSD8J0A=; b=AIJXsygHNWnV30/8Ixi0CkMLOAi947WTdAWMkTeKkTi72c7OPv8bGj6wmYl6O7Qh7n qOgPuuKdvYzeOsewTk2VLItQwInlfBEPCIhrmKMX/mA9RPbuZduYtfrVq7fRUbBHfPLs YRs6UXlD472weFqcPrjim3bHgw3q3jXDVNLw0pXrD1p6Yl4Y6IOT7KlswZVDmFpSAiEC qAtt0MUrR6v9L4DBUYiA6wZxS2rlsHnqbyP1Sm1IR24Zw4RJ8JfUmCT38a80HwxBPh+A nAGz49yC2QcgH/Eh5Y7ihhfCtlO+GlTSjjaF2w0P6GF5Dijw0Xd7qyfnRJEMbG5JzijA klDg== X-Gm-Message-State: AOAM532h6Ql7O9SnLkR5Tl6FbfeeLDA3SQQXQR12VxfctPKxWnWunKjH 2aYBG2HvI2pzAPajoq9hf4k= X-Google-Smtp-Source: ABdhPJwj9geSc+IXAM9pLBxPXQHm5g6/wOIzA3S2+NMG+K3d3P3hMkk4xgteb0YPwSuaXc2NUKX5bA== X-Received: by 2002:a05:6000:146:: with SMTP id r6mr26664521wrx.9.1589894065833; Tue, 19 May 2020 06:14:25 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e5sm20549864wro.3.2020.05.19.06.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:14:25 -0700 (PDT) From: luca.boccassi@gmail.com To: Honnappa Nagarahalli Cc: Phil Yang , Harry van Haaren , dpdk stable Date: Tue, 19 May 2020 14:04:58 +0100 Message-Id: <20200519130549.112823-163-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'service: fix identification of service running on other lcore' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 99303c675dd25151ed360468a049c909531dad1e Mon Sep 17 00:00:00 2001 From: Honnappa Nagarahalli Date: Wed, 6 May 2020 23:28:00 +0800 Subject: [PATCH] service: fix identification of service running on other lcore [ upstream commit 5c76111f068c4ef8aff4f5b4e2e641a21ff733a0 ] The logic to identify if the MT unsafe service is running on another core can return -EBUSY spuriously. In such cases, running the service becomes costlier than using atomic operations. Assume that the application passes the right parameters and reduce the number of instructions for all cases. Fixes: 8d39d3e237c2 ("service: fix race in service on app lcore function") Signed-off-by: Honnappa Nagarahalli Reviewed-by: Phil Yang Acked-by: Harry van Haaren --- lib/librte_eal/common/rte_service.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c index 4cf5254cc3..62618910f6 100644 --- a/lib/librte_eal/common/rte_service.c +++ b/lib/librte_eal/common/rte_service.c @@ -360,7 +360,7 @@ rte_service_runner_do_callback(struct rte_service_spec_impl *s, /* Expects the service 's' is valid. */ static int32_t service_run(uint32_t i, struct core_state *cs, uint64_t service_mask, - struct rte_service_spec_impl *s) + struct rte_service_spec_impl *s, uint32_t serialize_mt_unsafe) { if (!s) return -EINVAL; @@ -374,7 +374,7 @@ service_run(uint32_t i, struct core_state *cs, uint64_t service_mask, cs->service_active_on_lcore[i] = 1; - if (service_mt_safe(s) == 0) { + if ((service_mt_safe(s) == 0) && (serialize_mt_unsafe == 1)) { if (!rte_atomic32_cmpset((uint32_t *)&s->execute_lock, 0, 1)) return -EBUSY; @@ -412,24 +412,14 @@ rte_service_run_iter_on_app_lcore(uint32_t id, uint32_t serialize_mt_unsafe) SERVICE_VALID_GET_OR_ERR_RET(id, s, -EINVAL); - /* Atomically add this core to the mapped cores first, then examine if - * we can run the service. This avoids a race condition between - * checking the value, and atomically adding to the mapped count. + /* Increment num_mapped_cores to reflect that this core is + * now mapped capable of running the service. */ - if (serialize_mt_unsafe) - rte_atomic32_inc(&s->num_mapped_cores); + rte_atomic32_inc(&s->num_mapped_cores); - if (service_mt_safe(s) == 0 && - rte_atomic32_read(&s->num_mapped_cores) > 1) { - if (serialize_mt_unsafe) - rte_atomic32_dec(&s->num_mapped_cores); - return -EBUSY; - } + int ret = service_run(id, cs, UINT64_MAX, s, serialize_mt_unsafe); - int ret = service_run(id, cs, UINT64_MAX, s); - - if (serialize_mt_unsafe) - rte_atomic32_dec(&s->num_mapped_cores); + rte_atomic32_dec(&s->num_mapped_cores); return ret; } @@ -449,7 +439,7 @@ rte_service_runner_func(void *arg) if (!service_valid(i)) continue; /* return value ignored as no change to code flow */ - service_run(i, cs, service_mask, service_get(i)); + service_run(i, cs, service_mask, service_get(i), 1); } cs->loops++; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:51.136888089 +0100 +++ 0163-service-fix-identification-of-service-running-on-oth.patch 2020-05-19 14:04:44.504653593 +0100 @@ -1,15 +1,16 @@ -From 5c76111f068c4ef8aff4f5b4e2e641a21ff733a0 Mon Sep 17 00:00:00 2001 +From 99303c675dd25151ed360468a049c909531dad1e Mon Sep 17 00:00:00 2001 From: Honnappa Nagarahalli Date: Wed, 6 May 2020 23:28:00 +0800 Subject: [PATCH] service: fix identification of service running on other lcore +[ upstream commit 5c76111f068c4ef8aff4f5b4e2e641a21ff733a0 ] + The logic to identify if the MT unsafe service is running on another core can return -EBUSY spuriously. In such cases, running the service becomes costlier than using atomic operations. Assume that the application passes the right parameters and reduce the number of instructions for all cases. -Cc: stable@dpdk.org Fixes: 8d39d3e237c2 ("service: fix race in service on app lcore function") Signed-off-by: Honnappa Nagarahalli @@ -20,7 +21,7 @@ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c -index b8c465eb96..c283408cf1 100644 +index 4cf5254cc3..62618910f6 100644 --- a/lib/librte_eal/common/rte_service.c +++ b/lib/librte_eal/common/rte_service.c @@ -360,7 +360,7 @@ rte_service_runner_do_callback(struct rte_service_spec_impl *s,