Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9e5f8e8 authored by Chris Wilson's avatar Chris Wilson
Browse files

Merge branch 'drm-intel-fixes' into HEAD 

Conflicts:
	drivers/char/agp/intel-agp.c
	drivers/gpu/drm/i915/intel_crt.c
parents f899fc64 db8c076b

Documentation/DocBook/device-drivers.tmpl

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 


     <sect1><title>Atomic and pointer manipulation</title>

!Iarch/x86/include/asm/atomic.h

!Iarch/x86/include/asm/unaligned.h

     </sect1>



     <sect1><title>Delaying, scheduling, and timer routines</title>

Documentation/DocBook/kernel-api.tmpl

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 
     </para>



     <sect1><title>String Conversions</title>

!Ilib/vsprintf.c

!Elib/vsprintf.c

     </sect1>

     <sect1><title>String Manipulation</title>

Documentation/DocBook/kernel-locking.tmpl

+6 −0
Original line number Diff line number Diff line
@@ -1961,6 +1961,12 @@ machines due to caching. 
   </sect1>

  </chapter>



  <chapter id="apiref">

   <title>Mutex API reference</title>

!Iinclude/linux/mutex.h

!Ekernel/mutex.c

  </chapter>



  <chapter id="references">

   <title>Further reading</title>

Documentation/DocBook/tracepoint.tmpl

+5 −0
Original line number Diff line number Diff line
@@ -104,4 +104,9 @@ 
   <title>Block IO</title>

!Iinclude/trace/events/block.h

  </chapter>



  <chapter id="workqueue">

   <title>Workqueue</title>

!Iinclude/trace/events/workqueue.h

  </chapter>

</book>

Documentation/block/cfq-iosched.txt

0 → 100644
+45 −0
Original line number Diff line number Diff line 
CFQ ioscheduler tunables

========================



slice_idle

----------

This specifies how long CFQ should idle for next request on certain cfq queues

(for sequential workloads) and service trees (for random workloads) before

queue is expired and CFQ selects next queue to dispatch from.



By default slice_idle is a non-zero value. That means by default we idle on

queues/service trees. This can be very helpful on highly seeky media like

single spindle SATA/SAS disks where we can cut down on overall number of

seeks and see improved throughput.



Setting slice_idle to 0 will remove all the idling on queues/service tree

level and one should see an overall improved throughput on faster storage

devices like multiple SATA/SAS disks in hardware RAID configuration. The down

side is that isolation provided from WRITES also goes down and notion of

IO priority becomes weaker.



So depending on storage and workload, it might be useful to set slice_idle=0.

In general I think for SATA/SAS disks and software RAID of SATA/SAS disks

keeping slice_idle enabled should be useful. For any configurations where

there are multiple spindles behind single LUN (Host based hardware RAID

controller or for storage arrays), setting slice_idle=0 might end up in better

throughput and acceptable latencies.



CFQ IOPS Mode for group scheduling

===================================

Basic CFQ design is to provide priority based time slices. Higher priority

process gets bigger time slice and lower priority process gets smaller time

slice. Measuring time becomes harder if storage is fast and supports NCQ and

it would be better to dispatch multiple requests from multiple cfq queues in

request queue at a time. In such scenario, it is not possible to measure time

consumed by single queue accurately.



What is possible though is to measure number of requests dispatched from a

single queue and also allow dispatch from multiple cfq queue at the same time.

This effectively becomes the fairness in terms of IOPS (IO operations per

second).



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

dispatched. Note that this mode switching takes effect only for group

scheduling. For non-cgroup users nothing should change.