forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'for-5.11/drivers-2020-12-14' of git://git.kernel.dk/linux-…
…block Pull block driver updates from Jens Axboe: "Nothing major in here: - NVMe pull request from Christoph: - nvmet passthrough improvements (Chaitanya Kulkarni) - fcloop error injection support (James Smart) - read-only support for zoned namespaces without Zone Append (Javier González) - improve some error message (Minwoo Im) - reject I/O to offline fabrics namespaces (Victor Gladkov) - PCI queue allocation cleanups (Niklas Schnelle) - remove an unused allocation in nvmet (Amit Engel) - a Kconfig spelling fix (Colin Ian King) - nvme_req_qid simplication (Baolin Wang) - MD pull request from Song: - Fix race condition in md_ioctl() (Dae R. Jeong) - Initialize read_slot properly for raid10 (Kevin Vigor) - Code cleanup (Pankaj Gupta) - md-cluster resync/reshape fix (Zhao Heming) - Move null_blk into its own directory (Damien Le Moal) - null_blk zone and discard improvements (Damien Le Moal) - bcache race fix (Dongsheng Yang) - Set of rnbd fixes/improvements (Gioh Kim, Guoqing Jiang, Jack Wang, Lutz Pogrell, Md Haris Iqbal) - lightnvm NULL pointer deref fix (tangzhenhao) - sr in_interrupt() removal (Sebastian Andrzej Siewior) - FC endpoint security support for s390/dasd (Jan Höppner, Sebastian Ott, Vineeth Vijayan). From the s390 arch guys, arch bits included as it made it easier for them to funnel the feature through the block driver tree. - Follow up fixes (Colin Ian King)" * tag 'for-5.11/drivers-2020-12-14' of git://git.kernel.dk/linux-block: (64 commits) block: drop dead assignments in loop_init() sr: Remove in_interrupt() usage in sr_init_command(). sr: Switch the sector size back to 2048 if sr_read_sector() changed it. cdrom: Reset sector_size back it is not 2048. drivers/lightnvm: fix a null-ptr-deref bug in pblk-core.c null_blk: Move driver into its own directory null_blk: Allow controlling max_hw_sectors limit null_blk: discard zones on reset null_blk: cleanup discard handling null_blk: Improve implicit zone close null_blk: improve zone locking block: Align max_hw_sectors to logical blocksize null_blk: Fail zone append to conventional zones null_blk: Fix zone size initialization bcache: fix race between setting bdev state to none and new write request direct to backing block/rnbd: fix a null pointer dereference on dev->blk_symlink_name block/rnbd-clt: Dynamically alloc buffer for pathname & blk_symlink_name block/rnbd: call kobject_put in the failure path Documentation/ABI/rnbd-srv: add document for force_close block/rnbd-srv: close a mapped device from server side. ...
- Loading branch information
Showing
62 changed files
with
1,395 additions
and
485 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -66,7 +66,7 @@ Description: Expected format is the following:: | |
The rnbd_server prepends the <device_path> received from client | ||
with <dev_search_path> and tries to open the | ||
<dev_search_path>/<device_path> block device. On success, | ||
a /dev/rnbd<N> device file, a /sys/block/rnbd_client/rnbd<N>/ | ||
a /dev/rnbd<N> device file, a /sys/block/rnbd<N>/ | ||
directory and an entry in /sys/class/rnbd-client/ctl/devices | ||
will be created. | ||
|
||
|
@@ -95,12 +95,12 @@ Description: Expected format is the following:: | |
--------------------------------- | ||
|
||
After mapping, the device file can be found by: | ||
o The symlink /sys/class/rnbd-client/ctl/devices/<device_id> | ||
o The symlink /sys/class/rnbd-client/ctl/devices/<device_id>@<session_name> | ||
points to /sys/block/<dev-name>. The last part of the symlink destination | ||
is the same as the device name. By extracting the last part of the | ||
path the path to the device /dev/<dev-name> can be build. | ||
|
||
* /dev/block/$(cat /sys/class/rnbd-client/ctl/devices/<device_id>/dev) | ||
* /dev/block/$(cat /sys/class/rnbd-client/ctl/devices/<device_id>@<session_name>/dev) | ||
|
||
How to find the <device_id> of the device is described on the next | ||
section. | ||
|
@@ -110,7 +110,7 @@ Date: Feb 2020 | |
KernelVersion: 5.7 | ||
Contact: Jack Wang <[email protected]> Danil Kipnis <[email protected]> | ||
Description: For each device mapped on the client a new symbolic link is created as | ||
/sys/class/rnbd-client/ctl/devices/<device_id>, which points | ||
/sys/class/rnbd-client/ctl/devices/<device_id>@<session_name>, which points | ||
to the block device created by rnbd (/sys/block/rnbd<N>/). | ||
The <device_id> of each device is created as follows: | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -48,3 +48,11 @@ Date: Feb 2020 | |
KernelVersion: 5.7 | ||
Contact: Jack Wang <[email protected]> Danil Kipnis <[email protected]> | ||
Description: Contains the device access mode: ro, rw or migration. | ||
|
||
What: /sys/class/rnbd-server/ctl/devices/<device_name>/sessions/<session-name>/force_close | ||
Date: Nov 2020 | ||
KernelVersion: 5.10 | ||
Contact: Jack Wang <[email protected]> Danil Kipnis <[email protected]> | ||
Description: Write "1" to the file to close the device on server side. Please | ||
note that the client side device will not be closed, read or | ||
write to the device will get -ENOTCONN. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# SPDX-License-Identifier: GPL-2.0 | ||
# | ||
# Null block device driver configuration | ||
# | ||
|
||
config BLK_DEV_NULL_BLK | ||
tristate "Null test block driver" | ||
select CONFIGFS_FS | ||
|
||
config BLK_DEV_NULL_BLK_FAULT_INJECTION | ||
bool "Support fault injection for Null test block driver" | ||
depends on BLK_DEV_NULL_BLK && FAULT_INJECTION |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
# SPDX-License-Identifier: GPL-2.0 | ||
|
||
# needed for trace events | ||
ccflags-y += -I$(src) | ||
|
||
obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk.o | ||
null_blk-objs := main.o | ||
ifeq ($(CONFIG_BLK_DEV_ZONED), y) | ||
null_blk-$(CONFIG_TRACING) += trace.o | ||
endif | ||
null_blk-$(CONFIG_BLK_DEV_ZONED) += zoned.o |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.