rcu_read auto macro use
cover rcu_read auto macro use
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
A couple more uses of the rcu_read macros; in qsp and
hyperv (neither of which list maintainers, so I guess best through RCU).
The hyperv case saves a temporary.
The qsp case uses an rcu_read_lock around the lifetime of a snapshot and carefully comments that; but now it's automatic.
[Hyperv not tested]
Dave
Dr. David Alan Gilbert (2):
hyperv: Use auto rcu_read macros
qsp: Use WITH_RCU_READ_LOCK_GUARD
hw/hyperv/hyperv.c | 22 +++++++++------------- util/qsp.c | 22 ++++++++++------------ 2 files changed, 19 insertions(+), 25 deletions(-)
Signature · 1 line
2.23.0
PATCH 1/2 hyperv: Use auto rcu_read macros
From: "Dr. David Alan Gilbert" <[email protected]>
Use RCU_READ_LOCK_GUARD and WITH_RCU_READ_LOCK_GUARD to replace the manual rcu_read_(un)lock calls.
--- hw/hyperv/hyperv.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
hw/hyperv/hyperv.c +9 -13
@@ -546,14 +546,14 @@ uint16_t hyperv_hcall_post_message(uint64_t param, bool fast) } ret =HV_STATUS_INVALID_CONNECTION_ID ; -rcu_read_lock (); - QLIST_FOREACH_RCU(mh, &msg_handlers, link) { -if (mh->conn_id == (msg->connection_id &HV_CONNECTION_ID_MASK )) { - ret = mh->handler (msg, mh->data); -break ; + WITH_RCU_READ_LOCK_GUARD() { + QLIST_FOREACH_RCU(mh, &msg_handlers, link) { +if (mh->conn_id == (msg->connection_id &HV_CONNECTION_ID_MASK )) { + ret = mh->handler (msg, mh->data); +break ; + } } } -rcu_read_unlock (); unmap:cpu_physical_memory_unmap (msg, len,0 ,0 );
@@ -619,7 +619,6 @@ int hyperv_set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)uint16_t hyperv_hcall_signal_event (uint64_t param,bool fast) { -uint16_t ret;EventFlagHandler *handler;if (unlikely (!fast)) {
@@ -645,15 +644,12 @@ uint16_t hyperv_hcall_signal_event(uint64_t param, bool fast)return HV_STATUS_INVALID_HYPERCALL_INPUT ; } - ret =HV_STATUS_INVALID_CONNECTION_ID ; -rcu_read_lock (); +RCU_READ_LOCK_GUARD (); QLIST_FOREACH_RCU(handler, &event_flag_handlers, link) {if (handler->conn_id == param) {event_notifier_set (handler->notifier); - ret =0 ; -break ; +return 0 ; } } -rcu_read_unlock (); -return ret; +return HV_STATUS_INVALID_CONNECTION_ID ; }
Signature · 1 line
2.23.0
Re: [PATCH 1/2] hyperv: Use auto rcu_read macros
Quoted 52 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Use
RCU_READ_LOCK_GUARDandWITH_RCU_READ_LOCK_GUARDto replace the manual rcu_read_(un)lock calls.Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/hyperv/hyperv.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)hw/hyperv/hyperv.c +7
-9@@ -546,14 +546,14 @@ uint16_t hyperv_hcall_post_message(uint64_t param, bool fast) } ret =HV_STATUS_INVALID_CONNECTION_ID ; -rcu_read_lock (); - QLIST_FOREACH_RCU(mh, &msg_handlers, link) { -if (mh->conn_id == (msg->connection_id &HV_CONNECTION_ID_MASK )) { - ret = mh->handler (msg, mh->data); -break ; + WITH_RCU_READ_LOCK_GUARD() { + QLIST_FOREACH_RCU(mh, &msg_handlers, link) { +if (mh->conn_id == (msg->connection_id &HV_CONNECTION_ID_MASK )) { + ret = mh->handler (msg, mh->data); +break ; + } } } -rcu_read_unlock (); unmap:cpu_physical_memory_unmap (msg, len,0 ,0 );@@ -619,7 +619,6 @@ int hyperv_set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)uint16_t hyperv_hcall_signal_event (uint64_t param,bool fast) { -uint16_t ret;EventFlagHandler *handler;if (unlikely (!fast)) {@@ -645,15 +644,12 @@ uint16_t hyperv_hcall_signal_event(uint64_t param, bool fast)return HV_STATUS_INVALID_HYPERCALL_INPUT ; } - ret =HV_STATUS_INVALID_CONNECTION_ID ; -rcu_read_lock (); +RCU_READ_LOCK_GUARD (); QLIST_FOREACH_RCU(handler, &event_flag_handlers, link) {if (handler->conn_id == param) {
hw/hyperv/hyperv.c uint16_t hyperv_hcall_signal_event(uint64_t param, bool fast) · line 655
Quoted 10 lines
hw/hyperv/hyperv.c +2
-4event_notifier_set (handler->notifier); - ret =0 ; -break ; +return 0 ; } } -rcu_read_unlock (); -return ret; +return HV_STATUS_INVALID_CONNECTION_ID ; }
I have a slight preference towards using WITH_RCU_READ_LOCK_GUARD instead of sticking RCU_READ_LOCK_GUARD in the middle of the function and implicitly relying on there being none but trivial statements past the rcu-protected section.
Nothing that I would insist on, though, so
PATCH 2/2 qsp: Use WITH_RCU_READ_LOCK_GUARD
In reply to Dr. David Alan Gilbert (git)From: "Dr. David Alan Gilbert" <[email protected]>
The automatic rcu read lock maintenance works quite nicely in this case where it previously relied on a comment to delimit the lifetime and now has a block.
--- util/qsp.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
util/qsp.c +10 -12
@@ -598,7 +598,6 @@ static void qsp_ht_delete(void *p, uint32_t h, void *htp)static void qsp_mktree (GTree *tree,bool callsite_coalesce) { -QSPSnapshot *snap;struct qht ht, coalesce_ht;struct qht *htp;
@@ -610,20 +609,19 @@ static void qsp_mktree(GTree *tree, bool callsite_coalesce)* We must remain in an RCU read-side critical section until we're done * with the snapshot. */ -rcu_read_lock (); - snap =atomic_rcu_read (&qsp_snapshot); + WITH_RCU_READ_LOCK_GUARD() { +QSPSnapshot *snap =atomic_rcu_read (&qsp_snapshot); -/* Aggregate all results from the global hash table into a local one */ -qht_init (&ht, qsp_entry_no_thread_cmp,QSP_INITIAL_SIZE , -QHT_MODE_AUTO_RESIZE |QHT_MODE_RAW_MUTEXES ); -qht_iter (&qsp_ht, qsp_aggregate, &ht); +/* Aggregate all results from the global hash table into a local one */ +qht_init (&ht, qsp_entry_no_thread_cmp,QSP_INITIAL_SIZE , +QHT_MODE_AUTO_RESIZE |QHT_MODE_RAW_MUTEXES ); +qht_iter (&qsp_ht, qsp_aggregate, &ht); -/* compute the difference wrt the snapshot, if any */ -if (snap) { -qsp_diff (&snap->ht, &ht); +/* compute the difference wrt the snapshot, if any */ +if (snap) { +qsp_diff (&snap->ht, &ht); + } } -/* done with the snapshot; RCU can reclaim it */ -rcu_read_unlock (); htp = &ht;if (callsite_coalesce) {
Signature · 1 line
2.23.0
Paolo Bonzini
AppliedQuoted 7 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
A couple more uses of thercu_readmacros; in qsp and
hyperv (neither of which list maintainers, so I guess best through RCU).
Quoted 6 lines
The hyperv case saves a temporary.
The qsp case uses anrcu_read_lockaround the lifetime of a snapshot and carefully comments that; but now it's automatic.[Hyperv not tested]
Queued, thanks.
Paolo
Quoted 10 lines
Dave
Dr. David Alan Gilbert (2):
hyperv: Use autorcu_readmacros
qsp: UseWITH_RCU_READ_LOCK_GUARDhw/hyperv/hyperv.c | 22 +++++++++------------- util/qsp.c | 22 ++++++++++------------ 2 files changed, 19 insertions(+), 25 deletions(-)