mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
![Paul E. McKenney](/assets/img/avatar_default.png)
This patch fixes a long-standing performance bug in classic RCU that results in massive internal-to-RCU lock contention on systems with more than a few hundred CPUs. Although this patch creates a separate flavor of RCU for ease of review and patch maintenance, it is intended to replace classic RCU. This patch still handles stress better than does mainline, so I am still calling it ready for inclusion. This patch is against the -tip tree. Nevertheless, experience on an actual 1000+ CPU machine would still be most welcome. Most of the changes noted below were found while creating an rcutiny (which should permit ejecting the current rcuclassic) and while doing detailed line-by-line documentation. Updates from v9 (http://lkml.org/lkml/2008/12/2/334): o Fixes from remainder of line-by-line code walkthrough, including comment spelling, initialization, undesirable narrowing due to type conversion, removing redundant memory barriers, removing redundant local-variable initialization, and removing redundant local variables. I do not believe that any of these fixes address the CPU-hotplug issues that Andi Kleen was seeing, but please do give it a whirl in case the machine is smarter than I am. A writeup from the walkthrough may be found at the following URL, in case you are suffering from terminal insomnia or masochism: http://www.kernel.org/pub/linux/kernel/people/paulmck/tmp/rcutree-walkthrough.2008.12.16a.pdf o Made rcutree tracing use seq_file, as suggested some time ago by Lai Jiangshan. o Added a .csv variant of the rcudata debugfs trace file, to allow people having thousands of CPUs to drop the data into a spreadsheet. Tested with oocalc and gnumeric. Updated documentation to suit. Updates from v8 (http://lkml.org/lkml/2008/11/15/139): o Fix a theoretical race between grace-period initialization and force_quiescent_state() that could occur if more than three jiffies were required to carry out the grace-period initialization. Which it might, if you had enough CPUs. o Apply Ingo's printk-standardization patch. o Substitute local variables for repeated accesses to global variables. o Fix comment misspellings and redundant (but harmless) increments of ->n_rcu_pending (this latter after having explicitly added it). o Apply checkpatch fixes. Updates from v7 (http://lkml.org/lkml/2008/10/10/291): o Fixed a number of problems noted by Gautham Shenoy, including the cpu-stall-detection bug that he was having difficulty convincing me was real. ;-) o Changed cpu-stall detection to wait for ten seconds rather than three in order to reduce false positive, as suggested by Ingo Molnar. o Produced a design document (http://lwn.net/Articles/305782/). The act of writing this document uncovered a number of both theoretical and "here and now" bugs as noted below. o Fix dynticks_nesting accounting confusion, simplify WARN_ON() condition, fix kerneldoc comments, and add memory barriers in dynticks interface functions. o Add more data to tracing. o Remove unused "rcu_barrier" field from rcu_data structure. o Count calls to rcu_pending() from scheduling-clock interrupt to use as a surrogate timebase should jiffies stop counting. o Fix a theoretical race between force_quiescent_state() and grace-period initialization. Yes, initialization does have to go on for some jiffies for this race to occur, but given enough CPUs... Updates from v6 (http://lkml.org/lkml/2008/9/23/448): o Fix a number of checkpatch.pl complaints. o Apply review comments from Ingo Molnar and Lai Jiangshan on the stall-detection code. o Fix several bugs in !CONFIG_SMP builds. o Fix a misspelled config-parameter name so that RCU now announces at boot time if stall detection is configured. o Run tests on numerous combinations of configurations parameters, which after the fixes above, now build and run correctly. Updates from v5 (http://lkml.org/lkml/2008/9/15/92, bad subject line): o Fix a compiler error in the !CONFIG_FANOUT_EXACT case (blew a changeset some time ago, and finally got around to retesting this option). o Fix some tracing bugs in rcupreempt that caused incorrect totals to be printed. o I now test with a more brutal random-selection online/offline script (attached). Probably more brutal than it needs to be on the people reading it as well, but so it goes. o A number of optimizations and usability improvements: o Make rcu_pending() ignore the grace-period timeout when there is no grace period in progress. o Make force_quiescent_state() avoid going for a global lock in the case where there is no grace period in progress. o Rearrange struct fields to improve struct layout. o Make call_rcu() initiate a grace period if RCU was idle, rather than waiting for the next scheduling clock interrupt. o Invoke rcu_irq_enter() and rcu_irq_exit() only when idle, as suggested by Andi Kleen. I still don't completely trust this change, and might back it out. o Make CONFIG_RCU_TRACE be the single config variable manipulated for all forms of RCU, instead of the prior confusion. o Document tracing files and formats for both rcupreempt and rcutree. Updates from v4 for those missing v5 given its bad subject line: o Separated dynticks interface so that NMIs and irqs call separate functions, greatly simplifying it. In particular, this code no longer requires a proof of correctness. ;-) o Separated dynticks state out into its own per-CPU structure, avoiding the duplicated accounting. o The case where a dynticks-idle CPU runs an irq handler that invokes call_rcu() is now correctly handled, forcing that CPU out of dynticks-idle mode. o Review comments have been applied (thank you all!!!). For but one example, fixed the dynticks-ordering issue that Manfred pointed out, saving me much debugging. ;-) o Adjusted rcuclassic and rcupreempt to handle dynticks changes. Attached is an updated patch to Classic RCU that applies a hierarchy, greatly reducing the contention on the top-level lock for large machines. This passes 10-hour concurrent rcutorture and online-offline testing on 128-CPU ppc64 without dynticks enabled, and exposes some timekeeping bugs in presence of dynticks (exciting working on a system where "sleep 1" hangs until interrupted...), which were fixed in the 2.6.27 kernel. It is getting more reliable than mainline by some measures, so the next version will be against -tip for inclusion. See also Manfred Spraul's recent patches (or his earlier work from 2004 at http://marc.info/?l=linux-kernel&m=108546384711797&w=2). We will converge onto a common patch in the fullness of time, but are currently exploring different regions of the design space. That said, I have already gratefully stolen quite a few of Manfred's ideas. This patch provides CONFIG_RCU_FANOUT, which controls the bushiness of the RCU hierarchy. Defaults to 32 on 32-bit machines and 64 on 64-bit machines. If CONFIG_NR_CPUS is less than CONFIG_RCU_FANOUT, there is no hierarchy. By default, the RCU initialization code will adjust CONFIG_RCU_FANOUT to balance the hierarchy, so strongly NUMA architectures may choose to set CONFIG_RCU_FANOUT_EXACT to disable this balancing, allowing the hierarchy to be exactly aligned to the underlying hardware. Up to two levels of hierarchy are permitted (in addition to the root node), allowing up to 16,384 CPUs on 32-bit systems and up to 262,144 CPUs on 64-bit systems. I just know that I am going to regret saying this, but this seems more than sufficient for the foreseeable future. (Some architectures might wish to set CONFIG_RCU_FANOUT=4, which would limit such architectures to 64 CPUs. If this becomes a real problem, additional levels can be added, but I doubt that it will make a significant difference on real hardware.) In the common case, a given CPU will manipulate its private rcu_data structure and the rcu_node structure that it shares with its immediate neighbors. This can reduce both lock and memory contention by multiple orders of magnitude, which should eliminate the need for the strange manipulations that are reported to be required when running Linux on very large systems. Some shortcomings: o More bugs will probably surface as a result of an ongoing line-by-line code inspection. Patches will be provided as required. o There are probably hangs, rcutorture failures, &c. Seems quite stable on a 128-CPU machine, but that is kind of small compared to 4096 CPUs. However, seems to do better than mainline. Patches will be provided as required. o The memory footprint of this version is several KB larger than rcuclassic. A separate UP-only rcutiny patch will be provided, which will reduce the memory footprint significantly, even compared to the old rcuclassic. One such patch passes light testing, and has a memory footprint smaller even than rcuclassic. Initial reaction from various embedded guys was "it is not worth it", so am putting it aside. Credits: o Manfred Spraul for ideas, review comments, and bugs spotted, as well as some good friendly competition. ;-) o Josh Triplett, Ingo Molnar, Peter Zijlstra, Mathieu Desnoyers, Lai Jiangshan, Andi Kleen, Andy Whitcroft, and Andrew Morton for reviews and comments. o Thomas Gleixner for much-needed help with some timer issues (see patches below). o Jon M. Tollefson, Tim Pepper, Andrew Theurer, Jose R. Santos, Andy Whitcroft, Darrick Wong, Nishanth Aravamudan, Anton Blanchard, Dave Kleikamp, and Nathan Lynch for keeping machines alive despite my heavy abuse^Wtesting. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
334 lines
9.3 KiB
C
334 lines
9.3 KiB
C
/*
|
|
* Read-Copy Update tracing for realtime implementation
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* Copyright IBM Corporation, 2006
|
|
*
|
|
* Papers: http://www.rdrop.com/users/paulmck/RCU
|
|
*
|
|
* For detailed explanation of Read-Copy Update mechanism see -
|
|
* Documentation/RCU/ *.txt
|
|
*
|
|
*/
|
|
#include <linux/types.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/rcupdate.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/sched.h>
|
|
#include <asm/atomic.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/module.h>
|
|
#include <linux/completion.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/percpu.h>
|
|
#include <linux/notifier.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/rcupreempt_trace.h>
|
|
#include <linux/debugfs.h>
|
|
|
|
static struct mutex rcupreempt_trace_mutex;
|
|
static char *rcupreempt_trace_buf;
|
|
#define RCUPREEMPT_TRACE_BUF_SIZE 4096
|
|
|
|
void rcupreempt_trace_move2done(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->done_length += trace->wait_length;
|
|
trace->done_add += trace->wait_length;
|
|
trace->wait_length = 0;
|
|
}
|
|
void rcupreempt_trace_move2wait(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->wait_length += trace->next_length;
|
|
trace->wait_add += trace->next_length;
|
|
trace->next_length = 0;
|
|
}
|
|
void rcupreempt_trace_try_flip_1(struct rcupreempt_trace *trace)
|
|
{
|
|
atomic_inc(&trace->rcu_try_flip_1);
|
|
}
|
|
void rcupreempt_trace_try_flip_e1(struct rcupreempt_trace *trace)
|
|
{
|
|
atomic_inc(&trace->rcu_try_flip_e1);
|
|
}
|
|
void rcupreempt_trace_try_flip_i1(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->rcu_try_flip_i1++;
|
|
}
|
|
void rcupreempt_trace_try_flip_ie1(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->rcu_try_flip_ie1++;
|
|
}
|
|
void rcupreempt_trace_try_flip_g1(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->rcu_try_flip_g1++;
|
|
}
|
|
void rcupreempt_trace_try_flip_a1(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->rcu_try_flip_a1++;
|
|
}
|
|
void rcupreempt_trace_try_flip_ae1(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->rcu_try_flip_ae1++;
|
|
}
|
|
void rcupreempt_trace_try_flip_a2(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->rcu_try_flip_a2++;
|
|
}
|
|
void rcupreempt_trace_try_flip_z1(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->rcu_try_flip_z1++;
|
|
}
|
|
void rcupreempt_trace_try_flip_ze1(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->rcu_try_flip_ze1++;
|
|
}
|
|
void rcupreempt_trace_try_flip_z2(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->rcu_try_flip_z2++;
|
|
}
|
|
void rcupreempt_trace_try_flip_m1(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->rcu_try_flip_m1++;
|
|
}
|
|
void rcupreempt_trace_try_flip_me1(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->rcu_try_flip_me1++;
|
|
}
|
|
void rcupreempt_trace_try_flip_m2(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->rcu_try_flip_m2++;
|
|
}
|
|
void rcupreempt_trace_check_callbacks(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->rcu_check_callbacks++;
|
|
}
|
|
void rcupreempt_trace_done_remove(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->done_remove += trace->done_length;
|
|
trace->done_length = 0;
|
|
}
|
|
void rcupreempt_trace_invoke(struct rcupreempt_trace *trace)
|
|
{
|
|
atomic_inc(&trace->done_invoked);
|
|
}
|
|
void rcupreempt_trace_next_add(struct rcupreempt_trace *trace)
|
|
{
|
|
trace->next_add++;
|
|
trace->next_length++;
|
|
}
|
|
|
|
static void rcupreempt_trace_sum(struct rcupreempt_trace *sp)
|
|
{
|
|
struct rcupreempt_trace *cp;
|
|
int cpu;
|
|
|
|
memset(sp, 0, sizeof(*sp));
|
|
for_each_possible_cpu(cpu) {
|
|
cp = rcupreempt_trace_cpu(cpu);
|
|
sp->next_length += cp->next_length;
|
|
sp->next_add += cp->next_add;
|
|
sp->wait_length += cp->wait_length;
|
|
sp->wait_add += cp->wait_add;
|
|
sp->done_length += cp->done_length;
|
|
sp->done_add += cp->done_add;
|
|
sp->done_remove += cp->done_remove;
|
|
atomic_add(atomic_read(&cp->done_invoked), &sp->done_invoked);
|
|
sp->rcu_check_callbacks += cp->rcu_check_callbacks;
|
|
atomic_add(atomic_read(&cp->rcu_try_flip_1),
|
|
&sp->rcu_try_flip_1);
|
|
atomic_add(atomic_read(&cp->rcu_try_flip_e1),
|
|
&sp->rcu_try_flip_e1);
|
|
sp->rcu_try_flip_i1 += cp->rcu_try_flip_i1;
|
|
sp->rcu_try_flip_ie1 += cp->rcu_try_flip_ie1;
|
|
sp->rcu_try_flip_g1 += cp->rcu_try_flip_g1;
|
|
sp->rcu_try_flip_a1 += cp->rcu_try_flip_a1;
|
|
sp->rcu_try_flip_ae1 += cp->rcu_try_flip_ae1;
|
|
sp->rcu_try_flip_a2 += cp->rcu_try_flip_a2;
|
|
sp->rcu_try_flip_z1 += cp->rcu_try_flip_z1;
|
|
sp->rcu_try_flip_ze1 += cp->rcu_try_flip_ze1;
|
|
sp->rcu_try_flip_z2 += cp->rcu_try_flip_z2;
|
|
sp->rcu_try_flip_m1 += cp->rcu_try_flip_m1;
|
|
sp->rcu_try_flip_me1 += cp->rcu_try_flip_me1;
|
|
sp->rcu_try_flip_m2 += cp->rcu_try_flip_m2;
|
|
}
|
|
}
|
|
|
|
static ssize_t rcustats_read(struct file *filp, char __user *buffer,
|
|
size_t count, loff_t *ppos)
|
|
{
|
|
struct rcupreempt_trace trace;
|
|
ssize_t bcount;
|
|
int cnt = 0;
|
|
|
|
rcupreempt_trace_sum(&trace);
|
|
mutex_lock(&rcupreempt_trace_mutex);
|
|
snprintf(&rcupreempt_trace_buf[cnt], RCUPREEMPT_TRACE_BUF_SIZE - cnt,
|
|
"ggp=%ld rcc=%ld\n",
|
|
rcu_batches_completed(),
|
|
trace.rcu_check_callbacks);
|
|
snprintf(&rcupreempt_trace_buf[cnt], RCUPREEMPT_TRACE_BUF_SIZE - cnt,
|
|
"na=%ld nl=%ld wa=%ld wl=%ld da=%ld dl=%ld dr=%ld di=%d\n"
|
|
"1=%d e1=%d i1=%ld ie1=%ld g1=%ld a1=%ld ae1=%ld a2=%ld\n"
|
|
"z1=%ld ze1=%ld z2=%ld m1=%ld me1=%ld m2=%ld\n",
|
|
|
|
trace.next_add, trace.next_length,
|
|
trace.wait_add, trace.wait_length,
|
|
trace.done_add, trace.done_length,
|
|
trace.done_remove, atomic_read(&trace.done_invoked),
|
|
atomic_read(&trace.rcu_try_flip_1),
|
|
atomic_read(&trace.rcu_try_flip_e1),
|
|
trace.rcu_try_flip_i1, trace.rcu_try_flip_ie1,
|
|
trace.rcu_try_flip_g1,
|
|
trace.rcu_try_flip_a1, trace.rcu_try_flip_ae1,
|
|
trace.rcu_try_flip_a2,
|
|
trace.rcu_try_flip_z1, trace.rcu_try_flip_ze1,
|
|
trace.rcu_try_flip_z2,
|
|
trace.rcu_try_flip_m1, trace.rcu_try_flip_me1,
|
|
trace.rcu_try_flip_m2);
|
|
bcount = simple_read_from_buffer(buffer, count, ppos,
|
|
rcupreempt_trace_buf, strlen(rcupreempt_trace_buf));
|
|
mutex_unlock(&rcupreempt_trace_mutex);
|
|
return bcount;
|
|
}
|
|
|
|
static ssize_t rcugp_read(struct file *filp, char __user *buffer,
|
|
size_t count, loff_t *ppos)
|
|
{
|
|
long oldgp = rcu_batches_completed();
|
|
ssize_t bcount;
|
|
|
|
mutex_lock(&rcupreempt_trace_mutex);
|
|
synchronize_rcu();
|
|
snprintf(rcupreempt_trace_buf, RCUPREEMPT_TRACE_BUF_SIZE,
|
|
"oldggp=%ld newggp=%ld\n", oldgp, rcu_batches_completed());
|
|
bcount = simple_read_from_buffer(buffer, count, ppos,
|
|
rcupreempt_trace_buf, strlen(rcupreempt_trace_buf));
|
|
mutex_unlock(&rcupreempt_trace_mutex);
|
|
return bcount;
|
|
}
|
|
|
|
static ssize_t rcuctrs_read(struct file *filp, char __user *buffer,
|
|
size_t count, loff_t *ppos)
|
|
{
|
|
int cnt = 0;
|
|
int cpu;
|
|
int f = rcu_batches_completed() & 0x1;
|
|
ssize_t bcount;
|
|
|
|
mutex_lock(&rcupreempt_trace_mutex);
|
|
|
|
cnt += snprintf(&rcupreempt_trace_buf[cnt], RCUPREEMPT_TRACE_BUF_SIZE,
|
|
"CPU last cur F M\n");
|
|
for_each_online_cpu(cpu) {
|
|
long *flipctr = rcupreempt_flipctr(cpu);
|
|
cnt += snprintf(&rcupreempt_trace_buf[cnt],
|
|
RCUPREEMPT_TRACE_BUF_SIZE - cnt,
|
|
"%3d %4ld %3ld %d %d\n",
|
|
cpu,
|
|
flipctr[!f],
|
|
flipctr[f],
|
|
rcupreempt_flip_flag(cpu),
|
|
rcupreempt_mb_flag(cpu));
|
|
}
|
|
cnt += snprintf(&rcupreempt_trace_buf[cnt],
|
|
RCUPREEMPT_TRACE_BUF_SIZE - cnt,
|
|
"ggp = %ld, state = %s\n",
|
|
rcu_batches_completed(),
|
|
rcupreempt_try_flip_state_name());
|
|
cnt += snprintf(&rcupreempt_trace_buf[cnt],
|
|
RCUPREEMPT_TRACE_BUF_SIZE - cnt,
|
|
"\n");
|
|
bcount = simple_read_from_buffer(buffer, count, ppos,
|
|
rcupreempt_trace_buf, strlen(rcupreempt_trace_buf));
|
|
mutex_unlock(&rcupreempt_trace_mutex);
|
|
return bcount;
|
|
}
|
|
|
|
static struct file_operations rcustats_fops = {
|
|
.owner = THIS_MODULE,
|
|
.read = rcustats_read,
|
|
};
|
|
|
|
static struct file_operations rcugp_fops = {
|
|
.owner = THIS_MODULE,
|
|
.read = rcugp_read,
|
|
};
|
|
|
|
static struct file_operations rcuctrs_fops = {
|
|
.owner = THIS_MODULE,
|
|
.read = rcuctrs_read,
|
|
};
|
|
|
|
static struct dentry *rcudir, *statdir, *ctrsdir, *gpdir;
|
|
static int rcupreempt_debugfs_init(void)
|
|
{
|
|
rcudir = debugfs_create_dir("rcu", NULL);
|
|
if (!rcudir)
|
|
goto out;
|
|
statdir = debugfs_create_file("rcustats", 0444, rcudir,
|
|
NULL, &rcustats_fops);
|
|
if (!statdir)
|
|
goto free_out;
|
|
|
|
gpdir = debugfs_create_file("rcugp", 0444, rcudir, NULL, &rcugp_fops);
|
|
if (!gpdir)
|
|
goto free_out;
|
|
|
|
ctrsdir = debugfs_create_file("rcuctrs", 0444, rcudir,
|
|
NULL, &rcuctrs_fops);
|
|
if (!ctrsdir)
|
|
goto free_out;
|
|
return 0;
|
|
free_out:
|
|
if (statdir)
|
|
debugfs_remove(statdir);
|
|
if (gpdir)
|
|
debugfs_remove(gpdir);
|
|
debugfs_remove(rcudir);
|
|
out:
|
|
return 1;
|
|
}
|
|
|
|
static int __init rcupreempt_trace_init(void)
|
|
{
|
|
int ret;
|
|
|
|
mutex_init(&rcupreempt_trace_mutex);
|
|
rcupreempt_trace_buf = kmalloc(RCUPREEMPT_TRACE_BUF_SIZE, GFP_KERNEL);
|
|
if (!rcupreempt_trace_buf)
|
|
return 1;
|
|
ret = rcupreempt_debugfs_init();
|
|
if (ret)
|
|
kfree(rcupreempt_trace_buf);
|
|
return ret;
|
|
}
|
|
|
|
static void __exit rcupreempt_trace_cleanup(void)
|
|
{
|
|
debugfs_remove(statdir);
|
|
debugfs_remove(gpdir);
|
|
debugfs_remove(ctrsdir);
|
|
debugfs_remove(rcudir);
|
|
kfree(rcupreempt_trace_buf);
|
|
}
|
|
|
|
|
|
module_init(rcupreempt_trace_init);
|
|
module_exit(rcupreempt_trace_cleanup);
|