Commit 6ab9e092 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-4.20/block-20181021' of git://git.kernel.dk/linux-block 

Pull block layer updates from Jens Axboe:
 "This is the main pull request for block changes for 4.20. This
  contains:

   - Series enabling runtime PM for blk-mq (Bart).

   - Two pull requests from Christoph for NVMe, with items such as;
      - Better AEN tracking
      - Multipath improvements
      - RDMA fixes
      - Rework of FC for target removal
      - Fixes for issues identified by static checkers
      - Fabric cleanups, as prep for TCP transport
      - Various cleanups and bug fixes

   - Block merging cleanups (Christoph)

   - Conversion of drivers to generic DMA mapping API (Christoph)

   - Series fixing ref count issues with blkcg (Dennis)

   - Series improving BFQ heuristics (Paolo, et al)

   - Series improving heuristics for the Kyber IO scheduler (Omar)

   - Removal of dangerous bio_rewind_iter() API (Ming)

   - Apply single queue IPI redirection logic to blk-mq (Ming)

   - Set of fixes and improvements for bcache (Coly et al)

   - Series closing a hotplug race with sysfs group attributes (Hannes)

   - Set of patches for lightnvm:
      - pblk trace support (Hans)
      - SPDX license header update (Javier)
      - Tons of refactoring patches to cleanly abstract the 1.2 and 2.0
        specs behind a common core interface. (Javier, Matias)
      - Enable pblk to use a common interface to retrieve chunk metadata
        (Matias)
      - Bug fixes (Various)

   - Set of fixes and updates to the blk IO latency target (Josef)

   - blk-mq queue number updates fixes (Jianchao)

   - Convert a bunch of drivers from the old legacy IO interface to
     blk-mq. This will conclude with the removal of the legacy IO
     interface itself in 4.21, with the rest of the drivers (me, Omar)

   - Removal of the DAC960 driver. The SCSI tree will introduce two
     replacement drivers for this (Hannes)"

* tag 'for-4.20/block-20181021' of git://git.kernel.dk/linux-block: (204 commits)
  block: setup bounce bio_sets properly
  blkcg: reassociate bios when make_request() is called recursively
  blkcg: fix edge case for blk_get_rl() under memory pressure
  nvme-fabrics: move controller options matching to fabrics
  nvme-rdma: always have a valid trsvcid
  mtip32xx: fully switch to the generic DMA API
  rsxx: switch to the generic DMA API
  umem: switch to the generic DMA API
  sx8: switch to the generic DMA API
  sx8: remove dead IF_64BIT_DMA_IS_POSSIBLE code
  skd: switch to the generic DMA API
  ubd: remove use of blk_rq_map_sg
  nvme-pci: remove duplicate check
  drivers/block: Remove DAC960 driver
  nvme-pci: fix hot removal during error handling
  nvmet-fcloop: suppress a compiler warning
  nvme-core: make implicit seed truncation explicit
  nvmet-fc: fix kernel-doc headers
  nvme-fc: rework the request initialization code
  nvme-fc: introduce struct nvme_fcp_op_w_sgl
  ...
parents 52898511 52990a5f

Documentation/admin-guide/cgroup-v2.rst

+5 −3
Original line number Diff line number Diff line
@@ -1857,8 +1857,10 @@ following two functions. 


  wbc_init_bio(@wbc, @bio)

	Should be called for each bio carrying writeback data and

	associates the bio with the inode's owner cgroup.  Can be

	called anytime between bio allocation and submission.

	associates the bio with the inode's owner cgroup and the

	corresponding request queue.  This must be called after

	a queue (device) has been associated with the bio and

	before submission.



  wbc_account_io(@wbc, @page, @bytes)

	Should be called for each data segment being written out.
@@ -1877,7 +1879,7 @@ the configuration, the bio may be executed at a lower priority and if 
the writeback session is holding shared resources, e.g. a journal

entry, may lead to priority inversion.  There is no one easy solution

for the problem.  Filesystems can try to work around specific problem

cases by skipping wbc_init_bio() or using bio_associate_blkcg()

cases by skipping wbc_init_bio() or using bio_associate_create_blkg()

directly.

Documentation/blockdev/README.DAC960

deleted100644 → 0
+0 −756

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/blockdev/zram.txt

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ whitespace: 
 notify_free      Depending on device usage scenario it may account

                  a) the number of pages freed because of swap slot free

                  notifications or b) the number of pages freed because of

                  REQ_DISCARD requests sent by bio. The former ones are

                  REQ_OP_DISCARD requests sent by bio. The former ones are

                  sent to a swap block device when a swap slot is freed,

                  which implies that this disk is being used as a swap disk.

                  The latter ones are sent by filesystem mounted with

Documentation/device-mapper/log-writes.txt

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ inconsistent file system. 
Any REQ_FUA requests bypass this flushing mechanism and are logged as soon as

they complete as those requests will obviously bypass the device cache.



Any REQ_DISCARD requests are treated like WRITE requests.  Otherwise we would

Any REQ_OP_DISCARD requests are treated like WRITE requests.  Otherwise we would

have all the DISCARD requests, and then the WRITE requests and then the FLUSH

request.  Consider the following example:

arch/arm/include/asm/io.h

+0 −15
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <asm/byteorder.h>

#include <asm/memory.h>

#include <asm-generic/pci_iomap.h>

#include <xen/xen.h>



/*

 * ISA I/O bus memory addresses are 1:1 with the physical address.
@@ -459,20 +458,6 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr); 


#include <asm-generic/io.h>



/*

 * can the hardware map this into one segment or not, given no other

 * constraints.

 */

#define BIOVEC_MERGEABLE(vec1, vec2)	\

	((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2)))



struct bio_vec;

extern bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,

				      const struct bio_vec *vec2);

#define BIOVEC_PHYS_MERGEABLE(vec1, vec2)				\

	(__BIOVEC_PHYS_MERGEABLE(vec1, vec2) &&				\

	 (!xen_domain() || xen_biovec_phys_mergeable(vec1, vec2)))



#ifdef CONFIG_MMU

#define ARCH_HAS_VALID_PHYS_ADDR_RANGE

extern int valid_phys_addr_range(phys_addr_t addr, size_t size);