Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-fastboot (2d51b753) · Commits · 戴 / test

drivers/md/Kconfig

+14 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,20 @@ config BLK_DEV_MD

		If unsure, say N.

		config MD_AUTODETECT
		bool "Autodetect RAID arrays during kernel boot"
		depends on BLK_DEV_MD=y
		default y
		---help---
		If you say Y here, then the kernel will try to autodetect raid
		arrays as part of its boot process.

		If you don't use raid and say Y, this autodetection can cause
		a several-second delay in the boot time due to various
		synchronisation steps that are part of this step.

		If unsure, say Y.

		config MD_LINEAR
		tristate "Linear (append) mode"
		depends on BLK_DEV_MD

init/do_mounts_md.c

+31 −9

Original line number	Diff line number	Diff line
		@@ -12,7 +12,12 @@
		* The code for that is here.
		*/

		static int __initdata raid_noautodetect, raid_autopart;
		#ifdef CONFIG_MD_AUTODETECT
		static int __initdata raid_noautodetect;
		#else
		static int __initdata raid_noautodetect=1;
		#endif
		static int __initdata raid_autopart;

		static struct {
		int minor;
		@@ -252,6 +257,8 @@ static int __init raid_setup(char *str)

		if (!strncmp(str, "noautodetect", wlen))
		raid_noautodetect = 1;
		if (!strncmp(str, "autodetect", wlen))
		raid_noautodetect = 0;
		if (strncmp(str, "partitionable", wlen)==0)
		raid_autopart = 1;
		if (strncmp(str, "part", wlen)==0)
		@@ -264,17 +271,32 @@ static int __init raid_setup(char *str)
		__setup("raid=", raid_setup);
		__setup("md=", md_setup);

		void __init md_run_setup(void)
		static void autodetect_raid(void)
		{
		create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));
		if (raid_noautodetect)
		printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");
		else {
		int fd = sys_open("/dev/md0", 0, 0);
		int fd;

		/*
		* Since we don't want to detect and use half a raid array, we need to
		* wait for the known devices to complete their probing
		*/
		printk(KERN_INFO "md: Waiting for all devices to be available before autodetect\n");
		printk(KERN_INFO "md: If you don't use raid, use raid=noautodetect\n");
		while (driver_probe_done() < 0)
		msleep(100);
		fd = sys_open("/dev/md0", 0, 0);
		if (fd >= 0) {
		sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
		sys_close(fd);
		}
		}

		void __init md_run_setup(void)
		{
		create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));

		if (raid_noautodetect)
		printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=autodetect will force)\n");
		else
		autodetect_raid();
		md_setup_drive();
		}

init/main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -708,7 +708,7 @@ int do_one_initcall(initcall_t fn)
		int result;

		if (initcall_debug) {
		printk("calling %pF\n", fn);
		printk("calling %pF @ %i\n", fn, task_pid_nr(current));
		t0 = ktime_get();
		}

scripts/bootgraph.pl

0 → 100644

+147 −0

Original line number	Diff line number	Diff line
		#!/usr/bin/perl

		# Copyright 2008, Intel Corporation
		#
		# This file is part of the Linux kernel
		#
		# This program file 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; version 2 of the License.
		#
		# 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 in a file named COPYING; if not, write to the
		# Free Software Foundation, Inc.,
		# 51 Franklin Street, Fifth Floor,
		# Boston, MA 02110-1301 USA
		#
		# Authors:
		# Arjan van de Ven <arjan@linux.intel.com>


		#
		# This script turns a dmesg output into a SVG graphic that shows which
		# functions take how much time. You can view SVG graphics with various
		# programs, including Inkscape, The Gimp and Firefox.
		#
		#
		# For this script to work, the kernel needs to be compiled with the
		# CONFIG_PRINTK_TIME configuration option enabled, and with
		# "initcall_debug" passed on the kernel command line.
		#
		# usage:
		# dmesg \| perl scripts/bootgraph.pl > output.svg
		#

		my @rows;
		my %start, %end, %row;
		my $done = 0;
		my $rowcount = 0;
		my $maxtime = 0;
		my $firsttime = 100;
		my $count = 0;
		while (<>) {
		my $line = $_;
		if ($line =~ /([0-9\.]+)\] calling ([a-zA-Z0-9\_]+)\+/) {
		my $func = $2;
		if ($done == 0) {
		$start{$func} = $1;
		if ($1 < $firsttime) {
		$firsttime = $1;
		}
		}
		$row{$func} = 1;
		if ($line =~ /\@ ([0-9]+)/) {
		my $pid = $1;
		if (!defined($rows[$pid])) {
		$rowcount = $rowcount + 1;
		$rows[$pid] = $rowcount;
		}
		$row{$func} = $rows[$pid];
		}
		$count = $count + 1;
		}

		if ($line =~ /([0-9\.]+)\] initcall ([a-zA-Z0-9\_]+)\+.*returned/) {
		if ($done == 0) {
		$end{$2} = $1;
		$maxtime = $1;
		}
		}
		if ($line =~ /Write protecting the/) {
		$done = 1;
		}
		if ($line =~ /Freeing unused kernel memory/) {
		$done = 1;
		}
		}

		if ($count == 0) {
		print "No data found in the dmesg. Make sure that 'printk.time=1' and\n";
		print "'initcall_debug' are passed on the kernel command line.\n\n";
		print "Usage: \n";
		print " dmesg \| perl scripts/bootgraph.pl > output.svg\n\n";
		exit;
		}

		print "<?xml version=\"1.0\" standalone=\"no\"?> \n";
		print "<svg width=\"1000\" height=\"100%\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\">\n";

		my @styles;

		$styles[0] = "fill:rgb(0,0,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
		$styles[1] = "fill:rgb(0,255,0);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
		$styles[2] = "fill:rgb(255,0,20);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
		$styles[3] = "fill:rgb(255,255,20);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
		$styles[4] = "fill:rgb(255,0,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
		$styles[5] = "fill:rgb(0,255,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
		$styles[6] = "fill:rgb(0,128,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
		$styles[7] = "fill:rgb(0,255,128);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
		$styles[8] = "fill:rgb(255,0,128);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
		$styles[9] = "fill:rgb(255,255,128);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
		$styles[10] = "fill:rgb(255,128,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
		$styles[11] = "fill:rgb(128,255,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";

		my $mult = 950.0 / ($maxtime - $firsttime);
		my $threshold = ($maxtime - $firsttime) / 60.0;
		my $stylecounter = 0;
		while (($key,$value) = each %start) {
		my $duration = $end{$key} - $start{$key};

		if ($duration >= $threshold) {
		my $s, $s2, $e, $y;
		$s = ($value - $firsttime) * $mult;
		$s2 = $s + 6;
		$e = ($end{$key} - $firsttime) * $mult;
		$w = $e - $s;

		$y = $row{$key} * 150;
		$y2 = $y + 4;

		$style = $styles[$stylecounter];
		$stylecounter = $stylecounter + 1;
		if ($stylecounter > 11) {
		$stylecounter = 0;
		};

		print "<rect x=\"$s\" width=\"$w\" y=\"$y\" height=\"145\" style=\"$style\"/>\n";
		print "<text transform=\"translate($s2,$y2) rotate(90)\">$key</text>\n";
		}
		}


		# print the time line on top
		my $time = $firsttime;
		my $step = ($maxtime - $firsttime) / 15;
		while ($time < $maxtime) {
		my $s2 = ($time - $firsttime) * $mult;
		my $tm = int($time * 100) / 100.0;
		print "<text transform=\"translate($s2,89) rotate(90)\">$tm</text>\n";
		$time = $time + $step;
		}

		print "</svg>\n";

Admin message