locking: Update code snippets
cover locking: Update code snippets
From 0d7e7b86bf743ee1646b705f246bc50e38d23803 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <[email protected]>
Date: Tue, 20 Nov 2018 00:03:43 +0900
Subject: [PATCH 0/3] locking: Update code snippets
Hi Paul,
This is another set of patches to apply new code-snippet scheme in Chapter 7.
Patch #1 does the simple substitutions.
Patch #2 replaces remaining ACCESS_ONCE()s in Chapter 7 and CodeSamples/locking. It also adds a couple of READ_ONCE() and WRITE_ONCE() in xchglock.c.
Patch #3 fixes the use of "figure" referencing code snippets.
Thanks, Akira
--
Akira Yokosawa (3):
locking: Employ new snippet scheme
locking: Get rid of ACCESS_ONCE()
locking: Fix reference to code snippet by "figure"
CodeSamples/locking/locked_list.c | 29 ++- CodeSamples/locking/xchglock.c | 32 +-- locking/locking-existence.tex | 108 ++++----- locking/locking.tex | 473 +++++++++++++++++--------------------- 4 files changed, 299 insertions(+), 343 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/3 locking: Employ new snippet scheme
From c0e039de5fbfd2379548e81cce26fd10843aa245 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <[email protected]>
Date: Mon, 19 Nov 2018 22:51:32 +0900
Subject: [PATCH 1/3] locking: Employ new snippet scheme
--- CodeSamples/locking/locked_list.c | 29 ++- CodeSamples/locking/xchglock.c | 24 +- locking/locking-existence.tex | 104 ++++----- locking/locking.tex | 471 +++++++++++++++++--------------------- 4 files changed, 292 insertions(+), 336 deletions(-)
CodeSamples/locking/locked_list.c +17 -12
@@ -20,14 +20,15 @@#include "../api.h" +//\begin{snippet}[labelbase=ln:locking:locked_list:start_next,commandchars=\\\[\]] struct locked_list {spinlock_t s;struct cds_list_head h; }; -struct cds_list_head *list_next (struct locked_list *lp, -struct cds_list_head *np); - +struct cds_list_head *list_next (struct locked_list *lp,//\fcvexclude +struct cds_list_head *np);//\fcvexclude +//\fcvexclude struct cds_list_head *list_start (struct locked_list *lp) {spin_lock (&lp->s);
@@ -35,7 +36,7 @@ struct cds_list_head *list_start(struct locked_list *lp) }struct cds_list_head *list_next (struct locked_list *lp, -struct cds_list_head *np) +struct cds_list_head *np) {struct cds_list_head *ret;
@@ -46,29 +47,33 @@ struct cds_list_head *list_next(struct locked_list *lp, }return ret; } +//\end{snippet} +void list_stop (struct locked_list *lp) {spin_unlock (&lp->s); } -struct list_ints { +//\begin{snippet}[labelbase=ln:locking:locked_list:list_print,commandchars=\@\[\]] +struct list_ints {//\lnlbl{ints:b} struct cds_list_head n;int a; -}; +};//\lnlbl{ints:e} -void list_print (struct locked_list *lp) +void list_print (struct locked_list *lp)//\lnlbl{print:b} {struct cds_list_head *np;struct list_ints *ip; - np =list_start (lp); + np =list_start (lp);//\lnlbl{print:start} while (np !=NULL ) { - ip = cds_list_entry(np, struct list_ints, n); -printf ("\t%d\n" , ip->a); - np =list_next (lp, np); + ip = cds_list_entry(np, struct list_ints, n); //\lnlbl{print:entry} +printf ("\t%d\n" , ip->a);//\lnlbl{print:print} + np =list_next (lp, np);//\lnlbl{print:next} } -} +}//\lnlbl{print:e} +//\end{snippet} struct locked_list head;
CodeSamples/locking/xchglock.c +13 -11
@@ -20,22 +20,24 @@#include "../api.h" -typedef int xchglock_t ; +//\begin{snippet}[labelbase=ln:locking:xchglock:lock_unlock,commandchars=\\\[\]] +typedef int xchglock_t ;//\lnlbl{typedef} +//\fcvexclude +#define DEFINE_XCHG_LOCK (n) xchglock_t n = 0 //\lnlbl{initval} -#define DEFINE_XCHG_LOCK (n) xchglock_t n = 0 - -void xchg_lock (xchglock_t *xp) +void xchg_lock (xchglock_t *xp)//\lnlbl{lock:b} { -while (xchg (xp,1 ) ==1 ) { -while (*xp ==1 ) -continue ; +while (xchg (xp,1 ) ==1 ) {//\lnlbl{lock:atmxchg} +while (*xp ==1 )//\lnlbl{lock:inner:b} +continue ;//\lnlbl{lock:inner:e} } -} +}//\lnlbl{lock:e} -void xchg_unlock (xchglock_t *xp) +void xchg_unlock (xchglock_t *xp)//\lnlbl{unlock:b} { - (void )xchg (xp,0 ); -} + (void )xchg (xp,0 );//\lnlbl{unlock:atmxchg} +}//\lnlbl{unlock:e} +//\end{snippet} DEFINE_XCHG_LOCK (testlock);
locking/locking-existence.tex +53 -51
149 lines not on this page · raw message
locking/locking.tex +209 -262
640 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 2/3 locking: Get rid of ACCESS_ONCE()
In reply to Akira YokosawaFrom 99b7e15342fda1591838efc068d2624457afd5b0 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <[email protected]>
Date: Mon, 19 Nov 2018 23:02:09 +0900
Subject: [PATCH 2/3] locking: Get rid of ACCESS_ONCE()
Also add READ_ONCE() and WRITE_ONCE() to racy accesses in xchglock.c.
--- CodeSamples/locking/xchglock.c | 10 +++++----- locking/locking.tex | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-)
CodeSamples/locking/xchglock.c +5 -5
@@ -28,7 +28,7 @@ typedef int xchglock_t; //\lnlbl{typedef}void xchg_lock (xchglock_t *xp)//\lnlbl{lock:b} {while (xchg (xp,1 ) ==1 ) {//\lnlbl{lock:atmxchg} -while (*xp ==1 )//\lnlbl{lock:inner:b} +while (READ_ONCE (*xp) ==1 )//\lnlbl{lock:inner:b} continue ;//\lnlbl{lock:inner:e} } }//\lnlbl{lock:e}
@@ -59,9 +59,9 @@ void *test_xchg_lock(void *arg)run_on (me);atomic_inc (&nthreadsrunning); -while (ACCESS_ONCE (goflag) ==GOFLAG_INIT ) +while (READ_ONCE (goflag) ==GOFLAG_INIT )poll (NULL ,0 ,1 ); -while (ACCESS_ONCE (goflag) ==GOFLAG_RUN ) { +while (READ_ONCE (goflag) ==GOFLAG_RUN ) {xchg_lock (&testlock);if (owner !=-1 ) lockerr++;
@@ -86,11 +86,11 @@ int main(int argc, char *argv[])smp_mb ();while (atomic_read (&nthreadsrunning) < nthreads)poll (NULL ,0 ,1 ); - goflag =GOFLAG_RUN ; +WRITE_ONCE (goflag,GOFLAG_RUN );smp_mb ();poll (NULL ,0 ,10000 );smp_mb (); - goflag =GOFLAG_STOP ; +WRITE_ONCE (goflag,GOFLAG_STOP );smp_mb ();wait_all_threads ();printf ("lockacqs = %lu, lockerr = %lu\n" , lockacqs, lockerr);
locking/locking.tex +5 -5
@@ -1463,7 +1463,7 @@ void force_quiescent_state(struct rcu_node *rnp_leaf) struct rcu_node *rnp_old = NULL; for (; rnp != NULL; rnp = rnp->parent) { \lnlbl[loop:b] - ret = (ACCESS_ONCE(gp_flags)) || \lnlbl[flag_set] + ret = (READ_ONCE(gp_flags)) || \lnlbl[flag_set] !raw_spin_trylock(&rnp->fqslock);\lnlbl[trylock] if (rnp_old != NULL) \lnlbl[non_NULL] raw_spin_unlock(&rnp_old->fqslock);\lnlbl[rel1]
@@ -1471,11 +1471,11 @@ void force_quiescent_state(struct rcu_node *rnp_leaf) return; \lnlbl[return] rnp_old = rnp; \lnlbl[save] } \lnlbl[loop:e] - if (!ACCESS_ONCE(gp_flags)) { \lnlbl[flag_not_set] - ACCESS_ONCE(gp_flags) = 1; \lnlbl[set_flag] + if (!READ_ONCE(gp_flags)) { \lnlbl[flag_not_set] + WRITE_ONCE(gp_flags, 1); \lnlbl[set_flag] do_force_quiescent_state(); \lnlbl[invoke] schedule_timeout_interruptible(HZ / 10);\lnlbl[wait] - ACCESS_ONCE(gp_flags) = 0; \lnlbl[clr_flag] + WRITE_ONCE(gp_flags, 0); \lnlbl[clr_flag] } raw_spin_unlock(&rnp_old->fqslock); \lnlbl[rel2] }
@@ -1649,7 +1649,7 @@ the lock, thus marking it as having been released. \QuickQuizAnswer{ This can be a legitimate implementation, but only if this store is preceded by a memory barrier and makes use - of \co{ACCESS_ONCE()}. + of \co{WRITE_ONCE()}. The memory barrier is not required when the \co{xchg()} operation is used because this operation implies a full memory barrier due to the fact that it returns
Signature · 1 line
2.7.4
PATCH 3/3 locking: Fix reference to code snippet by "figure"
In reply to Akira YokosawaFrom 0d7e7b86bf743ee1646b705f246bc50e38d23803 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <[email protected]>
Date: Mon, 19 Nov 2018 23:35:34 +0900
Subject: [PATCH 3/3] locking: Fix reference to code snippet by "figure"
They are the remnant of old style labeling of code snippets as figures.
--- locking/locking-existence.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
locking/locking-existence.tex +2 -2
@@ -116,7 +116,7 @@ Listing~\ref{lst:locking:Per-Element Locking Without Existence Guarantees}. Consider the following sequence of events: \begin{enumerate} \item Thread~0 invokes \co{delete(0)}, and reaches line~\lnref{acq} of - the figure, acquiring the lock. + the listing, acquiring the lock. \item Thread~1 concurrently invokes \co{delete(0)}, reaching line~\lnref{acq}, but spins on the lock because Thread~0 holds it. \item Thread~0 executes lines~\lnref{NULL}-\lnref{return1}, removing the element from
@@ -172,7 +172,7 @@ This approach allows acquiring the proper lock (on line~\lnref{acq}) before gaining a pointer to the data element (on line~\lnref{getp}). Although this approach works quite well for elements contained in a single partitionable data structure such as the hash table shown in the -figure, it can be problematic if a given data element can be a member +listing, it can be problematic if a given data element can be a member of multiple hash tables or given more-complex data structures such as trees or graphs. Not only can these problems be solved, but the solutions also form
Signature · 1 line
2.7.4
Paul E. McKenney
AppliedQuoted 10 lines · Akira Yokosawa
Quoted 1 line
From
0d7e7b86bf743ee1646b705f246bc50e38d23803Mon Sep 17 00:00:00 2001From: Akira Yokosawa <[email protected]>
Date: Tue, 20 Nov 2018 00:03:43 +0900
Subject: [PATCH 0/3] locking: Update code snippetsHi Paul,
This is another set of patches to apply new code-snippet scheme in Chapter 7.
Quoted 7 lines
Patch #1 does the simple substitutions.
Patch #2 replaces remaining ACCESS_ONCE()s in Chapter 7 and CodeSamples/locking. It also adds a couple of
READ_ONCE()andWRITE_ONCE()inxchglock.c.Patch #3 fixes the use of "figure" referencing code snippets.
Queued and pushed, thank you!!!
Thanx, Paul
Quoted 16 lines
Thanks, Akira
--
Akira Yokosawa (3):
locking: Employ new snippet scheme
locking: Get rid ofACCESS_ONCE()
locking: Fix reference to code snippet by "figure"CodeSamples/locking/locked_list.c | 29 ++- CodeSamples/locking/xchglock.c | 32 +-- locking/locking-existence.tex | 108 ++++----- locking/locking.tex | 473 +++++++++++++++++--------------------- 4 files changed, 299 insertions(+), 343 deletions(-)Signature · 1 line
2.7.4