| @@ -56,7 +56,7 @@ static LIST_HEAD(srcu_boot_list); · 55 unmodified lines |
| 56 | 56 | static bool __read_mostly srcu_init_done; |
| 57 | 57 | |
| 58 | 58 | static void srcu_invoke_callbacks(struct work_struct *work); |
| 59 | | −static void srcu_reschedule(struct srcu_struct *sp, unsigned long delay); |
| 59 | +static void srcu_reschedule(struct srcu_struct *ssp, unsigned long delay); |
| 60 | 60 | static void process_srcu(struct work_struct *work); |
| 61 | 61 | |
| 62 | 62 | /* Wrappers for lock acquisition and release, see raw_spin_lock_rcu_node(). */ |
| @@ -92,7 +92,7 @@ do { \ · 29 unmodified lines |
| 92 | 92 | * srcu_read_unlock() running against them. So if the is_static parameter |
| 93 | 93 | * is set, don't initialize ->srcu_lock_count[] and ->srcu_unlock_count[]. |
| 94 | 94 | */ |
| 95 | | −static void init_srcu_struct_nodes(struct srcu_struct *sp, bool is_static) |
| 95 | +static void init_srcu_struct_nodes(struct srcu_struct *ssp, bool is_static) |
| 96 | 96 | { |
| 97 | 97 | int cpu; |
| 98 | 98 | int i; |
| @@ -103,13 +103,13 @@ static void init_srcu_struct_nodes(struct srcu_struct *sp, bool is_static) · 4 unmodified lines |
| 103 | 103 | struct srcu_node *snp_first; |
| 104 | 104 | |
| 105 | 105 | /* Work out the overall tree geometry. */ |
| 106 | | − sp->level[0] = &sp->node[0]; |
| 106 | + ssp->level[0] = &ssp->node[0]; |
| 107 | 107 | for (i = 1; i < rcu_num_lvls; i++) |
| 108 | | − sp->level[i] = sp->level[i - 1] + num_rcu_lvl[i - 1]; |
| 108 | + ssp->level[i] = ssp->level[i - 1] + num_rcu_lvl[i - 1]; |
| 109 | 109 | rcu_init_levelspread(levelspread, num_rcu_lvl); |
| 110 | 110 | |
| 111 | 111 | /* Each pass through this loop initializes one srcu_node structure. */ |
| 112 | | − srcu_for_each_node_breadth_first(sp, snp) { |
| 112 | + srcu_for_each_node_breadth_first(ssp, snp) { |
| 113 | 113 | spin_lock_init(&ACCESS_PRIVATE(snp, lock)); |
| 114 | 114 | WARN_ON_ONCE(ARRAY_SIZE(snp->srcu_have_cbs) != |
| 115 | 115 | ARRAY_SIZE(snp->srcu_data_have_cbs)); |
| @@ -120,17 +120,17 @@ static void init_srcu_struct_nodes(struct srcu_struct *sp, bool is_static) · 4 unmodified lines |
| 120 | 120 | snp->srcu_gp_seq_needed_exp = 0; |
| 121 | 121 | snp->grplo = -1; |
| 122 | 122 | snp->grphi = -1; |
| 123 | | − if (snp == &sp->node[0]) { |
| 123 | + if (snp == &ssp->node[0]) { |
| 124 | 124 | /* Root node, special case. */ |
| 125 | 125 | snp->srcu_parent = NULL; |
| 126 | 126 | continue; |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | /* Non-root node. */ |
| 130 | | − if (snp == sp->level[level + 1]) |
| 130 | + if (snp == ssp->level[level + 1]) |
| 131 | 131 | level++; |
| 132 | | − snp->srcu_parent = sp->level[level - 1] + |
| 133 | | − (snp - sp->level[level]) / |
| 132 | + snp->srcu_parent = ssp->level[level - 1] + |
| 133 | + (snp - ssp->level[level]) / |
| 134 | 134 | levelspread[level - 1]; |
| 135 | 135 | } |
| 136 | 136 | |
| @@ -141,14 +141,14 @@ static void init_srcu_struct_nodes(struct srcu_struct *sp, bool is_static) · 4 unmodified lines |
| 141 | 141 | WARN_ON_ONCE(ARRAY_SIZE(sdp->srcu_lock_count) != |
| 142 | 142 | ARRAY_SIZE(sdp->srcu_unlock_count)); |
| 143 | 143 | level = rcu_num_lvls - 1; |
| 144 | | − snp_first = sp->level[level]; |
| 144 | + snp_first = ssp->level[level]; |
| 145 | 145 | for_each_possible_cpu(cpu) { |
| 146 | | − sdp = per_cpu_ptr(sp->sda, cpu); |
| 146 | + sdp = per_cpu_ptr(ssp->sda, cpu); |
| 147 | 147 | spin_lock_init(&ACCESS_PRIVATE(sdp, lock)); |
| 148 | 148 | rcu_segcblist_init(&sdp->srcu_cblist); |
| 149 | 149 | sdp->srcu_cblist_invoking = false; |
| 150 | | − sdp->srcu_gp_seq_needed = sp->srcu_gp_seq; |
| 151 | | − sdp->srcu_gp_seq_needed_exp = sp->srcu_gp_seq; |
| 150 | + sdp->srcu_gp_seq_needed = ssp->srcu_gp_seq; |
| 151 | + sdp->srcu_gp_seq_needed_exp = ssp->srcu_gp_seq; |
| 152 | 152 | sdp->mynode = &snp_first[cpu / levelspread[level]]; |
| 153 | 153 | for (snp = sdp->mynode; snp != NULL; snp = snp->srcu_parent) { |
| 154 | 154 | if (snp->grplo < 0) |
| @@ -157,7 +157,7 @@ static void init_srcu_struct_nodes(struct srcu_struct *sp, bool is_static) · 2 unmodified lines |
| 157 | 157 | } |
| 158 | 158 | sdp->cpu = cpu; |
| 159 | 159 | INIT_DELAYED_WORK(&sdp->work, srcu_invoke_callbacks); |
| 160 | | − sdp->sp = sp; |
| 160 | + sdp->ssp = ssp; |
| 161 | 161 | sdp->grpmask = 1 << (cpu - sdp->mynode->grplo); |
| 162 | 162 | if (is_static) |
| 163 | 163 | continue; |
| @@ -176,35 +176,35 @@ static void init_srcu_struct_nodes(struct srcu_struct *sp, bool is_static) · 12 unmodified lines |
| 176 | 176 | * parameter is passed through to init_srcu_struct_nodes(), and |
| 177 | 177 | * also tells us that ->sda has already been wired up to srcu_data. |
| 178 | 178 | */ |
| 179 | | −static int init_srcu_struct_fields(struct srcu_struct *sp, bool is_static) |
| 179 | +static int init_srcu_struct_fields(struct srcu_struct *ssp, bool is_static) |
| 180 | 180 | { |
| 181 | | − mutex_init(&sp->srcu_cb_mutex); |
| 182 | | − mutex_init(&sp->srcu_gp_mutex); |
| 183 | | − sp->srcu_idx = 0; |
| 184 | | − sp->srcu_gp_seq = 0; |
| 185 | | − sp->srcu_barrier_seq = 0; |
| 186 | | − mutex_init(&sp->srcu_barrier_mutex); |
| 187 | | − atomic_set(&sp->srcu_barrier_cpu_cnt, 0); |
| 188 | | − INIT_DELAYED_WORK(&sp->work, process_srcu); |
| 181 | + mutex_init(&ssp->srcu_cb_mutex); |
| 182 | + mutex_init(&ssp->srcu_gp_mutex); |
| 183 | + ssp->srcu_idx = 0; |
| 184 | + ssp->srcu_gp_seq = 0; |
| 185 | + ssp->srcu_barrier_seq = 0; |
| 186 | + mutex_init(&ssp->srcu_barrier_mutex); |
| 187 | + atomic_set(&ssp->srcu_barrier_cpu_cnt, 0); |
| 188 | + INIT_DELAYED_WORK(&ssp->work, process_srcu); |
| 189 | 189 | if (!is_static) |
| 190 | | − sp->sda = alloc_percpu(struct srcu_data); |
| 191 | | − init_srcu_struct_nodes(sp, is_static); |
| 192 | | − sp->srcu_gp_seq_needed_exp = 0; |
| 193 | | − sp->srcu_last_gp_end = ktime_get_mono_fast_ns(); |
| 194 | | − smp_store_release(&sp->srcu_gp_seq_needed, 0); /* Init done. */ |
| 195 | | − return sp->sda ? 0 : -ENOMEM; |
| 190 | + ssp->sda = alloc_percpu(struct srcu_data); |
| 191 | + init_srcu_struct_nodes(ssp, is_static); |
| 192 | + ssp->srcu_gp_seq_needed_exp = 0; |
| 193 | + ssp->srcu_last_gp_end = ktime_get_mono_fast_ns(); |
| 194 | + smp_store_release(&ssp->srcu_gp_seq_needed, 0); /* Init done. */ |
| 195 | + return ssp->sda ? 0 : -ENOMEM; |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | #ifdef CONFIG_DEBUG_LOCK_ALLOC |
| 199 | 199 | |
| 200 | | −int __init_srcu_struct(struct srcu_struct *sp, const char *name, |
| 200 | +int __init_srcu_struct(struct srcu_struct *ssp, const char *name, |
| 201 | 201 | struct lock_class_key *key) |
| 202 | 202 | { |
| 203 | 203 | /* Don't re-initialize a lock while it is held. */ |
| 204 | | − debug_check_no_locks_freed((void *)sp, sizeof(*sp)); |
| 205 | | − lockdep_init_map(&sp->dep_map, name, key, 0); |
| 206 | | − spin_lock_init(&ACCESS_PRIVATE(sp, lock)); |
| 207 | | − return init_srcu_struct_fields(sp, false); |
| 204 | + debug_check_no_locks_freed((void *)ssp, sizeof(*ssp)); |
| 205 | + lockdep_init_map(&ssp->dep_map, name, key, 0); |
| 206 | + spin_lock_init(&ACCESS_PRIVATE(ssp, lock)); |
| 207 | + return init_srcu_struct_fields(ssp, false); |
| 208 | 208 | } |
| 209 | 209 | EXPORT_SYMBOL_GPL(__init_srcu_struct); |
| 210 | 210 | |
| @@ -212,16 +212,16 @@ EXPORT_SYMBOL_GPL(__init_srcu_struct); · 1 unmodified line |
| 212 | 212 | |
| 213 | 213 | /** |
| 214 | 214 | * init_srcu_struct - initialize a sleep-RCU structure |
| 215 | | − * @sp: structure to initialize. |
| 215 | + * @ssp: structure to initialize. |
| 216 | 216 | * |
| 217 | 217 | * Must invoke this on a given srcu_struct before passing that srcu_struct |
| 218 | 218 | * to any other function. Each srcu_struct represents a separate domain |
| 219 | 219 | * of SRCU protection. |
| 220 | 220 | */ |
| 221 | | −int init_srcu_struct(struct srcu_struct *sp) |
| 221 | +int init_srcu_struct(struct srcu_struct *ssp) |
| 222 | 222 | { |
| 223 | | − spin_lock_init(&ACCESS_PRIVATE(sp, lock)); |
| 224 | | − return init_srcu_struct_fields(sp, false); |
| 223 | + spin_lock_init(&ACCESS_PRIVATE(ssp, lock)); |
| 224 | + return init_srcu_struct_fields(ssp, false); |
| 225 | 225 | } |
| 226 | 226 | EXPORT_SYMBOL_GPL(init_srcu_struct); |
| 227 | 227 | |
| @@ -231,37 +231,37 @@ EXPORT_SYMBOL_GPL(init_srcu_struct); · 3 unmodified lines |
| 231 | 231 | * First-use initialization of statically allocated srcu_struct |
| 232 | 232 | * structure. Wiring up the combining tree is more than can be |
| 233 | 233 | * done with compile-time initialization, so this check is added |
| 234 | | − * to each update-side SRCU primitive. Use sp->lock, which -is- |
| 234 | + * to each update-side SRCU primitive. Use ssp->lock, which -is- |
| 235 | 235 | * compile-time initialized, to resolve races involving multiple |
| 236 | 236 | * CPUs trying to garner first-use privileges. |
| 237 | 237 | */ |
| 238 | | −static void check_init_srcu_struct(struct srcu_struct *sp) |
| 238 | +static void check_init_srcu_struct(struct srcu_struct *ssp) |
| 239 | 239 | { |
| 240 | 240 | unsigned long flags; |
| 241 | 241 | |
| 242 | 242 | /* The smp_load_acquire() pairs with the smp_store_release(). */ |
| 243 | | − if (!rcu_seq_state(smp_load_acquire(&sp->srcu_gp_seq_needed))) /*^^^*/ |
| 243 | + if (!rcu_seq_state(smp_load_acquire(&ssp->srcu_gp_seq_needed))) /*^^^*/ |
| 244 | 244 | return; /* Already initialized. */ |
| 245 | | − spin_lock_irqsave_rcu_node(sp, flags); |
| 246 | | − if (!rcu_seq_state(sp->srcu_gp_seq_needed)) { |
| 247 | | − spin_unlock_irqrestore_rcu_node(sp, flags); |
| 245 | + spin_lock_irqsave_rcu_node(ssp, flags); |
| 246 | + if (!rcu_seq_state(ssp->srcu_gp_seq_needed)) { |
| 247 | + spin_unlock_irqrestore_rcu_node(ssp, flags); |
| 248 | 248 | return; |
| 249 | 249 | } |
| 250 | | − init_srcu_struct_fields(sp, true); |
| 251 | | − spin_unlock_irqrestore_rcu_node(sp, flags); |
| 250 | + init_srcu_struct_fields(ssp, true); |
| 251 | + spin_unlock_irqrestore_rcu_node(ssp, flags); |
| 252 | 252 | } |
| 253 | 253 | |
| 254 | 254 | /* |
| 255 | 255 | * Returns approximate total of the readers' ->srcu_lock_count[] values |
| 256 | 256 | * for the rank of per-CPU counters specified by idx. |
| 257 | 257 | */ |
| 258 | | −static unsigned long srcu_readers_lock_idx(struct srcu_struct *sp, int idx) |
| 258 | +static unsigned long srcu_readers_lock_idx(struct srcu_struct *ssp, int idx) |
| 259 | 259 | { |
| 260 | 260 | int cpu; |
| 261 | 261 | unsigned long sum = 0; |
| 262 | 262 | |
| 263 | 263 | for_each_possible_cpu(cpu) { |
| 264 | | − struct srcu_data *cpuc = per_cpu_ptr(sp->sda, cpu); |
| 264 | + struct srcu_data *cpuc = per_cpu_ptr(ssp->sda, cpu); |
| 265 | 265 | |
| 266 | 266 | sum += READ_ONCE(cpuc->srcu_lock_count[idx]); |
| 267 | 267 | } |
| @@ -272,13 +272,13 @@ static unsigned long srcu_readers_lock_idx(struct srcu_struct *sp, int idx) · 4 unmodified lines |
| 272 | 272 | * Returns approximate total of the readers' ->srcu_unlock_count[] values |
| 273 | 273 | * for the rank of per-CPU counters specified by idx. |
| 274 | 274 | */ |
| 275 | | −static unsigned long srcu_readers_unlock_idx(struct srcu_struct *sp, int idx) |
| 275 | +static unsigned long srcu_readers_unlock_idx(struct srcu_struct *ssp, int idx) |
| 276 | 276 | { |
| 277 | 277 | int cpu; |
| 278 | 278 | unsigned long sum = 0; |
| 279 | 279 | |
| 280 | 280 | for_each_possible_cpu(cpu) { |
| 281 | | − struct srcu_data *cpuc = per_cpu_ptr(sp->sda, cpu); |
| 281 | + struct srcu_data *cpuc = per_cpu_ptr(ssp->sda, cpu); |
| 282 | 282 | |
| 283 | 283 | sum += READ_ONCE(cpuc->srcu_unlock_count[idx]); |
| 284 | 284 | } |
| @@ -289,11 +289,11 @@ static unsigned long srcu_readers_unlock_idx(struct srcu_struct *sp, int idx) · 4 unmodified lines |
| 289 | 289 | * Return true if the number of pre-existing readers is determined to |
| 290 | 290 | * be zero. |
| 291 | 291 | */ |
| 292 | | −static bool srcu_readers_active_idx_check(struct srcu_struct *sp, int idx) |
| 292 | +static bool srcu_readers_active_idx_check(struct srcu_struct *ssp, int idx) |
| 293 | 293 | { |
| 294 | 294 | unsigned long unlocks; |
| 295 | 295 | |
| 296 | | − unlocks = srcu_readers_unlock_idx(sp, idx); |
| 296 | + unlocks = srcu_readers_unlock_idx(ssp, idx); |
| 297 | 297 | |
| 298 | 298 | /* |
| 299 | 299 | * Make sure that a lock is always counted if the corresponding |
| @@ -329,25 +329,25 @@ static bool srcu_readers_active_idx_check(struct srcu_struct *sp, int idx) · 29 unmodified lines |
| 329 | 329 | * of floor(ULONG_MAX/NR_CPUS/2), which should be sufficient, |
| 330 | 330 | * especially on 64-bit systems. |
| 331 | 331 | */ |
| 332 | | − return srcu_readers_lock_idx(sp, idx) == unlocks; |
| 332 | + return srcu_readers_lock_idx(ssp, idx) == unlocks; |
| 333 | 333 | } |
| 334 | 334 | |
| 335 | 335 | /** |
| 336 | 336 | * srcu_readers_active - returns true if there are readers. and false |
| 337 | 337 | * otherwise |
| 338 | | − * @sp: which srcu_struct to count active readers (holding srcu_read_lock). |
| 338 | + * @ssp: which srcu_struct to count active readers (holding srcu_read_lock). |
| 339 | 339 | * |
| 340 | 340 | * Note that this is not an atomic primitive, and can therefore suffer |
| 341 | 341 | * severe errors when invoked on an active srcu_struct. That said, it |
| 342 | 342 | * can be useful as an error check at cleanup time. |
| 343 | 343 | */ |
| 344 | | −static bool srcu_readers_active(struct srcu_struct *sp) |
| 344 | +static bool srcu_readers_active(struct srcu_struct *ssp) |
| 345 | 345 | { |
| 346 | 346 | int cpu; |
| 347 | 347 | unsigned long sum = 0; |
| 348 | 348 | |
| 349 | 349 | for_each_possible_cpu(cpu) { |
| 350 | | − struct srcu_data *cpuc = per_cpu_ptr(sp->sda, cpu); |
| 350 | + struct srcu_data *cpuc = per_cpu_ptr(ssp->sda, cpu); |
| 351 | 351 | |
| 352 | 352 | sum += READ_ONCE(cpuc->srcu_lock_count[0]); |
| 353 | 353 | sum += READ_ONCE(cpuc->srcu_lock_count[1]); |
| @@ -363,44 +363,44 @@ static bool srcu_readers_active(struct srcu_struct *sp) · 9 unmodified lines |
| 363 | 363 | * Return grace-period delay, zero if there are expedited grace |
| 364 | 364 | * periods pending, SRCU_INTERVAL otherwise. |
| 365 | 365 | */ |
| 366 | | −static unsigned long srcu_get_delay(struct srcu_struct *sp) |
| 366 | +static unsigned long srcu_get_delay(struct srcu_struct *ssp) |
| 367 | 367 | { |
| 368 | | − if (ULONG_CMP_LT(READ_ONCE(sp->srcu_gp_seq), |
| 369 | | − READ_ONCE(sp->srcu_gp_seq_needed_exp))) |
| 368 | + if (ULONG_CMP_LT(READ_ONCE(ssp->srcu_gp_seq), |
| 369 | + READ_ONCE(ssp->srcu_gp_seq_needed_exp))) |
| 370 | 370 | return 0; |
| 371 | 371 | return SRCU_INTERVAL; |
| 372 | 372 | } |
| 373 | 373 | |
| 374 | 374 | /* Helper for cleanup_srcu_struct() and cleanup_srcu_struct_quiesced(). */ |
| 375 | | −void _cleanup_srcu_struct(struct srcu_struct *sp, bool quiesced) |
| 375 | +void _cleanup_srcu_struct(struct srcu_struct *ssp, bool quiesced) |
| 376 | 376 | { |
| 377 | 377 | int cpu; |
| 378 | 378 | |
| 379 | | − if (WARN_ON(!srcu_get_delay(sp))) |
| 379 | + if (WARN_ON(!srcu_get_delay(ssp))) |
| 380 | 380 | return; /* Just leak it! */ |
| 381 | | − if (WARN_ON(srcu_readers_active(sp))) |
| 381 | + if (WARN_ON(srcu_readers_active(ssp))) |
| 382 | 382 | return; /* Just leak it! */ |
| 383 | 383 | if (quiesced) { |
| 384 | | − if (WARN_ON(delayed_work_pending(&sp->work))) |
| 384 | + if (WARN_ON(delayed_work_pending(&ssp->work))) |
| 385 | 385 | return; /* Just leak it! */ |
| 386 | 386 | } else { |
| 387 | | − flush_delayed_work(&sp->work); |
| 387 | + flush_delayed_work(&ssp->work); |
| 388 | 388 | } |
| 389 | 389 | for_each_possible_cpu(cpu) |
| 390 | 390 | if (quiesced) { |
| 391 | | − if (WARN_ON(delayed_work_pending(&per_cpu_ptr(sp->sda, cpu)->work))) |
| 391 | + if (WARN_ON(delayed_work_pending(&per_cpu_ptr(ssp->sda, cpu)->work))) |
| 392 | 392 | return; /* Just leak it! */ |
| 393 | 393 | } else { |
| 394 | | − flush_delayed_work(&per_cpu_ptr(sp->sda, cpu)->work); |
| 394 | + flush_delayed_work(&per_cpu_ptr(ssp->sda, cpu)->work); |
| 395 | 395 | } |
| 396 | | − if (WARN_ON(rcu_seq_state(READ_ONCE(sp->srcu_gp_seq)) != SRCU_STATE_IDLE) || |
| 397 | | − WARN_ON(srcu_readers_active(sp))) { |
| 396 | + if (WARN_ON(rcu_seq_state(READ_ONCE(ssp->srcu_gp_seq)) != SRCU_STATE_IDLE) || |
| 397 | + WARN_ON(srcu_readers_active(ssp))) { |
| 398 | 398 | pr_info("%s: Active srcu_struct %p state: %d\n", |
| 399 | | − __func__, sp, rcu_seq_state(READ_ONCE(sp->srcu_gp_seq))); |
| 399 | + __func__, ssp, rcu_seq_state(READ_ONCE(ssp->srcu_gp_seq))); |
| 400 | 400 | return; /* Caller forgot to stop doing call_srcu()? */ |
| 401 | 401 | } |
| 402 | | − free_percpu(sp->sda); |
| 403 | | − sp->sda = NULL; |
| 402 | + free_percpu(ssp->sda); |
| 403 | + ssp->sda = NULL; |
| 404 | 404 | } |
| 405 | 405 | EXPORT_SYMBOL_GPL(_cleanup_srcu_struct); |
| 406 | 406 | |
| @@ -409,12 +409,12 @@ EXPORT_SYMBOL_GPL(_cleanup_srcu_struct); · 2 unmodified lines |
| 409 | 409 | * srcu_struct. |
| 410 | 410 | * Returns an index that must be passed to the matching srcu_read_unlock(). |
| 411 | 411 | */ |
| 412 | | −int __srcu_read_lock(struct srcu_struct *sp) |
| 412 | +int __srcu_read_lock(struct srcu_struct *ssp) |
| 413 | 413 | { |
| 414 | 414 | int idx; |
| 415 | 415 | |
| 416 | | − idx = READ_ONCE(sp->srcu_idx) & 0x1; |
| 417 | | − this_cpu_inc(sp->sda->srcu_lock_count[idx]); |
| 416 | + idx = READ_ONCE(ssp->srcu_idx) & 0x1; |
| 417 | + this_cpu_inc(ssp->sda->srcu_lock_count[idx]); |
| 418 | 418 | smp_mb(); /* B */ /* Avoid leaking the critical section. */ |
| 419 | 419 | return idx; |
| 420 | 420 | } |
| @@ -425,10 +425,10 @@ EXPORT_SYMBOL_GPL(__srcu_read_lock); · 4 unmodified lines |
| 425 | 425 | * element of the srcu_struct. Note that this may well be a different |
| 426 | 426 | * CPU than that which was incremented by the corresponding srcu_read_lock(). |
| 427 | 427 | */ |
| 428 | | −void __srcu_read_unlock(struct srcu_struct *sp, int idx) |
| 428 | +void __srcu_read_unlock(struct srcu_struct *ssp, int idx) |
| 429 | 429 | { |
| 430 | 430 | smp_mb(); /* C */ /* Avoid leaking the critical section. */ |
| 431 | | − this_cpu_inc(sp->sda->srcu_unlock_count[idx]); |
| 431 | + this_cpu_inc(ssp->sda->srcu_unlock_count[idx]); |
| 432 | 432 | } |
| 433 | 433 | EXPORT_SYMBOL_GPL(__srcu_read_unlock); |
| 434 | 434 | |
| @@ -444,22 +444,22 @@ EXPORT_SYMBOL_GPL(__srcu_read_unlock); · 9 unmodified lines |
| 444 | 444 | /* |
| 445 | 445 | * Start an SRCU grace period. |
| 446 | 446 | */ |
| 447 | | −static void srcu_gp_start(struct srcu_struct *sp) |
| 447 | +static void srcu_gp_start(struct srcu_struct *ssp) |
| 448 | 448 | { |
| 449 | | − struct srcu_data *sdp = this_cpu_ptr(sp->sda); |
| 449 | + struct srcu_data *sdp = this_cpu_ptr(ssp->sda); |
| 450 | 450 | int state; |
| 451 | 451 | |
| 452 | | − lockdep_assert_held(&ACCESS_PRIVATE(sp, lock)); |
| 453 | | − WARN_ON_ONCE(ULONG_CMP_GE(sp->srcu_gp_seq, sp->srcu_gp_seq_needed)); |
| 452 | + lockdep_assert_held(&ACCESS_PRIVATE(ssp, lock)); |
| 453 | + WARN_ON_ONCE(ULONG_CMP_GE(ssp->srcu_gp_seq, ssp->srcu_gp_seq_needed)); |
| 454 | 454 | spin_lock_rcu_node(sdp); /* Interrupts already disabled. */ |
| 455 | 455 | rcu_segcblist_advance(&sdp->srcu_cblist, |
| 456 | | − rcu_seq_current(&sp->srcu_gp_seq)); |
| 456 | + rcu_seq_current(&ssp->srcu_gp_seq)); |
| 457 | 457 | (void)rcu_segcblist_accelerate(&sdp->srcu_cblist, |
| 458 | | − rcu_seq_snap(&sp->srcu_gp_seq)); |
| 458 | + rcu_seq_snap(&ssp->srcu_gp_seq)); |
| 459 | 459 | spin_unlock_rcu_node(sdp); /* Interrupts remain disabled. */ |
| 460 | 460 | smp_mb(); /* Order prior store to ->srcu_gp_seq_needed vs. GP start. */ |
| 461 | | − rcu_seq_start(&sp->srcu_gp_seq); |
| 462 | | − state = rcu_seq_state(READ_ONCE(sp->srcu_gp_seq)); |
| 461 | + rcu_seq_start(&ssp->srcu_gp_seq); |
| 462 | + state = rcu_seq_state(READ_ONCE(ssp->srcu_gp_seq)); |
| 463 | 463 | WARN_ON_ONCE(state != SRCU_STATE_SCAN1); |
| 464 | 464 | } |
| 465 | 465 | |
| @@ -513,7 +513,7 @@ static void srcu_schedule_cbs_sdp(struct srcu_data *sdp, unsigned long delay) · 47 unmodified lines |
| 513 | 513 | * just-completed grace period, the one corresponding to idx. If possible, |
| 514 | 514 | * schedule this invocation on the corresponding CPUs. |
| 515 | 515 | */ |
| 516 | | −static void srcu_schedule_cbs_snp(struct srcu_struct *sp, struct srcu_node *snp, |
| 516 | +static void srcu_schedule_cbs_snp(struct srcu_struct *ssp, struct srcu_node *snp, |
| 517 | 517 | unsigned long mask, unsigned long delay) |
| 518 | 518 | { |
| 519 | 519 | int cpu; |
| @@ -521,7 +521,7 @@ static void srcu_schedule_cbs_snp(struct srcu_struct *sp, struct srcu_node *snp, · 1 unmodified line |
| 521 | 521 | for (cpu = snp->grplo; cpu <= snp->grphi; cpu++) { |
| 522 | 522 | if (!(mask & (1 << (cpu - snp->grplo)))) |
| 523 | 523 | continue; |
| 524 | | − srcu_schedule_cbs_sdp(per_cpu_ptr(sp->sda, cpu), delay); |
| 524 | + srcu_schedule_cbs_sdp(per_cpu_ptr(ssp->sda, cpu), delay); |
| 525 | 525 | } |
| 526 | 526 | } |
| 527 | 527 | |
| @@ -534,7 +534,7 @@ static void srcu_schedule_cbs_snp(struct srcu_struct *sp, struct srcu_node *snp, · 6 unmodified lines |
| 534 | 534 | * are initiating callback invocation. This allows the ->srcu_have_cbs[] |
| 535 | 535 | * array to have a finite number of elements. |
| 536 | 536 | */ |
| 537 | | −static void srcu_gp_end(struct srcu_struct *sp) |
| 537 | +static void srcu_gp_end(struct srcu_struct *ssp) |
| 538 | 538 | { |
| 539 | 539 | unsigned long cbdelay; |
| 540 | 540 | bool cbs; |
| @@ -548,28 +548,28 @@ static void srcu_gp_end(struct srcu_struct *sp) · 7 unmodified lines |
| 548 | 548 | struct srcu_node *snp; |
| 549 | 549 | |
| 550 | 550 | /* Prevent more than one additional grace period. */ |
| 551 | | − mutex_lock(&sp->srcu_cb_mutex); |
| 551 | + mutex_lock(&ssp->srcu_cb_mutex); |
| 552 | 552 | |
| 553 | 553 | /* End the current grace period. */ |
| 554 | | − spin_lock_irq_rcu_node(sp); |
| 555 | | − idx = rcu_seq_state(sp->srcu_gp_seq); |
| 554 | + spin_lock_irq_rcu_node(ssp); |
| 555 | + idx = rcu_seq_state(ssp->srcu_gp_seq); |
| 556 | 556 | WARN_ON_ONCE(idx != SRCU_STATE_SCAN2); |
| 557 | | − cbdelay = srcu_get_delay(sp); |
| 558 | | − sp->srcu_last_gp_end = ktime_get_mono_fast_ns(); |
| 559 | | − rcu_seq_end(&sp->srcu_gp_seq); |
| 560 | | − gpseq = rcu_seq_current(&sp->srcu_gp_seq); |
| 561 | | − if (ULONG_CMP_LT(sp->srcu_gp_seq_needed_exp, gpseq)) |
| 562 | | − sp->srcu_gp_seq_needed_exp = gpseq; |
| 563 | | − spin_unlock_irq_rcu_node(sp); |
| 564 | | − mutex_unlock(&sp->srcu_gp_mutex); |
| 557 | + cbdelay = srcu_get_delay(ssp); |
| 558 | + ssp->srcu_last_gp_end = ktime_get_mono_fast_ns(); |
| 559 | + rcu_seq_end(&ssp->srcu_gp_seq); |
| 560 | + gpseq = rcu_seq_current(&ssp->srcu_gp_seq); |
| 561 | + if (ULONG_CMP_LT(ssp->srcu_gp_seq_needed_exp, gpseq)) |
| 562 | + ssp->srcu_gp_seq_needed_exp = gpseq; |
| 563 | + spin_unlock_irq_rcu_node(ssp); |
| 564 | + mutex_unlock(&ssp->srcu_gp_mutex); |
| 565 | 565 | /* A new grace period can start at this point. But only one. */ |
| 566 | 566 | |
| 567 | 567 | /* Initiate callback invocation as needed. */ |
| 568 | 568 | idx = rcu_seq_ctr(gpseq) % ARRAY_SIZE(snp->srcu_have_cbs); |
| 569 | | − srcu_for_each_node_breadth_first(sp, snp) { |
| 569 | + srcu_for_each_node_breadth_first(ssp, snp) { |
| 570 | 570 | spin_lock_irq_rcu_node(snp); |
| 571 | 571 | cbs = false; |
| 572 | | − last_lvl = snp >= sp->level[rcu_num_lvls - 1]; |
| 572 | + last_lvl = snp >= ssp->level[rcu_num_lvls - 1]; |
| 573 | 573 | if (last_lvl) |
| 574 | 574 | cbs = snp->srcu_have_cbs[idx] == gpseq; |
| 575 | 575 | snp->srcu_have_cbs[idx] = gpseq; |
| @@ -580,12 +580,12 @@ static void srcu_gp_end(struct srcu_struct *sp) · 4 unmodified lines |
| 580 | 580 | snp->srcu_data_have_cbs[idx] = 0; |
| 581 | 581 | spin_unlock_irq_rcu_node(snp); |
| 582 | 582 | if (cbs) |
| 583 | | − srcu_schedule_cbs_snp(sp, snp, mask, cbdelay); |
| 583 | + srcu_schedule_cbs_snp(ssp, snp, mask, cbdelay); |
| 584 | 584 | |
| 585 | 585 | /* Occasionally prevent srcu_data counter wrap. */ |
| 586 | 586 | if (!(gpseq & counter_wrap_check) && last_lvl) |
| 587 | 587 | for (cpu = snp->grplo; cpu <= snp->grphi; cpu++) { |
| 588 | | − sdp = per_cpu_ptr(sp->sda, cpu); |
| 588 | + sdp = per_cpu_ptr(ssp->sda, cpu); |
| 589 | 589 | spin_lock_irqsave_rcu_node(sdp, flags); |
| 590 | 590 | if (ULONG_CMP_GE(gpseq, |
| 591 | 591 | sdp->srcu_gp_seq_needed + 100)) |
| @@ -598,18 +598,18 @@ static void srcu_gp_end(struct srcu_struct *sp) · 6 unmodified lines |
| 598 | 598 | } |
| 599 | 599 | |
| 600 | 600 | /* Callback initiation done, allow grace periods after next. */ |
| 601 | | − mutex_unlock(&sp->srcu_cb_mutex); |
| 601 | + mutex_unlock(&ssp->srcu_cb_mutex); |
| 602 | 602 | |
| 603 | 603 | /* Start a new grace period if needed. */ |
| 604 | | − spin_lock_irq_rcu_node(sp); |
| 605 | | − gpseq = rcu_seq_current(&sp->srcu_gp_seq); |
| 604 | + spin_lock_irq_rcu_node(ssp); |
| 605 | + gpseq = rcu_seq_current(&ssp->srcu_gp_seq); |
| 606 | 606 | if (!rcu_seq_state(gpseq) && |
| 607 | | − ULONG_CMP_LT(gpseq, sp->srcu_gp_seq_needed)) { |
| 608 | | − srcu_gp_start(sp); |
| 609 | | − spin_unlock_irq_rcu_node(sp); |
| 610 | | − srcu_reschedule(sp, 0); |
| 607 | + ULONG_CMP_LT(gpseq, ssp->srcu_gp_seq_needed)) { |
| 608 | + srcu_gp_start(ssp); |
| 609 | + spin_unlock_irq_rcu_node(ssp); |
| 610 | + srcu_reschedule(ssp, 0); |
| 611 | 611 | } else { |
| 612 | | − spin_unlock_irq_rcu_node(sp); |
| 612 | + spin_unlock_irq_rcu_node(ssp); |
| 613 | 613 | } |
| 614 | 614 | } |
| 615 | 615 | |
| @@ -620,13 +620,13 @@ static void srcu_gp_end(struct srcu_struct *sp) · 4 unmodified lines |
| 620 | 620 | * but without expediting. To start a completely new grace period, |
| 621 | 621 | * whether expedited or not, use srcu_funnel_gp_start() instead. |
| 622 | 622 | */ |
| 623 | | −static void srcu_funnel_exp_start(struct srcu_struct *sp, struct srcu_node *snp, |
| 623 | +static void srcu_funnel_exp_start(struct srcu_struct *ssp, struct srcu_node *snp, |
| 624 | 624 | unsigned long s) |
| 625 | 625 | { |
| 626 | 626 | unsigned long flags; |
| 627 | 627 | |
| 628 | 628 | for (; snp != NULL; snp = snp->srcu_parent) { |
| 629 | | − if (rcu_seq_done(&sp->srcu_gp_seq, s) || |
| 629 | + if (rcu_seq_done(&ssp->srcu_gp_seq, s) || |
| 630 | 630 | ULONG_CMP_GE(READ_ONCE(snp->srcu_gp_seq_needed_exp), s)) |
| 631 | 631 | return; |
| 632 | 632 | spin_lock_irqsave_rcu_node(snp, flags); |
| @@ -637,10 +637,10 @@ static void srcu_funnel_exp_start(struct srcu_struct *sp, struct srcu_node *snp, · 4 unmodified lines |
| 637 | 637 | WRITE_ONCE(snp->srcu_gp_seq_needed_exp, s); |
| 638 | 638 | spin_unlock_irqrestore_rcu_node(snp, flags); |
| 639 | 639 | } |
| 640 | | − spin_lock_irqsave_rcu_node(sp, flags); |
| 641 | | − if (ULONG_CMP_LT(sp->srcu_gp_seq_needed_exp, s)) |
| 642 | | − sp->srcu_gp_seq_needed_exp = s; |
| 643 | | − spin_unlock_irqrestore_rcu_node(sp, flags); |
| 640 | + spin_lock_irqsave_rcu_node(ssp, flags); |
| 641 | + if (ULONG_CMP_LT(ssp->srcu_gp_seq_needed_exp, s)) |
| 642 | + ssp->srcu_gp_seq_needed_exp = s; |
| 643 | + spin_unlock_irqrestore_rcu_node(ssp, flags); |
| 644 | 644 | } |
| 645 | 645 | |
| 646 | 646 | /* |
| @@ -653,7 +653,7 @@ static void srcu_funnel_exp_start(struct srcu_struct *sp, struct srcu_node *snp, · 6 unmodified lines |
| 653 | 653 | * Note that this function also does the work of srcu_funnel_exp_start(), |
| 654 | 654 | * in some cases by directly invoking it. |
| 655 | 655 | */ |
| 656 | | −static void srcu_funnel_gp_start(struct srcu_struct *sp, struct srcu_data *sdp, |
| 656 | +static void srcu_funnel_gp_start(struct srcu_struct *ssp, struct srcu_data *sdp, |
| 657 | 657 | unsigned long s, bool do_norm) |
| 658 | 658 | { |
| 659 | 659 | unsigned long flags; |
| @@ -663,7 +663,7 @@ static void srcu_funnel_gp_start(struct srcu_struct *sp, struct srcu_data *sdp, · 3 unmodified lines |
| 663 | 663 | |
| 664 | 664 | /* Each pass through the loop does one level of the srcu_node tree. */ |
| 665 | 665 | for (; snp != NULL; snp = snp->srcu_parent) { |
| 666 | | − if (rcu_seq_done(&sp->srcu_gp_seq, s) && snp != sdp->mynode) |
| 666 | + if (rcu_seq_done(&ssp->srcu_gp_seq, s) && snp != sdp->mynode) |
| 667 | 667 | return; /* GP already done and CBs recorded. */ |
| 668 | 668 | spin_lock_irqsave_rcu_node(snp, flags); |
| 669 | 669 | if (ULONG_CMP_GE(snp->srcu_have_cbs[idx], s)) { |
| @@ -678,7 +678,7 @@ static void srcu_funnel_gp_start(struct srcu_struct *sp, struct srcu_data *sdp, · 8 unmodified lines |
| 678 | 678 | return; |
| 679 | 679 | } |
| 680 | 680 | if (!do_norm) |
| 681 | | − srcu_funnel_exp_start(sp, snp, s); |
| 681 | + srcu_funnel_exp_start(ssp, snp, s); |
| 682 | 682 | return; |
| 683 | 683 | } |
| 684 | 684 | snp->srcu_have_cbs[idx] = s; |
| @@ -690,29 +690,29 @@ static void srcu_funnel_gp_start(struct srcu_struct *sp, struct srcu_data *sdp, · 5 unmodified lines |
| 690 | 690 | } |
| 691 | 691 | |
| 692 | 692 | /* Top of tree, must ensure the grace period will be started. */ |
| 693 | | − spin_lock_irqsave_rcu_node(sp, flags); |
| 694 | | − if (ULONG_CMP_LT(sp->srcu_gp_seq_needed, s)) { |
| 693 | + spin_lock_irqsave_rcu_node(ssp, flags); |
| 694 | + if (ULONG_CMP_LT(ssp->srcu_gp_seq_needed, s)) { |
| 695 | 695 | /* |
| 696 | 696 | * Record need for grace period s. Pair with load |
| 697 | 697 | * acquire setting up for initialization. |
| 698 | 698 | */ |
| 699 | | − smp_store_release(&sp->srcu_gp_seq_needed, s); /*^^^*/ |
| 699 | + smp_store_release(&ssp->srcu_gp_seq_needed, s); /*^^^*/ |
| 700 | 700 | } |
| 701 | | − if (!do_norm && ULONG_CMP_LT(sp->srcu_gp_seq_needed_exp, s)) |
| 702 | | − sp->srcu_gp_seq_needed_exp = s; |
| 701 | + if (!do_norm && ULONG_CMP_LT(ssp->srcu_gp_seq_needed_exp, s)) |
| 702 | + ssp->srcu_gp_seq_needed_exp = s; |
| 703 | 703 | |
| 704 | 704 | /* If grace period not already done and none in progress, start it. */ |
| 705 | | − if (!rcu_seq_done(&sp->srcu_gp_seq, s) && |
| 706 | | − rcu_seq_state(sp->srcu_gp_seq) == SRCU_STATE_IDLE) { |
| 707 | | − WARN_ON_ONCE(ULONG_CMP_GE(sp->srcu_gp_seq, sp->srcu_gp_seq_needed)); |
| 708 | | − srcu_gp_start(sp); |
| 705 | + if (!rcu_seq_done(&ssp->srcu_gp_seq, s) && |
| 706 | + rcu_seq_state(ssp->srcu_gp_seq) == SRCU_STATE_IDLE) { |
| 707 | + WARN_ON_ONCE(ULONG_CMP_GE(ssp->srcu_gp_seq, ssp->srcu_gp_seq_needed)); |
| 708 | + srcu_gp_start(ssp); |
| 709 | 709 | if (likely(srcu_init_done)) |
| 710 | | − queue_delayed_work(rcu_gp_wq, &sp->work, |
| 711 | | − srcu_get_delay(sp)); |
| 712 | | − else if (list_empty(&sp->work.work.entry)) |
| 713 | | − list_add(&sp->work.work.entry, &srcu_boot_list); |
| 710 | + queue_delayed_work(rcu_gp_wq, &ssp->work, |
| 711 | + srcu_get_delay(ssp)); |
| 712 | + else if (list_empty(&ssp->work.work.entry)) |
| 713 | + list_add(&ssp->work.work.entry, &srcu_boot_list); |
| 714 | 714 | } |
| 715 | | − spin_unlock_irqrestore_rcu_node(sp, flags); |
| 715 | + spin_unlock_irqrestore_rcu_node(ssp, flags); |
| 716 | 716 | } |
| 717 | 717 | |
| 718 | 718 | /* |
| @@ -720,12 +720,12 @@ static void srcu_funnel_gp_start(struct srcu_struct *sp, struct srcu_data *sdp, · 1 unmodified line |
| 720 | 720 | * loop an additional time if there is an expedited grace period pending. |
| 721 | 721 | * The caller must ensure that ->srcu_idx is not changed while checking. |
| 722 | 722 | */ |
| 723 | | −static bool try_check_zero(struct srcu_struct *sp, int idx, int trycount) |
| 723 | +static bool try_check_zero(struct srcu_struct *ssp, int idx, int trycount) |
| 724 | 724 | { |
| 725 | 725 | for (;;) { |
| 726 | | − if (srcu_readers_active_idx_check(sp, idx)) |
| 726 | + if (srcu_readers_active_idx_check(ssp, idx)) |
| 727 | 727 | return true; |
| 728 | | − if (--trycount + !srcu_get_delay(sp) <= 0) |
| 728 | + if (--trycount + !srcu_get_delay(ssp) <= 0) |
| 729 | 729 | return false; |
| 730 | 730 | udelay(SRCU_RETRY_CHECK_DELAY); |
| 731 | 731 | } |
| @@ -736,7 +736,7 @@ static bool try_check_zero(struct srcu_struct *sp, int idx, int trycount) · 4 unmodified lines |
| 736 | 736 | * use the other rank of the ->srcu_(un)lock_count[] arrays. This allows |
| 737 | 737 | * us to wait for pre-existing readers in a starvation-free manner. |
| 738 | 738 | */ |
| 739 | | −static void srcu_flip(struct srcu_struct *sp) |
| 739 | +static void srcu_flip(struct srcu_struct *ssp) |
| 740 | 740 | { |
| 741 | 741 | /* |
| 742 | 742 | * Ensure that if this updater saw a given reader's increment |
| @@ -748,7 +748,7 @@ static void srcu_flip(struct srcu_struct *sp) · 5 unmodified lines |
| 748 | 748 | */ |
| 749 | 749 | smp_mb(); /* E */ /* Pairs with B and C. */ |
| 750 | 750 | |
| 751 | | − WRITE_ONCE(sp->srcu_idx, sp->srcu_idx + 1); |
| 751 | + WRITE_ONCE(ssp->srcu_idx, ssp->srcu_idx + 1); |
| 752 | 752 | |
| 753 | 753 | /* |
| 754 | 754 | * Ensure that if the updater misses an __srcu_read_unlock() |
| @@ -781,7 +781,7 @@ static void srcu_flip(struct srcu_struct *sp) · 26 unmodified lines |
| 781 | 781 | * negligible when amoritized over that time period, and the extra latency |
| 782 | 782 | * of a needlessly non-expedited grace period is similarly negligible. |
| 783 | 783 | */ |
| 784 | | −static bool srcu_might_be_idle(struct srcu_struct *sp) |
| 784 | +static bool srcu_might_be_idle(struct srcu_struct *ssp) |
| 785 | 785 | { |
| 786 | 786 | unsigned long curseq; |
| 787 | 787 | unsigned long flags; |
| @@ -790,7 +790,7 @@ static bool srcu_might_be_idle(struct srcu_struct *sp) · 2 unmodified lines |
| 790 | 790 | |
| 791 | 791 | /* If the local srcu_data structure has callbacks, not idle. */ |
| 792 | 792 | local_irq_save(flags); |
| 793 | | − sdp = this_cpu_ptr(sp->sda); |
| 793 | + sdp = this_cpu_ptr(ssp->sda); |
| 794 | 794 | if (rcu_segcblist_pend_cbs(&sdp->srcu_cblist)) { |
| 795 | 795 | local_irq_restore(flags); |
| 796 | 796 | return false; /* Callbacks already present, so not idle. */ |
| @@ -806,17 +806,17 @@ static bool srcu_might_be_idle(struct srcu_struct *sp) · 9 unmodified lines |
| 806 | 806 | /* First, see if enough time has passed since the last GP. */ |
| 807 | 807 | t = ktime_get_mono_fast_ns(); |
| 808 | 808 | if (exp_holdoff == 0 || |
| 809 | | − time_in_range_open(t, sp->srcu_last_gp_end, |
| 810 | | − sp->srcu_last_gp_end + exp_holdoff)) |
| 809 | + time_in_range_open(t, ssp->srcu_last_gp_end, |
| 810 | + ssp->srcu_last_gp_end + exp_holdoff)) |
| 811 | 811 | return false; /* Too soon after last GP. */ |
| 812 | 812 | |
| 813 | 813 | /* Next, check for probable idleness. */ |
| 814 | | − curseq = rcu_seq_current(&sp->srcu_gp_seq); |
| 814 | + curseq = rcu_seq_current(&ssp->srcu_gp_seq); |
| 815 | 815 | smp_mb(); /* Order ->srcu_gp_seq with ->srcu_gp_seq_needed. */ |
| 816 | | − if (ULONG_CMP_LT(curseq, READ_ONCE(sp->srcu_gp_seq_needed))) |
| 816 | + if (ULONG_CMP_LT(curseq, READ_ONCE(ssp->srcu_gp_seq_needed))) |
| 817 | 817 | return false; /* Grace period in progress, so not idle. */ |
| 818 | 818 | smp_mb(); /* Order ->srcu_gp_seq with prior access. */ |
| 819 | | − if (curseq != rcu_seq_current(&sp->srcu_gp_seq)) |
| 819 | + if (curseq != rcu_seq_current(&ssp->srcu_gp_seq)) |
| 820 | 820 | return false; /* GP # changed, so not idle. */ |
| 821 | 821 | return true; /* With reasonable probability, idle! */ |
| 822 | 822 | } |
| @@ -856,7 +856,7 @@ static void srcu_leak_callback(struct rcu_head *rhp) · 33 unmodified lines |
| 856 | 856 | * srcu_read_lock(), and srcu_read_unlock() that are all passed the same |
| 857 | 857 | * srcu_struct structure. |
| 858 | 858 | */ |
| 859 | | −void __call_srcu(struct srcu_struct *sp, struct rcu_head *rhp, |
| 859 | +void __call_srcu(struct srcu_struct *ssp, struct rcu_head *rhp, |
| 860 | 860 | rcu_callback_t func, bool do_norm) |
| 861 | 861 | { |
| 862 | 862 | unsigned long flags; |
| @@ -866,7 +866,7 @@ void __call_srcu(struct srcu_struct *sp, struct rcu_head *rhp, · 3 unmodified lines |
| 866 | 866 | unsigned long s; |
| 867 | 867 | struct srcu_data *sdp; |
| 868 | 868 | |
| 869 | | − check_init_srcu_struct(sp); |
| 869 | + check_init_srcu_struct(ssp); |
| 870 | 870 | if (debug_rcu_head_queue(rhp)) { |
| 871 | 871 | /* Probable double call_srcu(), so leak the callback. */ |
| 872 | 872 | WRITE_ONCE(rhp->func, srcu_leak_callback); |
| @@ -874,14 +874,14 @@ void __call_srcu(struct srcu_struct *sp, struct rcu_head *rhp, · 1 unmodified line |
| 874 | 874 | return; |
| 875 | 875 | } |
| 876 | 876 | rhp->func = func; |
| 877 | | − idx = srcu_read_lock(sp); |
| 877 | + idx = srcu_read_lock(ssp); |
| 878 | 878 | local_irq_save(flags); |
| 879 | | − sdp = this_cpu_ptr(sp->sda); |
| 879 | + sdp = this_cpu_ptr(ssp->sda); |
| 880 | 880 | spin_lock_rcu_node(sdp); |
| 881 | 881 | rcu_segcblist_enqueue(&sdp->srcu_cblist, rhp, false); |
| 882 | 882 | rcu_segcblist_advance(&sdp->srcu_cblist, |
| 883 | | − rcu_seq_current(&sp->srcu_gp_seq)); |
| 884 | | − s = rcu_seq_snap(&sp->srcu_gp_seq); |
| 883 | + rcu_seq_current(&ssp->srcu_gp_seq)); |
| 884 | + s = rcu_seq_snap(&ssp->srcu_gp_seq); |
| 885 | 885 | (void)rcu_segcblist_accelerate(&sdp->srcu_cblist, s); |
| 886 | 886 | if (ULONG_CMP_LT(sdp->srcu_gp_seq_needed, s)) { |
| 887 | 887 | sdp->srcu_gp_seq_needed = s; |
| @@ -893,15 +893,15 @@ void __call_srcu(struct srcu_struct *sp, struct rcu_head *rhp, · 5 unmodified lines |
| 893 | 893 | } |
| 894 | 894 | spin_unlock_irqrestore_rcu_node(sdp, flags); |
| 895 | 895 | if (needgp) |
| 896 | | − srcu_funnel_gp_start(sp, sdp, s, do_norm); |
| 896 | + srcu_funnel_gp_start(ssp, sdp, s, do_norm); |
| 897 | 897 | else if (needexp) |
| 898 | | − srcu_funnel_exp_start(sp, sdp->mynode, s); |
| 899 | | − srcu_read_unlock(sp, idx); |
| 898 | + srcu_funnel_exp_start(ssp, sdp->mynode, s); |
| 899 | + srcu_read_unlock(ssp, idx); |
| 900 | 900 | } |
| 901 | 901 | |
| 902 | 902 | /** |
| 903 | 903 | * call_srcu() - Queue a callback for invocation after an SRCU grace period |
| 904 | | − * @sp: srcu_struct in queue the callback |
| 904 | + * @ssp: srcu_struct in queue the callback |
| 905 | 905 | * @rhp: structure to be used for queueing the SRCU callback. |
| 906 | 906 | * @func: function to be invoked after the SRCU grace period |
| 907 | 907 | * |
| @@ -916,21 +916,21 @@ void __call_srcu(struct srcu_struct *sp, struct rcu_head *rhp, · 8 unmodified lines |
| 916 | 916 | * The callback will be invoked from process context, but must nevertheless |
| 917 | 917 | * be fast and must not block. |
| 918 | 918 | */ |
| 919 | | −void call_srcu(struct srcu_struct *sp, struct rcu_head *rhp, |
| 919 | +void call_srcu(struct srcu_struct *ssp, struct rcu_head *rhp, |
| 920 | 920 | rcu_callback_t func) |
| 921 | 921 | { |
| 922 | | − __call_srcu(sp, rhp, func, true); |
| 922 | + __call_srcu(ssp, rhp, func, true); |
| 923 | 923 | } |
| 924 | 924 | EXPORT_SYMBOL_GPL(call_srcu); |
| 925 | 925 | |
| 926 | 926 | /* |
| 927 | 927 | * Helper function for synchronize_srcu() and synchronize_srcu_expedited(). |
| 928 | 928 | */ |
| 929 | | −static void __synchronize_srcu(struct srcu_struct *sp, bool do_norm) |
| 929 | +static void __synchronize_srcu(struct srcu_struct *ssp, bool do_norm) |
| 930 | 930 | { |
| 931 | 931 | struct rcu_synchronize rcu; |
| 932 | 932 | |
| 933 | | − RCU_LOCKDEP_WARN(lock_is_held(&sp->dep_map) || |
| 933 | + RCU_LOCKDEP_WARN(lock_is_held(&ssp->dep_map) || |
| 934 | 934 | lock_is_held(&rcu_bh_lock_map) || |
| 935 | 935 | lock_is_held(&rcu_lock_map) || |
| 936 | 936 | lock_is_held(&rcu_sched_lock_map), |
| @@ -939,10 +939,10 @@ static void __synchronize_srcu(struct srcu_struct *sp, bool do_norm) · 2 unmodified lines |
| 939 | 939 | if (rcu_scheduler_active == RCU_SCHEDULER_INACTIVE) |
| 940 | 940 | return; |
| 941 | 941 | might_sleep(); |
| 942 | | − check_init_srcu_struct(sp); |
| 942 | + check_init_srcu_struct(ssp); |
| 943 | 943 | init_completion(&rcu.completion); |
| 944 | 944 | init_rcu_head_on_stack(&rcu.head); |
| 945 | | − __call_srcu(sp, &rcu.head, wakeme_after_rcu, do_norm); |
| 945 | + __call_srcu(ssp, &rcu.head, wakeme_after_rcu, do_norm); |
| 946 | 946 | wait_for_completion(&rcu.completion); |
| 947 | 947 | destroy_rcu_head_on_stack(&rcu.head); |
| 948 | 948 | |
| @@ -958,7 +958,7 @@ static void __synchronize_srcu(struct srcu_struct *sp, bool do_norm) · 9 unmodified lines |
| 958 | 958 | |
| 959 | 959 | /** |
| 960 | 960 | * synchronize_srcu_expedited - Brute-force SRCU grace period |
| 961 | | − * @sp: srcu_struct with which to synchronize. |
| 961 | + * @ssp: srcu_struct with which to synchronize. |
| 962 | 962 | * |
| 963 | 963 | * Wait for an SRCU grace period to elapse, but be more aggressive about |
| 964 | 964 | * spinning rather than blocking when waiting. |
| @@ -966,15 +966,15 @@ static void __synchronize_srcu(struct srcu_struct *sp, bool do_norm) · 1 unmodified line |
| 966 | 966 | * Note that synchronize_srcu_expedited() has the same deadlock and |
| 967 | 967 | * memory-ordering properties as does synchronize_srcu(). |
| 968 | 968 | */ |
| 969 | | −void synchronize_srcu_expedited(struct srcu_struct *sp) |
| 969 | +void synchronize_srcu_expedited(struct srcu_struct *ssp) |
| 970 | 970 | { |
| 971 | | − __synchronize_srcu(sp, rcu_gp_is_normal()); |
| 971 | + __synchronize_srcu(ssp, rcu_gp_is_normal()); |
| 972 | 972 | } |
| 973 | 973 | EXPORT_SYMBOL_GPL(synchronize_srcu_expedited); |
| 974 | 974 | |
| 975 | 975 | /** |
| 976 | 976 | * synchronize_srcu - wait for prior SRCU read-side critical-section completion |
| 977 | | − * @sp: srcu_struct with which to synchronize. |
| 977 | + * @ssp: srcu_struct with which to synchronize. |
| 978 | 978 | * |
| 979 | 979 | * Wait for the count to drain to zero of both indexes. To avoid the |
| 980 | 980 | * possible starvation of synchronize_srcu(), it waits for the count of |
| @@ -1016,12 +1016,12 @@ EXPORT_SYMBOL_GPL(synchronize_srcu_expedited); · 35 unmodified lines |
| 1016 | 1016 | * SRCU must also provide it. Note that detecting idleness is heuristic |
| 1017 | 1017 | * and subject to both false positives and negatives. |
| 1018 | 1018 | */ |
| 1019 | | −void synchronize_srcu(struct srcu_struct *sp) |
| 1019 | +void synchronize_srcu(struct srcu_struct *ssp) |
| 1020 | 1020 | { |
| 1021 | | − if (srcu_might_be_idle(sp) || rcu_gp_is_expedited()) |
| 1022 | | − synchronize_srcu_expedited(sp); |
| 1021 | + if (srcu_might_be_idle(ssp) || rcu_gp_is_expedited()) |
| 1022 | + synchronize_srcu_expedited(ssp); |
| 1023 | 1023 | else |
| 1024 | | − __synchronize_srcu(sp, true); |
| 1024 | + __synchronize_srcu(ssp, true); |
| 1025 | 1025 | } |
| 1026 | 1026 | EXPORT_SYMBOL_GPL(synchronize_srcu); |
| 1027 | 1027 | |
| @@ -1031,36 +1031,36 @@ EXPORT_SYMBOL_GPL(synchronize_srcu); · 3 unmodified lines |
| 1031 | 1031 | static void srcu_barrier_cb(struct rcu_head *rhp) |
| 1032 | 1032 | { |
| 1033 | 1033 | struct srcu_data *sdp; |
| 1034 | | − struct srcu_struct *sp; |
| 1034 | + struct srcu_struct *ssp; |
| 1035 | 1035 | |
| 1036 | 1036 | sdp = container_of(rhp, struct srcu_data, srcu_barrier_head); |
| 1037 | | − sp = sdp->sp; |
| 1038 | | − if (atomic_dec_and_test(&sp->srcu_barrier_cpu_cnt)) |
| 1039 | | − complete(&sp->srcu_barrier_completion); |
| 1037 | + ssp = sdp->ssp; |
| 1038 | + if (atomic_dec_and_test(&ssp->srcu_barrier_cpu_cnt)) |
| 1039 | + complete(&ssp->srcu_barrier_completion); |
| 1040 | 1040 | } |
| 1041 | 1041 | |
| 1042 | 1042 | /** |
| 1043 | 1043 | * srcu_barrier - Wait until all in-flight call_srcu() callbacks complete. |
| 1044 | | − * @sp: srcu_struct on which to wait for in-flight callbacks. |
| 1044 | + * @ssp: srcu_struct on which to wait for in-flight callbacks. |
| 1045 | 1045 | */ |
| 1046 | | −void srcu_barrier(struct srcu_struct *sp) |
| 1046 | +void srcu_barrier(struct srcu_struct *ssp) |
| 1047 | 1047 | { |
| 1048 | 1048 | int cpu; |
| 1049 | 1049 | struct srcu_data *sdp; |
| 1050 | | − unsigned long s = rcu_seq_snap(&sp->srcu_barrier_seq); |
| 1050 | + unsigned long s = rcu_seq_snap(&ssp->srcu_barrier_seq); |
| 1051 | 1051 | |
| 1052 | | − check_init_srcu_struct(sp); |
| 1053 | | − mutex_lock(&sp->srcu_barrier_mutex); |
| 1054 | | − if (rcu_seq_done(&sp->srcu_barrier_seq, s)) { |
| 1052 | + check_init_srcu_struct(ssp); |
| 1053 | + mutex_lock(&ssp->srcu_barrier_mutex); |
| 1054 | + if (rcu_seq_done(&ssp->srcu_barrier_seq, s)) { |
| 1055 | 1055 | smp_mb(); /* Force ordering following return. */ |
| 1056 | | − mutex_unlock(&sp->srcu_barrier_mutex); |
| 1056 | + mutex_unlock(&ssp->srcu_barrier_mutex); |
| 1057 | 1057 | return; /* Someone else did our work for us. */ |
| 1058 | 1058 | } |
| 1059 | | − rcu_seq_start(&sp->srcu_barrier_seq); |
| 1060 | | − init_completion(&sp->srcu_barrier_completion); |
| 1059 | + rcu_seq_start(&ssp->srcu_barrier_seq); |
| 1060 | + init_completion(&ssp->srcu_barrier_completion); |
| 1061 | 1061 | |
| 1062 | 1062 | /* Initial count prevents reaching zero until all CBs are posted. */ |
| 1063 | | − atomic_set(&sp->srcu_barrier_cpu_cnt, 1); |
| 1063 | + atomic_set(&ssp->srcu_barrier_cpu_cnt, 1); |
| 1064 | 1064 | |
| 1065 | 1065 | /* |
| 1066 | 1066 | * Each pass through this loop enqueues a callback, but only |
| @@ -1071,39 +1071,39 @@ void srcu_barrier(struct srcu_struct *sp) · 4 unmodified lines |
| 1071 | 1071 | * grace period as the last callback already in the queue. |
| 1072 | 1072 | */ |
| 1073 | 1073 | for_each_possible_cpu(cpu) { |
| 1074 | | − sdp = per_cpu_ptr(sp->sda, cpu); |
| 1074 | + sdp = per_cpu_ptr(ssp->sda, cpu); |
| 1075 | 1075 | spin_lock_irq_rcu_node(sdp); |
| 1076 | | − atomic_inc(&sp->srcu_barrier_cpu_cnt); |
| 1076 | + atomic_inc(&ssp->srcu_barrier_cpu_cnt); |
| 1077 | 1077 | sdp->srcu_barrier_head.func = srcu_barrier_cb; |
| 1078 | 1078 | debug_rcu_head_queue(&sdp->srcu_barrier_head); |
| 1079 | 1079 | if (!rcu_segcblist_entrain(&sdp->srcu_cblist, |
| 1080 | 1080 | &sdp->srcu_barrier_head, 0)) { |
| 1081 | 1081 | debug_rcu_head_unqueue(&sdp->srcu_barrier_head); |
| 1082 | | − atomic_dec(&sp->srcu_barrier_cpu_cnt); |
| 1082 | + atomic_dec(&ssp->srcu_barrier_cpu_cnt); |
| 1083 | 1083 | } |
| 1084 | 1084 | spin_unlock_irq_rcu_node(sdp); |
| 1085 | 1085 | } |
| 1086 | 1086 | |
| 1087 | 1087 | /* Remove the initial count, at which point reaching zero can happen. */ |
| 1088 | | − if (atomic_dec_and_test(&sp->srcu_barrier_cpu_cnt)) |
| 1089 | | − complete(&sp->srcu_barrier_completion); |
| 1090 | | − wait_for_completion(&sp->srcu_barrier_completion); |
| 1088 | + if (atomic_dec_and_test(&ssp->srcu_barrier_cpu_cnt)) |
| 1089 | + complete(&ssp->srcu_barrier_completion); |
| 1090 | + wait_for_completion(&ssp->srcu_barrier_completion); |
| 1091 | 1091 | |
| 1092 | | − rcu_seq_end(&sp->srcu_barrier_seq); |
| 1093 | | − mutex_unlock(&sp->srcu_barrier_mutex); |
| 1092 | + rcu_seq_end(&ssp->srcu_barrier_seq); |
| 1093 | + mutex_unlock(&ssp->srcu_barrier_mutex); |
| 1094 | 1094 | } |
| 1095 | 1095 | EXPORT_SYMBOL_GPL(srcu_barrier); |
| 1096 | 1096 | |
| 1097 | 1097 | /** |
| 1098 | 1098 | * srcu_batches_completed - return batches completed. |
| 1099 | | − * @sp: srcu_struct on which to report batch completion. |
| 1099 | + * @ssp: srcu_struct on which to report batch completion. |
| 1100 | 1100 | * |
| 1101 | 1101 | * Report the number of batches, correlated with, but not necessarily |
| 1102 | 1102 | * precisely the same as, the number of grace periods that have elapsed. |
| 1103 | 1103 | */ |
| 1104 | | −unsigned long srcu_batches_completed(struct srcu_struct *sp) |
| 1104 | +unsigned long srcu_batches_completed(struct srcu_struct *ssp) |
| 1105 | 1105 | { |
| 1106 | | − return sp->srcu_idx; |
| 1106 | + return ssp->srcu_idx; |
| 1107 | 1107 | } |
| 1108 | 1108 | EXPORT_SYMBOL_GPL(srcu_batches_completed); |
| 1109 | 1109 | |
| @@ -1112,11 +1112,11 @@ EXPORT_SYMBOL_GPL(srcu_batches_completed); · 2 unmodified lines |
| 1112 | 1112 | * to SRCU_STATE_SCAN2, and invoke srcu_gp_end() when scan has |
| 1113 | 1113 | * completed in that state. |
| 1114 | 1114 | */ |
| 1115 | | −static void srcu_advance_state(struct srcu_struct *sp) |
| 1115 | +static void srcu_advance_state(struct srcu_struct *ssp) |
| 1116 | 1116 | { |
| 1117 | 1117 | int idx; |
| 1118 | 1118 | |
| 1119 | | − mutex_lock(&sp->srcu_gp_mutex); |
| 1119 | + mutex_lock(&ssp->srcu_gp_mutex); |
| 1120 | 1120 | |
| 1121 | 1121 | /* |
| 1122 | 1122 | * Because readers might be delayed for an extended period after |
| @@ -1128,47 +1128,47 @@ static void srcu_advance_state(struct srcu_struct *sp) · 5 unmodified lines |
| 1128 | 1128 | * The load-acquire ensures that we see the accesses performed |
| 1129 | 1129 | * by the prior grace period. |
| 1130 | 1130 | */ |
| 1131 | | − idx = rcu_seq_state(smp_load_acquire(&sp->srcu_gp_seq)); /* ^^^ */ |
| 1131 | + idx = rcu_seq_state(smp_load_acquire(&ssp->srcu_gp_seq)); /* ^^^ */ |
| 1132 | 1132 | if (idx == SRCU_STATE_IDLE) { |
| 1133 | | − spin_lock_irq_rcu_node(sp); |
| 1134 | | − if (ULONG_CMP_GE(sp->srcu_gp_seq, sp->srcu_gp_seq_needed)) { |
| 1135 | | − WARN_ON_ONCE(rcu_seq_state(sp->srcu_gp_seq)); |
| 1136 | | − spin_unlock_irq_rcu_node(sp); |
| 1137 | | − mutex_unlock(&sp->srcu_gp_mutex); |
| 1133 | + spin_lock_irq_rcu_node(ssp); |
| 1134 | + if (ULONG_CMP_GE(ssp->srcu_gp_seq, ssp->srcu_gp_seq_needed)) { |
| 1135 | + WARN_ON_ONCE(rcu_seq_state(ssp->srcu_gp_seq)); |
| 1136 | + spin_unlock_irq_rcu_node(ssp); |
| 1137 | + mutex_unlock(&ssp->srcu_gp_mutex); |
| 1138 | 1138 | return; |
| 1139 | 1139 | } |
| 1140 | | − idx = rcu_seq_state(READ_ONCE(sp->srcu_gp_seq)); |
| 1140 | + idx = rcu_seq_state(READ_ONCE(ssp->srcu_gp_seq)); |
| 1141 | 1141 | if (idx == SRCU_STATE_IDLE) |
| 1142 | | − srcu_gp_start(sp); |
| 1143 | | − spin_unlock_irq_rcu_node(sp); |
| 1142 | + srcu_gp_start(ssp); |
| 1143 | + spin_unlock_irq_rcu_node(ssp); |
| 1144 | 1144 | if (idx != SRCU_STATE_IDLE) { |
| 1145 | | − mutex_unlock(&sp->srcu_gp_mutex); |
| 1145 | + mutex_unlock(&ssp->srcu_gp_mutex); |
| 1146 | 1146 | return; /* Someone else started the grace period. */ |
| 1147 | 1147 | } |
| 1148 | 1148 | } |
| 1149 | 1149 | |
| 1150 | | − if (rcu_seq_state(READ_ONCE(sp->srcu_gp_seq)) == SRCU_STATE_SCAN1) { |
| 1151 | | − idx = 1 ^ (sp->srcu_idx & 1); |
| 1152 | | − if (!try_check_zero(sp, idx, 1)) { |
| 1153 | | − mutex_unlock(&sp->srcu_gp_mutex); |
| 1150 | + if (rcu_seq_state(READ_ONCE(ssp->srcu_gp_seq)) == SRCU_STATE_SCAN1) { |
| 1151 | + idx = 1 ^ (ssp->srcu_idx & 1); |
| 1152 | + if (!try_check_zero(ssp, idx, 1)) { |
| 1153 | + mutex_unlock(&ssp->srcu_gp_mutex); |
| 1154 | 1154 | return; /* readers present, retry later. */ |
| 1155 | 1155 | } |
| 1156 | | − srcu_flip(sp); |
| 1157 | | − rcu_seq_set_state(&sp->srcu_gp_seq, SRCU_STATE_SCAN2); |
| 1156 | + srcu_flip(ssp); |
| 1157 | + rcu_seq_set_state(&ssp->srcu_gp_seq, SRCU_STATE_SCAN2); |
| 1158 | 1158 | } |
| 1159 | 1159 | |
| 1160 | | − if (rcu_seq_state(READ_ONCE(sp->srcu_gp_seq)) == SRCU_STATE_SCAN2) { |
| 1160 | + if (rcu_seq_state(READ_ONCE(ssp->srcu_gp_seq)) == SRCU_STATE_SCAN2) { |
| 1161 | 1161 | |
| 1162 | 1162 | /* |
| 1163 | 1163 | * SRCU read-side critical sections are normally short, |
| 1164 | 1164 | * so check at least twice in quick succession after a flip. |
| 1165 | 1165 | */ |
| 1166 | | − idx = 1 ^ (sp->srcu_idx & 1); |
| 1167 | | − if (!try_check_zero(sp, idx, 2)) { |
| 1168 | | − mutex_unlock(&sp->srcu_gp_mutex); |
| 1166 | + idx = 1 ^ (ssp->srcu_idx & 1); |
| 1167 | + if (!try_check_zero(ssp, idx, 2)) { |
| 1168 | + mutex_unlock(&ssp->srcu_gp_mutex); |
| 1169 | 1169 | return; /* readers present, retry later. */ |
| 1170 | 1170 | } |
| 1171 | | − srcu_gp_end(sp); /* Releases ->srcu_gp_mutex. */ |
| 1171 | + srcu_gp_end(ssp); /* Releases ->srcu_gp_mutex. */ |
| 1172 | 1172 | } |
| 1173 | 1173 | } |
| 1174 | 1174 | |
| @@ -1184,14 +1184,14 @@ static void srcu_invoke_callbacks(struct work_struct *work) · 9 unmodified lines |
| 1184 | 1184 | struct rcu_cblist ready_cbs; |
| 1185 | 1185 | struct rcu_head *rhp; |
| 1186 | 1186 | struct srcu_data *sdp; |
| 1187 | | − struct srcu_struct *sp; |
| 1187 | + struct srcu_struct *ssp; |
| 1188 | 1188 | |
| 1189 | 1189 | sdp = container_of(work, struct srcu_data, work.work); |
| 1190 | | − sp = sdp->sp; |
| 1190 | + ssp = sdp->ssp; |
| 1191 | 1191 | rcu_cblist_init(&ready_cbs); |
| 1192 | 1192 | spin_lock_irq_rcu_node(sdp); |
| 1193 | 1193 | rcu_segcblist_advance(&sdp->srcu_cblist, |
| 1194 | | − rcu_seq_current(&sp->srcu_gp_seq)); |
| 1194 | + rcu_seq_current(&ssp->srcu_gp_seq)); |
| 1195 | 1195 | if (sdp->srcu_cblist_invoking || |
| 1196 | 1196 | !rcu_segcblist_ready_cbs(&sdp->srcu_cblist)) { |
| 1197 | 1197 | spin_unlock_irq_rcu_node(sdp); |
| @@ -1217,7 +1217,7 @@ static void srcu_invoke_callbacks(struct work_struct *work) · 19 unmodified lines |
| 1217 | 1217 | spin_lock_irq_rcu_node(sdp); |
| 1218 | 1218 | rcu_segcblist_insert_count(&sdp->srcu_cblist, &ready_cbs); |
| 1219 | 1219 | (void)rcu_segcblist_accelerate(&sdp->srcu_cblist, |
| 1220 | | − rcu_seq_snap(&sp->srcu_gp_seq)); |
| 1220 | + rcu_seq_snap(&ssp->srcu_gp_seq)); |
| 1221 | 1221 | sdp->srcu_cblist_invoking = false; |
| 1222 | 1222 | more = rcu_segcblist_ready_cbs(&sdp->srcu_cblist); |
| 1223 | 1223 | spin_unlock_irq_rcu_node(sdp); |
| @@ -1229,24 +1229,24 @@ static void srcu_invoke_callbacks(struct work_struct *work) · 5 unmodified lines |
| 1229 | 1229 | * Finished one round of SRCU grace period. Start another if there are |
| 1230 | 1230 | * more SRCU callbacks queued, otherwise put SRCU into not-running state. |
| 1231 | 1231 | */ |
| 1232 | | −static void srcu_reschedule(struct srcu_struct *sp, unsigned long delay) |
| 1232 | +static void srcu_reschedule(struct srcu_struct *ssp, unsigned long delay) |
| 1233 | 1233 | { |
| 1234 | 1234 | bool pushgp = true; |
| 1235 | 1235 | |
| 1236 | | − spin_lock_irq_rcu_node(sp); |
| 1237 | | − if (ULONG_CMP_GE(sp->srcu_gp_seq, sp->srcu_gp_seq_needed)) { |
| 1238 | | − if (!WARN_ON_ONCE(rcu_seq_state(sp->srcu_gp_seq))) { |
| 1236 | + spin_lock_irq_rcu_node(ssp); |
| 1237 | + if (ULONG_CMP_GE(ssp->srcu_gp_seq, ssp->srcu_gp_seq_needed)) { |
| 1238 | + if (!WARN_ON_ONCE(rcu_seq_state(ssp->srcu_gp_seq))) { |
| 1239 | 1239 | /* All requests fulfilled, time to go idle. */ |
| 1240 | 1240 | pushgp = false; |
| 1241 | 1241 | } |
| 1242 | | − } else if (!rcu_seq_state(sp->srcu_gp_seq)) { |
| 1242 | + } else if (!rcu_seq_state(ssp->srcu_gp_seq)) { |
| 1243 | 1243 | /* Outstanding request and no GP. Start one. */ |
| 1244 | | − srcu_gp_start(sp); |
| 1244 | + srcu_gp_start(ssp); |
| 1245 | 1245 | } |
| 1246 | | − spin_unlock_irq_rcu_node(sp); |
| 1246 | + spin_unlock_irq_rcu_node(ssp); |
| 1247 | 1247 | |
| 1248 | 1248 | if (pushgp) |
| 1249 | | − queue_delayed_work(rcu_gp_wq, &sp->work, delay); |
| 1249 | + queue_delayed_work(rcu_gp_wq, &ssp->work, delay); |
| 1250 | 1250 | } |
| 1251 | 1251 | |
| 1252 | 1252 | /* |
| @@ -1254,41 +1254,41 @@ static void srcu_reschedule(struct srcu_struct *sp, unsigned long delay) · 1 unmodified line |
| 1254 | 1254 | */ |
| 1255 | 1255 | static void process_srcu(struct work_struct *work) |
| 1256 | 1256 | { |
| 1257 | | − struct srcu_struct *sp; |
| 1257 | + struct srcu_struct *ssp; |
| 1258 | 1258 | |
| 1259 | | − sp = container_of(work, struct srcu_struct, work.work); |
| 1259 | + ssp = container_of(work, struct srcu_struct, work.work); |
| 1260 | 1260 | |
| 1261 | | − srcu_advance_state(sp); |
| 1262 | | − srcu_reschedule(sp, srcu_get_delay(sp)); |
| 1261 | + srcu_advance_state(ssp); |
| 1262 | + srcu_reschedule(ssp, srcu_get_delay(ssp)); |
| 1263 | 1263 | } |
| 1264 | 1264 | |
| 1265 | 1265 | void srcutorture_get_gp_data(enum rcutorture_type test_type, |
| 1266 | | − struct srcu_struct *sp, int *flags, |
| 1266 | + struct srcu_struct *ssp, int *flags, |
| 1267 | 1267 | unsigned long *gp_seq) |
| 1268 | 1268 | { |
| 1269 | 1269 | if (test_type != SRCU_FLAVOR) |
| 1270 | 1270 | return; |
| 1271 | 1271 | *flags = 0; |
| 1272 | | − *gp_seq = rcu_seq_current(&sp->srcu_gp_seq); |
| 1272 | + *gp_seq = rcu_seq_current(&ssp->srcu_gp_seq); |
| 1273 | 1273 | } |
| 1274 | 1274 | EXPORT_SYMBOL_GPL(srcutorture_get_gp_data); |
| 1275 | 1275 | |
| 1276 | | −void srcu_torture_stats_print(struct srcu_struct *sp, char *tt, char *tf) |
| 1276 | +void srcu_torture_stats_print(struct srcu_struct *ssp, char *tt, char *tf) |
| 1277 | 1277 | { |
| 1278 | 1278 | int cpu; |
| 1279 | 1279 | int idx; |
| 1280 | 1280 | unsigned long s0 = 0, s1 = 0; |
| 1281 | 1281 | |
| 1282 | | − idx = sp->srcu_idx & 0x1; |
| 1282 | + idx = ssp->srcu_idx & 0x1; |
| 1283 | 1283 | pr_alert("%s%s Tree SRCU g%ld per-CPU(idx=%d):", |
| 1284 | | − tt, tf, rcu_seq_current(&sp->srcu_gp_seq), idx); |
| 1284 | + tt, tf, rcu_seq_current(&ssp->srcu_gp_seq), idx); |
| 1285 | 1285 | for_each_possible_cpu(cpu) { |
| 1286 | 1286 | unsigned long l0, l1; |
| 1287 | 1287 | unsigned long u0, u1; |
| 1288 | 1288 | long c0, c1; |
| 1289 | 1289 | struct srcu_data *sdp; |
| 1290 | 1290 | |
| 1291 | | − sdp = per_cpu_ptr(sp->sda, cpu); |
| 1291 | + sdp = per_cpu_ptr(ssp->sda, cpu); |
| 1292 | 1292 | u0 = sdp->srcu_unlock_count[!idx]; |
| 1293 | 1293 | u1 = sdp->srcu_unlock_count[idx]; |
| 1294 | 1294 | |
| @@ -1323,14 +1323,14 @@ early_initcall(srcu_bootup_announce); · 28 unmodified lines |
| 1323 | 1323 | |
| 1324 | 1324 | void __init srcu_init(void) |
| 1325 | 1325 | { |
| 1326 | | − struct srcu_struct *sp; |
| 1326 | + struct srcu_struct *ssp; |
| 1327 | 1327 | |
| 1328 | 1328 | srcu_init_done = true; |
| 1329 | 1329 | while (!list_empty(&srcu_boot_list)) { |
| 1330 | | − sp = list_first_entry(&srcu_boot_list, struct srcu_struct, |
| 1330 | + ssp = list_first_entry(&srcu_boot_list, struct srcu_struct, |
| 1331 | 1331 | work.work.entry); |
| 1332 | | − check_init_srcu_struct(sp); |
| 1333 | | − list_del_init(&sp->work.work.entry); |
| 1334 | | − queue_work(rcu_gp_wq, &sp->work.work); |
| 1332 | + check_init_srcu_struct(ssp); |
| 1333 | + list_del_init(&ssp->work.work.entry); |
| 1334 | + queue_work(rcu_gp_wq, &ssp->work.work); |
| 1335 | 1335 | } |
| 1336 | 1336 | } |