Merge branch 'master' of... (5e93c6b4) · Commits · 戴 / test

CREDITS

+0 −2

Original line number	Diff line number	Diff line
		@@ -2365,8 +2365,6 @@ E: acme@redhat.com
		W: http://oops.ghostprotocols.net:81/blog/
		P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01
		D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
		S: R. Brasílio Itiberê, 4270/1010 - Água Verde
		S: 80240-060 - Curitiba - Paraná
		S: Brazil

		N: Karsten Merker

Documentation/ABI/testing/sysfs-class-net-batman-adv

0 → 100644

+14 −0

Original line number	Diff line number	Diff line

		What: /sys/class/net/<iface>/batman-adv/mesh_iface
		Date: May 2010
		Contact: Marek Lindner <lindner_marek@yahoo.de>
		Description:
		The /sys/class/net/<iface>/batman-adv/mesh_iface file
		displays the batman mesh interface this <iface>
		currently is associated with.

		What: /sys/class/net/<iface>/batman-adv/iface_status
		Date: May 2010
		Contact: Marek Lindner <lindner_marek@yahoo.de>
		Description:
		Indicates the status of <iface> as it is seen by batman.

Documentation/ABI/testing/sysfs-class-net-mesh

0 → 100644

+69 −0

Original line number	Diff line number	Diff line

		What: /sys/class/net/<mesh_iface>/mesh/aggregated_ogms
		Date: May 2010
		Contact: Marek Lindner <lindner_marek@yahoo.de>
		Description:
		Indicates whether the batman protocol messages of the
		mesh <mesh_iface> shall be aggregated or not.

		What: /sys/class/net/<mesh_iface>/mesh/bonding
		Date: June 2010
		Contact: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
		Description:
		Indicates whether the data traffic going through the
		mesh will be sent using multiple interfaces at the
		same time (if available).

		What: /sys/class/net/<mesh_iface>/mesh/fragmentation
		Date: October 2010
		Contact: Andreas Langer <an.langer@gmx.de>
		Description:
		Indicates whether the data traffic going through the
		mesh will be fragmented or silently discarded if the
		packet size exceeds the outgoing interface MTU.

		What: /sys/class/net/<mesh_iface>/mesh/gw_bandwidth
		Date: October 2010
		Contact: Marek Lindner <lindner_marek@yahoo.de>
		Description:
		Defines the bandwidth which is propagated by this
		node if gw_mode was set to 'server'.

		What: /sys/class/net/<mesh_iface>/mesh/gw_mode
		Date: October 2010
		Contact: Marek Lindner <lindner_marek@yahoo.de>
		Description:
		Defines the state of the gateway features. Can be
		either 'off', 'client' or 'server'.

		What: /sys/class/net/<mesh_iface>/mesh/gw_sel_class
		Date: October 2010
		Contact: Marek Lindner <lindner_marek@yahoo.de>
		Description:
		Defines the selection criteria this node will use
		to choose a gateway if gw_mode was set to 'client'.

		What: /sys/class/net/<mesh_iface>/mesh/orig_interval
		Date: May 2010
		Contact: Marek Lindner <lindner_marek@yahoo.de>
		Description:
		Defines the interval in milliseconds in which batman
		sends its protocol messages.

		What: /sys/class/net/<mesh_iface>/mesh/hop_penalty
		Date: Oct 2010
		Contact: Linus Lüssing <linus.luessing@web.de>
		Description:
		Defines the penalty which will be applied to an
		originator message's tq-field on every hop.

		What: /sys/class/net/<mesh_iface>/mesh/vis_mode
		Date: May 2010
		Contact: Marek Lindner <lindner_marek@yahoo.de>
		Description:
		Each batman node only maintains information about its
		own local neighborhood, therefore generating graphs
		showing the topology of the entire mesh is not easily
		feasible without having a central instance to collect
		the local topologies from all nodes. This file allows
		to activate the collecting (server) mode.

Documentation/DocBook/80211.tmpl

+68 −2

Original line number	Diff line number	Diff line
		@@ -146,6 +146,7 @@
		!Finclude/net/cfg80211.h cfg80211_rx_mgmt
		!Finclude/net/cfg80211.h cfg80211_mgmt_tx_status
		!Finclude/net/cfg80211.h cfg80211_cqm_rssi_notify
		!Finclude/net/cfg80211.h cfg80211_cqm_pktloss_notify
		!Finclude/net/cfg80211.h cfg80211_michael_mic_failure
		</chapter>
		<chapter>
		@@ -332,10 +333,16 @@
		<title>functions/definitions</title>
		!Finclude/net/mac80211.h ieee80211_rx_status
		!Finclude/net/mac80211.h mac80211_rx_flags
		!Finclude/net/mac80211.h mac80211_tx_control_flags
		!Finclude/net/mac80211.h mac80211_rate_control_flags
		!Finclude/net/mac80211.h ieee80211_tx_rate
		!Finclude/net/mac80211.h ieee80211_tx_info
		!Finclude/net/mac80211.h ieee80211_tx_info_clear_status
		!Finclude/net/mac80211.h ieee80211_rx
		!Finclude/net/mac80211.h ieee80211_rx_ni
		!Finclude/net/mac80211.h ieee80211_rx_irqsafe
		!Finclude/net/mac80211.h ieee80211_tx_status
		!Finclude/net/mac80211.h ieee80211_tx_status_ni
		!Finclude/net/mac80211.h ieee80211_tx_status_irqsafe
		!Finclude/net/mac80211.h ieee80211_rts_get
		!Finclude/net/mac80211.h ieee80211_rts_duration
		@@ -346,6 +353,7 @@
		!Finclude/net/mac80211.h ieee80211_stop_queue
		!Finclude/net/mac80211.h ieee80211_wake_queues
		!Finclude/net/mac80211.h ieee80211_stop_queues
		!Finclude/net/mac80211.h ieee80211_queue_stopped
		</sect1>
		</chapter>

		@@ -354,6 +362,13 @@
		!Pinclude/net/mac80211.h Frame filtering
		!Finclude/net/mac80211.h ieee80211_filter_flags
		</chapter>

		<chapter id="workqueue">
		<title>The mac80211 workqueue</title>
		!Pinclude/net/mac80211.h mac80211 workqueue
		!Finclude/net/mac80211.h ieee80211_queue_work
		!Finclude/net/mac80211.h ieee80211_queue_delayed_work
		</chapter>
		</part>

		<part id="advanced">
		@@ -374,6 +389,9 @@
		!Finclude/net/mac80211.h set_key_cmd
		!Finclude/net/mac80211.h ieee80211_key_conf
		!Finclude/net/mac80211.h ieee80211_key_flags
		!Finclude/net/mac80211.h ieee80211_tkip_key_type
		!Finclude/net/mac80211.h ieee80211_get_tkip_key
		!Finclude/net/mac80211.h ieee80211_key_removed
		</chapter>

		<chapter id="powersave">
		@@ -417,6 +435,18 @@
		supported by mac80211, add notes about supporting hw crypto
		with it.
		</para>
		!Finclude/net/mac80211.h ieee80211_iterate_active_interfaces
		!Finclude/net/mac80211.h ieee80211_iterate_active_interfaces_atomic
		</chapter>

		<chapter id="station-handling">
		<title>Station handling</title>
		<para>TODO</para>
		!Finclude/net/mac80211.h ieee80211_sta
		!Finclude/net/mac80211.h sta_notify_cmd
		!Finclude/net/mac80211.h ieee80211_find_sta
		!Finclude/net/mac80211.h ieee80211_find_sta_by_ifaddr
		!Finclude/net/mac80211.h ieee80211_sta_block_awake
		</chapter>

		<chapter id="hardware-scan-offload">
		@@ -424,6 +454,28 @@
		<para>TBD</para>
		!Finclude/net/mac80211.h ieee80211_scan_completed
		</chapter>

		<chapter id="aggregation">
		<title>Aggregation</title>
		<sect1>
		<title>TX A-MPDU aggregation</title>
		!Pnet/mac80211/agg-tx.c TX A-MPDU aggregation
		!Cnet/mac80211/agg-tx.c
		</sect1>
		<sect1>
		<title>RX A-MPDU aggregation</title>
		!Pnet/mac80211/agg-rx.c RX A-MPDU aggregation
		!Cnet/mac80211/agg-rx.c
		</sect1>
		!Finclude/net/mac80211.h ieee80211_ampdu_mlme_action
		</chapter>

		<chapter id="smps">
		<title>Spatial Multiplexing Powersave (SMPS)</title>
		!Pinclude/net/mac80211.h Spatial multiplexing power save
		!Finclude/net/mac80211.h ieee80211_request_smps
		!Finclude/net/mac80211.h ieee80211_smps_mode
		</chapter>
		</part>

		<part id="rate-control">
		@@ -435,9 +487,16 @@
		interface and how it relates to mac80211 and drivers.
		</para>
		</partintro>
		<chapter id="dummy">
		<title>dummy chapter</title>
		<chapter id="ratecontrol-api">
		<title>Rate Control API</title>
		<para>TBD</para>
		!Finclude/net/mac80211.h ieee80211_start_tx_ba_session
		!Finclude/net/mac80211.h ieee80211_start_tx_ba_cb_irqsafe
		!Finclude/net/mac80211.h ieee80211_stop_tx_ba_session
		!Finclude/net/mac80211.h ieee80211_stop_tx_ba_cb_irqsafe
		!Finclude/net/mac80211.h rate_control_changed
		!Finclude/net/mac80211.h ieee80211_tx_rate_control
		!Finclude/net/mac80211.h rate_control_send_low
		</chapter>
		</part>

		@@ -485,6 +544,13 @@
		</sect1>
		</chapter>

		<chapter id="aggregation-internals">
		<title>Aggregation</title>
		!Fnet/mac80211/sta_info.h sta_ampdu_mlme
		!Fnet/mac80211/sta_info.h tid_ampdu_tx
		!Fnet/mac80211/sta_info.h tid_ampdu_rx
		</chapter>

		<chapter id="synchronisation">
		<title>Synchronisation</title>
		<para>TBD</para>

Documentation/RCU/trace.txt

+128 −16

Original line number	Diff line number	Diff line
		CONFIG_RCU_TRACE debugfs Files and Formats


		The rcutree implementation of RCU provides debugfs trace output that
		summarizes counters and state. This information is useful for debugging
		RCU itself, and can sometimes also help to debug abuses of RCU.
		The following sections describe the debugfs files and formats.
		The rcutree and rcutiny implementations of RCU provide debugfs trace
		output that summarizes counters and state. This information is useful for
		debugging RCU itself, and can sometimes also help to debug abuses of RCU.
		The following sections describe the debugfs files and formats, first
		for rcutree and next for rcutiny.


		Hierarchical RCU debugfs Files and Formats
		CONFIG_TREE_RCU and CONFIG_TREE_PREEMPT_RCU debugfs Files and Formats

		This implementation of RCU provides three debugfs files under the
		These implementations of RCU provides five debugfs files under the
		top-level directory RCU: rcu/rcudata (which displays fields in struct
		rcu_data), rcu/rcugp (which displays grace-period counters), and
		rcu/rcuhier (which displays the struct rcu_node hierarchy).
		rcu_data), rcu/rcudata.csv (which is a .csv spreadsheet version of
		rcu/rcudata), rcu/rcugp (which displays grace-period counters),
		rcu/rcuhier (which displays the struct rcu_node hierarchy), and
		rcu/rcu_pending (which displays counts of the reasons that the
		rcu_pending() function decided that there was core RCU work to do).

		The output of "cat rcu/rcudata" looks as follows:

		@@ -130,7 +134,8 @@ o "ci" is the number of RCU callbacks that have been invoked for
		been registered in absence of CPU-hotplug activity.

		o "co" is the number of RCU callbacks that have been orphaned due to
		this CPU going offline.
		this CPU going offline. These orphaned callbacks have been moved
		to an arbitrarily chosen online CPU.

		o "ca" is the number of RCU callbacks that have been adopted due to
		other CPUs going offline. Note that ci+co-ca+ql is the number of
		@@ -168,12 +173,12 @@ o "gpnum" is the number of grace periods that have started. It is

		The output of "cat rcu/rcuhier" looks as follows, with very long lines:

		c=6902 g=6903 s=2 jfq=3 j=72c7 nfqs=13142/nfqsng=0(13142) fqlh=6 oqlen=0
		c=6902 g=6903 s=2 jfq=3 j=72c7 nfqs=13142/nfqsng=0(13142) fqlh=6
		1/1 .>. 0:127 ^0
		3/3 .>. 0:35 ^0 0/0 .>. 36:71 ^1 0/0 .>. 72:107 ^2 0/0 .>. 108:127 ^3
		3/3f .>. 0:5 ^0 2/3 .>. 6:11 ^1 0/0 .>. 12:17 ^2 0/0 .>. 18:23 ^3 0/0 .>. 24:29 ^4 0/0 .>. 30:35 ^5 0/0 .>. 36:41 ^0 0/0 .>. 42:47 ^1 0/0 .>. 48:53 ^2 0/0 .>. 54:59 ^3 0/0 .>. 60:65 ^4 0/0 .>. 66:71 ^5 0/0 .>. 72:77 ^0 0/0 .>. 78:83 ^1 0/0 .>. 84:89 ^2 0/0 .>. 90:95 ^3 0/0 .>. 96:101 ^4 0/0 .>. 102:107 ^5 0/0 .>. 108:113 ^0 0/0 .>. 114:119 ^1 0/0 .>. 120:125 ^2 0/0 .>. 126:127 ^3
		rcu_bh:
		c=-226 g=-226 s=1 jfq=-5701 j=72c7 nfqs=88/nfqsng=0(88) fqlh=0 oqlen=0
		c=-226 g=-226 s=1 jfq=-5701 j=72c7 nfqs=88/nfqsng=0(88) fqlh=0
		0/1 .>. 0:127 ^0
		0/3 .>. 0:35 ^0 0/0 .>. 36:71 ^1 0/0 .>. 72:107 ^2 0/0 .>. 108:127 ^3
		0/3f .>. 0:5 ^0 0/3 .>. 6:11 ^1 0/0 .>. 12:17 ^2 0/0 .>. 18:23 ^3 0/0 .>. 24:29 ^4 0/0 .>. 30:35 ^5 0/0 .>. 36:41 ^0 0/0 .>. 42:47 ^1 0/0 .>. 48:53 ^2 0/0 .>. 54:59 ^3 0/0 .>. 60:65 ^4 0/0 .>. 66:71 ^5 0/0 .>. 72:77 ^0 0/0 .>. 78:83 ^1 0/0 .>. 84:89 ^2 0/0 .>. 90:95 ^3 0/0 .>. 96:101 ^4 0/0 .>. 102:107 ^5 0/0 .>. 108:113 ^0 0/0 .>. 114:119 ^1 0/0 .>. 120:125 ^2 0/0 .>. 126:127 ^3
		@@ -212,11 +217,6 @@ o "fqlh" is the number of calls to force_quiescent_state() that
		exited immediately (without even being counted in nfqs above)
		due to contention on ->fqslock.

		o "oqlen" is the number of callbacks on the "orphan" callback
		list. RCU callbacks are placed on this list by CPUs going
		offline, and are "adopted" either by the CPU helping the outgoing
		CPU or by the next rcu_barrier*() call, whichever comes first.

		o Each element of the form "1/1 0:127 ^0" represents one struct
		rcu_node. Each line represents one level of the hierarchy, from
		root to leaves. It is best to think of the rcu_data structures
		@@ -326,3 +326,115 @@ o "nn" is the number of times that this CPU needed nothing. Alert
		readers will note that the rcu "nn" number for a given CPU very
		closely matches the rcu_bh "np" number for that same CPU. This
		is due to short-circuit evaluation in rcu_pending().


		CONFIG_TINY_RCU and CONFIG_TINY_PREEMPT_RCU debugfs Files and Formats

		These implementations of RCU provides a single debugfs file under the
		top-level directory RCU, namely rcu/rcudata, which displays fields in
		rcu_bh_ctrlblk, rcu_sched_ctrlblk and, for CONFIG_TINY_PREEMPT_RCU,
		rcu_preempt_ctrlblk.

		The output of "cat rcu/rcudata" is as follows:

		rcu_preempt: qlen=24 gp=1097669 g197/p197/c197 tasks=...
		ttb=. btg=no ntb=184 neb=0 nnb=183 j=01f7 bt=0274
		normal balk: nt=1097669 gt=0 bt=371 b=0 ny=25073378 nos=0
		exp balk: bt=0 nos=0
		rcu_sched: qlen: 0
		rcu_bh: qlen: 0

		This is split into rcu_preempt, rcu_sched, and rcu_bh sections, with the
		rcu_preempt section appearing only in CONFIG_TINY_PREEMPT_RCU builds.
		The last three lines of the rcu_preempt section appear only in
		CONFIG_RCU_BOOST kernel builds. The fields are as follows:

		o "qlen" is the number of RCU callbacks currently waiting either
		for an RCU grace period or waiting to be invoked. This is the
		only field present for rcu_sched and rcu_bh, due to the
		short-circuiting of grace period in those two cases.

		o "gp" is the number of grace periods that have completed.

		o "g197/p197/c197" displays the grace-period state, with the
		"g" number being the number of grace periods that have started
		(mod 256), the "p" number being the number of grace periods
		that the CPU has responded to (also mod 256), and the "c"
		number being the number of grace periods that have completed
		(once again mode 256).

		Why have both "gp" and "g"? Because the data flowing into
		"gp" is only present in a CONFIG_RCU_TRACE kernel.

		o "tasks" is a set of bits. The first bit is "T" if there are
		currently tasks that have recently blocked within an RCU
		read-side critical section, the second bit is "N" if any of the
		aforementioned tasks are blocking the current RCU grace period,
		and the third bit is "E" if any of the aforementioned tasks are
		blocking the current expedited grace period. Each bit is "."
		if the corresponding condition does not hold.

		o "ttb" is a single bit. It is "B" if any of the blocked tasks
		need to be priority boosted and "." otherwise.

		o "btg" indicates whether boosting has been carried out during
		the current grace period, with "exp" indicating that boosting
		is in progress for an expedited grace period, "no" indicating
		that boosting has not yet started for a normal grace period,
		"begun" indicating that boosting has bebug for a normal grace
		period, and "done" indicating that boosting has completed for
		a normal grace period.

		o "ntb" is the total number of tasks subjected to RCU priority boosting
		periods since boot.

		o "neb" is the number of expedited grace periods that have had
		to resort to RCU priority boosting since boot.

		o "nnb" is the number of normal grace periods that have had
		to resort to RCU priority boosting since boot.

		o "j" is the low-order 12 bits of the jiffies counter in hexadecimal.

		o "bt" is the low-order 12 bits of the value that the jiffies counter
		will have at the next time that boosting is scheduled to begin.

		o In the line beginning with "normal balk", the fields are as follows:

		o "nt" is the number of times that the system balked from
		boosting because there were no blocked tasks to boost.
		Note that the system will balk from boosting even if the
		grace period is overdue when the currently running task
		is looping within an RCU read-side critical section.
		There is no point in boosting in this case, because
		boosting a running task won't make it run any faster.

		o "gt" is the number of times that the system balked
		from boosting because, although there were blocked tasks,
		none of them were preventing the current grace period
		from completing.

		o "bt" is the number of times that the system balked
		from boosting because boosting was already in progress.

		o "b" is the number of times that the system balked from
		boosting because boosting had already completed for
		the grace period in question.

		o "ny" is the number of times that the system balked from
		boosting because it was not yet time to start boosting
		the grace period in question.

		o "nos" is the number of times that the system balked from
		boosting for inexplicable ("not otherwise specified")
		reasons. This can actually happen due to races involving
		increments of the jiffies counter.

		o In the line beginning with "exp balk", the fields are as follows:

		o "bt" is the number of times that the system balked from
		boosting because there were no blocked tasks to boost.

		o "nos" is the number of times that the system balked from
		boosting for inexplicable ("not otherwise specified")
		reasons.

Admin message