Commit fc058606 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.13/drivers-2021-04-27' of git://git.kernel.dk/linux-block 

Pull block driver updates from Jens Axboe:

 - MD changes via Song:
        - raid5 POWER fix
        - raid1 failure fix
        - UAF fix for md cluster
        - mddev_find_or_alloc() clean up
        - Fix NULL pointer deref with external bitmap
        - Performance improvement for raid10 discard requests
        - Fix missing information of /proc/mdstat

 - rsxx const qualifier removal (Arnd)

 - Expose allocated brd pages (Calvin)

 - rnbd via Gioh Kim:
        - Change maintainer
        - Change domain address of maintainers' email
        - Add polling IO mode and document update
        - Fix memory leak and some bug detected by static code analysis
          tools
        - Code refactoring

 - Series of floppy cleanups/fixes (Denis)

 - s390 dasd fixes (Julian)

 - kerneldoc fixes (Lee)

 - null_blk double free (Lv)

 - null_blk virtual boundary addition (Max)

 - Remove xsysace driver (Michal)

 - umem driver removal (Davidlohr)

 - ataflop fixes (Dan)

 - Revalidate disk removal (Christoph)

 - Bounce buffer cleanups (Christoph)

 - Mark lightnvm as deprecated (Christoph)

 - mtip32xx init cleanups (Shixin)

 - Various fixes (Tian, Gustavo, Coly, Yang, Zhang, Zhiqiang)

* tag 'for-5.13/drivers-2021-04-27' of git://git.kernel.dk/linux-block: (143 commits)
  async_xor: increase src_offs when dropping destination page
  drivers/block/null_blk/main: Fix a double free in null_init.
  md/raid1: properly indicate failure when ending a failed write request
  md-cluster: fix use-after-free issue when removing rdev
  nvme: introduce generic per-namespace chardev
  nvme: cleanup nvme_configure_apst
  nvme: do not try to reconfigure APST when the controller is not live
  nvme: add 'kato' sysfs attribute
  nvme: sanitize KATO setting
  nvmet: avoid queuing keep-alive timer if it is disabled
  brd: expose number of allocated pages in debugfs
  ataflop: fix off by one in ataflop_probe()
  ataflop: potential out of bounds in do_format()
  drbd: Fix fall-through warnings for Clang
  block/rnbd: Use strscpy instead of strlcpy
  block/rnbd-clt-sysfs: Remove copy buffer overlap in rnbd_clt_get_path_name
  block/rnbd-clt: Remove max_segment_size
  block/rnbd-clt: Generate kobject_uevent when the rnbd device state changes
  block/rnbd-srv: Remove unused arguments of rnbd_srv_rdma_ev
  Documentation/ABI/rnbd-clt: Add description for nr_poll_queues
  ...
parents 6c002921 8324fbae

Documentation/ABI/testing/sysfs-block-rnbd

+18 −0
Original line number Diff line number Diff line
@@ -44,3 +44,21 @@ Date: Feb 2020 
KernelVersion:	5.7

Contact:	Jack Wang <jinpu.wang@cloud.ionos.com> Danil Kipnis <danil.kipnis@cloud.ionos.com>

Description:	Contains the device access mode: ro, rw or migration.



What:		/sys/block/rnbd<N>/rnbd/resize

Date:		Feb 2020

KernelVersion:	5.7

Contact:	Jack Wang <jinpu.wang@cloud.ionos.com> Danil Kipnis <danil.kipnis@cloud.ionos.com>

Description:	Write the number of sectors to change the size of the disk.



What:		/sys/block/rnbd<N>/rnbd/remap_device

Date:		Feb 2020

KernelVersion:	5.7

Contact:	Jack Wang <jinpu.wang@cloud.ionos.com> Danil Kipnis <danil.kipnis@cloud.ionos.com>

Description:	Remap the disconnected device if the session is not destroyed yet.



What:		/sys/block/rnbd<N>/rnbd/nr_poll_queues

Date:		Feb 2020

KernelVersion:	5.7

Contact:	Jack Wang <jinpu.wang@cloud.ionos.com> Danil Kipnis <danil.kipnis@cloud.ionos.com>

Description:	Contains the number of poll-mode queues

Documentation/ABI/testing/sysfs-class-rnbd-client

+13 −0
Original line number Diff line number Diff line
@@ -85,6 +85,19 @@ Description: Expected format is the following:: 


		By default "rw" is used.



		nr_poll_queues

		  specifies the number of poll-mode queues. If the IO has HIPRI flag,

		  the block-layer will send the IO via the poll-mode queue.

		  For fast network and device the polling is faster than interrupt-base

		  IO handling because it saves time for context switching, switching to

		  another process, handling the interrupt and switching back to the

		  issuing process.



		  Set -1 if you want to set it as the number of CPUs

		  By default rnbd client creates only irq-mode queues.



		  NOTICE: MUST make a unique session for a device using the poll-mode queues.



		Exit Codes:



		If the device is already mapped it will fail with EEXIST. If the input

Documentation/filesystems/locking.rst

+0 −2
Original line number Diff line number Diff line
@@ -474,7 +474,6 @@ prototypes:: 
	int (*direct_access) (struct block_device *, sector_t, void **,

				unsigned long *);

	void (*unlock_native_capacity) (struct gendisk *);

	int (*revalidate_disk) (struct gendisk *);

	int (*getgeo)(struct block_device *, struct hd_geometry *);

	void (*swap_slot_free_notify) (struct block_device *, unsigned long);
@@ -489,7 +488,6 @@ ioctl: no 
compat_ioctl:		no

direct_access:		no

unlock_native_capacity:	no

revalidate_disk:	no

getgeo:			no

swap_slot_free_notify:	no	(see below)

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

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -2756,7 +2756,6 @@ F: Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml 
F:	Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml

F:	Documentation/devicetree/bindings/spi/xlnx,zynq-qspi.yaml

F:	arch/arm/mach-zynq/

F:	drivers/block/xsysace.c

F:	drivers/clocksource/timer-cadence-ttc.c

F:	drivers/cpuidle/cpuidle-zynq.c

F:	drivers/edac/synopsys_edac.c
@@ -15540,8 +15539,8 @@ N: riscv 
K:	riscv









RNBD BLOCK DRIVERS









M:	Danil Kipnis <danil.kipnis@cloud.ionos.com>









M:	Jack Wang <jinpu.wang@cloud.ionos.com>









M:	Md. Haris Iqbal <haris.iqbal@ionos.com>









M:	Jack Wang <jinpu.wang@ionos.com>









L:	linux-block@vger.kernel.org









S:	Maintained









F:	drivers/block/rnbd/
































arch/microblaze/boot/dts/system.dts



+0
−8






























Original line number
Diff line number
Diff line







@@ -310,14 +310,6 @@ RS232_Uart_1: serial@84000000 {







			xlnx,odd-parity = <0x0>;









			xlnx,use-parity = <0x0>;









		} ;









		SysACE_CompactFlash: sysace@83600000 {









			compatible = "xlnx,xps-sysace-1.00.a";









			interrupt-parent = <&xps_intc_0>;









			interrupts = < 4 2 >;









			reg = < 0x83600000 0x10000 >;









			xlnx,family = "virtex5";









			xlnx,mem-width = <0x10>;









		} ;









		debug_module: debug@84400000 {









			compatible = "xlnx,mdm-1.00.d";









			reg = < 0x84400000 0x10000 >;