Skip to contentSkip to conversation

seqlock: mark raw_read_seqcount and read_seqcount_retry as __always_inline

PATCH Superseded Anders Roxell 2 participants 2 messages Jun 3, 2019 – Jun 5, 2019 Locking primitives

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 seqlock: mark raw_read_seqcount and read_seqcount_retry as __always_inline

If CONFIG_FUNCTION_GRAPH_TRACER is enabled function sched_clock() in kernel/time/sched_clock.c is marked as notrace. However, functions raw_read_seqcount and read_seqcount_retry are marked as inline. If CONFIG_OPTIMIZE_INLINING is set that will make the two functions tracable which they shouldn't.

Rework so that functions raw_read_seqcount and read_seqcount_retry are marked with __always_inline so they will be inlined even if CONFIG_OPTIMIZE_INLINING is turned on.

---
 include/linux/seqlock.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
include/linux/seqlock.h +3 -2
index bcf4cf26b8c8..1b18e3df186e 100644
@@ -127,7 +127,7 @@ static inline unsigned __read_seqcount_begin(const seqcount_t *s)
  * seqcount without any lockdep checking and without checking or
  * masking the LSB. Calling code is responsible for handling that.
  */
-static inline unsigned raw_read_seqcount(const seqcount_t *s)
+static __always_inline unsigned raw_read_seqcount(const seqcount_t *s)
 {
 	unsigned ret = READ_ONCE(s->sequence);
 	smp_rmb();
@@ -215,7 +215,8 @@ static inline int __read_seqcount_retry(const seqcount_t *s, unsigned start)
  * If the critical section was invalid, it must be ignored (and typically
  * retried).
  */
-static inline int read_seqcount_retry(const seqcount_t *s, unsigned start)
+static
+__always_inline int read_seqcount_retry(const seqcount_t *s, unsigned start)
 {
 	smp_rmb();
 	return __read_seqcount_retry(s, start);
Signature · 1 line
2.20.1
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Anders Roxell

If CONFIG_FUNCTION_GRAPH_TRACER is enabled function sched_clock() in kernel/time/sched_clock.c is marked as notrace. However, functions raw_read_seqcount and read_seqcount_retry are marked as inline. If CONFIG_OPTIMIZE_INLINING is set that will make the two functions tracable which they shouldn't.

Might be nice to elaborate a bit here on what goes from specifically for seqlocks. I assume something ends up going recursive thanks to the tracing code?

With that:

Will