patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Cc: Phil Yang <phil.yang@arm.com>,
	Harry van Haaren <harry.van.haaren@intel.com>,
	dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'service: fix identification of service running on other lcore' has been queued to LTS release 18.11.9
Date: Fri,  5 Jun 2020 19:24:17 +0100
Message-ID: <20200605182525.22483-20-ktraynor@redhat.com> (raw)
In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com>

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/e41b1e38cc5bb71254248dcb3ea0e3242adefe58

Thanks.

Kevin.

---
From e41b1e38cc5bb71254248dcb3ea0e3242adefe58 Mon Sep 17 00:00:00 2001
From: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
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 <honnappa.nagarahalli@arm.com>
Reviewed-by: Phil Yang <phil.yang@arm.com>
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
---
 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 e71e1efaa8..0030e44e94 100644
--- a/lib/librte_eal/common/rte_service.c
+++ b/lib/librte_eal/common/rte_service.c
@@ -360,5 +360,5 @@ rte_service_runner_do_callback(struct rte_service_spec_impl *s,
 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)
@@ -374,5 +374,5 @@ 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,22 +412,12 @@ 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,5 +439,5 @@ rte_service_runner_func(void *arg)
 				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);
 		}
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.015288547 +0100
+++ 0020-service-fix-identification-of-service-running-on-oth.patch	2020-06-05 19:20:50.741042381 +0100
@@ -1 +1 @@
-From 5c76111f068c4ef8aff4f5b4e2e641a21ff733a0 Mon Sep 17 00:00:00 2001
+From e41b1e38cc5bb71254248dcb3ea0e3242adefe58 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5c76111f068c4ef8aff4f5b4e2e641a21ff733a0 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index b8c465eb96..c283408cf1 100644
+index e71e1efaa8..0030e44e94 100644
@@ -26 +27 @@
-@@ -361,5 +361,5 @@ rte_service_runner_do_callback(struct rte_service_spec_impl *s,
+@@ -360,5 +360,5 @@ rte_service_runner_do_callback(struct rte_service_spec_impl *s,
@@ -33 +34 @@
-@@ -375,5 +375,5 @@ service_run(uint32_t i, struct core_state *cs, uint64_t service_mask,
+@@ -374,5 +374,5 @@ service_run(uint32_t i, struct core_state *cs, uint64_t service_mask,
@@ -40 +41 @@
-@@ -413,22 +413,12 @@ rte_service_run_iter_on_app_lcore(uint32_t id, uint32_t serialize_mt_unsafe)
+@@ -412,22 +412,12 @@ rte_service_run_iter_on_app_lcore(uint32_t id, uint32_t serialize_mt_unsafe)
@@ -68 +69 @@
-@@ -450,5 +440,5 @@ rte_service_runner_func(void *arg)
+@@ -449,5 +439,5 @@ rte_service_runner_func(void *arg)


  parent reply	other threads:[~2020-06-05 18:26 UTC|newest]

Thread overview: 90+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-05 18:23 [dpdk-stable] patch 'app/testpmd: add parsing for QinQ VLAN headers' " Kevin Traynor
2020-06-05 18:23 ` [dpdk-stable] patch 'doc: fix log level example in Linux guide' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eal: fix typo in endian conversion macros' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/avp: fix gcc 10 maybe-uninitialized warning' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eal/x86: ignore gcc 10 stringop-overflow warnings' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'kvargs: fix invalid token parsing on FreeBSD' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eal/ppc: fix build with gcc 9.3' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/i40e: fix flow director for ARP packets' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'doc: add i40e limitation for flow director' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/i40e: fix flush of flow director filter' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'vhost: fix peer close check' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'vhost: prevent zero-copy with incompatible client mode' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/softnic: fix memory leak for thread' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/softnic: fix resource leak for pipeline' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/octeontx: fix dangling pointer on init failure' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix RSS enablement' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eventdev: fix probe and remove for secondary process' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'event/dsw: avoid reusing previously recorded events' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'service: fix race condition for MT unsafe service' " Kevin Traynor
2020-06-05 18:24 ` Kevin Traynor [this message]
2020-06-05 18:24 ` [dpdk-stable] patch 'service: remove rte prefix from static functions' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'remove references to private PCI probe function' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'examples/l2fwd-keepalive: fix mbuf pool size' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'mem: fix overflow on allocation' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'examples/eventdev: fix crash on exit' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'test/flow_classify: enable multi-sockets system' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'bbdev: fix doxygen comments' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/ccp: fix fd leak on probe failure' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app/crypto-perf: fix display of sample test vector' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/qat: fix cipher descriptor for ZUC and SNOW' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/kasumi: fix extern declaration' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/failsafe: fix fd leak' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app/testpmd: fix statistics after reset' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/netvsc: fix comment spelling' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'bus/vmbus: " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/ixgbe: fix link status synchronization on BSD' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/tap: fix crash in flow destroy' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix FW version query' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app/testpmd: fix memory failure handling for i40e DDP' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'bus/fslmc: fix dereferencing null pointer' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/dpaa2: fix 10G port negotiation' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'bus/fslmc: fix size of qman fq descriptor' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/ring: fix device pointer on allocation' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix matching for UDP tunnels with Verbs' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx4: fix drop queue error handling' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix Tx queue release debug log timing' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app: remove extra new line after link duplex' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'examples: " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'event/dsw: fix enqueue burst return value' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app/eventdev: check Tx adapter service ID' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/caam_jr: fix check of file descriptors' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/caam_jr: fix IRQ functions return type' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'build: disable gcc 10 zero-length-bounds warning' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eal: fix C++17 compilation' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/e1000: fix port hotplug for multi-process' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'doc: fix multicast filter feature announcement' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/ixgbe: fix statistics in flow control mode' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/qede: fix link state configuration' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/vmxnet3: handle bad host framing' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/qede: fix port reconfiguration' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix error log for command timeout' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix using RSS config struct' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'app/testpmd: fix DCB set' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/ixgbe/base: update copyright' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e/base: " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'pci: accept 32-bit domain numbers' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'pci: reject negative values in PCI id' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'kvargs: fix strcmp helper documentation' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'mempool/dpaa2: install missing header with meson' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'fix same typo in multiple places' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'examples/kni: fix MTU change to setup Tx queue' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix wild pointer' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix queue related exception handling' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'vhost: fix zero-copy server mode' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/mvpp2: fix build with gcc 10' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'examples/vm_power: drop Unix path limit redefinition' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'doc: fix build with doxygen 1.8.18' " Kevin Traynor
2020-06-05 22:46   ` Thomas Monjalon
2020-06-10 14:48     ` Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'cryptodev: fix SHA-1 digest enum comment' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/sfc/base: fix manual filter delete in EF10' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix setting L2TAG' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/iavf: " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/ixgbe: check driver type in MACsec API' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'examples/kni: fix crash during MTU set' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'examples/ip_pipeline: remove check of null response' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'doc: add NASM installation steps' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'doc: fix typo in contributors guide' " Kevin Traynor
2020-06-05 18:25 ` Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'doc: prefer https when pointing to dpdk.org' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200605182525.22483-20-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=harry.van.haaren@intel.com \
    --cc=honnappa.nagarahalli@arm.com \
    --cc=phil.yang@arm.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git