Merge commit 'v3.1-rc7' into perf/core (ed3982cf) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/ABI/testing/sysfs-class-scsi_host

0 → 100644

+13 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/class/scsi_host/hostX/isci_id
			Date: June 2011
			Contact: Dave Jiang <dave.jiang@intel.com>
			Description:
			This file contains the enumerated host ID for the Intel
			SCU controller. The Intel(R) C600 Series Chipset SATA/SAS
			Storage Control Unit embeds up to two 4-port controllers in
			a single PCI device. The controllers are enumerated in order
			which usually means the lowest number scsi_host corresponds
			with the first controller, but this association is not
			guaranteed. The 'isci_id' attribute unambiguously identifies
			the controller index: '0' for the first controller,
			'1' for the second.

Documentation/DocBook/media/v4l/controls.xml

+19 −19

Original line number	Original line	Diff line number	Diff line
	@@ -1455,7 +1455,7 @@ Applicable to the H264 encoder.</entry>
	</row>		</row>

	<row><entry></entry></row>		<row><entry></entry></row>
	<row>		<row id="v4l2-mpeg-video-h264-vui-sar-idc">
	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC</constant> </entry>		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC</constant> </entry>
	<entry>enum v4l2_mpeg_video_h264_vui_sar_idc</entry>		<entry>enum v4l2_mpeg_video_h264_vui_sar_idc</entry>
	</row>		</row>
	@@ -1561,7 +1561,7 @@ Applicable to the H264 encoder.</entry>
	</row>		</row>

	<row><entry></entry></row>		<row><entry></entry></row>
	<row>		<row id="v4l2-mpeg-video-h264-level">
	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LEVEL</constant> </entry>		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LEVEL</constant> </entry>
	<entry>enum v4l2_mpeg_video_h264_level</entry>		<entry>enum v4l2_mpeg_video_h264_level</entry>
	</row>		</row>
	@@ -1641,7 +1641,7 @@ Possible values are:</entry>
	</row>		</row>

	<row><entry></entry></row>		<row><entry></entry></row>
	<row>		<row id="v4l2-mpeg-video-mpeg4-level">
	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL</constant> </entry>		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL</constant> </entry>
	<entry>enum v4l2_mpeg_video_mpeg4_level</entry>		<entry>enum v4l2_mpeg_video_mpeg4_level</entry>
	</row>		</row>
	@@ -1689,9 +1689,9 @@ Possible values are:</entry>
	</row>		</row>

	<row><entry></entry></row>		<row><entry></entry></row>
	<row>		<row id="v4l2-mpeg-video-h264-profile">
	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_PROFILE</constant> </entry>		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_PROFILE</constant> </entry>
	<entry>enum v4l2_mpeg_h264_profile</entry>		<entry>enum v4l2_mpeg_video_h264_profile</entry>
	</row>		</row>
	<row><entry spanname="descr">The profile information for H264.		<row><entry spanname="descr">The profile information for H264.
	Applicable to the H264 encoder.		Applicable to the H264 encoder.
	@@ -1774,9 +1774,9 @@ Possible values are:</entry>
	</row>		</row>

	<row><entry></entry></row>		<row><entry></entry></row>
	<row>		<row id="v4l2-mpeg-video-mpeg4-profile">
	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE</constant> </entry>		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE</constant> </entry>
	<entry>enum v4l2_mpeg_mpeg4_profile</entry>		<entry>enum v4l2_mpeg_video_mpeg4_profile</entry>
	</row>		</row>
	<row><entry spanname="descr">The profile information for MPEG4.		<row><entry spanname="descr">The profile information for MPEG4.
	Applicable to the MPEG4 encoder.		Applicable to the MPEG4 encoder.
	@@ -1820,9 +1820,9 @@ Applicable to the encoder.
	</row>		</row>

	<row><entry></entry></row>		<row><entry></entry></row>
	<row>		<row id="v4l2-mpeg-video-multi-slice-mode">
	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE</constant> </entry>		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE</constant> </entry>
	<entry>enum v4l2_mpeg_multi_slice_mode</entry>		<entry>enum v4l2_mpeg_video_multi_slice_mode</entry>
	</row>		</row>
	<row><entry spanname="descr">Determines how the encoder should handle division of frame into slices.		<row><entry spanname="descr">Determines how the encoder should handle division of frame into slices.
	Applicable to the encoder.		Applicable to the encoder.
	@@ -1868,9 +1868,9 @@ Applicable to the encoder.</entry>
	</row>		</row>

	<row><entry></entry></row>		<row><entry></entry></row>
	<row>		<row id="v4l2-mpeg-video-h264-loop-filter-mode">
	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE</constant> </entry>		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE</constant> </entry>
	<entry>enum v4l2_mpeg_h264_loop_filter_mode</entry>		<entry>enum v4l2_mpeg_video_h264_loop_filter_mode</entry>
	</row>		</row>
	<row><entry spanname="descr">Loop filter mode for H264 encoder.		<row><entry spanname="descr">Loop filter mode for H264 encoder.
	Possible values are:</entry>		Possible values are:</entry>
	@@ -1913,9 +1913,9 @@ Applicable to the H264 encoder.</entry>
	</row>		</row>

	<row><entry></entry></row>		<row><entry></entry></row>
	<row>		<row id="v4l2-mpeg-video-h264-entropy-mode">
	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE</constant> </entry>		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE</constant> </entry>
	<entry>enum v4l2_mpeg_h264_symbol_mode</entry>		<entry>enum v4l2_mpeg_video_h264_entropy_mode</entry>
	</row>		</row>
	<row><entry spanname="descr">Entropy coding mode for H264 - CABAC/CAVALC.		<row><entry spanname="descr">Entropy coding mode for H264 - CABAC/CAVALC.
	Applicable to the H264 encoder.		Applicable to the H264 encoder.
	@@ -2140,9 +2140,9 @@ previous frames. Applicable to the H264 encoder.</entry>
	</row>		</row>

	<row><entry></entry></row>		<row><entry></entry></row>
	<row>		<row id="v4l2-mpeg-video-header-mode">
	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_HEADER_MODE</constant> </entry>		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_HEADER_MODE</constant> </entry>
	<entry>enum v4l2_mpeg_header_mode</entry>		<entry>enum v4l2_mpeg_video_header_mode</entry>
	</row>		</row>
	<row><entry spanname="descr">Determines whether the header is returned as the first buffer or is		<row><entry spanname="descr">Determines whether the header is returned as the first buffer or is
	it returned together with the first frame. Applicable to encoders.		it returned together with the first frame. Applicable to encoders.
	@@ -2320,9 +2320,9 @@ Valid only when H.264 and macroblock level RC is enabled (<constant>V4L2_CID_MPE
	Applicable to the H264 encoder.</entry>		Applicable to the H264 encoder.</entry>
	</row>		</row>
	<row><entry></entry></row>		<row><entry></entry></row>
	<row>		<row id="v4l2-mpeg-mfc51-video-frame-skip-mode">
	<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE</constant> </entry>		<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE</constant> </entry>
	<entry>enum v4l2_mpeg_mfc51_frame_skip_mode</entry>		<entry>enum v4l2_mpeg_mfc51_video_frame_skip_mode</entry>
	</row>		</row>
	<row><entry spanname="descr">		<row><entry spanname="descr">
	Indicates in what conditions the encoder should skip frames. If encoding a frame would cause the encoded stream to be larger then		Indicates in what conditions the encoder should skip frames. If encoding a frame would cause the encoded stream to be larger then
	@@ -2361,9 +2361,9 @@ the stream will meet tight bandwidth contraints. Applicable to encoders.
	</entry>		</entry>
	</row>		</row>
	<row><entry></entry></row>		<row><entry></entry></row>
	<row>		<row id="v4l2-mpeg-mfc51-video-force-frame-type">
	<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE</constant> </entry>		<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE</constant> </entry>
	<entry>enum v4l2_mpeg_mfc51_force_frame_type</entry>		<entry>enum v4l2_mpeg_mfc51_video_force_frame_type</entry>
	</row>		</row>
	<row><entry spanname="descr">Force a frame type for the next queued buffer. Applicable to encoders.		<row><entry spanname="descr">Force a frame type for the next queued buffer. Applicable to encoders.
	Possible values are:</entry>		Possible values are:</entry>

Documentation/block/cfq-iosched.txt

+71 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43,3 +43,74 @@ If one sets slice_idle=0 and if storage supports NCQ, CFQ internally switches
	to IOPS mode and starts providing fairness in terms of number of requests		to IOPS mode and starts providing fairness in terms of number of requests
	dispatched. Note that this mode switching takes effect only for group		dispatched. Note that this mode switching takes effect only for group
	scheduling. For non-cgroup users nothing should change.		scheduling. For non-cgroup users nothing should change.

			CFQ IO scheduler Idling Theory
			===============================
			Idling on a queue is primarily about waiting for the next request to come
			on same queue after completion of a request. In this process CFQ will not
			dispatch requests from other cfq queues even if requests are pending there.

			The rationale behind idling is that it can cut down on number of seeks
			on rotational media. For example, if a process is doing dependent
			sequential reads (next read will come on only after completion of previous
			one), then not dispatching request from other queue should help as we
			did not move the disk head and kept on dispatching sequential IO from
			one queue.

			CFQ has following service trees and various queues are put on these trees.

			sync-idle sync-noidle async

			All cfq queues doing synchronous sequential IO go on to sync-idle tree.
			On this tree we idle on each queue individually.

			All synchronous non-sequential queues go on sync-noidle tree. Also any
			request which are marked with REQ_NOIDLE go on this service tree. On this
			tree we do not idle on individual queues instead idle on the whole group
			of queues or the tree. So if there are 4 queues waiting for IO to dispatch
			we will idle only once last queue has dispatched the IO and there is
			no more IO on this service tree.

			All async writes go on async service tree. There is no idling on async
			queues.

			CFQ has some optimizations for SSDs and if it detects a non-rotational
			media which can support higher queue depth (multiple requests at in
			flight at a time), then it cuts down on idling of individual queues and
			all the queues move to sync-noidle tree and only tree idle remains. This
			tree idling provides isolation with buffered write queues on async tree.

			FAQ
			===
			Q1. Why to idle at all on queues marked with REQ_NOIDLE.

			A1. We only do tree idle (all queues on sync-noidle tree) on queues marked
			with REQ_NOIDLE. This helps in providing isolation with all the sync-idle
			queues. Otherwise in presence of many sequential readers, other
			synchronous IO might not get fair share of disk.

			For example, if there are 10 sequential readers doing IO and they get
			100ms each. If a REQ_NOIDLE request comes in, it will be scheduled
			roughly after 1 second. If after completion of REQ_NOIDLE request we
			do not idle, and after a couple of milli seconds a another REQ_NOIDLE
			request comes in, again it will be scheduled after 1second. Repeat it
			and notice how a workload can lose its disk share and suffer due to
			multiple sequential readers.

			fsync can generate dependent IO where bunch of data is written in the
			context of fsync, and later some journaling data is written. Journaling
			data comes in only after fsync has finished its IO (atleast for ext4
			that seemed to be the case). Now if one decides not to idle on fsync
			thread due to REQ_NOIDLE, then next journaling write will not get
			scheduled for another second. A process doing small fsync, will suffer
			badly in presence of multiple sequential readers.

			Hence doing tree idling on threads using REQ_NOIDLE flag on requests
			provides isolation from multiple sequential readers and at the same
			time we do not idle on individual threads.

			Q2. When to specify REQ_NOIDLE
			A2. I would think whenever one is doing synchronous write and not expecting
			more writes to be dispatched from same context soon, should be able
			to specify REQ_NOIDLE on writes and that probably should work well for
			most of the cases.

Documentation/cgroups/memory.txt

+1 −84

Original line number	Original line	Diff line number	Diff line
	@@ -380,7 +380,7 @@ will be charged as a new owner of it.

	5.2 stat file		5.2 stat file

	5.2.1 memory.stat file includes following statistics		memory.stat file includes following statistics

	# per-memory cgroup local status		# per-memory cgroup local status
	cache - # of bytes of page cache memory.		cache - # of bytes of page cache memory.
	@@ -438,89 +438,6 @@ Note:
	file_mapped is accounted only when the memory cgroup is owner of page		file_mapped is accounted only when the memory cgroup is owner of page
	cache.)		cache.)

	5.2.2 memory.vmscan_stat

	memory.vmscan_stat includes statistics information for memory scanning and
	freeing, reclaiming. The statistics shows memory scanning information since
	memory cgroup creation and can be reset to 0 by writing 0 as

	#echo 0 > ../memory.vmscan_stat

	This file contains following statistics.

	[param]_[file_or_anon]_pages_by_[reason]_[under_heararchy]
	[param]_elapsed_ns_by_[reason]_[under_hierarchy]

	For example,

	scanned_file_pages_by_limit indicates the number of scanned
	file pages at vmscan.

	Now, 3 parameters are supported

	scanned - the number of pages scanned by vmscan
	rotated - the number of pages activated at vmscan
	freed - the number of pages freed by vmscan

	If "rotated" is high against scanned/freed, the memcg seems busy.

	Now, 2 reason are supported

	limit - the memory cgroup's limit
	system - global memory pressure + softlimit
	(global memory pressure not under softlimit is not handled now)

	When under_hierarchy is added in the tail, the number indicates the
	total memcg scan of its children and itself.

	elapsed_ns is a elapsed time in nanosecond. This may include sleep time
	and not indicates CPU usage. So, please take this as just showing
	latency.

	Here is an example.

	# cat /cgroup/memory/A/memory.vmscan_stat
	scanned_pages_by_limit 9471864
	scanned_anon_pages_by_limit 6640629
	scanned_file_pages_by_limit 2831235
	rotated_pages_by_limit 4243974
	rotated_anon_pages_by_limit 3971968
	rotated_file_pages_by_limit 272006
	freed_pages_by_limit 2318492
	freed_anon_pages_by_limit 962052
	freed_file_pages_by_limit 1356440
	elapsed_ns_by_limit 351386416101
	scanned_pages_by_system 0
	scanned_anon_pages_by_system 0
	scanned_file_pages_by_system 0
	rotated_pages_by_system 0
	rotated_anon_pages_by_system 0
	rotated_file_pages_by_system 0
	freed_pages_by_system 0
	freed_anon_pages_by_system 0
	freed_file_pages_by_system 0
	elapsed_ns_by_system 0
	scanned_pages_by_limit_under_hierarchy 9471864
	scanned_anon_pages_by_limit_under_hierarchy 6640629
	scanned_file_pages_by_limit_under_hierarchy 2831235
	rotated_pages_by_limit_under_hierarchy 4243974
	rotated_anon_pages_by_limit_under_hierarchy 3971968
	rotated_file_pages_by_limit_under_hierarchy 272006
	freed_pages_by_limit_under_hierarchy 2318492
	freed_anon_pages_by_limit_under_hierarchy 962052
	freed_file_pages_by_limit_under_hierarchy 1356440
	elapsed_ns_by_limit_under_hierarchy 351386416101
	scanned_pages_by_system_under_hierarchy 0
	scanned_anon_pages_by_system_under_hierarchy 0
	scanned_file_pages_by_system_under_hierarchy 0
	rotated_pages_by_system_under_hierarchy 0
	rotated_anon_pages_by_system_under_hierarchy 0
	rotated_file_pages_by_system_under_hierarchy 0
	freed_pages_by_system_under_hierarchy 0
	freed_anon_pages_by_system_under_hierarchy 0
	freed_file_pages_by_system_under_hierarchy 0
	elapsed_ns_by_system_under_hierarchy 0

	5.3 swappiness		5.3 swappiness

	Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.		Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.

Documentation/feature-removal-schedule.txt

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -592,3 +592,11 @@ Why: In 3.0, we can now autodetect internal 3G device and already have
	interface that was used by acer-wmi driver. It will replaced by		interface that was used by acer-wmi driver. It will replaced by
	information log when acer-wmi initial.		information log when acer-wmi initial.
	Who: Lee, Chun-Yi <jlee@novell.com>		Who: Lee, Chun-Yi <jlee@novell.com>

			----------------------------
			What: The XFS nodelaylog mount option
			When: 3.3
			Why: The delaylog mode that has been the default since 2.6.39 has proven
			stable, and the old code is in the way of additional improvements in
			the log code.
			Who: Christoph Hellwig <hch@lst.de>