* [dpdk-dev] [PATCH v1] pflock: implementation of phase-fair reader writer locks
2021-02-12 1:38 ` [dpdk-dev] [RFC] pflock: add implementation of phase-fair locks Stephen Hemminger
@ 2021-02-28 17:21 ` Stephen Hemminger
2021-03-03 18:30 ` [dpdk-dev] [PATCH v2] " Stephen Hemminger
` (3 subsequent siblings)
4 siblings, 0 replies; 27+ messages in thread
From: Stephen Hemminger @ 2021-02-28 17:21 UTC (permalink / raw)
To: honnappa.nagarahalli, dev; +Cc: Stephen Hemminger
This is a new type of reader-writer lock that provides better fairness
guarantees which makes it better for typical DPDK applications.
They lock internally uses two ticket pools, one for readers and one
for writers.
Phase fair reader writer locks ensure that neither reader or writer will be
starved. Neither reader or writer are preferred, they execute in
alternating phases. All operations of the same time (reader or writer)
that try to acquire the lock are handled in FIFO order. Write
operations are exclusive, and multiple read operations can be run
together (until a write arrives).
A similar implementation is in Concurrency Kit package in FreeBSD.
For more information see:
"Reader-Writer Synchronization for Shared-Memory Multiprocessor
Real-Time Systems",
http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
v1 - cleanup whitespace from the RFC version
Note: checkpatch has bogus complaint about spelling error
on this patch. It objects to the definition "RTE_PFLOCK_PRES"
as a spelling error.
app/test/meson.build | 6 +
app/test/test_pflock.c | 220 ++++++++++++++++
lib/librte_eal/arm/include/meson.build | 1 +
lib/librte_eal/arm/include/rte_pflock.h | 18 ++
lib/librte_eal/include/generic/rte_pflock.h | 272 ++++++++++++++++++++
lib/librte_eal/ppc/include/meson.build | 1 +
lib/librte_eal/ppc/include/rte_pflock.h | 16 ++
lib/librte_eal/x86/include/meson.build | 1 +
lib/librte_eal/x86/include/rte_pflock.h | 18 ++
9 files changed, 553 insertions(+)
create mode 100644 app/test/test_pflock.c
create mode 100644 lib/librte_eal/arm/include/rte_pflock.h
create mode 100644 lib/librte_eal/include/generic/rte_pflock.h
create mode 100644 lib/librte_eal/ppc/include/rte_pflock.h
create mode 100644 lib/librte_eal/x86/include/rte_pflock.h
diff --git a/app/test/meson.build b/app/test/meson.build
index 561e493a2944..134098de9ac2 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -90,6 +90,7 @@ test_sources = files('commands.c',
'test_mcslock.c',
'test_mp_secondary.c',
'test_per_lcore.c',
+ 'test_pflock.c',
'test_pmd_perf.c',
'test_power.c',
'test_power_cpufreq.c',
@@ -228,6 +229,11 @@ fast_tests = [
['meter_autotest', true],
['multiprocess_autotest', false],
['per_lcore_autotest', true],
+ ['pflock_autotest', true],
+ ['pflock_test1_autotest', true],
+ ['pflock_rda_autotest', true],
+ ['pflock_rds_wrm_autotest', true],
+ ['pflock_rde_wro_autotest', true],
['prefetch_autotest', true],
['rcu_qsbr_autotest', true],
['red_autotest', true],
diff --git a/app/test/test_pflock.c b/app/test/test_pflock.c
new file mode 100644
index 000000000000..b6c5d2f8afde
--- /dev/null
+++ b/app/test/test_pflock.c
@@ -0,0 +1,220 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <unistd.h>
+#include <sys/queue.h>
+#include <string.h>
+
+#include <rte_common.h>
+#include <rte_memory.h>
+#include <rte_per_lcore.h>
+#include <rte_launch.h>
+#include <rte_pause.h>
+#include <rte_pflock.h>
+#include <rte_eal.h>
+#include <rte_lcore.h>
+#include <rte_cycles.h>
+
+#include "test.h"
+
+/*
+ * phase fair lock test
+ * ===========
+ * Provides UT for phase fair lock API.
+ * Main concern is on functional testing, but also provides some
+ * performance measurements.
+ * Obviously for proper testing need to be executed with more than one lcore.
+ */
+
+#define ITER_NUM 0x80
+
+#define TEST_SEC 5
+
+static rte_pflock_t sl;
+static rte_pflock_t sl_tab[RTE_MAX_LCORE];
+static uint32_t synchro;
+
+enum {
+ LC_TYPE_RDLOCK,
+ LC_TYPE_WRLOCK,
+};
+
+static int
+test_pflock_per_core(__rte_unused void *arg)
+{
+ rte_pflock_write_lock(&sl);
+ printf("Global write lock taken on core %u\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl);
+
+ rte_pflock_write_lock(&sl_tab[rte_lcore_id()]);
+ printf("Hello from core %u !\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl_tab[rte_lcore_id()]);
+
+ rte_pflock_read_lock(&sl);
+ printf("Global read lock taken on core %u\n", rte_lcore_id());
+ rte_delay_ms(100);
+ printf("Release global read lock on core %u\n", rte_lcore_id());
+ rte_pflock_read_unlock(&sl);
+
+ return 0;
+}
+
+static rte_pflock_t lk = RTE_PFLOCK_INITIALIZER;
+static volatile uint64_t pflock_data;
+static uint64_t time_count[RTE_MAX_LCORE] = {0};
+
+#define MAX_LOOP 10000
+#define TEST_PFLOCK_DEBUG 0
+
+static int
+load_loop_fn(__rte_unused void *arg)
+{
+ uint64_t time_diff = 0, begin;
+ uint64_t hz = rte_get_timer_hz();
+ uint64_t lcount = 0;
+ const unsigned int lcore = rte_lcore_id();
+
+ /* wait synchro for workers */
+ if (lcore != rte_get_main_lcore())
+ rte_wait_until_equal_32(&synchro, 1, __ATOMIC_RELAXED);
+
+ begin = rte_rdtsc_precise();
+ while (lcount < MAX_LOOP) {
+ rte_pflock_write_lock(&lk);
+ ++pflock_data;
+ rte_pflock_write_unlock(&lk);
+
+ rte_pflock_read_lock(&lk);
+ if (TEST_PFLOCK_DEBUG && !(lcount % 100))
+ printf("Core [%u] pflock_data = %"PRIu64"\n",
+ lcore, pflock_data);
+ rte_pflock_read_unlock(&lk);
+
+ lcount++;
+ /* delay to make lock duty cycle slightly realistic */
+ rte_pause();
+ }
+
+ time_diff = rte_rdtsc_precise() - begin;
+ time_count[lcore] = time_diff * 1000000 / hz;
+ return 0;
+}
+
+static int
+test_pflock_perf(void)
+{
+ unsigned int i;
+ uint64_t total = 0;
+
+ printf("\nPhase fair test on %u cores...\n", rte_lcore_count());
+
+ /* clear synchro and start workers */
+ synchro = 0;
+ if (rte_eal_mp_remote_launch(load_loop_fn, NULL, SKIP_MAIN) < 0)
+ return -1;
+
+ /* start synchro and launch test on main */
+ __atomic_store_n(&synchro, 1, __ATOMIC_RELAXED);
+ load_loop_fn(NULL);
+
+ rte_eal_mp_wait_lcore();
+
+ RTE_LCORE_FOREACH(i) {
+ printf("Core [%u] cost time = %"PRIu64" us\n",
+ i, time_count[i]);
+ total += time_count[i];
+ }
+
+ printf("Total cost time = %"PRIu64" us\n", total);
+ memset(time_count, 0, sizeof(time_count));
+
+ return 0;
+}
+
+/*
+ * - There is a global pflock and a table of pflocks (one per lcore).
+ *
+ * - The test function takes all of these locks and launches the
+ * ``test_pflock_per_core()`` function on each core (except the main).
+ *
+ * - The function takes the global write lock, display something,
+ * then releases the global lock.
+ * - Then, it takes the per-lcore write lock, display something, and
+ * releases the per-core lock.
+ * - Finally, a read lock is taken during 100 ms, then released.
+ *
+ * - The main function unlocks the per-lcore locks sequentially and
+ * waits between each lock. This triggers the display of a message
+ * for each core, in the correct order.
+ *
+ * Then, it tries to take the global write lock and display the last
+ * message. The autotest script checks that the message order is correct.
+ */
+static int
+pflock_test1(void)
+{
+ int i;
+
+ rte_pflock_init(&sl);
+ for (i = 0; i < RTE_MAX_LCORE; i++)
+ rte_pflock_init(&sl_tab[i]);
+
+ rte_pflock_write_lock(&sl);
+
+ RTE_LCORE_FOREACH_WORKER(i) {
+ rte_pflock_write_lock(&sl_tab[i]);
+ rte_eal_remote_launch(test_pflock_per_core, NULL, i);
+ }
+
+ rte_pflock_write_unlock(&sl);
+
+ RTE_LCORE_FOREACH_WORKER(i) {
+ rte_pflock_write_unlock(&sl_tab[i]);
+ rte_delay_ms(100);
+ }
+
+ rte_pflock_write_lock(&sl);
+ /* this message should be the last message of test */
+ printf("Global write lock taken on main core %u\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl);
+
+ rte_eal_mp_wait_lcore();
+
+ if (test_pflock_perf() < 0)
+ return -1;
+
+ return 0;
+}
+
+static int
+test_pflock(void)
+{
+ uint32_t i;
+ int32_t rc, ret;
+
+ static const struct {
+ const char *name;
+ int (*ftst)(void);
+ } test[] = {
+ {
+ .name = "pflock_test1",
+ .ftst = pflock_test1,
+ },
+ };
+
+ ret = 0;
+ for (i = 0; i != RTE_DIM(test); i++) {
+ printf("starting test %s;\n", test[i].name);
+ rc = test[i].ftst();
+ printf("test %s completed with status %d\n", test[i].name, rc);
+ ret |= rc;
+ }
+
+ return ret;
+}
+
+REGISTER_TEST_COMMAND(pflock_autotest, test_pflock);
diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build
index 770766de1a34..2c3cff61bed6 100644
--- a/lib/librte_eal/arm/include/meson.build
+++ b/lib/librte_eal/arm/include/meson.build
@@ -21,6 +21,7 @@ arch_headers = files(
'rte_pause_32.h',
'rte_pause_64.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch_32.h',
'rte_prefetch_64.h',
diff --git a/lib/librte_eal/arm/include/rte_pflock.h b/lib/librte_eal/arm/include/rte_pflock.h
new file mode 100644
index 000000000000..bb9934eec469
--- /dev/null
+++ b/lib/librte_eal/arm/include/rte_pflock.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#ifndef _RTE_PFLOCK_ARM_H_
+#define _RTE_PFLOCK_ARM_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_ARM_H_ */
diff --git a/lib/librte_eal/include/generic/rte_pflock.h b/lib/librte_eal/include/generic/rte_pflock.h
new file mode 100644
index 000000000000..327526bc8e12
--- /dev/null
+++ b/lib/librte_eal/include/generic/rte_pflock.h
@@ -0,0 +1,272 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corp.
+ * Copyright 2011-2015 Samy Al Bahra.
+ * All rights reserved.
+ */
+
+#ifndef _RTE_PFLOCK_H_
+#define _RTE_PFLOCK_H_
+
+/**
+ * @file
+ *
+ * Phase-fair locks
+ *
+ * This file defines an API for Phase Fair reader writer locks,
+ * which is a variant of typical reader-writer locks that prevent
+ * starvation. In this type of lock, readers and writers alternate.
+ * This significantly reduces the worst-case blocking for readers and writers.
+ *
+ * This is an implementation derived from FreeBSD
+ * based on the work described in:
+ * Brandenburg, B. and Anderson, J. 2010. Spin-Based
+ * Reader-Writer Synchronization for Multiprocessor Real-Time Systems
+ *
+ * All locks must be initialised before use, and only initialised once.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <rte_common.h>
+#include <rte_pause.h>
+
+/**
+ * The rte_pflock_t type.
+ */
+struct rte_pflock {
+ union rte_pflock_ticket {
+ uint32_t tickets;
+ struct {
+ uint16_t in;
+ uint16_t out;
+ };
+ } rd, wr;
+};
+typedef struct rte_pflock rte_pflock_t;
+
+/**
+ * Constants used to map the bits in reader counter
+ *
+ * +-----------------+-+-+
+ * | Readers |W|P|
+ * | |R|H|
+ * +-----------------+-+-+
+ */
+#define RTE_PFLOCK_LSB 0xFFFFFFF0
+#define RTE_PFLOCK_RINC 0x100 /* Reader increment value. */
+#define RTE_PFLOCK_WBITS 0x3 /* Writer bits in reader. */
+#define RTE_PFLOCK_PRES 0x2 /* Writer present bit. */
+#define RTE_PFLOCK_PHID 0x1 /* Phase ID bit. */
+
+/**
+ * A static pflock initializer.
+ */
+#define RTE_PFLOCK_INITIALIZER { }
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Initialize the pflock to an unlocked state.
+ *
+ * @param pf
+ * A pointer to the pflock.
+ */
+__rte_experimental
+static inline void
+rte_pflock_init(struct rte_pflock *pf)
+{
+ pf->rd.tickets = 0;
+ pf->wr.tickets = 0;
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Take a pflock for read.
+ *
+ * @param pf
+ * A pointer to a pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_read_lock(rte_pflock_t *pf)
+{
+ uint32_t w;
+
+ /*
+ * If no writer is present, then the operation has completed
+ * successfully.
+ */
+ w = __atomic_fetch_add(&pf->rd.in, RTE_PFLOCK_RINC, __ATOMIC_ACQ_REL) & RTE_PFLOCK_WBITS;
+ if (w == 0)
+ return;
+
+ /* Wait for current write phase to complete. */
+ while ((__atomic_load_n(&pf->rd.in, __ATOMIC_ACQUIRE) & RTE_PFLOCK_WBITS) == w)
+ rte_pause();
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Release a pflock locked for reading.
+ *
+ * @param pf
+ * A pointer to the pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_read_unlock(rte_pflock_t *pf)
+{
+ __atomic_fetch_add(&pf->rd.out, RTE_PFLOCK_RINC, __ATOMIC_RELEASE);
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Try to take a pflock for reading
+ *
+ * @param pf
+ * A pointer to a pflock structure.
+ * @return
+ * - zero if the lock is successfully taken
+ * - -EBUSY if lock could not be acquired for reading because a
+ * writer holds the lock
+ */
+__rte_experimental
+static inline int
+rte_pflock_read_trylock(rte_pflock_t *pf)
+{
+ union rte_pflock_ticket old, new;
+
+ /* Get current state of the lock */
+ old.tickets = __atomic_load_n(&pf->rd.tickets, __ATOMIC_RELAXED);
+
+ /* loop until writer shows up */
+ while ((old.in & RTE_PFLOCK_WBITS) == 0) {
+ new.out = old.out;
+ new.in = old.in + RTE_PFLOCK_RINC;
+ if (__atomic_compare_exchange_n(&pf->rd.tickets, &old.tickets, new.tickets,
+ 0, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED))
+ return 0; /* got it */
+
+ /* either new reader got in (so retry) or a writer */
+ }
+
+ /* If writer is present then we are busy */
+ return -EBUSY;
+}
+
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Take the pflock for write.
+ *
+ * @param p
+ * A pointer to the ticketlock.
+ */
+__rte_experimental
+static inline void
+rte_pflock_write_lock(rte_pflock_t *pf)
+{
+ uint16_t ticket;
+
+ /* Acquire ownership of write-phase. */
+ ticket = __atomic_fetch_add(&pf->wr.in, 1, __ATOMIC_ACQUIRE);
+ rte_wait_until_equal_16(&pf->wr.out, ticket, __ATOMIC_RELAXED);
+
+ /*
+ * Acquire ticket on read-side in order to allow them
+ * to flush. Indicates to any incoming reader that a
+ * write-phase is pending.
+ *
+ * Need ACQUIRE to prevent speculative execution of the wait loop
+ */
+ ticket = __atomic_fetch_add(&pf->rd.in,
+ (ticket & RTE_PFLOCK_PHID) | RTE_PFLOCK_PRES,
+ __ATOMIC_ACQUIRE);
+
+ /* Wait for any pending readers to flush. */
+ rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_RELAXED);
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Release a pflock held for writing.
+ *
+ * @param pf
+ * A pointer to a pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_write_unlock(rte_pflock_t *pf)
+{
+ /* Migrate from write phase to read phase. */
+ __atomic_fetch_and(&pf->rd.in, RTE_PFLOCK_LSB, __ATOMIC_RELEASE);
+
+ /* Allow other writers to continue. */
+ __atomic_fetch_add(&pf->wr.out, 1, __ATOMIC_RELEASE);
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Try to take the pflock for write.
+ *
+ * @param pf
+ * A pointer to the pflock.
+ * @return
+ * - zero if the lock is successfully taken
+ * - -EBUSY if lock could not be acquired for writing because
+ * another writer holds the lock
+ */
+__rte_experimental
+static inline int
+rte_pflock_write_trylock(rte_pflock_t *pf)
+{
+ union rte_pflock_ticket old, new;
+ uint16_t ticket;
+
+ /* Get current state of the lock */
+ old.tickets = __atomic_load_n(&pf->wr.tickets, __ATOMIC_RELAXED);
+ new.out = old.out;
+ new.in = old.in + 1;
+ ticket = new.in;
+
+ /* if writer is already present then too busy */
+ if (old.out != new.in ||
+ !__atomic_compare_exchange_n(&pf->wr.tickets, &old.tickets, new.tickets,
+ 0, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED))
+ return -EBUSY; /* another writer is present already */
+
+ /*
+ * We now own the write phase, but still need to tell
+ * readers and wait for them.
+ *
+ * Need ACQUIRE semantics to avoid speculative execution of wait loop
+ */
+ ticket = __atomic_fetch_add(&pf->rd.in,
+ (ticket & RTE_PFLOCK_PHID) | RTE_PFLOCK_PRES,
+ __ATOMIC_ACQUIRE);
+
+ /* Wait for any pending readers to flush. */
+ rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_RELAXED);
+ return 0;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RTE_PFLOCK_H */
diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build
index dae40ede546e..7692a531ccba 100644
--- a/lib/librte_eal/ppc/include/meson.build
+++ b/lib/librte_eal/ppc/include/meson.build
@@ -11,6 +11,7 @@ arch_headers = files(
'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rwlock.h',
diff --git a/lib/librte_eal/ppc/include/rte_pflock.h b/lib/librte_eal/ppc/include/rte_pflock.h
new file mode 100644
index 000000000000..e7b875ac56a8
--- /dev/null
+++ b/lib/librte_eal/ppc/include/rte_pflock.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ */
+#ifndef _RTE_PFLOCK_PPC_64_H_
+#define _RTE_PFLOCK_PPC_64_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_PPC_64_H_ */
diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build
index 1a6ad0b17342..f43645c20899 100644
--- a/lib/librte_eal/x86/include/meson.build
+++ b/lib/librte_eal/x86/include/meson.build
@@ -10,6 +10,7 @@ arch_headers = files(
'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rtm.h',
diff --git a/lib/librte_eal/x86/include/rte_pflock.h b/lib/librte_eal/x86/include/rte_pflock.h
new file mode 100644
index 000000000000..c2d876062c08
--- /dev/null
+++ b/lib/librte_eal/x86/include/rte_pflock.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#ifndef _RTE_PFLOCK_X86_64_H_
+#define _RTE_PFLOCK_X86_64_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_X86_64_H_ */
--
2.30.1
^ permalink raw reply [flat|nested] 27+ messages in thread* [dpdk-dev] [PATCH v2] pflock: implementation of phase-fair reader writer locks
2021-02-12 1:38 ` [dpdk-dev] [RFC] pflock: add implementation of phase-fair locks Stephen Hemminger
2021-02-28 17:21 ` [dpdk-dev] [PATCH v1] pflock: implementation of phase-fair reader writer locks Stephen Hemminger
@ 2021-03-03 18:30 ` Stephen Hemminger
2021-03-03 19:19 ` [dpdk-dev] [PATCH v3] " Stephen Hemminger
` (2 subsequent siblings)
4 siblings, 0 replies; 27+ messages in thread
From: Stephen Hemminger @ 2021-03-03 18:30 UTC (permalink / raw)
To: honnappa.nagarahalli, dev; +Cc: Stephen Hemminger, Stephen Hemminger
This is a new type of reader-writer lock that provides better fairness
guarantees which makes it better for typical DPDK applications.
They lock internally uses two ticket pools, one for readers and one
for writers.
Phase fair reader writer locks ensure that neither reader or writer will be
starved. Neither reader or writer are preferred, they execute in
alternating phases. All operations of the same time (reader or writer)
that try to acquire the lock are handled in FIFO order. Write
operations are exclusive, and multiple read operations can be run
together (until a write arrives).
A similar implementation is in Concurrency Kit package in FreeBSD.
For more information see:
"Reader-Writer Synchronization for Shared-Memory Multiprocessor
Real-Time Systems",
http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
v2 - fix truncation of mask (reported by some compilers)
and docbook formatting
app/test/meson.build | 6 +
app/test/test_pflock.c | 542 ++++++++++++++++++++
lib/librte_eal/arm/include/meson.build | 1 +
lib/librte_eal/arm/include/rte_pflock.h | 18 +
lib/librte_eal/include/generic/rte_pflock.h | 273 ++++++++++
lib/librte_eal/ppc/include/meson.build | 1 +
lib/librte_eal/ppc/include/rte_pflock.h | 16 +
lib/librte_eal/x86/include/meson.build | 1 +
lib/librte_eal/x86/include/rte_pflock.h | 18 +
9 files changed, 876 insertions(+)
create mode 100644 app/test/test_pflock.c
create mode 100644 lib/librte_eal/arm/include/rte_pflock.h
create mode 100644 lib/librte_eal/include/generic/rte_pflock.h
create mode 100644 lib/librte_eal/ppc/include/rte_pflock.h
create mode 100644 lib/librte_eal/x86/include/rte_pflock.h
diff --git a/app/test/meson.build b/app/test/meson.build
index 561e493a2944..134098de9ac2 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -90,6 +90,7 @@ test_sources = files('commands.c',
'test_mcslock.c',
'test_mp_secondary.c',
'test_per_lcore.c',
+ 'test_pflock.c',
'test_pmd_perf.c',
'test_power.c',
'test_power_cpufreq.c',
@@ -228,6 +229,11 @@ fast_tests = [
['meter_autotest', true],
['multiprocess_autotest', false],
['per_lcore_autotest', true],
+ ['pflock_autotest', true],
+ ['pflock_test1_autotest', true],
+ ['pflock_rda_autotest', true],
+ ['pflock_rds_wrm_autotest', true],
+ ['pflock_rde_wro_autotest', true],
['prefetch_autotest', true],
['rcu_qsbr_autotest', true],
['red_autotest', true],
diff --git a/app/test/test_pflock.c b/app/test/test_pflock.c
new file mode 100644
index 000000000000..cd36c02cc710
--- /dev/null
+++ b/app/test/test_pflock.c
@@ -0,0 +1,542 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <unistd.h>
+#include <sys/queue.h>
+#include <string.h>
+
+#include <rte_common.h>
+#include <rte_memory.h>
+#include <rte_per_lcore.h>
+#include <rte_launch.h>
+#include <rte_pause.h>
+#include <rte_pflock.h>
+#include <rte_eal.h>
+#include <rte_lcore.h>
+#include <rte_cycles.h>
+
+#include "test.h"
+
+/*
+ * phase fair lock test
+ * ===========
+ * Provides UT for phase fair lock API.
+ * Main concern is on functional testing, but also provides some
+ * performance measurements.
+ * Obviously for proper testing need to be executed with more than one lcore.
+ */
+
+#define ITER_NUM 0x80
+
+#define TEST_SEC 5
+
+static rte_pflock_t sl;
+static rte_pflock_t sl_tab[RTE_MAX_LCORE];
+static uint32_t synchro;
+
+enum {
+ LC_TYPE_RDLOCK,
+ LC_TYPE_WRLOCK,
+};
+
+static struct {
+ rte_pflock_t lock;
+ uint64_t tick;
+ volatile union {
+ uint8_t u8[RTE_CACHE_LINE_SIZE];
+ uint64_t u64[RTE_CACHE_LINE_SIZE / sizeof(uint64_t)];
+ } data;
+} __rte_cache_aligned try_pflock_data;
+
+struct try_pflock_lcore {
+ int32_t rc;
+ int32_t type;
+ struct {
+ uint64_t tick;
+ uint64_t fail;
+ uint64_t success;
+ } stat;
+} __rte_cache_aligned;
+
+static struct try_pflock_lcore try_lcore_data[RTE_MAX_LCORE];
+
+static int
+test_pflock_per_core(__rte_unused void *arg)
+{
+ rte_pflock_write_lock(&sl);
+ printf("Global write lock taken on core %u\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl);
+
+ rte_pflock_write_lock(&sl_tab[rte_lcore_id()]);
+ printf("Hello from core %u !\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl_tab[rte_lcore_id()]);
+
+ rte_pflock_read_lock(&sl);
+ printf("Global read lock taken on core %u\n", rte_lcore_id());
+ rte_delay_ms(100);
+ printf("Release global read lock on core %u\n", rte_lcore_id());
+ rte_pflock_read_unlock(&sl);
+
+ return 0;
+}
+
+static rte_pflock_t lk = RTE_PFLOCK_INITIALIZER;
+static volatile uint64_t pflock_data;
+static uint64_t time_count[RTE_MAX_LCORE] = {0};
+
+#define MAX_LOOP 10000
+#define TEST_PFLOCK_DEBUG 0
+
+static int
+load_loop_fn(__rte_unused void *arg)
+{
+ uint64_t time_diff = 0, begin;
+ uint64_t hz = rte_get_timer_hz();
+ uint64_t lcount = 0;
+ const unsigned int lcore = rte_lcore_id();
+
+ /* wait synchro for workers */
+ if (lcore != rte_get_main_lcore())
+ rte_wait_until_equal_32(&synchro, 1, __ATOMIC_RELAXED);
+
+ begin = rte_rdtsc_precise();
+ while (lcount < MAX_LOOP) {
+ rte_pflock_write_lock(&lk);
+ ++pflock_data;
+ rte_pflock_write_unlock(&lk);
+
+ rte_pflock_read_lock(&lk);
+ if (TEST_PFLOCK_DEBUG && !(lcount % 100))
+ printf("Core [%u] pflock_data = %"PRIu64"\n",
+ lcore, pflock_data);
+ rte_pflock_read_unlock(&lk);
+
+ lcount++;
+ /* delay to make lock duty cycle slightly realistic */
+ rte_pause();
+ }
+
+ time_diff = rte_rdtsc_precise() - begin;
+ time_count[lcore] = time_diff * 1000000 / hz;
+ return 0;
+}
+
+static int
+test_pflock_perf(void)
+{
+ unsigned int i;
+ uint64_t total = 0;
+
+ printf("\nPhase fair test on %u cores...\n", rte_lcore_count());
+
+ /* clear synchro and start workers */
+ synchro = 0;
+ if (rte_eal_mp_remote_launch(load_loop_fn, NULL, SKIP_MAIN) < 0)
+ return -1;
+
+ /* start synchro and launch test on main */
+ __atomic_store_n(&synchro, 1, __ATOMIC_RELAXED);
+ load_loop_fn(NULL);
+
+ rte_eal_mp_wait_lcore();
+
+ RTE_LCORE_FOREACH(i) {
+ printf("Core [%u] cost time = %"PRIu64" us\n",
+ i, time_count[i]);
+ total += time_count[i];
+ }
+
+ printf("Total cost time = %"PRIu64" us\n", total);
+ memset(time_count, 0, sizeof(time_count));
+
+ return 0;
+}
+
+/*
+ * - There is a global pflock and a table of pflocks (one per lcore).
+ *
+ * - The test function takes all of these locks and launches the
+ * ``test_pflock_per_core()`` function on each core (except the main).
+ *
+ * - The function takes the global write lock, display something,
+ * then releases the global lock.
+ * - Then, it takes the per-lcore write lock, display something, and
+ * releases the per-core lock.
+ * - Finally, a read lock is taken during 100 ms, then released.
+ *
+ * - The main function unlocks the per-lcore locks sequentially and
+ * waits between each lock. This triggers the display of a message
+ * for each core, in the correct order.
+ *
+ * Then, it tries to take the global write lock and display the last
+ * message. The autotest script checks that the message order is correct.
+ */
+static int
+pflock_test1(void)
+{
+ int i;
+
+ rte_pflock_init(&sl);
+ for (i = 0; i < RTE_MAX_LCORE; i++)
+ rte_pflock_init(&sl_tab[i]);
+
+ rte_pflock_write_lock(&sl);
+
+ RTE_LCORE_FOREACH_WORKER(i) {
+ rte_pflock_write_lock(&sl_tab[i]);
+ rte_eal_remote_launch(test_pflock_per_core, NULL, i);
+ }
+
+ rte_pflock_write_unlock(&sl);
+
+ RTE_LCORE_FOREACH_WORKER(i) {
+ rte_pflock_write_unlock(&sl_tab[i]);
+ rte_delay_ms(100);
+ }
+
+ rte_pflock_write_lock(&sl);
+ /* this message should be the last message of test */
+ printf("Global write lock taken on main core %u\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl);
+
+ rte_eal_mp_wait_lcore();
+
+ if (test_pflock_perf() < 0)
+ return -1;
+
+ return 0;
+}
+
+static int
+test_pflock(void)
+{
+ uint32_t i;
+ int32_t rc, ret;
+
+ static const struct {
+ const char *name;
+ int (*ftst)(void);
+ } test[] = {
+ {
+ .name = "pflock_test1",
+ .ftst = pflock_test1,
+ },
+ };
+
+ ret = 0;
+ for (i = 0; i != RTE_DIM(test); i++) {
+ printf("starting test %s;\n", test[i].name);
+ rc = test[i].ftst();
+ printf("test %s completed with status %d\n", test[i].name, rc);
+ ret |= rc;
+ }
+
+ return ret;
+}
+
+static int
+try_read(uint32_t lc)
+{
+ int32_t rc;
+ uint32_t i;
+
+ rc = rte_pflock_read_trylock(&try_pflock_data.lock);
+ if (rc != 0)
+ return rc;
+
+ for (i = 0; i != RTE_DIM(try_pflock_data.data.u64); i++) {
+
+ /* race condition occurred, lock doesn't work properly */
+ if (try_pflock_data.data.u64[i] != 0) {
+ printf("%s(%u) error: unexpected data pattern\n",
+ __func__, lc);
+ rte_memdump(stdout, NULL,
+ (void *)(uintptr_t)&try_pflock_data.data,
+ sizeof(try_pflock_data.data));
+ rc = -EFAULT;
+ break;
+ }
+ }
+
+ rte_pflock_read_unlock(&try_pflock_data.lock);
+ return rc;
+}
+
+static int
+try_write(uint32_t lc)
+{
+ int32_t rc;
+ uint32_t i, v;
+
+ v = RTE_MAX(lc % UINT8_MAX, 1U);
+
+ rc = rte_pflock_write_trylock(&try_pflock_data.lock);
+ if (rc != 0)
+ return rc;
+
+ /* update by bytes in reverese order */
+ for (i = RTE_DIM(try_pflock_data.data.u8); i-- != 0; ) {
+
+ /* race condition occurred, lock doesn't work properly */
+ if (try_pflock_data.data.u8[i] != 0) {
+ printf("%s:%d(%u) error: unexpected data pattern\n",
+ __func__, __LINE__, lc);
+ rte_memdump(stdout, NULL,
+ (void *)(uintptr_t)&try_pflock_data.data,
+ sizeof(try_pflock_data.data));
+ rc = -EFAULT;
+ break;
+ }
+
+ try_pflock_data.data.u8[i] = v;
+ }
+
+ /* restore by bytes in reverese order */
+ for (i = RTE_DIM(try_pflock_data.data.u8); i-- != 0; ) {
+
+ /* race condition occurred, lock doesn't work properly */
+ if (try_pflock_data.data.u8[i] != v) {
+ printf("%s:%d(%u) error: unexpected data pattern\n",
+ __func__, __LINE__, lc);
+ rte_memdump(stdout, NULL,
+ (void *)(uintptr_t)&try_pflock_data.data,
+ sizeof(try_pflock_data.data));
+ rc = -EFAULT;
+ break;
+ }
+
+ try_pflock_data.data.u8[i] = 0;
+ }
+
+ rte_pflock_write_unlock(&try_pflock_data.lock);
+ return rc;
+}
+
+static int
+try_read_lcore(__rte_unused void *data)
+{
+ int32_t rc;
+ uint32_t i, lc;
+ uint64_t ftm, stm, tm;
+ struct try_pflock_lcore *lcd;
+
+ lc = rte_lcore_id();
+ lcd = try_lcore_data + lc;
+ lcd->type = LC_TYPE_RDLOCK;
+
+ ftm = try_pflock_data.tick;
+ stm = rte_get_timer_cycles();
+
+ do {
+ for (i = 0; i != ITER_NUM; i++) {
+ rc = try_read(lc);
+ if (rc == 0)
+ lcd->stat.success++;
+ else if (rc == -EBUSY)
+ lcd->stat.fail++;
+ else
+ break;
+ rc = 0;
+ }
+ tm = rte_get_timer_cycles() - stm;
+ } while (tm < ftm && rc == 0);
+
+ lcd->rc = rc;
+ lcd->stat.tick = tm;
+ return rc;
+}
+
+static int
+try_write_lcore(__rte_unused void *data)
+{
+ int32_t rc;
+ uint32_t i, lc;
+ uint64_t ftm, stm, tm;
+ struct try_pflock_lcore *lcd;
+
+ lc = rte_lcore_id();
+ lcd = try_lcore_data + lc;
+ lcd->type = LC_TYPE_WRLOCK;
+
+ ftm = try_pflock_data.tick;
+ stm = rte_get_timer_cycles();
+
+ do {
+ for (i = 0; i != ITER_NUM; i++) {
+ rc = try_write(lc);
+ if (rc == 0)
+ lcd->stat.success++;
+ else if (rc == -EBUSY)
+ lcd->stat.fail++;
+ else
+ break;
+ rc = 0;
+ }
+ tm = rte_get_timer_cycles() - stm;
+ } while (tm < ftm && rc == 0);
+
+ lcd->rc = rc;
+ lcd->stat.tick = tm;
+ return rc;
+}
+
+static void
+print_try_lcore_stats(const struct try_pflock_lcore *tlc, uint32_t lc)
+{
+ uint64_t f, s;
+
+ f = RTE_MAX(tlc->stat.fail, 1ULL);
+ s = RTE_MAX(tlc->stat.success, 1ULL);
+
+ printf("try_lcore_data[%u]={\n"
+ "\trc=%d,\n"
+ "\ttype=%s,\n"
+ "\tfail=%" PRIu64 ",\n"
+ "\tsuccess=%" PRIu64 ",\n"
+ "\tcycles=%" PRIu64 ",\n"
+ "\tcycles/op=%#Lf,\n"
+ "\tcycles/success=%#Lf,\n"
+ "\tsuccess/fail=%#Lf,\n"
+ "};\n",
+ lc,
+ tlc->rc,
+ tlc->type == LC_TYPE_RDLOCK ? "RDLOCK" : "WRLOCK",
+ tlc->stat.fail,
+ tlc->stat.success,
+ tlc->stat.tick,
+ (long double)tlc->stat.tick /
+ (tlc->stat.fail + tlc->stat.success),
+ (long double)tlc->stat.tick / s,
+ (long double)tlc->stat.success / f);
+}
+
+static void
+collect_try_lcore_stats(struct try_pflock_lcore *tlc,
+ const struct try_pflock_lcore *lc)
+{
+ tlc->stat.tick += lc->stat.tick;
+ tlc->stat.fail += lc->stat.fail;
+ tlc->stat.success += lc->stat.success;
+}
+
+/*
+ * Process collected results:
+ * - check status
+ * - collect and print statistics
+ */
+static int
+process_try_lcore_stats(void)
+{
+ int32_t rc;
+ uint32_t lc, rd, wr;
+ struct try_pflock_lcore rlc, wlc;
+
+ memset(&rlc, 0, sizeof(rlc));
+ memset(&wlc, 0, sizeof(wlc));
+
+ rlc.type = LC_TYPE_RDLOCK;
+ wlc.type = LC_TYPE_WRLOCK;
+ rd = 0;
+ wr = 0;
+
+ rc = 0;
+ RTE_LCORE_FOREACH(lc) {
+ rc |= try_lcore_data[lc].rc;
+ if (try_lcore_data[lc].type == LC_TYPE_RDLOCK) {
+ collect_try_lcore_stats(&rlc, try_lcore_data + lc);
+ rd++;
+ } else {
+ collect_try_lcore_stats(&wlc, try_lcore_data + lc);
+ wr++;
+ }
+ }
+
+ if (rc == 0) {
+ RTE_LCORE_FOREACH(lc)
+ print_try_lcore_stats(try_lcore_data + lc, lc);
+
+ if (rd != 0) {
+ printf("aggregated stats for %u RDLOCK cores:\n", rd);
+ print_try_lcore_stats(&rlc, rd);
+ }
+
+ if (wr != 0) {
+ printf("aggregated stats for %u WRLOCK cores:\n", wr);
+ print_try_lcore_stats(&wlc, wr);
+ }
+ }
+
+ return rc;
+}
+
+static void
+try_test_reset(void)
+{
+ memset(&try_lcore_data, 0, sizeof(try_lcore_data));
+ memset(&try_pflock_data, 0, sizeof(try_pflock_data));
+ try_pflock_data.tick = TEST_SEC * rte_get_tsc_hz();
+}
+
+/* all lcores grab RDLOCK */
+static int
+try_pflock_test_rda(void)
+{
+ try_test_reset();
+
+ /* start read test on all avaialble lcores */
+ rte_eal_mp_remote_launch(try_read_lcore, NULL, CALL_MAIN);
+ rte_eal_mp_wait_lcore();
+
+ return process_try_lcore_stats();
+}
+
+/* all worker lcores grab RDLOCK, main one grabs WRLOCK */
+static int
+try_pflock_test_rds_wrm(void)
+{
+ try_test_reset();
+
+ rte_eal_mp_remote_launch(try_read_lcore, NULL, SKIP_MAIN);
+ try_write_lcore(NULL);
+ rte_eal_mp_wait_lcore();
+
+ return process_try_lcore_stats();
+}
+
+/* main and even worker lcores grab RDLOCK, odd lcores grab WRLOCK */
+static int
+try_pflock_test_rde_wro(void)
+{
+ uint32_t lc, mlc;
+
+ try_test_reset();
+
+ mlc = rte_get_main_lcore();
+
+ RTE_LCORE_FOREACH(lc) {
+ if (lc != mlc) {
+ if ((lc & 1) == 0)
+ rte_eal_remote_launch(try_read_lcore,
+ NULL, lc);
+ else
+ rte_eal_remote_launch(try_write_lcore,
+ NULL, lc);
+ }
+ }
+ try_read_lcore(NULL);
+ rte_eal_mp_wait_lcore();
+
+ return process_try_lcore_stats();
+}
+
+REGISTER_TEST_COMMAND(pflock_autotest, test_pflock);
+
+/* subtests used in meson for CI */
+REGISTER_TEST_COMMAND(pflock_test1_autotest, pflock_test1);
+REGISTER_TEST_COMMAND(pflock_rda_autotest, try_pflock_test_rda);
+REGISTER_TEST_COMMAND(pflock_rds_wrm_autotest, try_pflock_test_rds_wrm);
+REGISTER_TEST_COMMAND(pflock_rde_wro_autotest, try_pflock_test_rde_wro);
diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build
index 770766de1a34..2c3cff61bed6 100644
--- a/lib/librte_eal/arm/include/meson.build
+++ b/lib/librte_eal/arm/include/meson.build
@@ -21,6 +21,7 @@ arch_headers = files(
'rte_pause_32.h',
'rte_pause_64.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch_32.h',
'rte_prefetch_64.h',
diff --git a/lib/librte_eal/arm/include/rte_pflock.h b/lib/librte_eal/arm/include/rte_pflock.h
new file mode 100644
index 000000000000..bb9934eec469
--- /dev/null
+++ b/lib/librte_eal/arm/include/rte_pflock.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#ifndef _RTE_PFLOCK_ARM_H_
+#define _RTE_PFLOCK_ARM_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_ARM_H_ */
diff --git a/lib/librte_eal/include/generic/rte_pflock.h b/lib/librte_eal/include/generic/rte_pflock.h
new file mode 100644
index 000000000000..6808c70c34a2
--- /dev/null
+++ b/lib/librte_eal/include/generic/rte_pflock.h
@@ -0,0 +1,273 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corp.
+ * Copyright 2011-2015 Samy Al Bahra.
+ * All rights reserved.
+ */
+
+#ifndef _RTE_PFLOCK_H_
+#define _RTE_PFLOCK_H_
+
+/**
+ * @file
+ *
+ * Phase-fair locks
+ *
+ * This file defines an API for Phase Fair reader writer locks,
+ * which is a variant of typical reader-writer locks that prevent
+ * starvation. In this type of lock, readers and writers alternate.
+ * This significantly reduces the worst-case blocking for readers and writers.
+ *
+ * This is an implementation derived from FreeBSD
+ * based on the work described in:
+ * Brandenburg, B. and Anderson, J. 2010. Spin-Based
+ * Reader-Writer Synchronization for Multiprocessor Real-Time Systems
+ *
+ * All locks must be initialised before use, and only initialised once.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <rte_common.h>
+#include <rte_pause.h>
+
+/**
+ * The rte_pflock_t type.
+ */
+struct rte_pflock {
+ union rte_pflock_ticket {
+ uint32_t tickets;
+ struct {
+ uint16_t in;
+ uint16_t out;
+ };
+ } rd, wr;
+};
+typedef struct rte_pflock rte_pflock_t;
+
+/**
+ * Constants used to map the bits in reader counter
+ *
+ * +-----------------+-+-+
+ * | Readers |W|P|
+ * | |R|H|
+ * +-----------------+-+-+
+ */
+
+#define RTE_PFLOCK_LSB 0xFFF0
+#define RTE_PFLOCK_RINC 0x100 /* Reader increment value. */
+#define RTE_PFLOCK_WBITS 0x3 /* Writer bits in reader. */
+#define RTE_PFLOCK_PRES 0x2 /* Writer present bit. */
+#define RTE_PFLOCK_PHID 0x1 /* Phase ID bit. */
+
+/**
+ * A static pflock initializer.
+ */
+#define RTE_PFLOCK_INITIALIZER { }
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Initialize the pflock to an unlocked state.
+ *
+ * @param pf
+ * A pointer to the pflock.
+ */
+__rte_experimental
+static inline void
+rte_pflock_init(struct rte_pflock *pf)
+{
+ pf->rd.tickets = 0;
+ pf->wr.tickets = 0;
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Take a pflock for read.
+ *
+ * @param pf
+ * A pointer to a pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_read_lock(rte_pflock_t *pf)
+{
+ uint32_t w;
+
+ /*
+ * If no writer is present, then the operation has completed
+ * successfully.
+ */
+ w = __atomic_fetch_add(&pf->rd.in, RTE_PFLOCK_RINC, __ATOMIC_ACQ_REL) & RTE_PFLOCK_WBITS;
+ if (w == 0)
+ return;
+
+ /* Wait for current write phase to complete. */
+ while ((__atomic_load_n(&pf->rd.in, __ATOMIC_ACQUIRE) & RTE_PFLOCK_WBITS) == w)
+ rte_pause();
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Release a pflock locked for reading.
+ *
+ * @param pf
+ * A pointer to the pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_read_unlock(rte_pflock_t *pf)
+{
+ __atomic_fetch_add(&pf->rd.out, RTE_PFLOCK_RINC, __ATOMIC_RELEASE);
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Try to take a pflock for reading
+ *
+ * @param pf
+ * A pointer to a pflock structure.
+ * @return
+ * - zero if the lock is successfully taken
+ * - -EBUSY if lock could not be acquired for reading because a
+ * writer holds the lock
+ */
+__rte_experimental
+static inline int
+rte_pflock_read_trylock(rte_pflock_t *pf)
+{
+ union rte_pflock_ticket old, new;
+
+ /* Get current state of the lock */
+ old.tickets = __atomic_load_n(&pf->rd.tickets, __ATOMIC_RELAXED);
+
+ /* loop until writer shows up */
+ while ((old.in & RTE_PFLOCK_WBITS) == 0) {
+ new.out = old.out;
+ new.in = old.in + RTE_PFLOCK_RINC;
+ if (__atomic_compare_exchange_n(&pf->rd.tickets, &old.tickets, new.tickets,
+ 0, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED))
+ return 0; /* got it */
+
+ /* either new reader got in (so retry) or a writer */
+ }
+
+ /* If writer is present then we are busy */
+ return -EBUSY;
+}
+
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Take the pflock for write.
+ *
+ * @param pf
+ * A pointer to the ticketlock.
+ */
+__rte_experimental
+static inline void
+rte_pflock_write_lock(rte_pflock_t *pf)
+{
+ uint16_t ticket;
+
+ /* Acquire ownership of write-phase. */
+ ticket = __atomic_fetch_add(&pf->wr.in, 1, __ATOMIC_ACQUIRE);
+ rte_wait_until_equal_16(&pf->wr.out, ticket, __ATOMIC_RELAXED);
+
+ /*
+ * Acquire ticket on read-side in order to allow them
+ * to flush. Indicates to any incoming reader that a
+ * write-phase is pending.
+ *
+ * Need ACQUIRE to prevent speculative execution of the wait loop
+ */
+ ticket = __atomic_fetch_add(&pf->rd.in,
+ (ticket & RTE_PFLOCK_PHID) | RTE_PFLOCK_PRES,
+ __ATOMIC_ACQUIRE);
+
+ /* Wait for any pending readers to flush. */
+ rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_RELAXED);
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Release a pflock held for writing.
+ *
+ * @param pf
+ * A pointer to a pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_write_unlock(rte_pflock_t *pf)
+{
+ /* Migrate from write phase to read phase. */
+ __atomic_fetch_and(&pf->rd.in, RTE_PFLOCK_LSB, __ATOMIC_RELEASE);
+
+ /* Allow other writers to continue. */
+ __atomic_fetch_add(&pf->wr.out, 1, __ATOMIC_RELEASE);
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Try to take the pflock for write.
+ *
+ * @param pf
+ * A pointer to the pflock.
+ * @return
+ * - zero if the lock is successfully taken
+ * - -EBUSY if lock could not be acquired for writing because
+ * another writer holds the lock
+ */
+__rte_experimental
+static inline int
+rte_pflock_write_trylock(rte_pflock_t *pf)
+{
+ union rte_pflock_ticket old, new;
+ uint16_t ticket;
+
+ /* Get current state of the lock */
+ old.tickets = __atomic_load_n(&pf->wr.tickets, __ATOMIC_RELAXED);
+ new.out = old.out;
+ new.in = old.in + 1;
+ ticket = new.in;
+
+ /* if writer is already present then too busy */
+ if (old.out != new.in ||
+ !__atomic_compare_exchange_n(&pf->wr.tickets, &old.tickets, new.tickets,
+ 0, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED))
+ return -EBUSY; /* another writer is present already */
+
+ /*
+ * We now own the write phase, but still need to tell
+ * readers and wait for them.
+ *
+ * Need ACQUIRE semantics to avoid speculative execution of wait loop
+ */
+ ticket = __atomic_fetch_add(&pf->rd.in,
+ (ticket & RTE_PFLOCK_PHID) | RTE_PFLOCK_PRES,
+ __ATOMIC_ACQUIRE);
+
+ /* Wait for any pending readers to flush. */
+ rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_RELAXED);
+ return 0;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RTE_PFLOCK_H */
diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build
index dae40ede546e..7692a531ccba 100644
--- a/lib/librte_eal/ppc/include/meson.build
+++ b/lib/librte_eal/ppc/include/meson.build
@@ -11,6 +11,7 @@ arch_headers = files(
'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rwlock.h',
diff --git a/lib/librte_eal/ppc/include/rte_pflock.h b/lib/librte_eal/ppc/include/rte_pflock.h
new file mode 100644
index 000000000000..e7b875ac56a8
--- /dev/null
+++ b/lib/librte_eal/ppc/include/rte_pflock.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ */
+#ifndef _RTE_PFLOCK_PPC_64_H_
+#define _RTE_PFLOCK_PPC_64_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_PPC_64_H_ */
diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build
index 1a6ad0b17342..f43645c20899 100644
--- a/lib/librte_eal/x86/include/meson.build
+++ b/lib/librte_eal/x86/include/meson.build
@@ -10,6 +10,7 @@ arch_headers = files(
'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rtm.h',
diff --git a/lib/librte_eal/x86/include/rte_pflock.h b/lib/librte_eal/x86/include/rte_pflock.h
new file mode 100644
index 000000000000..c2d876062c08
--- /dev/null
+++ b/lib/librte_eal/x86/include/rte_pflock.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#ifndef _RTE_PFLOCK_X86_64_H_
+#define _RTE_PFLOCK_X86_64_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_X86_64_H_ */
--
2.30.1
^ permalink raw reply [flat|nested] 27+ messages in thread* [dpdk-dev] [PATCH v3] pflock: implementation of phase-fair reader writer locks
2021-02-12 1:38 ` [dpdk-dev] [RFC] pflock: add implementation of phase-fair locks Stephen Hemminger
2021-02-28 17:21 ` [dpdk-dev] [PATCH v1] pflock: implementation of phase-fair reader writer locks Stephen Hemminger
2021-03-03 18:30 ` [dpdk-dev] [PATCH v2] " Stephen Hemminger
@ 2021-03-03 19:19 ` Stephen Hemminger
2021-03-26 17:17 ` Stephen Hemminger
2021-03-29 3:14 ` Honnappa Nagarahalli
2021-03-30 5:00 ` [dpdk-dev] [PATCH v4] pflock: add " Stephen Hemminger
2021-04-02 1:42 ` [dpdk-dev] [PATCH v5] pflock: implementation of " Stephen Hemminger
4 siblings, 2 replies; 27+ messages in thread
From: Stephen Hemminger @ 2021-03-03 19:19 UTC (permalink / raw)
To: honnappa.nagarahalli, dev; +Cc: Stephen Hemminger, Stephen Hemminger
This is a new type of reader-writer lock that provides better fairness
guarantees which makes it better for typical DPDK applications.
They lock internally uses two ticket pools, one for readers and one
for writers.
Phase fair reader writer locks ensure that neither reader or writer will be
starved. Neither reader or writer are preferred, they execute in
alternating phases. All operations of the same time (reader or writer)
that try to acquire the lock are handled in FIFO order. Write
operations are exclusive, and multiple read operations can be run
together (until a write arrives).
A similar implementation is in Concurrency Kit package in FreeBSD.
For more information see:
"Reader-Writer Synchronization for Shared-Memory Multiprocessor
Real-Time Systems",
http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
v3 - fix some spelling errors inherited in app/test/test_pflock
app/test/meson.build | 6 +
app/test/test_pflock.c | 542 ++++++++++++++++++++
lib/librte_eal/arm/include/meson.build | 1 +
lib/librte_eal/arm/include/rte_pflock.h | 18 +
lib/librte_eal/include/generic/rte_pflock.h | 273 ++++++++++
lib/librte_eal/ppc/include/meson.build | 1 +
lib/librte_eal/ppc/include/rte_pflock.h | 16 +
lib/librte_eal/x86/include/meson.build | 1 +
lib/librte_eal/x86/include/rte_pflock.h | 18 +
9 files changed, 876 insertions(+)
create mode 100644 app/test/test_pflock.c
create mode 100644 lib/librte_eal/arm/include/rte_pflock.h
create mode 100644 lib/librte_eal/include/generic/rte_pflock.h
create mode 100644 lib/librte_eal/ppc/include/rte_pflock.h
create mode 100644 lib/librte_eal/x86/include/rte_pflock.h
diff --git a/app/test/meson.build b/app/test/meson.build
index 561e493a2944..134098de9ac2 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -90,6 +90,7 @@ test_sources = files('commands.c',
'test_mcslock.c',
'test_mp_secondary.c',
'test_per_lcore.c',
+ 'test_pflock.c',
'test_pmd_perf.c',
'test_power.c',
'test_power_cpufreq.c',
@@ -228,6 +229,11 @@ fast_tests = [
['meter_autotest', true],
['multiprocess_autotest', false],
['per_lcore_autotest', true],
+ ['pflock_autotest', true],
+ ['pflock_test1_autotest', true],
+ ['pflock_rda_autotest', true],
+ ['pflock_rds_wrm_autotest', true],
+ ['pflock_rde_wro_autotest', true],
['prefetch_autotest', true],
['rcu_qsbr_autotest', true],
['red_autotest', true],
diff --git a/app/test/test_pflock.c b/app/test/test_pflock.c
new file mode 100644
index 000000000000..f46610b73914
--- /dev/null
+++ b/app/test/test_pflock.c
@@ -0,0 +1,542 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <unistd.h>
+#include <sys/queue.h>
+#include <string.h>
+
+#include <rte_common.h>
+#include <rte_memory.h>
+#include <rte_per_lcore.h>
+#include <rte_launch.h>
+#include <rte_pause.h>
+#include <rte_pflock.h>
+#include <rte_eal.h>
+#include <rte_lcore.h>
+#include <rte_cycles.h>
+
+#include "test.h"
+
+/*
+ * phase fair lock test
+ * ===========
+ * Provides UT for phase fair lock API.
+ * Main concern is on functional testing, but also provides some
+ * performance measurements.
+ * Obviously for proper testing need to be executed with more than one lcore.
+ */
+
+#define ITER_NUM 0x80
+
+#define TEST_SEC 5
+
+static rte_pflock_t sl;
+static rte_pflock_t sl_tab[RTE_MAX_LCORE];
+static uint32_t synchro;
+
+enum {
+ LC_TYPE_RDLOCK,
+ LC_TYPE_WRLOCK,
+};
+
+static struct {
+ rte_pflock_t lock;
+ uint64_t tick;
+ volatile union {
+ uint8_t u8[RTE_CACHE_LINE_SIZE];
+ uint64_t u64[RTE_CACHE_LINE_SIZE / sizeof(uint64_t)];
+ } data;
+} __rte_cache_aligned try_pflock_data;
+
+struct try_pflock_lcore {
+ int32_t rc;
+ int32_t type;
+ struct {
+ uint64_t tick;
+ uint64_t fail;
+ uint64_t success;
+ } stat;
+} __rte_cache_aligned;
+
+static struct try_pflock_lcore try_lcore_data[RTE_MAX_LCORE];
+
+static int
+test_pflock_per_core(__rte_unused void *arg)
+{
+ rte_pflock_write_lock(&sl);
+ printf("Global write lock taken on core %u\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl);
+
+ rte_pflock_write_lock(&sl_tab[rte_lcore_id()]);
+ printf("Hello from core %u !\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl_tab[rte_lcore_id()]);
+
+ rte_pflock_read_lock(&sl);
+ printf("Global read lock taken on core %u\n", rte_lcore_id());
+ rte_delay_ms(100);
+ printf("Release global read lock on core %u\n", rte_lcore_id());
+ rte_pflock_read_unlock(&sl);
+
+ return 0;
+}
+
+static rte_pflock_t lk = RTE_PFLOCK_INITIALIZER;
+static volatile uint64_t pflock_data;
+static uint64_t time_count[RTE_MAX_LCORE] = {0};
+
+#define MAX_LOOP 10000
+#define TEST_PFLOCK_DEBUG 0
+
+static int
+load_loop_fn(__rte_unused void *arg)
+{
+ uint64_t time_diff = 0, begin;
+ uint64_t hz = rte_get_timer_hz();
+ uint64_t lcount = 0;
+ const unsigned int lcore = rte_lcore_id();
+
+ /* wait synchro for workers */
+ if (lcore != rte_get_main_lcore())
+ rte_wait_until_equal_32(&synchro, 1, __ATOMIC_RELAXED);
+
+ begin = rte_rdtsc_precise();
+ while (lcount < MAX_LOOP) {
+ rte_pflock_write_lock(&lk);
+ ++pflock_data;
+ rte_pflock_write_unlock(&lk);
+
+ rte_pflock_read_lock(&lk);
+ if (TEST_PFLOCK_DEBUG && !(lcount % 100))
+ printf("Core [%u] pflock_data = %"PRIu64"\n",
+ lcore, pflock_data);
+ rte_pflock_read_unlock(&lk);
+
+ lcount++;
+ /* delay to make lock duty cycle slightly realistic */
+ rte_pause();
+ }
+
+ time_diff = rte_rdtsc_precise() - begin;
+ time_count[lcore] = time_diff * 1000000 / hz;
+ return 0;
+}
+
+static int
+test_pflock_perf(void)
+{
+ unsigned int i;
+ uint64_t total = 0;
+
+ printf("\nPhase fair test on %u cores...\n", rte_lcore_count());
+
+ /* clear synchro and start workers */
+ synchro = 0;
+ if (rte_eal_mp_remote_launch(load_loop_fn, NULL, SKIP_MAIN) < 0)
+ return -1;
+
+ /* start synchro and launch test on main */
+ __atomic_store_n(&synchro, 1, __ATOMIC_RELAXED);
+ load_loop_fn(NULL);
+
+ rte_eal_mp_wait_lcore();
+
+ RTE_LCORE_FOREACH(i) {
+ printf("Core [%u] cost time = %"PRIu64" us\n",
+ i, time_count[i]);
+ total += time_count[i];
+ }
+
+ printf("Total cost time = %"PRIu64" us\n", total);
+ memset(time_count, 0, sizeof(time_count));
+
+ return 0;
+}
+
+/*
+ * - There is a global pflock and a table of pflocks (one per lcore).
+ *
+ * - The test function takes all of these locks and launches the
+ * ``test_pflock_per_core()`` function on each core (except the main).
+ *
+ * - The function takes the global write lock, display something,
+ * then releases the global lock.
+ * - Then, it takes the per-lcore write lock, display something, and
+ * releases the per-core lock.
+ * - Finally, a read lock is taken during 100 ms, then released.
+ *
+ * - The main function unlocks the per-lcore locks sequentially and
+ * waits between each lock. This triggers the display of a message
+ * for each core, in the correct order.
+ *
+ * Then, it tries to take the global write lock and display the last
+ * message. The autotest script checks that the message order is correct.
+ */
+static int
+pflock_test1(void)
+{
+ int i;
+
+ rte_pflock_init(&sl);
+ for (i = 0; i < RTE_MAX_LCORE; i++)
+ rte_pflock_init(&sl_tab[i]);
+
+ rte_pflock_write_lock(&sl);
+
+ RTE_LCORE_FOREACH_WORKER(i) {
+ rte_pflock_write_lock(&sl_tab[i]);
+ rte_eal_remote_launch(test_pflock_per_core, NULL, i);
+ }
+
+ rte_pflock_write_unlock(&sl);
+
+ RTE_LCORE_FOREACH_WORKER(i) {
+ rte_pflock_write_unlock(&sl_tab[i]);
+ rte_delay_ms(100);
+ }
+
+ rte_pflock_write_lock(&sl);
+ /* this message should be the last message of test */
+ printf("Global write lock taken on main core %u\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl);
+
+ rte_eal_mp_wait_lcore();
+
+ if (test_pflock_perf() < 0)
+ return -1;
+
+ return 0;
+}
+
+static int
+test_pflock(void)
+{
+ uint32_t i;
+ int32_t rc, ret;
+
+ static const struct {
+ const char *name;
+ int (*ftst)(void);
+ } test[] = {
+ {
+ .name = "pflock_test1",
+ .ftst = pflock_test1,
+ },
+ };
+
+ ret = 0;
+ for (i = 0; i != RTE_DIM(test); i++) {
+ printf("starting test %s;\n", test[i].name);
+ rc = test[i].ftst();
+ printf("test %s completed with status %d\n", test[i].name, rc);
+ ret |= rc;
+ }
+
+ return ret;
+}
+
+static int
+try_read(uint32_t lc)
+{
+ int32_t rc;
+ uint32_t i;
+
+ rc = rte_pflock_read_trylock(&try_pflock_data.lock);
+ if (rc != 0)
+ return rc;
+
+ for (i = 0; i != RTE_DIM(try_pflock_data.data.u64); i++) {
+
+ /* race condition occurred, lock doesn't work properly */
+ if (try_pflock_data.data.u64[i] != 0) {
+ printf("%s(%u) error: unexpected data pattern\n",
+ __func__, lc);
+ rte_memdump(stdout, NULL,
+ (void *)(uintptr_t)&try_pflock_data.data,
+ sizeof(try_pflock_data.data));
+ rc = -EFAULT;
+ break;
+ }
+ }
+
+ rte_pflock_read_unlock(&try_pflock_data.lock);
+ return rc;
+}
+
+static int
+try_write(uint32_t lc)
+{
+ int32_t rc;
+ uint32_t i, v;
+
+ v = RTE_MAX(lc % UINT8_MAX, 1U);
+
+ rc = rte_pflock_write_trylock(&try_pflock_data.lock);
+ if (rc != 0)
+ return rc;
+
+ /* update by bytes in reverse order */
+ for (i = RTE_DIM(try_pflock_data.data.u8); i-- != 0; ) {
+
+ /* race condition occurred, lock doesn't work properly */
+ if (try_pflock_data.data.u8[i] != 0) {
+ printf("%s:%d(%u) error: unexpected data pattern\n",
+ __func__, __LINE__, lc);
+ rte_memdump(stdout, NULL,
+ (void *)(uintptr_t)&try_pflock_data.data,
+ sizeof(try_pflock_data.data));
+ rc = -EFAULT;
+ break;
+ }
+
+ try_pflock_data.data.u8[i] = v;
+ }
+
+ /* restore by bytes in reverse order */
+ for (i = RTE_DIM(try_pflock_data.data.u8); i-- != 0; ) {
+
+ /* race condition occurred, lock doesn't work properly */
+ if (try_pflock_data.data.u8[i] != v) {
+ printf("%s:%d(%u) error: unexpected data pattern\n",
+ __func__, __LINE__, lc);
+ rte_memdump(stdout, NULL,
+ (void *)(uintptr_t)&try_pflock_data.data,
+ sizeof(try_pflock_data.data));
+ rc = -EFAULT;
+ break;
+ }
+
+ try_pflock_data.data.u8[i] = 0;
+ }
+
+ rte_pflock_write_unlock(&try_pflock_data.lock);
+ return rc;
+}
+
+static int
+try_read_lcore(__rte_unused void *data)
+{
+ int32_t rc;
+ uint32_t i, lc;
+ uint64_t ftm, stm, tm;
+ struct try_pflock_lcore *lcd;
+
+ lc = rte_lcore_id();
+ lcd = try_lcore_data + lc;
+ lcd->type = LC_TYPE_RDLOCK;
+
+ ftm = try_pflock_data.tick;
+ stm = rte_get_timer_cycles();
+
+ do {
+ for (i = 0; i != ITER_NUM; i++) {
+ rc = try_read(lc);
+ if (rc == 0)
+ lcd->stat.success++;
+ else if (rc == -EBUSY)
+ lcd->stat.fail++;
+ else
+ break;
+ rc = 0;
+ }
+ tm = rte_get_timer_cycles() - stm;
+ } while (tm < ftm && rc == 0);
+
+ lcd->rc = rc;
+ lcd->stat.tick = tm;
+ return rc;
+}
+
+static int
+try_write_lcore(__rte_unused void *data)
+{
+ int32_t rc;
+ uint32_t i, lc;
+ uint64_t ftm, stm, tm;
+ struct try_pflock_lcore *lcd;
+
+ lc = rte_lcore_id();
+ lcd = try_lcore_data + lc;
+ lcd->type = LC_TYPE_WRLOCK;
+
+ ftm = try_pflock_data.tick;
+ stm = rte_get_timer_cycles();
+
+ do {
+ for (i = 0; i != ITER_NUM; i++) {
+ rc = try_write(lc);
+ if (rc == 0)
+ lcd->stat.success++;
+ else if (rc == -EBUSY)
+ lcd->stat.fail++;
+ else
+ break;
+ rc = 0;
+ }
+ tm = rte_get_timer_cycles() - stm;
+ } while (tm < ftm && rc == 0);
+
+ lcd->rc = rc;
+ lcd->stat.tick = tm;
+ return rc;
+}
+
+static void
+print_try_lcore_stats(const struct try_pflock_lcore *tlc, uint32_t lc)
+{
+ uint64_t f, s;
+
+ f = RTE_MAX(tlc->stat.fail, 1ULL);
+ s = RTE_MAX(tlc->stat.success, 1ULL);
+
+ printf("try_lcore_data[%u]={\n"
+ "\trc=%d,\n"
+ "\ttype=%s,\n"
+ "\tfail=%" PRIu64 ",\n"
+ "\tsuccess=%" PRIu64 ",\n"
+ "\tcycles=%" PRIu64 ",\n"
+ "\tcycles/op=%#Lf,\n"
+ "\tcycles/success=%#Lf,\n"
+ "\tsuccess/fail=%#Lf,\n"
+ "};\n",
+ lc,
+ tlc->rc,
+ tlc->type == LC_TYPE_RDLOCK ? "RDLOCK" : "WRLOCK",
+ tlc->stat.fail,
+ tlc->stat.success,
+ tlc->stat.tick,
+ (long double)tlc->stat.tick /
+ (tlc->stat.fail + tlc->stat.success),
+ (long double)tlc->stat.tick / s,
+ (long double)tlc->stat.success / f);
+}
+
+static void
+collect_try_lcore_stats(struct try_pflock_lcore *tlc,
+ const struct try_pflock_lcore *lc)
+{
+ tlc->stat.tick += lc->stat.tick;
+ tlc->stat.fail += lc->stat.fail;
+ tlc->stat.success += lc->stat.success;
+}
+
+/*
+ * Process collected results:
+ * - check status
+ * - collect and print statistics
+ */
+static int
+process_try_lcore_stats(void)
+{
+ int32_t rc;
+ uint32_t lc, rd, wr;
+ struct try_pflock_lcore rlc, wlc;
+
+ memset(&rlc, 0, sizeof(rlc));
+ memset(&wlc, 0, sizeof(wlc));
+
+ rlc.type = LC_TYPE_RDLOCK;
+ wlc.type = LC_TYPE_WRLOCK;
+ rd = 0;
+ wr = 0;
+
+ rc = 0;
+ RTE_LCORE_FOREACH(lc) {
+ rc |= try_lcore_data[lc].rc;
+ if (try_lcore_data[lc].type == LC_TYPE_RDLOCK) {
+ collect_try_lcore_stats(&rlc, try_lcore_data + lc);
+ rd++;
+ } else {
+ collect_try_lcore_stats(&wlc, try_lcore_data + lc);
+ wr++;
+ }
+ }
+
+ if (rc == 0) {
+ RTE_LCORE_FOREACH(lc)
+ print_try_lcore_stats(try_lcore_data + lc, lc);
+
+ if (rd != 0) {
+ printf("aggregated stats for %u RDLOCK cores:\n", rd);
+ print_try_lcore_stats(&rlc, rd);
+ }
+
+ if (wr != 0) {
+ printf("aggregated stats for %u WRLOCK cores:\n", wr);
+ print_try_lcore_stats(&wlc, wr);
+ }
+ }
+
+ return rc;
+}
+
+static void
+try_test_reset(void)
+{
+ memset(&try_lcore_data, 0, sizeof(try_lcore_data));
+ memset(&try_pflock_data, 0, sizeof(try_pflock_data));
+ try_pflock_data.tick = TEST_SEC * rte_get_tsc_hz();
+}
+
+/* all lcores grab RDLOCK */
+static int
+try_pflock_test_rda(void)
+{
+ try_test_reset();
+
+ /* start read test on all available lcores */
+ rte_eal_mp_remote_launch(try_read_lcore, NULL, CALL_MAIN);
+ rte_eal_mp_wait_lcore();
+
+ return process_try_lcore_stats();
+}
+
+/* all worker lcores grab RDLOCK, main one grabs WRLOCK */
+static int
+try_pflock_test_rds_wrm(void)
+{
+ try_test_reset();
+
+ rte_eal_mp_remote_launch(try_read_lcore, NULL, SKIP_MAIN);
+ try_write_lcore(NULL);
+ rte_eal_mp_wait_lcore();
+
+ return process_try_lcore_stats();
+}
+
+/* main and even worker lcores grab RDLOCK, odd lcores grab WRLOCK */
+static int
+try_pflock_test_rde_wro(void)
+{
+ uint32_t lc, mlc;
+
+ try_test_reset();
+
+ mlc = rte_get_main_lcore();
+
+ RTE_LCORE_FOREACH(lc) {
+ if (lc != mlc) {
+ if ((lc & 1) == 0)
+ rte_eal_remote_launch(try_read_lcore,
+ NULL, lc);
+ else
+ rte_eal_remote_launch(try_write_lcore,
+ NULL, lc);
+ }
+ }
+ try_read_lcore(NULL);
+ rte_eal_mp_wait_lcore();
+
+ return process_try_lcore_stats();
+}
+
+REGISTER_TEST_COMMAND(pflock_autotest, test_pflock);
+
+/* subtests used in meson for CI */
+REGISTER_TEST_COMMAND(pflock_test1_autotest, pflock_test1);
+REGISTER_TEST_COMMAND(pflock_rda_autotest, try_pflock_test_rda);
+REGISTER_TEST_COMMAND(pflock_rds_wrm_autotest, try_pflock_test_rds_wrm);
+REGISTER_TEST_COMMAND(pflock_rde_wro_autotest, try_pflock_test_rde_wro);
diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build
index 770766de1a34..2c3cff61bed6 100644
--- a/lib/librte_eal/arm/include/meson.build
+++ b/lib/librte_eal/arm/include/meson.build
@@ -21,6 +21,7 @@ arch_headers = files(
'rte_pause_32.h',
'rte_pause_64.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch_32.h',
'rte_prefetch_64.h',
diff --git a/lib/librte_eal/arm/include/rte_pflock.h b/lib/librte_eal/arm/include/rte_pflock.h
new file mode 100644
index 000000000000..bb9934eec469
--- /dev/null
+++ b/lib/librte_eal/arm/include/rte_pflock.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#ifndef _RTE_PFLOCK_ARM_H_
+#define _RTE_PFLOCK_ARM_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_ARM_H_ */
diff --git a/lib/librte_eal/include/generic/rte_pflock.h b/lib/librte_eal/include/generic/rte_pflock.h
new file mode 100644
index 000000000000..6808c70c34a2
--- /dev/null
+++ b/lib/librte_eal/include/generic/rte_pflock.h
@@ -0,0 +1,273 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corp.
+ * Copyright 2011-2015 Samy Al Bahra.
+ * All rights reserved.
+ */
+
+#ifndef _RTE_PFLOCK_H_
+#define _RTE_PFLOCK_H_
+
+/**
+ * @file
+ *
+ * Phase-fair locks
+ *
+ * This file defines an API for Phase Fair reader writer locks,
+ * which is a variant of typical reader-writer locks that prevent
+ * starvation. In this type of lock, readers and writers alternate.
+ * This significantly reduces the worst-case blocking for readers and writers.
+ *
+ * This is an implementation derived from FreeBSD
+ * based on the work described in:
+ * Brandenburg, B. and Anderson, J. 2010. Spin-Based
+ * Reader-Writer Synchronization for Multiprocessor Real-Time Systems
+ *
+ * All locks must be initialised before use, and only initialised once.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <rte_common.h>
+#include <rte_pause.h>
+
+/**
+ * The rte_pflock_t type.
+ */
+struct rte_pflock {
+ union rte_pflock_ticket {
+ uint32_t tickets;
+ struct {
+ uint16_t in;
+ uint16_t out;
+ };
+ } rd, wr;
+};
+typedef struct rte_pflock rte_pflock_t;
+
+/**
+ * Constants used to map the bits in reader counter
+ *
+ * +-----------------+-+-+
+ * | Readers |W|P|
+ * | |R|H|
+ * +-----------------+-+-+
+ */
+
+#define RTE_PFLOCK_LSB 0xFFF0
+#define RTE_PFLOCK_RINC 0x100 /* Reader increment value. */
+#define RTE_PFLOCK_WBITS 0x3 /* Writer bits in reader. */
+#define RTE_PFLOCK_PRES 0x2 /* Writer present bit. */
+#define RTE_PFLOCK_PHID 0x1 /* Phase ID bit. */
+
+/**
+ * A static pflock initializer.
+ */
+#define RTE_PFLOCK_INITIALIZER { }
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Initialize the pflock to an unlocked state.
+ *
+ * @param pf
+ * A pointer to the pflock.
+ */
+__rte_experimental
+static inline void
+rte_pflock_init(struct rte_pflock *pf)
+{
+ pf->rd.tickets = 0;
+ pf->wr.tickets = 0;
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Take a pflock for read.
+ *
+ * @param pf
+ * A pointer to a pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_read_lock(rte_pflock_t *pf)
+{
+ uint32_t w;
+
+ /*
+ * If no writer is present, then the operation has completed
+ * successfully.
+ */
+ w = __atomic_fetch_add(&pf->rd.in, RTE_PFLOCK_RINC, __ATOMIC_ACQ_REL) & RTE_PFLOCK_WBITS;
+ if (w == 0)
+ return;
+
+ /* Wait for current write phase to complete. */
+ while ((__atomic_load_n(&pf->rd.in, __ATOMIC_ACQUIRE) & RTE_PFLOCK_WBITS) == w)
+ rte_pause();
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Release a pflock locked for reading.
+ *
+ * @param pf
+ * A pointer to the pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_read_unlock(rte_pflock_t *pf)
+{
+ __atomic_fetch_add(&pf->rd.out, RTE_PFLOCK_RINC, __ATOMIC_RELEASE);
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Try to take a pflock for reading
+ *
+ * @param pf
+ * A pointer to a pflock structure.
+ * @return
+ * - zero if the lock is successfully taken
+ * - -EBUSY if lock could not be acquired for reading because a
+ * writer holds the lock
+ */
+__rte_experimental
+static inline int
+rte_pflock_read_trylock(rte_pflock_t *pf)
+{
+ union rte_pflock_ticket old, new;
+
+ /* Get current state of the lock */
+ old.tickets = __atomic_load_n(&pf->rd.tickets, __ATOMIC_RELAXED);
+
+ /* loop until writer shows up */
+ while ((old.in & RTE_PFLOCK_WBITS) == 0) {
+ new.out = old.out;
+ new.in = old.in + RTE_PFLOCK_RINC;
+ if (__atomic_compare_exchange_n(&pf->rd.tickets, &old.tickets, new.tickets,
+ 0, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED))
+ return 0; /* got it */
+
+ /* either new reader got in (so retry) or a writer */
+ }
+
+ /* If writer is present then we are busy */
+ return -EBUSY;
+}
+
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Take the pflock for write.
+ *
+ * @param pf
+ * A pointer to the ticketlock.
+ */
+__rte_experimental
+static inline void
+rte_pflock_write_lock(rte_pflock_t *pf)
+{
+ uint16_t ticket;
+
+ /* Acquire ownership of write-phase. */
+ ticket = __atomic_fetch_add(&pf->wr.in, 1, __ATOMIC_ACQUIRE);
+ rte_wait_until_equal_16(&pf->wr.out, ticket, __ATOMIC_RELAXED);
+
+ /*
+ * Acquire ticket on read-side in order to allow them
+ * to flush. Indicates to any incoming reader that a
+ * write-phase is pending.
+ *
+ * Need ACQUIRE to prevent speculative execution of the wait loop
+ */
+ ticket = __atomic_fetch_add(&pf->rd.in,
+ (ticket & RTE_PFLOCK_PHID) | RTE_PFLOCK_PRES,
+ __ATOMIC_ACQUIRE);
+
+ /* Wait for any pending readers to flush. */
+ rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_RELAXED);
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Release a pflock held for writing.
+ *
+ * @param pf
+ * A pointer to a pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_write_unlock(rte_pflock_t *pf)
+{
+ /* Migrate from write phase to read phase. */
+ __atomic_fetch_and(&pf->rd.in, RTE_PFLOCK_LSB, __ATOMIC_RELEASE);
+
+ /* Allow other writers to continue. */
+ __atomic_fetch_add(&pf->wr.out, 1, __ATOMIC_RELEASE);
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Try to take the pflock for write.
+ *
+ * @param pf
+ * A pointer to the pflock.
+ * @return
+ * - zero if the lock is successfully taken
+ * - -EBUSY if lock could not be acquired for writing because
+ * another writer holds the lock
+ */
+__rte_experimental
+static inline int
+rte_pflock_write_trylock(rte_pflock_t *pf)
+{
+ union rte_pflock_ticket old, new;
+ uint16_t ticket;
+
+ /* Get current state of the lock */
+ old.tickets = __atomic_load_n(&pf->wr.tickets, __ATOMIC_RELAXED);
+ new.out = old.out;
+ new.in = old.in + 1;
+ ticket = new.in;
+
+ /* if writer is already present then too busy */
+ if (old.out != new.in ||
+ !__atomic_compare_exchange_n(&pf->wr.tickets, &old.tickets, new.tickets,
+ 0, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED))
+ return -EBUSY; /* another writer is present already */
+
+ /*
+ * We now own the write phase, but still need to tell
+ * readers and wait for them.
+ *
+ * Need ACQUIRE semantics to avoid speculative execution of wait loop
+ */
+ ticket = __atomic_fetch_add(&pf->rd.in,
+ (ticket & RTE_PFLOCK_PHID) | RTE_PFLOCK_PRES,
+ __ATOMIC_ACQUIRE);
+
+ /* Wait for any pending readers to flush. */
+ rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_RELAXED);
+ return 0;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RTE_PFLOCK_H */
diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build
index dae40ede546e..7692a531ccba 100644
--- a/lib/librte_eal/ppc/include/meson.build
+++ b/lib/librte_eal/ppc/include/meson.build
@@ -11,6 +11,7 @@ arch_headers = files(
'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rwlock.h',
diff --git a/lib/librte_eal/ppc/include/rte_pflock.h b/lib/librte_eal/ppc/include/rte_pflock.h
new file mode 100644
index 000000000000..e7b875ac56a8
--- /dev/null
+++ b/lib/librte_eal/ppc/include/rte_pflock.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ */
+#ifndef _RTE_PFLOCK_PPC_64_H_
+#define _RTE_PFLOCK_PPC_64_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_PPC_64_H_ */
diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build
index 1a6ad0b17342..f43645c20899 100644
--- a/lib/librte_eal/x86/include/meson.build
+++ b/lib/librte_eal/x86/include/meson.build
@@ -10,6 +10,7 @@ arch_headers = files(
'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rtm.h',
diff --git a/lib/librte_eal/x86/include/rte_pflock.h b/lib/librte_eal/x86/include/rte_pflock.h
new file mode 100644
index 000000000000..c2d876062c08
--- /dev/null
+++ b/lib/librte_eal/x86/include/rte_pflock.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#ifndef _RTE_PFLOCK_X86_64_H_
+#define _RTE_PFLOCK_X86_64_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_X86_64_H_ */
--
2.30.1
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [dpdk-dev] [PATCH v3] pflock: implementation of phase-fair reader writer locks
2021-03-03 19:19 ` [dpdk-dev] [PATCH v3] " Stephen Hemminger
@ 2021-03-26 17:17 ` Stephen Hemminger
2021-03-29 3:14 ` Honnappa Nagarahalli
1 sibling, 0 replies; 27+ messages in thread
From: Stephen Hemminger @ 2021-03-26 17:17 UTC (permalink / raw)
To: honnappa.nagarahalli, dev; +Cc: Stephen Hemminger
On Wed, 3 Mar 2021 11:19:45 -0800
Stephen Hemminger <stephen@networkplumber.org> wrote:
> This is a new type of reader-writer lock that provides better fairness
> guarantees which makes it better for typical DPDK applications.
> They lock internally uses two ticket pools, one for readers and one
> for writers.
>
> Phase fair reader writer locks ensure that neither reader or writer will be
> starved. Neither reader or writer are preferred, they execute in
> alternating phases. All operations of the same time (reader or writer)
> that try to acquire the lock are handled in FIFO order. Write
> operations are exclusive, and multiple read operations can be run
> together (until a write arrives).
>
> A similar implementation is in Concurrency Kit package in FreeBSD.
> For more information see:
> "Reader-Writer Synchronization for Shared-Memory Multiprocessor
> Real-Time Systems",
> http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Why has there been no review of this patch?
The only complaint in patchwork is a bogus checkpatch warning about
possible spelling error.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [dpdk-dev] [PATCH v3] pflock: implementation of phase-fair reader writer locks
2021-03-03 19:19 ` [dpdk-dev] [PATCH v3] " Stephen Hemminger
2021-03-26 17:17 ` Stephen Hemminger
@ 2021-03-29 3:14 ` Honnappa Nagarahalli
2021-03-29 17:22 ` Stephen Hemminger
2021-03-29 19:58 ` Stephen Hemminger
1 sibling, 2 replies; 27+ messages in thread
From: Honnappa Nagarahalli @ 2021-03-29 3:14 UTC (permalink / raw)
To: Stephen Hemminger, dev; +Cc: Stephen Hemminger, nd, Honnappa Nagarahalli, nd
<snip>
> Subject: [PATCH v3] pflock: implementation of phase-fair reader writer locks
>
> This is a new type of reader-writer lock that provides better fairness
> guarantees which makes it better for typical DPDK applications.
> They lock internally uses two ticket pools, one for readers and one for
^^^^ The
> writers.
>
> Phase fair reader writer locks ensure that neither reader or writer will be
> starved. Neither reader or writer are preferred, they execute in alternating
> phases. All operations of the same time (reader or writer) that try to acquire
^^^^ type
> the lock are handled in FIFO order. Write operations are exclusive, and
> multiple read operations can be run together (until a write arrives).
>
> A similar implementation is in Concurrency Kit package in FreeBSD.
> For more information see:
> "Reader-Writer Synchronization for Shared-Memory Multiprocessor
> Real-Time Systems",
> http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
> v3 - fix some spelling errors inherited in app/test/test_pflock
>
> app/test/meson.build | 6 +
> app/test/test_pflock.c | 542 ++++++++++++++++++++
> lib/librte_eal/arm/include/meson.build | 1 +
> lib/librte_eal/arm/include/rte_pflock.h | 18 +
> lib/librte_eal/include/generic/rte_pflock.h | 273 ++++++++++
> lib/librte_eal/ppc/include/meson.build | 1 +
> lib/librte_eal/ppc/include/rte_pflock.h | 16 +
> lib/librte_eal/x86/include/meson.build | 1 +
> lib/librte_eal/x86/include/rte_pflock.h | 18 +
> 9 files changed, 876 insertions(+)
> create mode 100644 app/test/test_pflock.c create mode 100644
> lib/librte_eal/arm/include/rte_pflock.h
> create mode 100644 lib/librte_eal/include/generic/rte_pflock.h
> create mode 100644 lib/librte_eal/ppc/include/rte_pflock.h
> create mode 100644 lib/librte_eal/x86/include/rte_pflock.h
>
> diff --git a/app/test/meson.build b/app/test/meson.build index
> 561e493a2944..134098de9ac2 100644
> --- a/app/test/meson.build
> +++ b/app/test/meson.build
> @@ -90,6 +90,7 @@ test_sources = files('commands.c',
> 'test_mcslock.c',
> 'test_mp_secondary.c',
> 'test_per_lcore.c',
> + 'test_pflock.c',
> 'test_pmd_perf.c',
> 'test_power.c',
> 'test_power_cpufreq.c',
> @@ -228,6 +229,11 @@ fast_tests = [
> ['meter_autotest', true],
> ['multiprocess_autotest', false],
> ['per_lcore_autotest', true],
> + ['pflock_autotest', true],
> + ['pflock_test1_autotest', true],
> + ['pflock_rda_autotest', true],
> + ['pflock_rds_wrm_autotest', true],
> + ['pflock_rde_wro_autotest', true],
> ['prefetch_autotest', true],
> ['rcu_qsbr_autotest', true],
> ['red_autotest', true],
> diff --git a/app/test/test_pflock.c b/app/test/test_pflock.c new file mode
> 100644 index 000000000000..f46610b73914
> --- /dev/null
> +++ b/app/test/test_pflock.c
> @@ -0,0 +1,542 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2010-2014 Intel Corporation */
Update the copyright
> +
> +#include <stdio.h>
> +#include <stdint.h>
> +#include <inttypes.h>
> +#include <unistd.h>
> +#include <sys/queue.h>
> +#include <string.h>
> +
> +#include <rte_common.h>
> +#include <rte_memory.h>
> +#include <rte_per_lcore.h>
> +#include <rte_launch.h>
> +#include <rte_pause.h>
> +#include <rte_pflock.h>
> +#include <rte_eal.h>
> +#include <rte_lcore.h>
> +#include <rte_cycles.h>
> +
> +#include "test.h"
> +
> +/*
> + * phase fair lock test
> + * ===========
> + * Provides UT for phase fair lock API.
> + * Main concern is on functional testing, but also provides some
> + * performance measurements.
> + * Obviously for proper testing need to be executed with more than one
> lcore.
> + */
> +
> +#define ITER_NUM 0x80
> +
> +#define TEST_SEC 5
> +
> +static rte_pflock_t sl;
> +static rte_pflock_t sl_tab[RTE_MAX_LCORE]; static uint32_t synchro;
> +
> +enum {
> + LC_TYPE_RDLOCK,
> + LC_TYPE_WRLOCK,
> +};
> +
> +static struct {
> + rte_pflock_t lock;
> + uint64_t tick;
> + volatile union {
> + uint8_t u8[RTE_CACHE_LINE_SIZE];
> + uint64_t u64[RTE_CACHE_LINE_SIZE / sizeof(uint64_t)];
> + } data;
> +} __rte_cache_aligned try_pflock_data;
> +
> +struct try_pflock_lcore {
> + int32_t rc;
> + int32_t type;
> + struct {
> + uint64_t tick;
> + uint64_t fail;
> + uint64_t success;
> + } stat;
> +} __rte_cache_aligned;
> +
> +static struct try_pflock_lcore try_lcore_data[RTE_MAX_LCORE];
> +
> +static int
> +test_pflock_per_core(__rte_unused void *arg) {
> + rte_pflock_write_lock(&sl);
> + printf("Global write lock taken on core %u\n", rte_lcore_id());
> + rte_pflock_write_unlock(&sl);
> +
> + rte_pflock_write_lock(&sl_tab[rte_lcore_id()]);
> + printf("Hello from core %u !\n", rte_lcore_id());
> + rte_pflock_write_unlock(&sl_tab[rte_lcore_id()]);
> +
> + rte_pflock_read_lock(&sl);
> + printf("Global read lock taken on core %u\n", rte_lcore_id());
> + rte_delay_ms(100);
> + printf("Release global read lock on core %u\n", rte_lcore_id());
> + rte_pflock_read_unlock(&sl);
> +
> + return 0;
> +}
> +
> +static rte_pflock_t lk = RTE_PFLOCK_INITIALIZER; static volatile
> +uint64_t pflock_data; static uint64_t time_count[RTE_MAX_LCORE] = {0};
> +
> +#define MAX_LOOP 10000
> +#define TEST_PFLOCK_DEBUG 0
> +
> +static int
> +load_loop_fn(__rte_unused void *arg)
> +{
> + uint64_t time_diff = 0, begin;
> + uint64_t hz = rte_get_timer_hz();
> + uint64_t lcount = 0;
> + const unsigned int lcore = rte_lcore_id();
> +
> + /* wait synchro for workers */
> + if (lcore != rte_get_main_lcore())
> + rte_wait_until_equal_32(&synchro, 1, __ATOMIC_RELAXED);
> +
> + begin = rte_rdtsc_precise();
> + while (lcount < MAX_LOOP) {
> + rte_pflock_write_lock(&lk);
> + ++pflock_data;
> + rte_pflock_write_unlock(&lk);
> +
> + rte_pflock_read_lock(&lk);
> + if (TEST_PFLOCK_DEBUG && !(lcount % 100))
> + printf("Core [%u] pflock_data = %"PRIu64"\n",
> + lcore, pflock_data);
> + rte_pflock_read_unlock(&lk);
> +
> + lcount++;
> + /* delay to make lock duty cycle slightly realistic */
> + rte_pause();
> + }
> +
> + time_diff = rte_rdtsc_precise() - begin;
> + time_count[lcore] = time_diff * 1000000 / hz;
> + return 0;
> +}
> +
> +static int
> +test_pflock_perf(void)
> +{
> + unsigned int i;
> + uint64_t total = 0;
> +
> + printf("\nPhase fair test on %u cores...\n", rte_lcore_count());
> +
> + /* clear synchro and start workers */
> + synchro = 0;
> + if (rte_eal_mp_remote_launch(load_loop_fn, NULL, SKIP_MAIN) <
> 0)
> + return -1;
> +
> + /* start synchro and launch test on main */
> + __atomic_store_n(&synchro, 1, __ATOMIC_RELAXED);
> + load_loop_fn(NULL);
> +
> + rte_eal_mp_wait_lcore();
> +
> + RTE_LCORE_FOREACH(i) {
> + printf("Core [%u] cost time = %"PRIu64" us\n",
> + i, time_count[i]);
> + total += time_count[i];
> + }
> +
> + printf("Total cost time = %"PRIu64" us\n", total);
> + memset(time_count, 0, sizeof(time_count));
> +
> + return 0;
> +}
> +
> +/*
> + * - There is a global pflock and a table of pflocks (one per lcore).
> + *
> + * - The test function takes all of these locks and launches the
> + * ``test_pflock_per_core()`` function on each core (except the main).
> + *
> + * - The function takes the global write lock, display something,
> + * then releases the global lock.
> + * - Then, it takes the per-lcore write lock, display something, and
> + * releases the per-core lock.
> + * - Finally, a read lock is taken during 100 ms, then released.
> + *
> + * - The main function unlocks the per-lcore locks sequentially and
> + * waits between each lock. This triggers the display of a message
> + * for each core, in the correct order.
> + *
> + * Then, it tries to take the global write lock and display the last
> + * message. The autotest script checks that the message order is correct.
> + */
> +static int
> +pflock_test1(void)
> +{
> + int i;
> +
> + rte_pflock_init(&sl);
> + for (i = 0; i < RTE_MAX_LCORE; i++)
> + rte_pflock_init(&sl_tab[i]);
> +
> + rte_pflock_write_lock(&sl);
> +
> + RTE_LCORE_FOREACH_WORKER(i) {
> + rte_pflock_write_lock(&sl_tab[i]);
> + rte_eal_remote_launch(test_pflock_per_core, NULL, i);
> + }
> +
> + rte_pflock_write_unlock(&sl);
> +
> + RTE_LCORE_FOREACH_WORKER(i) {
> + rte_pflock_write_unlock(&sl_tab[i]);
> + rte_delay_ms(100);
> + }
> +
> + rte_pflock_write_lock(&sl);
> + /* this message should be the last message of test */
> + printf("Global write lock taken on main core %u\n", rte_lcore_id());
> + rte_pflock_write_unlock(&sl);
> +
> + rte_eal_mp_wait_lcore();
> +
> + if (test_pflock_perf() < 0)
> + return -1;
> +
> + return 0;
> +}
> +
> +static int
> +test_pflock(void)
> +{
> + uint32_t i;
> + int32_t rc, ret;
> +
> + static const struct {
> + const char *name;
> + int (*ftst)(void);
> + } test[] = {
> + {
> + .name = "pflock_test1",
> + .ftst = pflock_test1,
> + },
> + };
> +
> + ret = 0;
> + for (i = 0; i != RTE_DIM(test); i++) {
> + printf("starting test %s;\n", test[i].name);
> + rc = test[i].ftst();
> + printf("test %s completed with status %d\n", test[i].name,
> rc);
> + ret |= rc;
> + }
> +
> + return ret;
> +}
> +
> +static int
> +try_read(uint32_t lc)
> +{
> + int32_t rc;
> + uint32_t i;
> +
> + rc = rte_pflock_read_trylock(&try_pflock_data.lock);
> + if (rc != 0)
> + return rc;
> +
> + for (i = 0; i != RTE_DIM(try_pflock_data.data.u64); i++) {
> +
> + /* race condition occurred, lock doesn't work properly */
> + if (try_pflock_data.data.u64[i] != 0) {
> + printf("%s(%u) error: unexpected data pattern\n",
> + __func__, lc);
> + rte_memdump(stdout, NULL,
> + (void *)(uintptr_t)&try_pflock_data.data,
> + sizeof(try_pflock_data.data));
> + rc = -EFAULT;
> + break;
> + }
> + }
> +
> + rte_pflock_read_unlock(&try_pflock_data.lock);
> + return rc;
> +}
> +
> +static int
> +try_write(uint32_t lc)
> +{
> + int32_t rc;
> + uint32_t i, v;
> +
> + v = RTE_MAX(lc % UINT8_MAX, 1U);
> +
> + rc = rte_pflock_write_trylock(&try_pflock_data.lock);
> + if (rc != 0)
> + return rc;
> +
> + /* update by bytes in reverse order */
> + for (i = RTE_DIM(try_pflock_data.data.u8); i-- != 0; ) {
> +
> + /* race condition occurred, lock doesn't work properly */
> + if (try_pflock_data.data.u8[i] != 0) {
> + printf("%s:%d(%u) error: unexpected data
> pattern\n",
> + __func__, __LINE__, lc);
> + rte_memdump(stdout, NULL,
> + (void *)(uintptr_t)&try_pflock_data.data,
> + sizeof(try_pflock_data.data));
> + rc = -EFAULT;
> + break;
> + }
> +
> + try_pflock_data.data.u8[i] = v;
> + }
> +
> + /* restore by bytes in reverse order */
> + for (i = RTE_DIM(try_pflock_data.data.u8); i-- != 0; ) {
> +
> + /* race condition occurred, lock doesn't work properly */
> + if (try_pflock_data.data.u8[i] != v) {
> + printf("%s:%d(%u) error: unexpected data
> pattern\n",
> + __func__, __LINE__, lc);
> + rte_memdump(stdout, NULL,
> + (void *)(uintptr_t)&try_pflock_data.data,
> + sizeof(try_pflock_data.data));
> + rc = -EFAULT;
> + break;
> + }
> +
> + try_pflock_data.data.u8[i] = 0;
> + }
> +
> + rte_pflock_write_unlock(&try_pflock_data.lock);
> + return rc;
> +}
> +
> +static int
> +try_read_lcore(__rte_unused void *data) {
> + int32_t rc;
> + uint32_t i, lc;
> + uint64_t ftm, stm, tm;
> + struct try_pflock_lcore *lcd;
> +
> + lc = rte_lcore_id();
> + lcd = try_lcore_data + lc;
> + lcd->type = LC_TYPE_RDLOCK;
> +
> + ftm = try_pflock_data.tick;
> + stm = rte_get_timer_cycles();
> +
> + do {
> + for (i = 0; i != ITER_NUM; i++) {
> + rc = try_read(lc);
> + if (rc == 0)
> + lcd->stat.success++;
> + else if (rc == -EBUSY)
> + lcd->stat.fail++;
> + else
> + break;
> + rc = 0;
> + }
> + tm = rte_get_timer_cycles() - stm;
> + } while (tm < ftm && rc == 0);
> +
> + lcd->rc = rc;
> + lcd->stat.tick = tm;
> + return rc;
> +}
> +
> +static int
> +try_write_lcore(__rte_unused void *data) {
> + int32_t rc;
> + uint32_t i, lc;
> + uint64_t ftm, stm, tm;
> + struct try_pflock_lcore *lcd;
> +
> + lc = rte_lcore_id();
> + lcd = try_lcore_data + lc;
> + lcd->type = LC_TYPE_WRLOCK;
> +
> + ftm = try_pflock_data.tick;
> + stm = rte_get_timer_cycles();
> +
> + do {
> + for (i = 0; i != ITER_NUM; i++) {
> + rc = try_write(lc);
> + if (rc == 0)
> + lcd->stat.success++;
> + else if (rc == -EBUSY)
> + lcd->stat.fail++;
> + else
> + break;
> + rc = 0;
> + }
> + tm = rte_get_timer_cycles() - stm;
> + } while (tm < ftm && rc == 0);
> +
> + lcd->rc = rc;
> + lcd->stat.tick = tm;
> + return rc;
> +}
> +
> +static void
> +print_try_lcore_stats(const struct try_pflock_lcore *tlc, uint32_t lc)
> +{
> + uint64_t f, s;
> +
> + f = RTE_MAX(tlc->stat.fail, 1ULL);
> + s = RTE_MAX(tlc->stat.success, 1ULL);
> +
> + printf("try_lcore_data[%u]={\n"
> + "\trc=%d,\n"
> + "\ttype=%s,\n"
> + "\tfail=%" PRIu64 ",\n"
> + "\tsuccess=%" PRIu64 ",\n"
> + "\tcycles=%" PRIu64 ",\n"
> + "\tcycles/op=%#Lf,\n"
> + "\tcycles/success=%#Lf,\n"
> + "\tsuccess/fail=%#Lf,\n"
> + "};\n",
> + lc,
> + tlc->rc,
> + tlc->type == LC_TYPE_RDLOCK ? "RDLOCK" : "WRLOCK",
> + tlc->stat.fail,
> + tlc->stat.success,
> + tlc->stat.tick,
> + (long double)tlc->stat.tick /
> + (tlc->stat.fail + tlc->stat.success),
> + (long double)tlc->stat.tick / s,
> + (long double)tlc->stat.success / f);
> +}
> +
> +static void
> +collect_try_lcore_stats(struct try_pflock_lcore *tlc,
> + const struct try_pflock_lcore *lc)
> +{
> + tlc->stat.tick += lc->stat.tick;
> + tlc->stat.fail += lc->stat.fail;
> + tlc->stat.success += lc->stat.success; }
> +
> +/*
> + * Process collected results:
> + * - check status
> + * - collect and print statistics
> + */
> +static int
> +process_try_lcore_stats(void)
> +{
> + int32_t rc;
> + uint32_t lc, rd, wr;
> + struct try_pflock_lcore rlc, wlc;
> +
> + memset(&rlc, 0, sizeof(rlc));
> + memset(&wlc, 0, sizeof(wlc));
> +
> + rlc.type = LC_TYPE_RDLOCK;
> + wlc.type = LC_TYPE_WRLOCK;
> + rd = 0;
> + wr = 0;
> +
> + rc = 0;
> + RTE_LCORE_FOREACH(lc) {
> + rc |= try_lcore_data[lc].rc;
> + if (try_lcore_data[lc].type == LC_TYPE_RDLOCK) {
> + collect_try_lcore_stats(&rlc, try_lcore_data + lc);
> + rd++;
> + } else {
> + collect_try_lcore_stats(&wlc, try_lcore_data + lc);
> + wr++;
> + }
> + }
> +
> + if (rc == 0) {
> + RTE_LCORE_FOREACH(lc)
> + print_try_lcore_stats(try_lcore_data + lc, lc);
> +
> + if (rd != 0) {
> + printf("aggregated stats for %u RDLOCK cores:\n",
> rd);
> + print_try_lcore_stats(&rlc, rd);
> + }
> +
> + if (wr != 0) {
> + printf("aggregated stats for %u WRLOCK cores:\n",
> wr);
> + print_try_lcore_stats(&wlc, wr);
> + }
> + }
> +
> + return rc;
> +}
> +
> +static void
> +try_test_reset(void)
> +{
> + memset(&try_lcore_data, 0, sizeof(try_lcore_data));
> + memset(&try_pflock_data, 0, sizeof(try_pflock_data));
> + try_pflock_data.tick = TEST_SEC * rte_get_tsc_hz(); }
> +
> +/* all lcores grab RDLOCK */
> +static int
> +try_pflock_test_rda(void)
> +{
> + try_test_reset();
> +
> + /* start read test on all available lcores */
> + rte_eal_mp_remote_launch(try_read_lcore, NULL, CALL_MAIN);
> + rte_eal_mp_wait_lcore();
> +
> + return process_try_lcore_stats();
> +}
> +
> +/* all worker lcores grab RDLOCK, main one grabs WRLOCK */ static int
> +try_pflock_test_rds_wrm(void)
> +{
> + try_test_reset();
> +
> + rte_eal_mp_remote_launch(try_read_lcore, NULL, SKIP_MAIN);
> + try_write_lcore(NULL);
> + rte_eal_mp_wait_lcore();
> +
> + return process_try_lcore_stats();
> +}
> +
> +/* main and even worker lcores grab RDLOCK, odd lcores grab WRLOCK */
> +static int
> +try_pflock_test_rde_wro(void)
> +{
> + uint32_t lc, mlc;
> +
> + try_test_reset();
> +
> + mlc = rte_get_main_lcore();
> +
> + RTE_LCORE_FOREACH(lc) {
> + if (lc != mlc) {
> + if ((lc & 1) == 0)
> + rte_eal_remote_launch(try_read_lcore,
> + NULL, lc);
> + else
> + rte_eal_remote_launch(try_write_lcore,
> + NULL, lc);
> + }
> + }
> + try_read_lcore(NULL);
> + rte_eal_mp_wait_lcore();
> +
> + return process_try_lcore_stats();
> +}
> +
> +REGISTER_TEST_COMMAND(pflock_autotest, test_pflock);
> +
> +/* subtests used in meson for CI */
> +REGISTER_TEST_COMMAND(pflock_test1_autotest, pflock_test1);
> +REGISTER_TEST_COMMAND(pflock_rda_autotest, try_pflock_test_rda);
> +REGISTER_TEST_COMMAND(pflock_rds_wrm_autotest,
> +try_pflock_test_rds_wrm);
> +REGISTER_TEST_COMMAND(pflock_rde_wro_autotest,
> +try_pflock_test_rde_wro);
> diff --git a/lib/librte_eal/arm/include/meson.build
> b/lib/librte_eal/arm/include/meson.build
> index 770766de1a34..2c3cff61bed6 100644
> --- a/lib/librte_eal/arm/include/meson.build
> +++ b/lib/librte_eal/arm/include/meson.build
> @@ -21,6 +21,7 @@ arch_headers = files(
> 'rte_pause_32.h',
> 'rte_pause_64.h',
> 'rte_pause.h',
> + 'rte_pflock.h',
> 'rte_power_intrinsics.h',
> 'rte_prefetch_32.h',
> 'rte_prefetch_64.h',
> diff --git a/lib/librte_eal/arm/include/rte_pflock.h
> b/lib/librte_eal/arm/include/rte_pflock.h
> new file mode 100644
> index 000000000000..bb9934eec469
> --- /dev/null
> +++ b/lib/librte_eal/arm/include/rte_pflock.h
> @@ -0,0 +1,18 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2021 Microsoft Corporation */
> +
> +#ifndef _RTE_PFLOCK_ARM_H_
> +#define _RTE_PFLOCK_ARM_H_
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +#include "generic/rte_pflock.h"
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#endif /* _RTE_PFLOCK_ARM_H_ */
> diff --git a/lib/librte_eal/include/generic/rte_pflock.h
> b/lib/librte_eal/include/generic/rte_pflock.h
> new file mode 100644
> index 000000000000..6808c70c34a2
> --- /dev/null
> +++ b/lib/librte_eal/include/generic/rte_pflock.h
> @@ -0,0 +1,273 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2021 Microsoft Corp.
> + * Copyright 2011-2015 Samy Al Bahra.
Any reason for adding the above copy right?
> + * All rights reserved.
> + */
> +
> +#ifndef _RTE_PFLOCK_H_
> +#define _RTE_PFLOCK_H_
> +
> +/**
> + * @file
> + *
> + * Phase-fair locks
> + *
> + * This file defines an API for Phase Fair reader writer locks,
> + * which is a variant of typical reader-writer locks that prevent
> + * starvation. In this type of lock, readers and writers alternate.
> + * This significantly reduces the worst-case blocking for readers and writers.
> + *
> + * This is an implementation derived from FreeBSD
> + * based on the work described in:
> + * Brandenburg, B. and Anderson, J. 2010. Spin-Based
> + * Reader-Writer Synchronization for Multiprocessor Real-Time Systems
> + *
> + * All locks must be initialised before use, and only initialised once.
> + */
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +#include <rte_common.h>
> +#include <rte_pause.h>
> +
> +/**
> + * The rte_pflock_t type.
> + */
> +struct rte_pflock {
> + union rte_pflock_ticket {
> + uint32_t tickets;
> + struct {
> + uint16_t in;
> + uint16_t out;
> + };
> + } rd, wr;
Just wondering if placing these on 2 different cache lines would help the performance?
> +};
> +typedef struct rte_pflock rte_pflock_t;
> +
> +/**
> + * Constants used to map the bits in reader counter
> + *
> + * +-----------------+-+-+
> + * | Readers |W|P|
> + * | |R|H|
> + * +-----------------+-+-+
It would be good to indicate the reserved part.
> + */
> +
> +#define RTE_PFLOCK_LSB 0xFFF0
Based on the value of RTE_PFLOCK_RINC, should this be 0xFF00?
> +#define RTE_PFLOCK_RINC 0x100 /* Reader increment value.
Does this mean, there can be only 256 concurrent readers?
> */
> +#define RTE_PFLOCK_WBITS 0x3 /* Writer bits in reader. */
> +#define RTE_PFLOCK_PRES 0x2 /* Writer present bit. */
> +#define RTE_PFLOCK_PHID 0x1 /* Phase ID bit. */
> +
> +/**
> + * A static pflock initializer.
> + */
> +#define RTE_PFLOCK_INITIALIZER { }
> +
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change without prior notice.
> + *
> + * Initialize the pflock to an unlocked state.
> + *
> + * @param pf
> + * A pointer to the pflock.
> + */
> +__rte_experimental
> +static inline void
> +rte_pflock_init(struct rte_pflock *pf)
> +{
> + pf->rd.tickets = 0;
> + pf->wr.tickets = 0;
> +}
> +
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change without prior notice.
> + *
> + * Take a pflock for read.
> + *
> + * @param pf
> + * A pointer to a pflock structure.
> + */
> +__rte_experimental
> +static inline void
> +rte_pflock_read_lock(rte_pflock_t *pf)
> +{
> + uint32_t w;
> +
> + /*
> + * If no writer is present, then the operation has completed
> + * successfully.
> + */
> + w = __atomic_fetch_add(&pf->rd.in, RTE_PFLOCK_RINC,
> __ATOMIC_ACQ_REL) & RTE_PFLOCK_WBITS;
Any reason for the RELEASE? I think ACQUIRE is enough as the write to rd.in is not releasing any previous memory operations.
> + if (w == 0)
> + return;
> +
> + /* Wait for current write phase to complete. */
> + while ((__atomic_load_n(&pf->rd.in, __ATOMIC_ACQUIRE) &
> RTE_PFLOCK_WBITS) == w)
> + rte_pause();
> +}
> +
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change without prior notice.
> + *
> + * Release a pflock locked for reading.
> + *
> + * @param pf
> + * A pointer to the pflock structure.
> + */
> +__rte_experimental
> +static inline void
> +rte_pflock_read_unlock(rte_pflock_t *pf) {
> + __atomic_fetch_add(&pf->rd.out, RTE_PFLOCK_RINC,
> __ATOMIC_RELEASE); }
> +
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change without prior notice.
> + *
> + * Try to take a pflock for reading
> + *
> + * @param pf
> + * A pointer to a pflock structure.
> + * @return
> + * - zero if the lock is successfully taken
> + * - -EBUSY if lock could not be acquired for reading because a
> + * writer holds the lock
> + */
> +__rte_experimental
> +static inline int
> +rte_pflock_read_trylock(rte_pflock_t *pf) {
> + union rte_pflock_ticket old, new;
> +
> + /* Get current state of the lock */
> + old.tickets = __atomic_load_n(&pf->rd.tickets,
> __ATOMIC_RELAXED);
> +
> + /* loop until writer shows up */
> + while ((old.in & RTE_PFLOCK_WBITS) == 0) {
> + new.out = old.out;
> + new.in = old.in + RTE_PFLOCK_RINC;
> + if (__atomic_compare_exchange_n(&pf->rd.tickets,
> &old.tickets, new.tickets,
> + 0, __ATOMIC_ACQ_REL,
^^^ I think ACQUIRE is enough. We are not releasing anything to other threads.
> __ATOMIC_RELAXED))
> + return 0; /* got it */
> +
> + /* either new reader got in (so retry) or a writer */
> + }
> +
> + /* If writer is present then we are busy */
> + return -EBUSY;
> +}
> +
> +
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change without prior notice.
> + *
> + * Take the pflock for write.
> + *
> + * @param pf
> + * A pointer to the ticketlock.
> + */
> +__rte_experimental
> +static inline void
> +rte_pflock_write_lock(rte_pflock_t *pf) {
> + uint16_t ticket;
> +
> + /* Acquire ownership of write-phase. */
> + ticket = __atomic_fetch_add(&pf->wr.in, 1, __ATOMIC_ACQUIRE);
> + rte_wait_until_equal_16(&pf->wr.out, ticket, __ATOMIC_RELAXED);
> +
> + /*
> + * Acquire ticket on read-side in order to allow them
> + * to flush. Indicates to any incoming reader that a
> + * write-phase is pending.
> + *
> + * Need ACQUIRE to prevent speculative execution of the wait loop
I do not think the entire wait loop will be executed speculatively. Only the load of pf->rd.out would happen speculatively. There is a dependency on 'ticket' variable. So, the load of the 'ticket' variable should happen after 'ticket' is updated below.
> + */
> + ticket = __atomic_fetch_add(&pf->rd.in,
> + (ticket & RTE_PFLOCK_PHID) |
> RTE_PFLOCK_PRES,
> + __ATOMIC_ACQUIRE);
Since, it is ok to execute part of the wait loop above this. We could make this RELAXED.
Also, since we just need to set the 2 bits, is it better to use __atomic_fetch_or? It also matches with the use of __atomic_fetch_and in the unlock API.
> +
> + /* Wait for any pending readers to flush. */
> + rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_RELAXED);
RELAXED here will allow the critical section to execute above the wait loop. Hence it is better to make this ACQUIRE.
> }
> +
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change without prior notice.
> + *
> + * Release a pflock held for writing.
> + *
> + * @param pf
> + * A pointer to a pflock structure.
> + */
> +__rte_experimental
> +static inline void
> +rte_pflock_write_unlock(rte_pflock_t *pf) {
> + /* Migrate from write phase to read phase. */
> + __atomic_fetch_and(&pf->rd.in, RTE_PFLOCK_LSB,
> __ATOMIC_RELEASE);
> +
> + /* Allow other writers to continue. */
> + __atomic_fetch_add(&pf->wr.out, 1, __ATOMIC_RELEASE); }
> +
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change without prior notice.
> + *
> + * Try to take the pflock for write.
> + *
> + * @param pf
> + * A pointer to the pflock.
> + * @return
> + * - zero if the lock is successfully taken
> + * - -EBUSY if lock could not be acquired for writing because
> + * another writer holds the lock
What about the readers holding the lock?
> + */
> +__rte_experimental
> +static inline int
> +rte_pflock_write_trylock(rte_pflock_t *pf) {
> + union rte_pflock_ticket old, new;
> + uint16_t ticket;
> +
> + /* Get current state of the lock */
> + old.tickets = __atomic_load_n(&pf->wr.tickets,
> __ATOMIC_RELAXED);
> + new.out = old.out;
> + new.in = old.in + 1;
> + ticket = new.in;
> +
> + /* if writer is already present then too busy */
> + if (old.out != new.in ||
> + !__atomic_compare_exchange_n(&pf->wr.tickets, &old.tickets,
> new.tickets,
> + 0, __ATOMIC_ACQ_REL,
> __ATOMIC_RELAXED))
> + return -EBUSY; /* another writer is present already */
> +
> + /*
> + * We now own the write phase, but still need to tell
> + * readers and wait for them.
The write lock is taken if there are no readers AND no writers (unlike the read lock which is taken if there are no writers waiting (only))
Since this is a try lock, should we wait for the readers to give up the lock?
I think, if the readers are present, we should give up the writer phase and return.
> + *
> + * Need ACQUIRE semantics to avoid speculative execution of wait
> loop
> + */
> + ticket = __atomic_fetch_add(&pf->rd.in,
> + (ticket & RTE_PFLOCK_PHID) |
> RTE_PFLOCK_PRES,
> + __ATOMIC_ACQUIRE);
> +
> + /* Wait for any pending readers to flush. */
> + rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_RELAXED);
> + return 0;
> +}
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#endif /* RTE_PFLOCK_H */
> diff --git a/lib/librte_eal/ppc/include/meson.build
> b/lib/librte_eal/ppc/include/meson.build
> index dae40ede546e..7692a531ccba 100644
> --- a/lib/librte_eal/ppc/include/meson.build
> +++ b/lib/librte_eal/ppc/include/meson.build
> @@ -11,6 +11,7 @@ arch_headers = files(
> 'rte_mcslock.h',
> 'rte_memcpy.h',
> 'rte_pause.h',
> + 'rte_pflock.h',
> 'rte_power_intrinsics.h',
> 'rte_prefetch.h',
> 'rte_rwlock.h',
> diff --git a/lib/librte_eal/ppc/include/rte_pflock.h
> b/lib/librte_eal/ppc/include/rte_pflock.h
> new file mode 100644
> index 000000000000..e7b875ac56a8
> --- /dev/null
> +++ b/lib/librte_eal/ppc/include/rte_pflock.h
> @@ -0,0 +1,16 @@
> +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef
Copyright header missing?
> +_RTE_PFLOCK_PPC_64_H_ #define _RTE_PFLOCK_PPC_64_H_
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +#include "generic/rte_pflock.h"
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#endif /* _RTE_PFLOCK_PPC_64_H_ */
> diff --git a/lib/librte_eal/x86/include/meson.build
> b/lib/librte_eal/x86/include/meson.build
> index 1a6ad0b17342..f43645c20899 100644
> --- a/lib/librte_eal/x86/include/meson.build
> +++ b/lib/librte_eal/x86/include/meson.build
> @@ -10,6 +10,7 @@ arch_headers = files(
> 'rte_mcslock.h',
> 'rte_memcpy.h',
> 'rte_pause.h',
> + 'rte_pflock.h',
> 'rte_power_intrinsics.h',
> 'rte_prefetch.h',
> 'rte_rtm.h',
> diff --git a/lib/librte_eal/x86/include/rte_pflock.h
> b/lib/librte_eal/x86/include/rte_pflock.h
> new file mode 100644
> index 000000000000..c2d876062c08
> --- /dev/null
> +++ b/lib/librte_eal/x86/include/rte_pflock.h
> @@ -0,0 +1,18 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2021 Microsoft Corporation */
> +
> +#ifndef _RTE_PFLOCK_X86_64_H_
> +#define _RTE_PFLOCK_X86_64_H_
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +#include "generic/rte_pflock.h"
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#endif /* _RTE_PFLOCK_X86_64_H_ */
> --
> 2.30.1
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [dpdk-dev] [PATCH v3] pflock: implementation of phase-fair reader writer locks
2021-03-29 3:14 ` Honnappa Nagarahalli
@ 2021-03-29 17:22 ` Stephen Hemminger
2021-03-29 18:09 ` Honnappa Nagarahalli
2021-03-29 19:58 ` Stephen Hemminger
1 sibling, 1 reply; 27+ messages in thread
From: Stephen Hemminger @ 2021-03-29 17:22 UTC (permalink / raw)
To: Honnappa Nagarahalli; +Cc: dev, Stephen Hemminger, nd
On Mon, 29 Mar 2021 03:14:29 +0000
Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com> wrote:
> <snip>
>
> > Subject: [PATCH v3] pflock: implementation of phase-fair reader writer locks
> >
> > This is a new type of reader-writer lock that provides better fairness
> > guarantees which makes it better for typical DPDK applications.
> > They lock internally uses two ticket pools, one for readers and one for
> ^^^^ The
>
> > writers.
> >
> > Phase fair reader writer locks ensure that neither reader or writer will be
> > starved. Neither reader or writer are preferred, they execute in alternating
> > phases. All operations of the same time (reader or writer) that try to acquire
> ^^^^ type
>
> > the lock are handled in FIFO order. Write operations are exclusive, and
> > multiple read operations can be run together (until a write arrives).
> >
> > A similar implementation is in Concurrency Kit package in FreeBSD.
> > For more information see:
> > "Reader-Writer Synchronization for Shared-Memory Multiprocessor
> > Real-Time Systems",
> > http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
> >
> > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Any more comments? Other than the typos in the commit log...
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [dpdk-dev] [PATCH v3] pflock: implementation of phase-fair reader writer locks
2021-03-29 17:22 ` Stephen Hemminger
@ 2021-03-29 18:09 ` Honnappa Nagarahalli
0 siblings, 0 replies; 27+ messages in thread
From: Honnappa Nagarahalli @ 2021-03-29 18:09 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev, Stephen Hemminger, nd, Honnappa Nagarahalli, nd
<snip>
> >
> > > Subject: [PATCH v3] pflock: implementation of phase-fair reader
> > > writer locks
> > >
> > > This is a new type of reader-writer lock that provides better
> > > fairness guarantees which makes it better for typical DPDK applications.
> > > They lock internally uses two ticket pools, one for readers and one
> > > for
> > ^^^^ The
> >
> > > writers.
> > >
> > > Phase fair reader writer locks ensure that neither reader or writer
> > > will be starved. Neither reader or writer are preferred, they
> > > execute in alternating phases. All operations of the same time
> > > (reader or writer) that try to acquire
> > ^^^^
> > type
> >
> > > the lock are handled in FIFO order. Write operations are exclusive,
> > > and multiple read operations can be run together (until a write arrives).
> > >
> > > A similar implementation is in Concurrency Kit package in FreeBSD.
> > > For more information see:
> > > "Reader-Writer Synchronization for Shared-Memory Multiprocessor
> > > Real-Time Systems",
> > > http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
> > >
> > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
>
> Any more comments? Other than the typos in the commit log...
There are additional comments in the code (in librte_eal/include/generic/rte_pflock.h), you need to scroll down as the test code is on the top. I did not take a deeper look at the test code yet.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [dpdk-dev] [PATCH v3] pflock: implementation of phase-fair reader writer locks
2021-03-29 3:14 ` Honnappa Nagarahalli
2021-03-29 17:22 ` Stephen Hemminger
@ 2021-03-29 19:58 ` Stephen Hemminger
2021-03-30 0:18 ` Honnappa Nagarahalli
1 sibling, 1 reply; 27+ messages in thread
From: Stephen Hemminger @ 2021-03-29 19:58 UTC (permalink / raw)
To: Honnappa Nagarahalli; +Cc: dev, Stephen Hemminger, nd
Meta question: is implementing trylock worth it?
The original did not have it.
There are tradeoffs about number of readers and added complexity
in the code?
> > diff --git a/lib/librte_eal/include/generic/rte_pflock.h
> > b/lib/librte_eal/include/generic/rte_pflock.h
> > new file mode 100644
> > index 000000000000..6808c70c34a2
> > --- /dev/null
> > +++ b/lib/librte_eal/include/generic/rte_pflock.h
> > @@ -0,0 +1,273 @@
> > +/* SPDX-License-Identifier: BSD-3-Clause
> > + * Copyright(c) 2021 Microsoft Corp.
> > + * Copyright 2011-2015 Samy Al Bahra.
> Any reason for adding the above copy right?
Code originally came from Concurrency Kit, so wanted to keep
attribution to original author
> > + * The rte_pflock_t type.
> > + */
> > +struct rte_pflock {
> > + union rte_pflock_ticket {
> > + uint32_t tickets;
> > + struct {
> > + uint16_t in;
> > + uint16_t out;
> > + };
> > + } rd, wr;
> Just wondering if placing these on 2 different cache lines would help the performance?
That won't work because the implementation of trylock requires compare/exchange of
the whole structure as an atomic operation.
>
> > +};
> > +typedef struct rte_pflock rte_pflock_t;
> > +
> > +/**
> > + * Constants used to map the bits in reader counter
> > + *
> > + * +-----------------+-+-+
> > + * | Readers |W|P|
> > + * | |R|H|
> > + * +-----------------+-+-+
> It would be good to indicate the reserved part.
Ok
>
> > + */
> > +
> > +#define RTE_PFLOCK_LSB 0xFFF0
> Based on the value of RTE_PFLOCK_RINC, should this be 0xFF00?
The unused bits never get set so it doesn't matter
>
> > +#define RTE_PFLOCK_RINC 0x100 /* Reader increment value.
> Does this mean, there can be only 256 concurrent readers?
Yes, there is a tradeoff. If you assume that the largest atomic operation
is 64 bits, and you want to support trylock then 256 readers is the limit.
The original code has 32 bit counters but no trylock.
> > +__rte_experimental
> > +static inline void
> > +rte_pflock_read_lock(rte_pflock_t *pf)
> > +{
> > + uint32_t w;
> > +
> > + /*
> > + * If no writer is present, then the operation has completed
> > + * successfully.
> > + */
> > + w = __atomic_fetch_add(&pf->rd.in, RTE_PFLOCK_RINC,
> > __ATOMIC_ACQ_REL) & RTE_PFLOCK_WBITS;
> Any reason for the RELEASE? I think ACQUIRE is enough as the write to rd.in is not releasing any previous memory operations.
That make sense, will fix
> > +__rte_experimental
> > +static inline int
> > +rte_pflock_read_trylock(rte_pflock_t *pf) {
> > + union rte_pflock_ticket old, new;
> > +
> > + /* Get current state of the lock */
> > + old.tickets = __atomic_load_n(&pf->rd.tickets,
> > __ATOMIC_RELAXED);
> > +
> > + /* loop until writer shows up */
> > + while ((old.in & RTE_PFLOCK_WBITS) == 0) {
> > + new.out = old.out;
> > + new.in = old.in + RTE_PFLOCK_RINC;
> > + if (__atomic_compare_exchange_n(&pf->rd.tickets,
> > &old.tickets, new.tickets,
> > + 0, __ATOMIC_ACQ_REL,
>
^^^ I think ACQUIRE is enough. We are not releasing anything to other threads.
Fixed.
>
> > __ATOMIC_RELAXED))
> > + return 0; /* got it */
> > +
> > + /* either new reader got in (so retry) or a writer */
> > + }
> > +
> > +__rte_experimental
> > +static inline void
> > +rte_pflock_write_lock(rte_pflock_t *pf) {
> > + uint16_t ticket;
> > +
> > + /* Acquire ownership of write-phase. */
> > + ticket = __atomic_fetch_add(&pf->wr.in, 1, __ATOMIC_ACQUIRE);
> > + rte_wait_until_equal_16(&pf->wr.out, ticket, __ATOMIC_RELAXED);
> > +
> > + /*
> > + * Acquire ticket on read-side in order to allow them
> > + * to flush. Indicates to any incoming reader that a
> > + * write-phase is pending.
> > + *
> > + * Need ACQUIRE to prevent speculative execution of the wait loop
> I do not think the entire wait loop will be executed speculatively. Only the load of pf->rd.out would happen speculatively. There is a dependency on 'ticket' variable. So, the load of the 'ticket' variable should happen after 'ticket' is updated below.
>
> > + */
> > + ticket = __atomic_fetch_add(&pf->rd.in,
> > + (ticket & RTE_PFLOCK_PHID) |
> > RTE_PFLOCK_PRES,
> > + __ATOMIC_ACQUIRE);
> Since, it is ok to execute part of the wait loop above this. We could make this RELAXED.
> Also, since we just need to set the 2 bits, is it better to use __atomic_fetch_or? It also matches with the use of __atomic_fetch_and in the unlock API.
ticket = __atomic_fetch_or(&pf->rd.in,
(ticket & RTE_PFLOCK_PHID) | RTE_PFLOCK_PRES,
__ATOMIC_RELAXED
> > +
> > + /* Wait for any pending readers to flush. */
> > + rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_RELAXED);
> RELAXED here will allow the critical section to execute above the wait loop. Hence it is better to make this ACQUIRE.
Would it be better to add a fence instead?
>
> > +/**
> > + * @warning
> > + * @b EXPERIMENTAL: this API may change without prior notice.
> > + *
> > + * Try to take the pflock for write.
> > + *
> > + * @param pf
> > + * A pointer to the pflock.
> > + * @return
> > + * - zero if the lock is successfully taken
> > + * - -EBUSY if lock could not be acquired for writing because
> > + * another writer holds the lock
> What about the readers holding the lock?
Originally, I had it return -EBUSY, but then all the write trylock would
fail. Trylock doesn't seem to play well with phase fair nature.
Writing is a two part operation in this model, if the 1st part succeeds
(which changes the phase), then there is no way to backout/undo the
ticket.
>
> > + */
> > +__rte_experimental
> > +static inline int
> > +rte_pflock_write_trylock(rte_pflock_t *pf) {
> > + union rte_pflock_ticket old, new;
> > + uint16_t ticket;
> > +
> > + /* Get current state of the lock */
> > + old.tickets = __atomic_load_n(&pf->wr.tickets,
> > __ATOMIC_RELAXED);
> > + new.out = old.out;
> > + new.in = old.in + 1;
> > + ticket = new.in;
> > +
> > + /* if writer is already present then too busy */
> > + if (old.out != new.in ||
> > + !__atomic_compare_exchange_n(&pf->wr.tickets, &old.tickets,
> > new.tickets,
> > + 0, __ATOMIC_ACQ_REL,
> > __ATOMIC_RELAXED))
> > + return -EBUSY; /* another writer is present already */
> > +
> > + /*
> > + * We now own the write phase, but still need to tell
> > + * readers and wait for them.
> The write lock is taken if there are no readers AND no writers (unlike the read lock which is taken if there are no writers waiting (only))
> Since this is a try lock, should we wait for the readers to give up the lock?
> I think, if the readers are present, we should give up the writer phase and return.
>
> > + *
> > + * Need ACQUIRE semantics to avoid speculative execution of wait
> > loop
> > + */
> > + ticket = __atomic_fetch_add(&pf->rd.in,
> > + (ticket & RTE_PFLOCK_PHID) |
> > RTE_PFLOCK_PRES,
> > + __ATOMIC_ACQUIRE);
> > +
> > + /* Wait for any pending readers to flush. */
> > + rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_RELAXED);
> > + return 0;
> > +}
> > +
> > +#ifdef __cplusplus
> > +}
> > +#endif
> > +
> > +#endif /* RTE_PFLOCK_H */
> > diff --git a/lib/librte_eal/ppc/include/meson.build
> > b/lib/librte_eal/ppc/include/meson.build
> > index dae40ede546e..7692a531ccba 100644
> > --- a/lib/librte_eal/ppc/include/meson.build
> > +++ b/lib/librte_eal/ppc/include/meson.build
> > @@ -11,6 +11,7 @@ arch_headers = files(
> > 'rte_mcslock.h',
> > 'rte_memcpy.h',
> > 'rte_pause.h',
> > + 'rte_pflock.h',
> > 'rte_power_intrinsics.h',
> > 'rte_prefetch.h',
> > 'rte_rwlock.h',
> > diff --git a/lib/librte_eal/ppc/include/rte_pflock.h
> > b/lib/librte_eal/ppc/include/rte_pflock.h
> > new file mode 100644
> > index 000000000000..e7b875ac56a8
> > --- /dev/null
> > +++ b/lib/librte_eal/ppc/include/rte_pflock.h
> > @@ -0,0 +1,16 @@
> > +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef
> Copyright header missing?
>
> > +_RTE_PFLOCK_PPC_64_H_ #define _RTE_PFLOCK_PPC_64_H_
> > +
> > +#ifdef __cplusplus
> > +extern "C" {
> > +#endif
> > +
> > +#include "generic/rte_pflock.h"
> > +
> > +#ifdef __cplusplus
> > +}
> > +#endif
> > +
> > +#endif /* _RTE_PFLOCK_PPC_64_H_ */
> > diff --git a/lib/librte_eal/x86/include/meson.build
> > b/lib/librte_eal/x86/include/meson.build
> > index 1a6ad0b17342..f43645c20899 100644
> > --- a/lib/librte_eal/x86/include/meson.build
> > +++ b/lib/librte_eal/x86/include/meson.build
> > @@ -10,6 +10,7 @@ arch_headers = files(
> > 'rte_mcslock.h',
> > 'rte_memcpy.h',
> > 'rte_pause.h',
> > + 'rte_pflock.h',
> > 'rte_power_intrinsics.h',
> > 'rte_prefetch.h',
> > 'rte_rtm.h',
> > diff --git a/lib/librte_eal/x86/include/rte_pflock.h
> > b/lib/librte_eal/x86/include/rte_pflock.h
> > new file mode 100644
> > index 000000000000..c2d876062c08
> > --- /dev/null
> > +++ b/lib/librte_eal/x86/include/rte_pflock.h
> > @@ -0,0 +1,18 @@
> > +/* SPDX-License-Identifier: BSD-3-Clause
> > + * Copyright(c) 2021 Microsoft Corporation */
> > +
> > +#ifndef _RTE_PFLOCK_X86_64_H_
> > +#define _RTE_PFLOCK_X86_64_H_
> > +
> > +#ifdef __cplusplus
> > +extern "C" {
> > +#endif
> > +
> > +#include "generic/rte_pflock.h"
> > +
> > +#ifdef __cplusplus
> > +}
> > +#endif
> > +
> > +#endif /* _RTE_PFLOCK_X86_64_H_ */
> > --
> > 2.30.1
>
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [dpdk-dev] [PATCH v3] pflock: implementation of phase-fair reader writer locks
2021-03-29 19:58 ` Stephen Hemminger
@ 2021-03-30 0:18 ` Honnappa Nagarahalli
2021-03-30 4:56 ` Stephen Hemminger
0 siblings, 1 reply; 27+ messages in thread
From: Honnappa Nagarahalli @ 2021-03-30 0:18 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev, Stephen Hemminger, nd, Honnappa Nagarahalli, nd
<snip>
> Subject: Re: [PATCH v3] pflock: implementation of phase-fair reader writer locks
>
> Meta question: is implementing trylock worth it?
> The original did not have it.
If there is no use for it currently, I suggest not to add. If someone sees a need, they can always add. I am ok if you add as well.
>
> There are tradeoffs about number of readers and added complexity in the code?
If we increase the size of 'in' and 'out' to 32b and 'tickets' to 64b, that should increase the number of readers. Do you see any other complexity?
This would mean 64b compare-swap in try lock, that should be fine I think.
>
> > > diff --git a/lib/librte_eal/include/generic/rte_pflock.h
> > > b/lib/librte_eal/include/generic/rte_pflock.h
> > > new file mode 100644
> > > index 000000000000..6808c70c34a2
> > > --- /dev/null
> > > +++ b/lib/librte_eal/include/generic/rte_pflock.h
> > > @@ -0,0 +1,273 @@
> > > +/* SPDX-License-Identifier: BSD-3-Clause
> > > + * Copyright(c) 2021 Microsoft Corp.
> > > + * Copyright 2011-2015 Samy Al Bahra.
> > Any reason for adding the above copy right?
>
> Code originally came from Concurrency Kit, so wanted to keep attribution to
> original author
Ack
>
> > > + * The rte_pflock_t type.
> > > + */
> > > +struct rte_pflock {
> > > + union rte_pflock_ticket {
> > > + uint32_t tickets;
> > > + struct {
> > > + uint16_t in;
> > > + uint16_t out;
> > > + };
> > > + } rd, wr;
> > Just wondering if placing these on 2 different cache lines would help the
> performance?
>
> That won't work because the implementation of trylock requires
> compare/exchange of the whole structure as an atomic operation.
I meant, placing 'rd' and 'wr' on separate cache lines. It might help in the reader-writer contention case.
>
> >
> > > +};
> > > +typedef struct rte_pflock rte_pflock_t;
> > > +
> > > +/**
> > > + * Constants used to map the bits in reader counter
> > > + *
> > > + * +-----------------+-+-+
> > > + * | Readers |W|P|
> > > + * | |R|H|
> > > + * +-----------------+-+-+
> > It would be good to indicate the reserved part.
>
> Ok
>
> >
> > > + */
> > > +
> > > +#define RTE_PFLOCK_LSB 0xFFF0
> > Based on the value of RTE_PFLOCK_RINC, should this be 0xFF00?
>
> The unused bits never get set so it doesn't matter
Agree, it just creates confusion while reading the code.
>
> >
> > > +#define RTE_PFLOCK_RINC 0x100 /* Reader increment value.
> > Does this mean, there can be only 256 concurrent readers?
>
> Yes, there is a tradeoff. If you assume that the largest atomic operation is 64
> bits, and you want to support trylock then 256 readers is the limit.
>
May be I am missing something, I see that you are using 32b atomic operations. 'union rte_pflock_ticket' is 32b.
> The original code has 32 bit counters but no trylock.
>
>
> > > +__rte_experimental
> > > +static inline void
> > > +rte_pflock_read_lock(rte_pflock_t *pf) {
> > > + uint32_t w;
> > > +
> > > + /*
> > > + * If no writer is present, then the operation has completed
> > > + * successfully.
> > > + */
> > > + w = __atomic_fetch_add(&pf->rd.in, RTE_PFLOCK_RINC,
> > > __ATOMIC_ACQ_REL) & RTE_PFLOCK_WBITS;
> > Any reason for the RELEASE? I think ACQUIRE is enough as the write to rd.in is
> not releasing any previous memory operations.
>
> That make sense, will fix
>
> > > +__rte_experimental
> > > +static inline int
> > > +rte_pflock_read_trylock(rte_pflock_t *pf) {
> > > + union rte_pflock_ticket old, new;
> > > +
> > > + /* Get current state of the lock */
> > > + old.tickets = __atomic_load_n(&pf->rd.tickets,
> > > __ATOMIC_RELAXED);
> > > +
> > > + /* loop until writer shows up */
> > > + while ((old.in & RTE_PFLOCK_WBITS) == 0) {
> > > + new.out = old.out;
> > > + new.in = old.in + RTE_PFLOCK_RINC;
> > > + if (__atomic_compare_exchange_n(&pf->rd.tickets,
> > > &old.tickets, new.tickets,
> > > + 0, __ATOMIC_ACQ_REL,
> >
> ^^^ I think ACQUIRE is enough. We are not releasing anything to other
> threads.
>
> Fixed.
>
> >
> > > __ATOMIC_RELAXED))
> > > + return 0; /* got it */
> > > +
> > > + /* either new reader got in (so retry) or a writer */
> > > + }
> > > +
>
> > > +__rte_experimental
> > > +static inline void
> > > +rte_pflock_write_lock(rte_pflock_t *pf) {
> > > + uint16_t ticket;
> > > +
> > > + /* Acquire ownership of write-phase. */
> > > + ticket = __atomic_fetch_add(&pf->wr.in, 1, __ATOMIC_ACQUIRE);
> > > + rte_wait_until_equal_16(&pf->wr.out, ticket, __ATOMIC_RELAXED);
> > > +
> > > + /*
> > > + * Acquire ticket on read-side in order to allow them
> > > + * to flush. Indicates to any incoming reader that a
> > > + * write-phase is pending.
> > > + *
> > > + * Need ACQUIRE to prevent speculative execution of the wait loop
> > I do not think the entire wait loop will be executed speculatively. Only the load
> of pf->rd.out would happen speculatively. There is a dependency on 'ticket'
> variable. So, the load of the 'ticket' variable should happen after 'ticket' is
> updated below.
> >
> > > + */
> > > + ticket = __atomic_fetch_add(&pf->rd.in,
> > > + (ticket & RTE_PFLOCK_PHID) |
> > > RTE_PFLOCK_PRES,
> > > + __ATOMIC_ACQUIRE);
> > Since, it is ok to execute part of the wait loop above this. We could make this
> RELAXED.
> > Also, since we just need to set the 2 bits, is it better to use __atomic_fetch_or?
> It also matches with the use of __atomic_fetch_and in the unlock API.
>
>
> ticket = __atomic_fetch_or(&pf->rd.in,
> (ticket & RTE_PFLOCK_PHID) |
> RTE_PFLOCK_PRES,
> __ATOMIC_RELAXED
Ack
>
> > > +
> > > + /* Wait for any pending readers to flush. */
> > > + rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_RELAXED);
> > RELAXED here will allow the critical section to execute above the wait loop.
> Hence it is better to make this ACQUIRE.
>
> Would it be better to add a fence instead?
Acquire fence here will have more restrictions for the micro-architecture to optimize. It does not allow the earlier reads to cross the fence (a load-acquire would allow it).
Good to run performance tests to confirm.
> >
> > > +/**
> > > + * @warning
> > > + * @b EXPERIMENTAL: this API may change without prior notice.
> > > + *
> > > + * Try to take the pflock for write.
> > > + *
> > > + * @param pf
> > > + * A pointer to the pflock.
> > > + * @return
> > > + * - zero if the lock is successfully taken
> > > + * - -EBUSY if lock could not be acquired for writing because
> > > + * another writer holds the lock
> > What about the readers holding the lock?
>
> Originally, I had it return -EBUSY, but then all the write trylock would fail.
Ok. It is also not clear what the try lock should do? Without the clear requirements we will bind ourselves into an implement which might not be suitable in the future. May be it is better to skip it.
> Trylock doesn't seem to play well with phase fair nature.
>
> Writing is a two part operation in this model, if the 1st part succeeds (which
> changes the phase), then there is no way to backout/undo the ticket.
The undo operation is similar to 'rte_pflock_write_unlock'? Reset the phase bits and increment the ticket.
>
>
>
> >
> > > + */
> > > +__rte_experimental
> > > +static inline int
> > > +rte_pflock_write_trylock(rte_pflock_t *pf) {
> > > + union rte_pflock_ticket old, new;
> > > + uint16_t ticket;
> > > +
> > > + /* Get current state of the lock */
> > > + old.tickets = __atomic_load_n(&pf->wr.tickets,
> > > __ATOMIC_RELAXED);
> > > + new.out = old.out;
> > > + new.in = old.in + 1;
> > > + ticket = new.in;
> > > +
> > > + /* if writer is already present then too busy */
> > > + if (old.out != new.in ||
> > > + !__atomic_compare_exchange_n(&pf->wr.tickets, &old.tickets,
> > > new.tickets,
> > > + 0, __ATOMIC_ACQ_REL,
> > > __ATOMIC_RELAXED))
> > > + return -EBUSY; /* another writer is present already */
> > > +
> > > + /*
> > > + * We now own the write phase, but still need to tell
> > > + * readers and wait for them.
> > The write lock is taken if there are no readers AND no writers (unlike the read
> lock which is taken if there are no writers waiting (only))
> > Since this is a try lock, should we wait for the readers to give up the lock?
> > I think, if the readers are present, we should give up the writer phase and
> return.
> >
> > > + *
> > > + * Need ACQUIRE semantics to avoid speculative execution of wait
> > > loop
> > > + */
> > > + ticket = __atomic_fetch_add(&pf->rd.in,
> > > + (ticket & RTE_PFLOCK_PHID) |
> > > RTE_PFLOCK_PRES,
> > > + __ATOMIC_ACQUIRE);
> > > +
> > > + /* Wait for any pending readers to flush. */
> > > + rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_RELAXED);
> > > + return 0;
> > > +}
> > > +
> > > +#ifdef __cplusplus
> > > +}
> > > +#endif
> > > +
> > > +#endif /* RTE_PFLOCK_H */
> > > diff --git a/lib/librte_eal/ppc/include/meson.build
> > > b/lib/librte_eal/ppc/include/meson.build
> > > index dae40ede546e..7692a531ccba 100644
> > > --- a/lib/librte_eal/ppc/include/meson.build
> > > +++ b/lib/librte_eal/ppc/include/meson.build
> > > @@ -11,6 +11,7 @@ arch_headers = files(
> > > 'rte_mcslock.h',
> > > 'rte_memcpy.h',
> > > 'rte_pause.h',
> > > + 'rte_pflock.h',
> > > 'rte_power_intrinsics.h',
> > > 'rte_prefetch.h',
> > > 'rte_rwlock.h',
> > > diff --git a/lib/librte_eal/ppc/include/rte_pflock.h
> > > b/lib/librte_eal/ppc/include/rte_pflock.h
> > > new file mode 100644
> > > index 000000000000..e7b875ac56a8
> > > --- /dev/null
> > > +++ b/lib/librte_eal/ppc/include/rte_pflock.h
> > > @@ -0,0 +1,16 @@
> > > +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef
> > Copyright header missing?
> >
> > > +_RTE_PFLOCK_PPC_64_H_ #define _RTE_PFLOCK_PPC_64_H_
> > > +
> > > +#ifdef __cplusplus
> > > +extern "C" {
> > > +#endif
> > > +
> > > +#include "generic/rte_pflock.h"
> > > +
> > > +#ifdef __cplusplus
> > > +}
> > > +#endif
> > > +
> > > +#endif /* _RTE_PFLOCK_PPC_64_H_ */
> > > diff --git a/lib/librte_eal/x86/include/meson.build
> > > b/lib/librte_eal/x86/include/meson.build
> > > index 1a6ad0b17342..f43645c20899 100644
> > > --- a/lib/librte_eal/x86/include/meson.build
> > > +++ b/lib/librte_eal/x86/include/meson.build
> > > @@ -10,6 +10,7 @@ arch_headers = files(
> > > 'rte_mcslock.h',
> > > 'rte_memcpy.h',
> > > 'rte_pause.h',
> > > + 'rte_pflock.h',
> > > 'rte_power_intrinsics.h',
> > > 'rte_prefetch.h',
> > > 'rte_rtm.h',
> > > diff --git a/lib/librte_eal/x86/include/rte_pflock.h
> > > b/lib/librte_eal/x86/include/rte_pflock.h
> > > new file mode 100644
> > > index 000000000000..c2d876062c08
> > > --- /dev/null
<snip>
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [dpdk-dev] [PATCH v3] pflock: implementation of phase-fair reader writer locks
2021-03-30 0:18 ` Honnappa Nagarahalli
@ 2021-03-30 4:56 ` Stephen Hemminger
0 siblings, 0 replies; 27+ messages in thread
From: Stephen Hemminger @ 2021-03-30 4:56 UTC (permalink / raw)
To: Honnappa Nagarahalli; +Cc: dev, Stephen Hemminger, nd
On Tue, 30 Mar 2021 00:18:40 +0000
Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com> wrote:
> > That won't work because the implementation of trylock requires
> > compare/exchange of the whole structure as an atomic operation.
> I meant, placing 'rd' and 'wr' on separate cache lines. It might help in the reader-writer contention case.
Except ARM default cache size is 128 which makes these locks rather large.
The reader is the hot case and it doesn't look at the writer part.
^ permalink raw reply [flat|nested] 27+ messages in thread
* [dpdk-dev] [PATCH v4] pflock: add phase-fair reader writer locks
2021-02-12 1:38 ` [dpdk-dev] [RFC] pflock: add implementation of phase-fair locks Stephen Hemminger
` (2 preceding siblings ...)
2021-03-03 19:19 ` [dpdk-dev] [PATCH v3] " Stephen Hemminger
@ 2021-03-30 5:00 ` Stephen Hemminger
2021-03-30 5:14 ` Stephen Hemminger
2021-03-31 4:19 ` Honnappa Nagarahalli
2021-04-02 1:42 ` [dpdk-dev] [PATCH v5] pflock: implementation of " Stephen Hemminger
4 siblings, 2 replies; 27+ messages in thread
From: Stephen Hemminger @ 2021-03-30 5:00 UTC (permalink / raw)
To: Honnappa.Nagarahalli; +Cc: dev, Stephen Hemminger
This is a new type of reader-writer lock that provides better fairness
guarantees which better suited for typical DPDK applications.
A pflock has two ticket pools, one for readers and one
for writers.
Phase fair reader writer locks ensure that neither reader nor writer will be
starved. Neither reader or writer are preferred, they execute in
alternating phases. All operations of the same type (reader or writer)
that acquire the lock are handled in FIFO order. Write
operations are exclusive, and multiple read operations can be run
together (until a write arrives).
A similar implementation is in Concurrency Kit package in FreeBSD.
For more information see:
"Reader-Writer Synchronization for Shared-Memory Multiprocessor
Real-Time Systems",
http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
app/test/meson.build | 2 +
app/test/test_pflock.c | 193 +++++++++++++++++++
lib/librte_eal/arm/include/meson.build | 1 +
lib/librte_eal/arm/include/rte_pflock.h | 18 ++
lib/librte_eal/include/generic/rte_pflock.h | 202 ++++++++++++++++++++
lib/librte_eal/ppc/include/meson.build | 1 +
lib/librte_eal/ppc/include/rte_pflock.h | 17 ++
lib/librte_eal/x86/include/meson.build | 1 +
lib/librte_eal/x86/include/rte_pflock.h | 18 ++
9 files changed, 453 insertions(+)
create mode 100644 app/test/test_pflock.c
create mode 100644 lib/librte_eal/arm/include/rte_pflock.h
create mode 100644 lib/librte_eal/include/generic/rte_pflock.h
create mode 100644 lib/librte_eal/ppc/include/rte_pflock.h
create mode 100644 lib/librte_eal/x86/include/rte_pflock.h
diff --git a/app/test/meson.build b/app/test/meson.build
index 76eaaea45746..bd50818f82b0 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -90,6 +90,7 @@ test_sources = files('commands.c',
'test_mcslock.c',
'test_mp_secondary.c',
'test_per_lcore.c',
+ 'test_pflock.c',
'test_pmd_perf.c',
'test_power.c',
'test_power_cpufreq.c',
@@ -228,6 +229,7 @@ fast_tests = [
['meter_autotest', true],
['multiprocess_autotest', false],
['per_lcore_autotest', true],
+ ['pflock_autotest', true],
['prefetch_autotest', true],
['rcu_qsbr_autotest', true],
['red_autotest', true],
diff --git a/app/test/test_pflock.c b/app/test/test_pflock.c
new file mode 100644
index 000000000000..5e3c05767767
--- /dev/null
+++ b/app/test/test_pflock.c
@@ -0,0 +1,193 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <unistd.h>
+#include <sys/queue.h>
+#include <string.h>
+
+#include <rte_common.h>
+#include <rte_memory.h>
+#include <rte_per_lcore.h>
+#include <rte_launch.h>
+#include <rte_pause.h>
+#include <rte_pflock.h>
+#include <rte_eal.h>
+#include <rte_lcore.h>
+#include <rte_cycles.h>
+
+#include "test.h"
+
+/*
+ * phase fair lock test
+ * ===========
+ * Provides UT for phase fair lock API.
+ * Main concern is on functional testing, but also provides some
+ * performance measurements.
+ * Obviously for proper testing need to be executed with more than one lcore.
+ */
+
+#define ITER_NUM 0x80
+
+#define TEST_SEC 5
+
+static rte_pflock_t sl;
+static rte_pflock_t sl_tab[RTE_MAX_LCORE];
+static uint32_t synchro;
+
+enum {
+ LC_TYPE_RDLOCK,
+ LC_TYPE_WRLOCK,
+};
+
+static int
+test_pflock_per_core(__rte_unused void *arg)
+{
+ rte_pflock_write_lock(&sl);
+ printf("Global write lock taken on core %u\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl);
+
+ rte_pflock_write_lock(&sl_tab[rte_lcore_id()]);
+ printf("Hello from core %u !\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl_tab[rte_lcore_id()]);
+
+ rte_pflock_read_lock(&sl);
+ printf("Global read lock taken on core %u\n", rte_lcore_id());
+ rte_delay_ms(100);
+ printf("Release global read lock on core %u\n", rte_lcore_id());
+ rte_pflock_read_unlock(&sl);
+
+ return 0;
+}
+
+static rte_pflock_t lk = RTE_PFLOCK_INITIALIZER;
+static volatile uint64_t pflock_data;
+static uint64_t time_count[RTE_MAX_LCORE] = {0};
+
+#define MAX_LOOP 10000
+#define TEST_PFLOCK_DEBUG 0
+
+static int
+load_loop_fn(__rte_unused void *arg)
+{
+ uint64_t time_diff = 0, begin;
+ uint64_t hz = rte_get_timer_hz();
+ uint64_t lcount = 0;
+ const unsigned int lcore = rte_lcore_id();
+
+ /* wait synchro for workers */
+ if (lcore != rte_get_main_lcore())
+ rte_wait_until_equal_32(&synchro, 1, __ATOMIC_RELAXED);
+
+ begin = rte_rdtsc_precise();
+ while (lcount < MAX_LOOP) {
+ rte_pflock_write_lock(&lk);
+ ++pflock_data;
+ rte_pflock_write_unlock(&lk);
+
+ rte_pflock_read_lock(&lk);
+ if (TEST_PFLOCK_DEBUG && !(lcount % 100))
+ printf("Core [%u] pflock_data = %"PRIu64"\n",
+ lcore, pflock_data);
+ rte_pflock_read_unlock(&lk);
+
+ lcount++;
+ /* delay to make lock duty cycle slightly realistic */
+ rte_pause();
+ }
+
+ time_diff = rte_rdtsc_precise() - begin;
+ time_count[lcore] = time_diff * 1000000 / hz;
+ return 0;
+}
+
+static int
+test_pflock_perf(void)
+{
+ unsigned int i;
+ uint64_t total = 0;
+
+ printf("\nPhase fair test on %u cores...\n", rte_lcore_count());
+
+ /* clear synchro and start workers */
+ synchro = 0;
+ if (rte_eal_mp_remote_launch(load_loop_fn, NULL, SKIP_MAIN) < 0)
+ return -1;
+
+ /* start synchro and launch test on main */
+ __atomic_store_n(&synchro, 1, __ATOMIC_RELAXED);
+ load_loop_fn(NULL);
+
+ rte_eal_mp_wait_lcore();
+
+ RTE_LCORE_FOREACH(i) {
+ printf("Core [%u] cost time = %"PRIu64" us\n",
+ i, time_count[i]);
+ total += time_count[i];
+ }
+
+ printf("Total cost time = %"PRIu64" us\n", total);
+ memset(time_count, 0, sizeof(time_count));
+
+ return 0;
+}
+
+/*
+ * - There is a global pflock and a table of pflocks (one per lcore).
+ *
+ * - The test function takes all of these locks and launches the
+ * ``test_pflock_per_core()`` function on each core (except the main).
+ *
+ * - The function takes the global write lock, display something,
+ * then releases the global lock.
+ * - Then, it takes the per-lcore write lock, display something, and
+ * releases the per-core lock.
+ * - Finally, a read lock is taken during 100 ms, then released.
+ *
+ * - The main function unlocks the per-lcore locks sequentially and
+ * waits between each lock. This triggers the display of a message
+ * for each core, in the correct order.
+ *
+ * Then, it tries to take the global write lock and display the last
+ * message. The autotest script checks that the message order is correct.
+ */
+static int
+test_pflock(void)
+{
+ int i;
+
+ rte_pflock_init(&sl);
+ for (i = 0; i < RTE_MAX_LCORE; i++)
+ rte_pflock_init(&sl_tab[i]);
+
+ rte_pflock_write_lock(&sl);
+
+ RTE_LCORE_FOREACH_WORKER(i) {
+ rte_pflock_write_lock(&sl_tab[i]);
+ rte_eal_remote_launch(test_pflock_per_core, NULL, i);
+ }
+
+ rte_pflock_write_unlock(&sl);
+
+ RTE_LCORE_FOREACH_WORKER(i) {
+ rte_pflock_write_unlock(&sl_tab[i]);
+ rte_delay_ms(100);
+ }
+
+ rte_pflock_write_lock(&sl);
+ /* this message should be the last message of test */
+ printf("Global write lock taken on main core %u\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl);
+
+ rte_eal_mp_wait_lcore();
+
+ if (test_pflock_perf() < 0)
+ return -1;
+
+ return 0;
+}
+
+REGISTER_TEST_COMMAND(pflock_autotest, test_pflock);
diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build
index 770766de1a34..2c3cff61bed6 100644
--- a/lib/librte_eal/arm/include/meson.build
+++ b/lib/librte_eal/arm/include/meson.build
@@ -21,6 +21,7 @@ arch_headers = files(
'rte_pause_32.h',
'rte_pause_64.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch_32.h',
'rte_prefetch_64.h',
diff --git a/lib/librte_eal/arm/include/rte_pflock.h b/lib/librte_eal/arm/include/rte_pflock.h
new file mode 100644
index 000000000000..bb9934eec469
--- /dev/null
+++ b/lib/librte_eal/arm/include/rte_pflock.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#ifndef _RTE_PFLOCK_ARM_H_
+#define _RTE_PFLOCK_ARM_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_ARM_H_ */
diff --git a/lib/librte_eal/include/generic/rte_pflock.h b/lib/librte_eal/include/generic/rte_pflock.h
new file mode 100644
index 000000000000..7c183633df60
--- /dev/null
+++ b/lib/librte_eal/include/generic/rte_pflock.h
@@ -0,0 +1,202 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corp.
+ * All rights reserved.
+ *
+ * Derived from Concurrency Kit
+ * Copyright 2011-2015 Samy Al Bahra.
+ */
+
+#ifndef _RTE_PFLOCK_H_
+#define _RTE_PFLOCK_H_
+
+/**
+ * @file
+ *
+ * Phase-fair locks
+ *
+ * This file defines an API for Phase Fair reader writer locks,
+ * which is a variant of typical reader-writer locks that prevent
+ * starvation. In this type of lock, readers and writers alternate.
+ * This significantly reduces the worst-case blocking for readers and writers.
+ *
+ * This is an implementation derived from FreeBSD
+ * based on the work described in:
+ * Brandenburg, B. and Anderson, J. 2010. Spin-Based
+ * Reader-Writer Synchronization for Multiprocessor Real-Time Systems
+ *
+ * All locks must be initialised before use, and only initialised once.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <rte_common.h>
+#include <rte_pause.h>
+
+/**
+ * The rte_pflock_t type.
+ */
+struct rte_pflock {
+ struct {
+ uint16_t in;
+ uint16_t out;
+ } rd, wr;
+};
+typedef struct rte_pflock rte_pflock_t;
+
+/*
+ * Allocation of bits to reader
+ *
+ * 16 8 7 2 1 0
+ * +-------------------+------+-+-+
+ * | rin: reads issued |unused| | |
+ * +-------------------+------+-+-+
+ * ^ ^
+ * | |
+ * PRES: writer present ---+ |
+ * PHID: writer phase id ----+
+ *
+ * 16 2 7 0
+ * +------------------+------+
+ * |rout:read complete|unused|
+ * +------------------+------+
+ *
+ * The maximum number of readers is 4095
+ */
+
+/* Constants used to map the bits in reader counter */
+#define RTE_PFLOCK_WBITS 0x3 /* Writer bits in reader. */
+#define RTE_PFLOCK_PRES 0x2 /* Writer present bit. */
+#define RTE_PFLOCK_PHID 0x1 /* Phase ID bit. */
+#define RTE_PFLOCK_LSB 0xFFF0 /* reader bits. */
+#define RTE_PFLOCK_RINC 0x10 /* Reader increment. */
+
+/**
+ * A static pflock initializer.
+ */
+#define RTE_PFLOCK_INITIALIZER { }
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Initialize the pflock to an unlocked state.
+ *
+ * @param pf
+ * A pointer to the pflock.
+ */
+__rte_experimental
+static inline void
+rte_pflock_init(struct rte_pflock *pf)
+{
+ memset(pf, 0, sizeof(*pf));
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Take a pflock for read.
+ *
+ * @param pf
+ * A pointer to a pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_read_lock(rte_pflock_t *pf)
+{
+ uint16_t w;
+
+ /*
+ * If no writer is present, then the operation has completed
+ * successfully.
+ */
+ w = __atomic_fetch_add(&pf->rd.in, RTE_PFLOCK_RINC, __ATOMIC_ACQUIRE)
+ & RTE_PFLOCK_WBITS;
+ if (w == 0)
+ return;
+
+ /* Wait for current write phase to complete. */
+ while ((__atomic_load_n(&pf->rd.in, __ATOMIC_ACQUIRE) & RTE_PFLOCK_WBITS) == w)
+ rte_pause();
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Release a pflock locked for reading.
+ *
+ * @param pf
+ * A pointer to the pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_read_unlock(rte_pflock_t *pf)
+{
+ __atomic_fetch_add(&pf->rd.out, RTE_PFLOCK_RINC, __ATOMIC_RELEASE);
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Take the pflock for write.
+ *
+ * @param pf
+ * A pointer to the ticketlock.
+ */
+__rte_experimental
+static inline void
+rte_pflock_write_lock(rte_pflock_t *pf)
+{
+ uint16_t ticket, w;
+
+ /* Acquire ownership of write-phase.
+ * This is same as rte_tickelock_lock().
+ */
+ ticket = __atomic_fetch_add(&pf->wr.in, 1, __ATOMIC_RELAXED);
+ rte_wait_until_equal_16(&pf->wr.out, ticket, __ATOMIC_ACQUIRE);
+
+ /*
+ * Acquire ticket on read-side in order to allow them
+ * to flush. Indicates to any incoming reader that a
+ * write-phase is pending.
+ *
+ * The load of rd.out in wait loop could be executed
+ * speculatively.
+ */
+ w = RTE_PFLOCK_PRES | (ticket & RTE_PFLOCK_PHID);
+ ticket = __atomic_fetch_add(&pf->rd.in, w, __ATOMIC_RELAXED);
+
+ /* Wait for any pending readers to flush. */
+ rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_ACQUIRE);
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Release a pflock held for writing.
+ *
+ * @param pf
+ * A pointer to a pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_write_unlock(rte_pflock_t *pf)
+{
+ /* Migrate from write phase to read phase. */
+ __atomic_fetch_and(&pf->rd.in, RTE_PFLOCK_LSB, __ATOMIC_RELEASE);
+
+ /* Allow other writers to continue. */
+ __atomic_fetch_add(&pf->wr.out, 1, __ATOMIC_RELEASE);
+}
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RTE_PFLOCK_H */
diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build
index dae40ede546e..7692a531ccba 100644
--- a/lib/librte_eal/ppc/include/meson.build
+++ b/lib/librte_eal/ppc/include/meson.build
@@ -11,6 +11,7 @@ arch_headers = files(
'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rwlock.h',
diff --git a/lib/librte_eal/ppc/include/rte_pflock.h b/lib/librte_eal/ppc/include/rte_pflock.h
new file mode 100644
index 000000000000..27c201b11d05
--- /dev/null
+++ b/lib/librte_eal/ppc/include/rte_pflock.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+#ifndef _RTE_PFLOCK_PPC_64_H_
+#define _RTE_PFLOCK_PPC_64_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_PPC_64_H_ */
diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build
index 1a6ad0b17342..f43645c20899 100644
--- a/lib/librte_eal/x86/include/meson.build
+++ b/lib/librte_eal/x86/include/meson.build
@@ -10,6 +10,7 @@ arch_headers = files(
'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rtm.h',
diff --git a/lib/librte_eal/x86/include/rte_pflock.h b/lib/librte_eal/x86/include/rte_pflock.h
new file mode 100644
index 000000000000..c2d876062c08
--- /dev/null
+++ b/lib/librte_eal/x86/include/rte_pflock.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#ifndef _RTE_PFLOCK_X86_64_H_
+#define _RTE_PFLOCK_X86_64_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_X86_64_H_ */
--
2.30.2
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [dpdk-dev] [PATCH v4] pflock: add phase-fair reader writer locks
2021-03-30 5:00 ` [dpdk-dev] [PATCH v4] pflock: add " Stephen Hemminger
@ 2021-03-30 5:14 ` Stephen Hemminger
2021-03-31 4:19 ` Honnappa Nagarahalli
1 sibling, 0 replies; 27+ messages in thread
From: Stephen Hemminger @ 2021-03-30 5:14 UTC (permalink / raw)
To: Honnappa.Nagarahalli; +Cc: dev
On Mon, 29 Mar 2021 22:00:47 -0700
Stephen Hemminger <stephen@networkplumber.org> wrote:
> This is a new type of reader-writer lock that provides better fairness
> guarantees which better suited for typical DPDK applications.
> A pflock has two ticket pools, one for readers and one
> for writers.
>
> Phase fair reader writer locks ensure that neither reader nor writer will be
> starved. Neither reader or writer are preferred, they execute in
> alternating phases. All operations of the same type (reader or writer)
> that acquire the lock are handled in FIFO order. Write
> operations are exclusive, and multiple read operations can be run
> together (until a write arrives).
>
> A similar implementation is in Concurrency Kit package in FreeBSD.
> For more information see:
> "Reader-Writer Synchronization for Shared-Memory Multiprocessor
> Real-Time Systems",
> http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
v4 incorporates feedback, adds some comments and drops the trylock for now.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [dpdk-dev] [PATCH v4] pflock: add phase-fair reader writer locks
2021-03-30 5:00 ` [dpdk-dev] [PATCH v4] pflock: add " Stephen Hemminger
2021-03-30 5:14 ` Stephen Hemminger
@ 2021-03-31 4:19 ` Honnappa Nagarahalli
2021-03-31 16:32 ` Stephen Hemminger
2021-04-02 1:37 ` Stephen Hemminger
1 sibling, 2 replies; 27+ messages in thread
From: Honnappa Nagarahalli @ 2021-03-31 4:19 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev, nd, Honnappa Nagarahalli, nd
<snip>
Few minor comments, overall looks good. Tested on few Arm platforms.
>
> This is a new type of reader-writer lock that provides better fairness
> guarantees which better suited for typical DPDK applications.
> A pflock has two ticket pools, one for readers and one for writers.
>
> Phase fair reader writer locks ensure that neither reader nor writer will be
> starved. Neither reader or writer are preferred, they execute in alternating
> phases. All operations of the same type (reader or writer) that acquire the
> lock are handled in FIFO order. Write operations are exclusive, and multiple
> read operations can be run together (until a write arrives).
>
> A similar implementation is in Concurrency Kit package in FreeBSD.
> For more information see:
> "Reader-Writer Synchronization for Shared-Memory Multiprocessor
> Real-Time Systems",
> http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
> app/test/meson.build | 2 +
> app/test/test_pflock.c | 193 +++++++++++++++++++
> lib/librte_eal/arm/include/meson.build | 1 +
> lib/librte_eal/arm/include/rte_pflock.h | 18 ++
> lib/librte_eal/include/generic/rte_pflock.h | 202 ++++++++++++++++++++
> lib/librte_eal/ppc/include/meson.build | 1 +
> lib/librte_eal/ppc/include/rte_pflock.h | 17 ++
> lib/librte_eal/x86/include/meson.build | 1 +
> lib/librte_eal/x86/include/rte_pflock.h | 18 ++
> 9 files changed, 453 insertions(+)
> create mode 100644 app/test/test_pflock.c create mode 100644
> lib/librte_eal/arm/include/rte_pflock.h
> create mode 100644 lib/librte_eal/include/generic/rte_pflock.h
> create mode 100644 lib/librte_eal/ppc/include/rte_pflock.h
> create mode 100644 lib/librte_eal/x86/include/rte_pflock.h
>
> diff --git a/app/test/meson.build b/app/test/meson.build index
> 76eaaea45746..bd50818f82b0 100644
> --- a/app/test/meson.build
> +++ b/app/test/meson.build
> @@ -90,6 +90,7 @@ test_sources = files('commands.c',
> 'test_mcslock.c',
> 'test_mp_secondary.c',
> 'test_per_lcore.c',
> + 'test_pflock.c',
> 'test_pmd_perf.c',
> 'test_power.c',
> 'test_power_cpufreq.c',
> @@ -228,6 +229,7 @@ fast_tests = [
> ['meter_autotest', true],
> ['multiprocess_autotest', false],
> ['per_lcore_autotest', true],
> + ['pflock_autotest', true],
> ['prefetch_autotest', true],
> ['rcu_qsbr_autotest', true],
> ['red_autotest', true],
> diff --git a/app/test/test_pflock.c b/app/test/test_pflock.c new file mode
> 100644 index 000000000000..5e3c05767767
> --- /dev/null
> +++ b/app/test/test_pflock.c
> @@ -0,0 +1,193 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2021 Microsoft Corporation */
> +
> +#include <stdio.h>
> +#include <stdint.h>
> +#include <inttypes.h>
> +#include <unistd.h>
> +#include <sys/queue.h>
> +#include <string.h>
> +
> +#include <rte_common.h>
> +#include <rte_memory.h>
> +#include <rte_per_lcore.h>
> +#include <rte_launch.h>
> +#include <rte_pause.h>
> +#include <rte_pflock.h>
> +#include <rte_eal.h>
> +#include <rte_lcore.h>
> +#include <rte_cycles.h>
> +
> +#include "test.h"
> +
> +/*
> + * phase fair lock test
> + * ===========
> + * Provides UT for phase fair lock API.
> + * Main concern is on functional testing, but also provides some
> + * performance measurements.
> + * Obviously for proper testing need to be executed with more than one
> lcore.
> + */
> +
> +#define ITER_NUM 0x80
> +
> +#define TEST_SEC 5
The above 2 #defines are not used, you can remove them
> +
> +static rte_pflock_t sl;
> +static rte_pflock_t sl_tab[RTE_MAX_LCORE]; static uint32_t synchro;
> +
> +enum {
> + LC_TYPE_RDLOCK,
> + LC_TYPE_WRLOCK,
> +};
This enum is not used, you can remove it
> +
> +static int
> +test_pflock_per_core(__rte_unused void *arg) {
> + rte_pflock_write_lock(&sl);
> + printf("Global write lock taken on core %u\n", rte_lcore_id());
> + rte_pflock_write_unlock(&sl);
> +
> + rte_pflock_write_lock(&sl_tab[rte_lcore_id()]);
> + printf("Hello from core %u !\n", rte_lcore_id());
> + rte_pflock_write_unlock(&sl_tab[rte_lcore_id()]);
> +
> + rte_pflock_read_lock(&sl);
> + printf("Global read lock taken on core %u\n", rte_lcore_id());
> + rte_delay_ms(100);
> + printf("Release global read lock on core %u\n", rte_lcore_id());
> + rte_pflock_read_unlock(&sl);
> +
> + return 0;
> +}
> +
> +static rte_pflock_t lk = RTE_PFLOCK_INITIALIZER; static volatile
> +uint64_t pflock_data; static uint64_t time_count[RTE_MAX_LCORE] = {0};
> +
> +#define MAX_LOOP 10000
> +#define TEST_PFLOCK_DEBUG 0
> +
> +static int
> +load_loop_fn(__rte_unused void *arg)
> +{
> + uint64_t time_diff = 0, begin;
> + uint64_t hz = rte_get_timer_hz();
> + uint64_t lcount = 0;
> + const unsigned int lcore = rte_lcore_id();
> +
> + /* wait synchro for workers */
> + if (lcore != rte_get_main_lcore())
> + rte_wait_until_equal_32(&synchro, 1, __ATOMIC_RELAXED);
> +
> + begin = rte_rdtsc_precise();
> + while (lcount < MAX_LOOP) {
> + rte_pflock_write_lock(&lk);
> + ++pflock_data;
This should be an atomic increment, better to use atomic fetch add
> + rte_pflock_write_unlock(&lk);
> +
> + rte_pflock_read_lock(&lk);
> + if (TEST_PFLOCK_DEBUG && !(lcount % 100))
> + printf("Core [%u] pflock_data = %"PRIu64"\n",
> + lcore, pflock_data);
> + rte_pflock_read_unlock(&lk);
> +
> + lcount++;
> + /* delay to make lock duty cycle slightly realistic */
> + rte_pause();
> + }
> +
> + time_diff = rte_rdtsc_precise() - begin;
> + time_count[lcore] = time_diff * 1000000 / hz;
> + return 0;
> +}
> +
> +static int
> +test_pflock_perf(void)
> +{
> + unsigned int i;
> + uint64_t total = 0;
> +
> + printf("\nPhase fair test on %u cores...\n", rte_lcore_count());
> +
> + /* clear synchro and start workers */
> + synchro = 0;
> + if (rte_eal_mp_remote_launch(load_loop_fn, NULL, SKIP_MAIN) <
> 0)
> + return -1;
> +
> + /* start synchro and launch test on main */
> + __atomic_store_n(&synchro, 1, __ATOMIC_RELAXED);
> + load_loop_fn(NULL);
> +
> + rte_eal_mp_wait_lcore();
> +
> + RTE_LCORE_FOREACH(i) {
> + printf("Core [%u] cost time = %"PRIu64" us\n",
> + i, time_count[i]);
> + total += time_count[i];
> + }
> +
> + printf("Total cost time = %"PRIu64" us\n", total);
> + memset(time_count, 0, sizeof(time_count));
> +
> + return 0;
> +}
> +
> +/*
> + * - There is a global pflock and a table of pflocks (one per lcore).
> + *
> + * - The test function takes all of these locks and launches the
> + * ``test_pflock_per_core()`` function on each core (except the main).
> + *
> + * - The function takes the global write lock, display something,
> + * then releases the global lock.
> + * - Then, it takes the per-lcore write lock, display something, and
> + * releases the per-core lock.
> + * - Finally, a read lock is taken during 100 ms, then released.
> + *
> + * - The main function unlocks the per-lcore locks sequentially and
> + * waits between each lock. This triggers the display of a message
> + * for each core, in the correct order.
> + *
> + * Then, it tries to take the global write lock and display the last
> + * message. The autotest script checks that the message order is correct.
> + */
> +static int
> +test_pflock(void)
> +{
> + int i;
> +
> + rte_pflock_init(&sl);
> + for (i = 0; i < RTE_MAX_LCORE; i++)
> + rte_pflock_init(&sl_tab[i]);
> +
> + rte_pflock_write_lock(&sl);
> +
> + RTE_LCORE_FOREACH_WORKER(i) {
> + rte_pflock_write_lock(&sl_tab[i]);
> + rte_eal_remote_launch(test_pflock_per_core, NULL, i);
> + }
> +
> + rte_pflock_write_unlock(&sl);
> +
> + RTE_LCORE_FOREACH_WORKER(i) {
> + rte_pflock_write_unlock(&sl_tab[i]);
> + rte_delay_ms(100);
> + }
> +
> + rte_pflock_write_lock(&sl);
> + /* this message should be the last message of test */
> + printf("Global write lock taken on main core %u\n", rte_lcore_id());
> + rte_pflock_write_unlock(&sl);
> +
> + rte_eal_mp_wait_lcore();
> +
> + if (test_pflock_perf() < 0)
Suggest separating out the performance test so that it is not run on the cloud CI platforms (which have issues with performance tests timing out). I think autotest_data.py needs to be modified.
> + return -1;
> +
> + return 0;
> +}
> +
> +REGISTER_TEST_COMMAND(pflock_autotest, test_pflock);
> diff --git a/lib/librte_eal/arm/include/meson.build
> b/lib/librte_eal/arm/include/meson.build
> index 770766de1a34..2c3cff61bed6 100644
> --- a/lib/librte_eal/arm/include/meson.build
> +++ b/lib/librte_eal/arm/include/meson.build
> @@ -21,6 +21,7 @@ arch_headers = files(
> 'rte_pause_32.h',
> 'rte_pause_64.h',
> 'rte_pause.h',
> + 'rte_pflock.h',
> 'rte_power_intrinsics.h',
> 'rte_prefetch_32.h',
> 'rte_prefetch_64.h',
> diff --git a/lib/librte_eal/arm/include/rte_pflock.h
> b/lib/librte_eal/arm/include/rte_pflock.h
> new file mode 100644
> index 000000000000..bb9934eec469
> --- /dev/null
> +++ b/lib/librte_eal/arm/include/rte_pflock.h
> @@ -0,0 +1,18 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2021 Microsoft Corporation */
> +
> +#ifndef _RTE_PFLOCK_ARM_H_
> +#define _RTE_PFLOCK_ARM_H_
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +#include "generic/rte_pflock.h"
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#endif /* _RTE_PFLOCK_ARM_H_ */
> diff --git a/lib/librte_eal/include/generic/rte_pflock.h
> b/lib/librte_eal/include/generic/rte_pflock.h
> new file mode 100644
> index 000000000000..7c183633df60
> --- /dev/null
> +++ b/lib/librte_eal/include/generic/rte_pflock.h
> @@ -0,0 +1,202 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2021 Microsoft Corp.
> + * All rights reserved.
> + *
> + * Derived from Concurrency Kit
> + * Copyright 2011-2015 Samy Al Bahra.
> + */
> +
> +#ifndef _RTE_PFLOCK_H_
> +#define _RTE_PFLOCK_H_
> +
> +/**
> + * @file
> + *
> + * Phase-fair locks
> + *
> + * This file defines an API for Phase Fair reader writer locks,
> + * which is a variant of typical reader-writer locks that prevent
> + * starvation. In this type of lock, readers and writers alternate.
> + * This significantly reduces the worst-case blocking for readers and writers.
> + *
> + * This is an implementation derived from FreeBSD
> + * based on the work described in:
> + * Brandenburg, B. and Anderson, J. 2010. Spin-Based
> + * Reader-Writer Synchronization for Multiprocessor Real-Time Systems
> + *
> + * All locks must be initialised before use, and only initialised once.
> + */
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +#include <rte_common.h>
> +#include <rte_pause.h>
> +
> +/**
> + * The rte_pflock_t type.
> + */
> +struct rte_pflock {
> + struct {
> + uint16_t in;
> + uint16_t out;
> + } rd, wr;
> +};
> +typedef struct rte_pflock rte_pflock_t;
> +
> +/*
> + * Allocation of bits to reader
> + *
> + * 16 8 7 2 1 0
Typo, this numbering should be 15 4 3 2 1 0
> + * +-------------------+------+-+-+
> + * | rin: reads issued |unused| | |
> + * +-------------------+------+-+-+
> + * ^ ^
> + * | |
> + * PRES: writer present ---+ |
> + * PHID: writer phase id ----+
> + *
> + * 16 2 7 0
Here, it should be 15 4 3 0
> + * +------------------+------+
> + * |rout:read complete|unused|
> + * +------------------+------+
> + *
> + * The maximum number of readers is 4095 */
> +
> +/* Constants used to map the bits in reader counter */
> +#define RTE_PFLOCK_WBITS 0x3 /* Writer bits in reader. */
> +#define RTE_PFLOCK_PRES 0x2 /* Writer present bit. */
> +#define RTE_PFLOCK_PHID 0x1 /* Phase ID bit. */
> +#define RTE_PFLOCK_LSB 0xFFF0 /* reader bits. */
> +#define RTE_PFLOCK_RINC 0x10 /* Reader increment. */
> +
> +/**
> + * A static pflock initializer.
> + */
> +#define RTE_PFLOCK_INITIALIZER { }
> +
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change without prior notice.
> + *
> + * Initialize the pflock to an unlocked state.
> + *
> + * @param pf
> + * A pointer to the pflock.
> + */
> +__rte_experimental
> +static inline void
Minor, this API does not need to be inline.
> +rte_pflock_init(struct rte_pflock *pf)
> +{
> + memset(pf, 0, sizeof(*pf));
> +}
> +
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change without prior notice.
> + *
> + * Take a pflock for read.
> + *
> + * @param pf
> + * A pointer to a pflock structure.
> + */
> +__rte_experimental
> +static inline void
> +rte_pflock_read_lock(rte_pflock_t *pf)
> +{
> + uint16_t w;
> +
> + /*
> + * If no writer is present, then the operation has completed
> + * successfully.
> + */
> + w = __atomic_fetch_add(&pf->rd.in, RTE_PFLOCK_RINC,
> __ATOMIC_ACQUIRE)
> + & RTE_PFLOCK_WBITS;
> + if (w == 0)
> + return;
> +
> + /* Wait for current write phase to complete. */
> + while ((__atomic_load_n(&pf->rd.in, __ATOMIC_ACQUIRE) &
> RTE_PFLOCK_WBITS) == w)
> + rte_pause();
> +}
> +
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change without prior notice.
> + *
> + * Release a pflock locked for reading.
> + *
> + * @param pf
> + * A pointer to the pflock structure.
> + */
> +__rte_experimental
> +static inline void
> +rte_pflock_read_unlock(rte_pflock_t *pf) {
> + __atomic_fetch_add(&pf->rd.out, RTE_PFLOCK_RINC,
> __ATOMIC_RELEASE); }
> +
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change without prior notice.
> + *
> + * Take the pflock for write.
> + *
> + * @param pf
> + * A pointer to the ticketlock.
Typo ^^^^^^^^ pflock
> + */
> +__rte_experimental
> +static inline void
> +rte_pflock_write_lock(rte_pflock_t *pf) {
> + uint16_t ticket, w;
> +
> + /* Acquire ownership of write-phase.
> + * This is same as rte_tickelock_lock().
> + */
> + ticket = __atomic_fetch_add(&pf->wr.in, 1, __ATOMIC_RELAXED);
> + rte_wait_until_equal_16(&pf->wr.out, ticket, __ATOMIC_ACQUIRE);
> +
> + /*
> + * Acquire ticket on read-side in order to allow them
> + * to flush. Indicates to any incoming reader that a
> + * write-phase is pending.
> + *
> + * The load of rd.out in wait loop could be executed
> + * speculatively.
> + */
> + w = RTE_PFLOCK_PRES | (ticket & RTE_PFLOCK_PHID);
> + ticket = __atomic_fetch_add(&pf->rd.in, w, __ATOMIC_RELAXED);
> +
> + /* Wait for any pending readers to flush. */
> + rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_ACQUIRE);
> }
> +
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change without prior notice.
> + *
> + * Release a pflock held for writing.
> + *
> + * @param pf
> + * A pointer to a pflock structure.
> + */
> +__rte_experimental
> +static inline void
> +rte_pflock_write_unlock(rte_pflock_t *pf) {
> + /* Migrate from write phase to read phase. */
> + __atomic_fetch_and(&pf->rd.in, RTE_PFLOCK_LSB,
> __ATOMIC_RELEASE);
> +
> + /* Allow other writers to continue. */
> + __atomic_fetch_add(&pf->wr.out, 1, __ATOMIC_RELEASE); }
> +
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#endif /* RTE_PFLOCK_H */
> diff --git a/lib/librte_eal/ppc/include/meson.build
> b/lib/librte_eal/ppc/include/meson.build
> index dae40ede546e..7692a531ccba 100644
> --- a/lib/librte_eal/ppc/include/meson.build
> +++ b/lib/librte_eal/ppc/include/meson.build
> @@ -11,6 +11,7 @@ arch_headers = files(
> 'rte_mcslock.h',
> 'rte_memcpy.h',
> 'rte_pause.h',
> + 'rte_pflock.h',
> 'rte_power_intrinsics.h',
> 'rte_prefetch.h',
> 'rte_rwlock.h',
> diff --git a/lib/librte_eal/ppc/include/rte_pflock.h
> b/lib/librte_eal/ppc/include/rte_pflock.h
> new file mode 100644
> index 000000000000..27c201b11d05
> --- /dev/null
> +++ b/lib/librte_eal/ppc/include/rte_pflock.h
> @@ -0,0 +1,17 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2021 Microsoft Corporation */ #ifndef
> +_RTE_PFLOCK_PPC_64_H_ #define _RTE_PFLOCK_PPC_64_H_
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +#include "generic/rte_pflock.h"
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#endif /* _RTE_PFLOCK_PPC_64_H_ */
> diff --git a/lib/librte_eal/x86/include/meson.build
> b/lib/librte_eal/x86/include/meson.build
> index 1a6ad0b17342..f43645c20899 100644
> --- a/lib/librte_eal/x86/include/meson.build
> +++ b/lib/librte_eal/x86/include/meson.build
> @@ -10,6 +10,7 @@ arch_headers = files(
> 'rte_mcslock.h',
> 'rte_memcpy.h',
> 'rte_pause.h',
> + 'rte_pflock.h',
> 'rte_power_intrinsics.h',
> 'rte_prefetch.h',
> 'rte_rtm.h',
> diff --git a/lib/librte_eal/x86/include/rte_pflock.h
> b/lib/librte_eal/x86/include/rte_pflock.h
> new file mode 100644
> index 000000000000..c2d876062c08
> --- /dev/null
> +++ b/lib/librte_eal/x86/include/rte_pflock.h
> @@ -0,0 +1,18 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2021 Microsoft Corporation */
> +
> +#ifndef _RTE_PFLOCK_X86_64_H_
> +#define _RTE_PFLOCK_X86_64_H_
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +#include "generic/rte_pflock.h"
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#endif /* _RTE_PFLOCK_X86_64_H_ */
> --
> 2.30.2
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [dpdk-dev] [PATCH v4] pflock: add phase-fair reader writer locks
2021-03-31 4:19 ` Honnappa Nagarahalli
@ 2021-03-31 16:32 ` Stephen Hemminger
2021-04-02 1:37 ` Stephen Hemminger
1 sibling, 0 replies; 27+ messages in thread
From: Stephen Hemminger @ 2021-03-31 16:32 UTC (permalink / raw)
To: Honnappa Nagarahalli; +Cc: dev, nd
On Wed, 31 Mar 2021 04:19:14 +0000
Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com> wrote:
> > +
> > + rte_pflock_write_lock(&sl);
> > + /* this message should be the last message of test */
> > + printf("Global write lock taken on main core %u\n", rte_lcore_id());
> > + rte_pflock_write_unlock(&sl);
> > +
> > + rte_eal_mp_wait_lcore();
> > +
> > + if (test_pflock_perf() < 0)
> Suggest separating out the performance test so that it is not run on the cloud CI platforms (which have issues with performance tests timing out). I think autotest_data.py needs to be modified.
I was just copying existing pattern of all lock tests (rwlock, mcslock. ticketlock).
They run the perf test as well.
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [dpdk-dev] [PATCH v4] pflock: add phase-fair reader writer locks
2021-03-31 4:19 ` Honnappa Nagarahalli
2021-03-31 16:32 ` Stephen Hemminger
@ 2021-04-02 1:37 ` Stephen Hemminger
1 sibling, 0 replies; 27+ messages in thread
From: Stephen Hemminger @ 2021-04-02 1:37 UTC (permalink / raw)
To: Honnappa Nagarahalli; +Cc: dev, nd
On Wed, 31 Mar 2021 04:19:14 +0000
Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com> wrote:
> > +__rte_experimental
> > +static inline void
> Minor, this API does not need to be inline.
Unfortunately, it has to be inline otherwise Gcc warns
about unused static function in every file that doesn't use it.
^ permalink raw reply [flat|nested] 27+ messages in thread
* [dpdk-dev] [PATCH v5] pflock: implementation of phase-fair reader writer locks
2021-02-12 1:38 ` [dpdk-dev] [RFC] pflock: add implementation of phase-fair locks Stephen Hemminger
` (3 preceding siblings ...)
2021-03-30 5:00 ` [dpdk-dev] [PATCH v4] pflock: add " Stephen Hemminger
@ 2021-04-02 1:42 ` Stephen Hemminger
2021-04-06 21:56 ` Honnappa Nagarahalli
2021-04-07 15:09 ` Ananyev, Konstantin
4 siblings, 2 replies; 27+ messages in thread
From: Stephen Hemminger @ 2021-04-02 1:42 UTC (permalink / raw)
To: dev, Honnappa Nagarahalli; +Cc: Stephen Hemminger
This is a new type of reader-writer lock that provides better fairness
guarantees which better suited for typical DPDK applications.
A pflock has two ticket pools, one for readers and one
for writers.
Phase fair reader writer locks ensure that neither reader nor writer will be
starved. Neither reader or writer are preferred, they execute in
alternating phases. All operations of the same type (reader or writer)
that acquire the lock are handled in FIFO order. Write
operations are exclusive, and multiple read operations can be run
together (until a write arrives).
A similar implementation is in Concurrency Kit package in FreeBSD.
For more information see:
"Reader-Writer Synchronization for Shared-Memory Multiprocessor
Real-Time Systems",
http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
v5 - cleanup typos in the lock code comments
minor revision to unit test.
Note: the unit test is intentionally the same as other locking tests.
app/test/meson.build | 2 +
app/test/test_pflock.c | 197 +++++++++++++++++++
lib/librte_eal/arm/include/meson.build | 1 +
lib/librte_eal/arm/include/rte_pflock.h | 18 ++
lib/librte_eal/include/generic/rte_pflock.h | 205 ++++++++++++++++++++
lib/librte_eal/ppc/include/meson.build | 1 +
lib/librte_eal/ppc/include/rte_pflock.h | 17 ++
lib/librte_eal/x86/include/meson.build | 1 +
lib/librte_eal/x86/include/rte_pflock.h | 18 ++
9 files changed, 460 insertions(+)
create mode 100644 app/test/test_pflock.c
create mode 100644 lib/librte_eal/arm/include/rte_pflock.h
create mode 100644 lib/librte_eal/include/generic/rte_pflock.h
create mode 100644 lib/librte_eal/ppc/include/rte_pflock.h
create mode 100644 lib/librte_eal/x86/include/rte_pflock.h
diff --git a/app/test/meson.build b/app/test/meson.build
index 76eaaea45746..bd50818f82b0 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -90,6 +90,7 @@ test_sources = files('commands.c',
'test_mcslock.c',
'test_mp_secondary.c',
'test_per_lcore.c',
+ 'test_pflock.c',
'test_pmd_perf.c',
'test_power.c',
'test_power_cpufreq.c',
@@ -228,6 +229,7 @@ fast_tests = [
['meter_autotest', true],
['multiprocess_autotest', false],
['per_lcore_autotest', true],
+ ['pflock_autotest', true],
['prefetch_autotest', true],
['rcu_qsbr_autotest', true],
['red_autotest', true],
diff --git a/app/test/test_pflock.c b/app/test/test_pflock.c
new file mode 100644
index 000000000000..6922bbc2f813
--- /dev/null
+++ b/app/test/test_pflock.c
@@ -0,0 +1,197 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <unistd.h>
+#include <sys/queue.h>
+#include <string.h>
+
+#include <rte_common.h>
+#include <rte_memory.h>
+#include <rte_per_lcore.h>
+#include <rte_launch.h>
+#include <rte_pause.h>
+#include <rte_pflock.h>
+#include <rte_eal.h>
+#include <rte_lcore.h>
+#include <rte_cycles.h>
+
+#include "test.h"
+
+/*
+ * phase fair lock test
+ * ===========
+ * Provides UT for phase fair lock API.
+ * Main concern is on functional testing, but also provides some
+ * performance measurements.
+ * Obviously for proper testing need to be executed with more than one lcore.
+ */
+
+static rte_pflock_t sl;
+static rte_pflock_t sl_tab[RTE_MAX_LCORE];
+static uint32_t synchro;
+
+static int
+test_pflock_per_core(__rte_unused void *arg)
+{
+ rte_pflock_write_lock(&sl);
+ printf("Global write lock taken on core %u\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl);
+
+ rte_pflock_write_lock(&sl_tab[rte_lcore_id()]);
+ printf("Hello from core %u !\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl_tab[rte_lcore_id()]);
+
+ rte_pflock_read_lock(&sl);
+ printf("Global read lock taken on core %u\n", rte_lcore_id());
+ rte_delay_ms(100);
+ printf("Release global read lock on core %u\n", rte_lcore_id());
+ rte_pflock_read_unlock(&sl);
+
+ return 0;
+}
+
+static rte_pflock_t lk = RTE_PFLOCK_INITIALIZER;
+static uint64_t time_count[RTE_MAX_LCORE] = {0};
+
+#define MAX_LOOP 10000
+
+static int
+load_loop_fn(void *arg)
+{
+ uint64_t time_diff = 0, begin;
+ uint64_t hz = rte_get_timer_hz();
+ uint64_t lcount = 0;
+ const int use_lock = *(int *)arg;
+ const unsigned int lcore = rte_lcore_id();
+
+ /* wait synchro for workers */
+ if (lcore != rte_get_main_lcore())
+ rte_wait_until_equal_32(&synchro, 1, __ATOMIC_RELAXED);
+
+ begin = rte_rdtsc_precise();
+ while (lcount < MAX_LOOP) {
+ if (use_lock)
+ rte_pflock_write_lock(&lk);
+ lcount++;
+ if (use_lock)
+ rte_pflock_write_unlock(&lk);
+
+ if (use_lock) {
+ rte_pflock_read_lock(&lk);
+ rte_pflock_read_unlock(&lk);
+ }
+ }
+
+ time_diff = rte_rdtsc_precise() - begin;
+ time_count[lcore] = time_diff * 1000000 / hz;
+ return 0;
+}
+
+static int
+test_pflock_perf(void)
+{
+ unsigned int i;
+ int lock = 0;
+ uint64_t total = 0;
+ const unsigned int lcore = rte_lcore_id();
+
+ printf("\nTest with no lock on single core...\n");
+ __atomic_store_n(&synchro, 1, __ATOMIC_RELAXED);
+ load_loop_fn(&lock);
+ printf("Core [%u] Cost Time = %"PRIu64" us\n",
+ lcore, time_count[lcore]);
+ memset(time_count, 0, sizeof(time_count));
+
+ printf("\nTest with phase fair lock on single core...\n");
+ lock = 1;
+ __atomic_store_n(&synchro, 1, __ATOMIC_RELAXED);
+ load_loop_fn(&lock);
+ printf("Core [%u] Cost Time = %"PRIu64" us\n",
+ lcore, time_count[lcore]);
+ memset(time_count, 0, sizeof(time_count));
+
+ printf("\nPhase fair test on %u cores...\n", rte_lcore_count());
+
+ /* clear synchro and start workers */
+ __atomic_store_n(&synchro, 0, __ATOMIC_RELAXED);
+ if (rte_eal_mp_remote_launch(load_loop_fn, &lock, SKIP_MAIN) < 0)
+ return -1;
+
+ /* start synchro and launch test on main */
+ __atomic_store_n(&synchro, 1, __ATOMIC_RELAXED);
+ load_loop_fn(&lock);
+
+ rte_eal_mp_wait_lcore();
+
+ RTE_LCORE_FOREACH(i) {
+ printf("Core [%u] cost time = %"PRIu64" us\n",
+ i, time_count[i]);
+ total += time_count[i];
+ }
+
+ printf("Total cost time = %"PRIu64" us\n", total);
+ memset(time_count, 0, sizeof(time_count));
+
+ return 0;
+}
+
+/*
+ * - There is a global pflock and a table of pflocks (one per lcore).
+ *
+ * - The test function takes all of these locks and launches the
+ * ``test_pflock_per_core()`` function on each core (except the main).
+ *
+ * - The function takes the global write lock, display something,
+ * then releases the global lock.
+ * - Then, it takes the per-lcore write lock, display something, and
+ * releases the per-core lock.
+ * - Finally, a read lock is taken during 100 ms, then released.
+ *
+ * - The main function unlocks the per-lcore locks sequentially and
+ * waits between each lock. This triggers the display of a message
+ * for each core, in the correct order.
+ *
+ * Then, it tries to take the global write lock and display the last
+ * message. The autotest script checks that the message order is correct.
+ */
+static int
+test_pflock(void)
+{
+ int i;
+
+ rte_pflock_init(&sl);
+ for (i = 0; i < RTE_MAX_LCORE; i++)
+ rte_pflock_init(&sl_tab[i]);
+
+ rte_pflock_write_lock(&sl);
+
+ RTE_LCORE_FOREACH_WORKER(i) {
+ rte_pflock_write_lock(&sl_tab[i]);
+ rte_eal_remote_launch(test_pflock_per_core, NULL, i);
+ }
+
+ rte_pflock_write_unlock(&sl);
+
+ RTE_LCORE_FOREACH_WORKER(i) {
+ rte_pflock_write_unlock(&sl_tab[i]);
+ rte_delay_ms(100);
+ }
+
+ rte_pflock_write_lock(&sl);
+ /* this message should be the last message of test */
+ printf("Global write lock taken on main core %u\n", rte_lcore_id());
+ rte_pflock_write_unlock(&sl);
+
+ rte_eal_mp_wait_lcore();
+
+ if (test_pflock_perf() < 0)
+ return -1;
+
+ return 0;
+}
+
+REGISTER_TEST_COMMAND(pflock_autotest, test_pflock);
diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build
index 770766de1a34..2c3cff61bed6 100644
--- a/lib/librte_eal/arm/include/meson.build
+++ b/lib/librte_eal/arm/include/meson.build
@@ -21,6 +21,7 @@ arch_headers = files(
'rte_pause_32.h',
'rte_pause_64.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch_32.h',
'rte_prefetch_64.h',
diff --git a/lib/librte_eal/arm/include/rte_pflock.h b/lib/librte_eal/arm/include/rte_pflock.h
new file mode 100644
index 000000000000..bb9934eec469
--- /dev/null
+++ b/lib/librte_eal/arm/include/rte_pflock.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#ifndef _RTE_PFLOCK_ARM_H_
+#define _RTE_PFLOCK_ARM_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_ARM_H_ */
diff --git a/lib/librte_eal/include/generic/rte_pflock.h b/lib/librte_eal/include/generic/rte_pflock.h
new file mode 100644
index 000000000000..72cf6440f7f1
--- /dev/null
+++ b/lib/librte_eal/include/generic/rte_pflock.h
@@ -0,0 +1,205 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corp.
+ * All rights reserved.
+ *
+ * Derived from Concurrency Kit
+ * Copyright 2011-2015 Samy Al Bahra.
+ */
+
+#ifndef _RTE_PFLOCK_H_
+#define _RTE_PFLOCK_H_
+
+/**
+ * @file
+ *
+ * Phase-fair locks
+ *
+ * This file defines an API for Phase Fair reader writer locks,
+ * which is a variant of typical reader-writer locks that prevent
+ * starvation. In this type of lock, readers and writers alternate.
+ * This significantly reduces the worst-case blocking for readers and writers.
+ *
+ * This is an implementation derived from FreeBSD
+ * based on the work described in:
+ * Brandenburg, B. and Anderson, J. 2010. Spin-Based
+ * Reader-Writer Synchronization for Multiprocessor Real-Time Systems
+ *
+ * All locks must be initialised before use, and only initialised once.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <rte_common.h>
+#include <rte_pause.h>
+
+/**
+ * The rte_pflock_t type.
+ */
+struct rte_pflock {
+ struct {
+ uint16_t in;
+ uint16_t out;
+ } rd, wr;
+};
+typedef struct rte_pflock rte_pflock_t;
+
+/*
+ * Allocation of bits to reader
+ *
+ * 15 4 3 2 1 0
+ * +-------------------+---+-+-+
+ * | rin: reads issued |x|x| | |
+ * +-------------------+---+-+-+
+ * ^ ^
+ * | |
+ * PRES: writer present ----/ |
+ * PHID: writer phase id -----/
+ *
+ * 15 4 3 2 1 0
+ * +------------------+------+
+ * |rout:read complete|unused|
+ * +------------------+------+
+ *
+ * The maximum number of readers is 4095
+ */
+
+/* Constants used to map the bits in reader counter */
+#define RTE_PFLOCK_WBITS 0x3 /* Writer bits in reader. */
+#define RTE_PFLOCK_PRES 0x2 /* Writer present bit. */
+#define RTE_PFLOCK_PHID 0x1 /* Phase ID bit. */
+#define RTE_PFLOCK_LSB 0xFFF0 /* reader bits. */
+#define RTE_PFLOCK_RINC 0x10 /* Reader increment. */
+
+/**
+ * A static pflock initializer.
+ */
+#define RTE_PFLOCK_INITIALIZER { }
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Initialize the pflock to an unlocked state.
+ *
+ * @param pf
+ * A pointer to the pflock.
+ */
+__rte_experimental
+static inline void
+rte_pflock_init(struct rte_pflock *pf)
+{
+ pf->rd.in = 0;
+ pf->rd.out = 0;
+ pf->wr.in = 0;
+ pf->wr.out = 0;
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Take a pflock for read.
+ *
+ * @param pf
+ * A pointer to a pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_read_lock(rte_pflock_t *pf)
+{
+ uint16_t w;
+
+ /*
+ * If no writer is present, then the operation has completed
+ * successfully.
+ */
+ w = __atomic_fetch_add(&pf->rd.in, RTE_PFLOCK_RINC, __ATOMIC_ACQUIRE)
+ & RTE_PFLOCK_WBITS;
+ if (w == 0)
+ return;
+
+ /* Wait for current write phase to complete. */
+ while ((__atomic_load_n(&pf->rd.in, __ATOMIC_ACQUIRE)
+ & RTE_PFLOCK_WBITS) == w)
+ rte_pause();
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Release a pflock locked for reading.
+ *
+ * @param pf
+ * A pointer to the pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_read_unlock(rte_pflock_t *pf)
+{
+ __atomic_fetch_add(&pf->rd.out, RTE_PFLOCK_RINC, __ATOMIC_RELEASE);
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Take the pflock for write.
+ *
+ * @param pf
+ * A pointer to the pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_write_lock(rte_pflock_t *pf)
+{
+ uint16_t ticket, w;
+
+ /* Acquire ownership of write-phase.
+ * This is same as rte_tickelock_lock().
+ */
+ ticket = __atomic_fetch_add(&pf->wr.in, 1, __ATOMIC_RELAXED);
+ rte_wait_until_equal_16(&pf->wr.out, ticket, __ATOMIC_ACQUIRE);
+
+ /*
+ * Acquire ticket on read-side in order to allow them
+ * to flush. Indicates to any incoming reader that a
+ * write-phase is pending.
+ *
+ * The load of rd.out in wait loop could be executed
+ * speculatively.
+ */
+ w = RTE_PFLOCK_PRES | (ticket & RTE_PFLOCK_PHID);
+ ticket = __atomic_fetch_add(&pf->rd.in, w, __ATOMIC_RELAXED);
+
+ /* Wait for any pending readers to flush. */
+ rte_wait_until_equal_16(&pf->rd.out, ticket, __ATOMIC_ACQUIRE);
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Release a pflock held for writing.
+ *
+ * @param pf
+ * A pointer to a pflock structure.
+ */
+__rte_experimental
+static inline void
+rte_pflock_write_unlock(rte_pflock_t *pf)
+{
+ /* Migrate from write phase to read phase. */
+ __atomic_fetch_and(&pf->rd.in, RTE_PFLOCK_LSB, __ATOMIC_RELEASE);
+
+ /* Allow other writers to continue. */
+ __atomic_fetch_add(&pf->wr.out, 1, __ATOMIC_RELEASE);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RTE_PFLOCK_H */
diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build
index dae40ede546e..7692a531ccba 100644
--- a/lib/librte_eal/ppc/include/meson.build
+++ b/lib/librte_eal/ppc/include/meson.build
@@ -11,6 +11,7 @@ arch_headers = files(
'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rwlock.h',
diff --git a/lib/librte_eal/ppc/include/rte_pflock.h b/lib/librte_eal/ppc/include/rte_pflock.h
new file mode 100644
index 000000000000..27c201b11d05
--- /dev/null
+++ b/lib/librte_eal/ppc/include/rte_pflock.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+#ifndef _RTE_PFLOCK_PPC_64_H_
+#define _RTE_PFLOCK_PPC_64_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_PPC_64_H_ */
diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build
index 1a6ad0b17342..f43645c20899 100644
--- a/lib/librte_eal/x86/include/meson.build
+++ b/lib/librte_eal/x86/include/meson.build
@@ -10,6 +10,7 @@ arch_headers = files(
'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
+ 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rtm.h',
diff --git a/lib/librte_eal/x86/include/rte_pflock.h b/lib/librte_eal/x86/include/rte_pflock.h
new file mode 100644
index 000000000000..c2d876062c08
--- /dev/null
+++ b/lib/librte_eal/x86/include/rte_pflock.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#ifndef _RTE_PFLOCK_X86_64_H_
+#define _RTE_PFLOCK_X86_64_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_pflock.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_PFLOCK_X86_64_H_ */
--
2.30.2
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [dpdk-dev] [PATCH v5] pflock: implementation of phase-fair reader writer locks
2021-04-02 1:42 ` [dpdk-dev] [PATCH v5] pflock: implementation of " Stephen Hemminger
@ 2021-04-06 21:56 ` Honnappa Nagarahalli
2021-04-06 22:33 ` Stephen Hemminger
2021-04-07 15:09 ` Ananyev, Konstantin
1 sibling, 1 reply; 27+ messages in thread
From: Honnappa Nagarahalli @ 2021-04-06 21:56 UTC (permalink / raw)
To: Stephen Hemminger, dev; +Cc: nd, Honnappa Nagarahalli, nd
<snip>
>
> This is a new type of reader-writer lock that provides better fairness
> guarantees which better suited for typical DPDK applications.
> A pflock has two ticket pools, one for readers and one for writers.
>
> Phase fair reader writer locks ensure that neither reader nor writer will be
> starved. Neither reader or writer are preferred, they execute in alternating
> phases. All operations of the same type (reader or writer) that acquire the
> lock are handled in FIFO order. Write operations are exclusive, and multiple
> read operations can be run together (until a write arrives).
>
> A similar implementation is in Concurrency Kit package in FreeBSD.
> For more information see:
> "Reader-Writer Synchronization for Shared-Memory Multiprocessor
> Real-Time Systems",
> http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Looks good.
Acked-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
One question below
> ---
> v5 - cleanup typos in the lock code comments
> minor revision to unit test.
> Note: the unit test is intentionally the same as other locking tests.
>
> app/test/meson.build | 2 +
> app/test/test_pflock.c | 197 +++++++++++++++++++
> lib/librte_eal/arm/include/meson.build | 1 +
> lib/librte_eal/arm/include/rte_pflock.h | 18 ++
> lib/librte_eal/include/generic/rte_pflock.h | 205 ++++++++++++++++++++
> lib/librte_eal/ppc/include/meson.build | 1 +
> lib/librte_eal/ppc/include/rte_pflock.h | 17 ++
> lib/librte_eal/x86/include/meson.build | 1 +
> lib/librte_eal/x86/include/rte_pflock.h | 18 ++
> 9 files changed, 460 insertions(+)
> create mode 100644 app/test/test_pflock.c create mode 100644
> lib/librte_eal/arm/include/rte_pflock.h
> create mode 100644 lib/librte_eal/include/generic/rte_pflock.h
> create mode 100644 lib/librte_eal/ppc/include/rte_pflock.h
> create mode 100644 lib/librte_eal/x86/include/rte_pflock.h
>
<snip>
> diff --git a/app/test/test_pflock.c b/app/test/test_pflock.c new file mode
> 100644 index 000000000000..6922bbc2f813
> --- /dev/null
> +++ b/app/test/test_pflock.c
> @@ -0,0 +1,197 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2021 Microsoft Corporation */
> +
> +#include <stdio.h>
> +#include <stdint.h>
> +#include <inttypes.h>
> +#include <unistd.h>
> +#include <sys/queue.h>
> +#include <string.h>
> +
> +#include <rte_common.h>
> +#include <rte_memory.h>
> +#include <rte_per_lcore.h>
> +#include <rte_launch.h>
> +#include <rte_pause.h>
> +#include <rte_pflock.h>
> +#include <rte_eal.h>
> +#include <rte_lcore.h>
> +#include <rte_cycles.h>
> +
> +#include "test.h"
> +
<snip>
> +
> +/*
> + * - There is a global pflock and a table of pflocks (one per lcore).
> + *
> + * - The test function takes all of these locks and launches the
> + * ``test_pflock_per_core()`` function on each core (except the main).
> + *
> + * - The function takes the global write lock, display something,
> + * then releases the global lock.
> + * - Then, it takes the per-lcore write lock, display something, and
> + * releases the per-core lock.
> + * - Finally, a read lock is taken during 100 ms, then released.
> + *
> + * - The main function unlocks the per-lcore locks sequentially and
> + * waits between each lock. This triggers the display of a message
> + * for each core, in the correct order.
> + *
> + * Then, it tries to take the global write lock and display the last
> + * message. The autotest script checks that the message order is correct.
How does the autotest script does this?
> + */
> +static int
> +test_pflock(void)
> +{
> + int i;
> +
> + rte_pflock_init(&sl);
> + for (i = 0; i < RTE_MAX_LCORE; i++)
> + rte_pflock_init(&sl_tab[i]);
> +
> + rte_pflock_write_lock(&sl);
> +
> + RTE_LCORE_FOREACH_WORKER(i) {
> + rte_pflock_write_lock(&sl_tab[i]);
> + rte_eal_remote_launch(test_pflock_per_core, NULL, i);
> + }
> +
> + rte_pflock_write_unlock(&sl);
> +
> + RTE_LCORE_FOREACH_WORKER(i) {
> + rte_pflock_write_unlock(&sl_tab[i]);
> + rte_delay_ms(100);
> + }
> +
> + rte_pflock_write_lock(&sl);
> + /* this message should be the last message of test */
> + printf("Global write lock taken on main core %u\n", rte_lcore_id());
> + rte_pflock_write_unlock(&sl);
> +
> + rte_eal_mp_wait_lcore();
> +
> + if (test_pflock_perf() < 0)
> + return -1;
> +
> + return 0;
> +}
> +
> +REGISTER_TEST_COMMAND(pflock_autotest, test_pflock);
<snip>
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [dpdk-dev] [PATCH v5] pflock: implementation of phase-fair reader writer locks
2021-04-06 21:56 ` Honnappa Nagarahalli
@ 2021-04-06 22:33 ` Stephen Hemminger
2021-04-07 0:17 ` Honnappa Nagarahalli
0 siblings, 1 reply; 27+ messages in thread
From: Stephen Hemminger @ 2021-04-06 22:33 UTC (permalink / raw)
To: Honnappa Nagarahalli; +Cc: dev, nd
On Tue, 6 Apr 2021 21:56:05 +0000
Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com> wrote:
> How does the autotest script does this?
This was copy-paste from original. Think the original was wrong here.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [dpdk-dev] [PATCH v5] pflock: implementation of phase-fair reader writer locks
2021-04-06 22:33 ` Stephen Hemminger
@ 2021-04-07 0:17 ` Honnappa Nagarahalli
0 siblings, 0 replies; 27+ messages in thread
From: Honnappa Nagarahalli @ 2021-04-07 0:17 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev, nd, Honnappa Nagarahalli, nd
<snip>
> Subject: Re: [PATCH v5] pflock: implementation of phase-fair reader writer
> locks
>
> On Tue, 6 Apr 2021 21:56:05 +0000
> Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com> wrote:
>
> > How does the autotest script does this?
>
> This was copy-paste from original. Think the original was wrong here.
Ok, would it be possible to automate the test case validation?
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [dpdk-dev] [PATCH v5] pflock: implementation of phase-fair reader writer locks
2021-04-02 1:42 ` [dpdk-dev] [PATCH v5] pflock: implementation of " Stephen Hemminger
2021-04-06 21:56 ` Honnappa Nagarahalli
@ 2021-04-07 15:09 ` Ananyev, Konstantin
2021-04-14 15:36 ` David Marchand
1 sibling, 1 reply; 27+ messages in thread
From: Ananyev, Konstantin @ 2021-04-07 15:09 UTC (permalink / raw)
To: Stephen Hemminger, dev, Honnappa Nagarahalli
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Stephen Hemminger
> Sent: Friday, April 2, 2021 2:43 AM
> To: dev@dpdk.org; Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com>
> Cc: Stephen Hemminger <stephen@networkplumber.org>
> Subject: [dpdk-dev] [PATCH v5] pflock: implementation of phase-fair reader writer locks
>
> This is a new type of reader-writer lock that provides better fairness
> guarantees which better suited for typical DPDK applications.
> A pflock has two ticket pools, one for readers and one
> for writers.
>
> Phase fair reader writer locks ensure that neither reader nor writer will be
> starved. Neither reader or writer are preferred, they execute in
> alternating phases. All operations of the same type (reader or writer)
> that acquire the lock are handled in FIFO order. Write
> operations are exclusive, and multiple read operations can be run
> together (until a write arrives).
>
> A similar implementation is in Concurrency Kit package in FreeBSD.
> For more information see:
> "Reader-Writer Synchronization for Shared-Memory Multiprocessor
> Real-Time Systems",
> http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
> 2.30.2
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [dpdk-dev] [PATCH v5] pflock: implementation of phase-fair reader writer locks
2021-04-07 15:09 ` Ananyev, Konstantin
@ 2021-04-14 15:36 ` David Marchand
0 siblings, 0 replies; 27+ messages in thread
From: David Marchand @ 2021-04-14 15:36 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev, Honnappa Nagarahalli, Ananyev, Konstantin
On Wed, Apr 7, 2021 at 5:10 PM Ananyev, Konstantin
<konstantin.ananyev@intel.com> wrote:
> > This is a new type of reader-writer lock that provides better fairness
> > guarantees which better suited for typical DPDK applications.
> > A pflock has two ticket pools, one for readers and one
> > for writers.
> >
> > Phase fair reader writer locks ensure that neither reader nor writer will be
> > starved. Neither reader or writer are preferred, they execute in
> > alternating phases. All operations of the same type (reader or writer)
> > that acquire the lock are handled in FIFO order. Write
> > operations are exclusive, and multiple read operations can be run
> > together (until a write arrives).
> >
> > A similar implementation is in Concurrency Kit package in FreeBSD.
> > For more information see:
> > "Reader-Writer Synchronization for Shared-Memory Multiprocessor
> > Real-Time Systems",
> > http://www.cs.unc.edu/~anderson/papers/ecrts09b.pdf
> >
> > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
> Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
I added a short release note update.
I chose "phase-fair" as the unique way to identify this new API.
I updated the patch with this for consistency.
I put this new API under the EAL common code section in MAINTAINERS.
A comparison on when/why to prefer this over the existing locks would
be helpful in the developer guide.
There is also a question from Honnappa about test validation.
Can you follow up on those two points?
Applied, thanks.
--
David Marchand
^ permalink raw reply [flat|nested] 27+ messages in thread