Commit 80ee071b authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-5.9' of git://git.infradead.org/nvme into for-5.9/drivers 

Pull NVMe updates from Christoph:

"Below is the current large chunk we have in the nvme tree for 5.9:

 - ZNS support (Aravind, Keith, Matias, Niklas)
  - misc cleanups and optimizations
     (Baolin, Chaitanya, David, Dongli, Max, Sagi)"

* 'nvme-5.9' of git://git.infradead.org/nvme: (28 commits)
  nvme: remove ns->disk checks
  nvme-pci: use standard block status symbolic names
  nvme-pci: use the consistent return type of nvme_pci_iod_alloc_size()
  nvme-pci: add a blank line after declarations
  nvme-pci: fix some comments issues
  nvme-pci: remove redundant segment validation
  nvme: document quirked Intel models
  nvme: expose reconnect_delay and ctrl_loss_tmo via sysfs
  nvme: support for zoned namespaces
  nvme: support for multiple Command Sets Supported and Effects log pages
  nvme: implement multiple I/O Command Set support
  null_blk: introduce zone capacity for zoned device
  block: add capacity field to zone descriptors
  nvme: use USEC_PER_SEC instead of magic numbers
  nvmet-tcp: simplify nvmet_process_resp_list
  nvme-tcp: optimize network stack with setting msg flags according to batch size
  nvme-tcp: leverage request plugging
  nvme-tcp: have queue prod/cons send list become a llist
  nvme-fcloop: verify wwnn and wwpn format
  nvmet: use unsigned type for u64
  ...
parents 482c6b61 3913f4f3

block/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -86,9 +86,10 @@ config BLK_DEV_ZONED 
	select MQ_IOSCHED_DEADLINE

	help

	Block layer zoned block device support. This option enables

	support for ZAC/ZBC host-managed and host-aware zoned block devices.

	support for ZAC/ZBC/ZNS host-managed and host-aware zoned block

	devices.



	Say yes here if you have a ZAC or ZBC storage device.

	Say yes here if you have a ZAC, ZBC, or ZNS storage device.



config BLK_DEV_THROTTLING

	bool "Block layer bio throttling support"

block/blk-zoned.c

+1 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ int blkdev_report_zones_ioctl(struct block_device *bdev, fmode_t mode, 
		return ret;



	rep.nr_zones = ret;

	rep.flags = BLK_ZONE_REP_CAPACITY;

	if (copy_to_user(argp, &rep, sizeof(struct blk_zone_report)))

		return -EFAULT;

	return 0;

drivers/block/null_blk.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct nullb_device { 
	unsigned long completion_nsec; /* time in ns to complete a request */

	unsigned long cache_size; /* disk cache size in MB */

	unsigned long zone_size; /* zone size in MB if device is zoned */

	unsigned long zone_capacity; /* zone capacity in MB if device is zoned */

	unsigned int zone_nr_conv; /* number of conventional zones */

	unsigned int submit_queues; /* number of submission queues */

	unsigned int home_node; /* home node for the device */

drivers/block/null_blk_main.c

+9 −1
Original line number Diff line number Diff line
@@ -200,6 +200,10 @@ static unsigned long g_zone_size = 256; 
module_param_named(zone_size, g_zone_size, ulong, S_IRUGO);

MODULE_PARM_DESC(zone_size, "Zone size in MB when block device is zoned. Must be power-of-two: Default: 256");



static unsigned long g_zone_capacity;

module_param_named(zone_capacity, g_zone_capacity, ulong, 0444);

MODULE_PARM_DESC(zone_capacity, "Zone capacity in MB when block device is zoned. Can be less than or equal to zone size. Default: Zone size");



static unsigned int g_zone_nr_conv;

module_param_named(zone_nr_conv, g_zone_nr_conv, uint, 0444);

MODULE_PARM_DESC(zone_nr_conv, "Number of conventional zones when block device is zoned. Default: 0");
@@ -341,6 +345,7 @@ NULLB_DEVICE_ATTR(mbps, uint, NULL); 
NULLB_DEVICE_ATTR(cache_size, ulong, NULL);

NULLB_DEVICE_ATTR(zoned, bool, NULL);

NULLB_DEVICE_ATTR(zone_size, ulong, NULL);

NULLB_DEVICE_ATTR(zone_capacity, ulong, NULL);

NULLB_DEVICE_ATTR(zone_nr_conv, uint, NULL);



static ssize_t nullb_device_power_show(struct config_item *item, char *page)
@@ -457,6 +462,7 @@ static struct configfs_attribute *nullb_device_attrs[] = { 
	&nullb_device_attr_badblocks,

	&nullb_device_attr_zoned,

	&nullb_device_attr_zone_size,

	&nullb_device_attr_zone_capacity,

	&nullb_device_attr_zone_nr_conv,

	NULL,

};
@@ -510,7 +516,8 @@ nullb_group_drop_item(struct config_group *group, struct config_item *item) 


static ssize_t memb_group_features_show(struct config_item *item, char *page)

{

	return snprintf(page, PAGE_SIZE, "memory_backed,discard,bandwidth,cache,badblocks,zoned,zone_size,zone_nr_conv\n");

	return snprintf(page, PAGE_SIZE,

			"memory_backed,discard,bandwidth,cache,badblocks,zoned,zone_size,zone_capacity,zone_nr_conv\n");

}



CONFIGFS_ATTR_RO(memb_group_, features);
@@ -571,6 +578,7 @@ static struct nullb_device *null_alloc_dev(void) 
	dev->use_per_node_hctx = g_use_per_node_hctx;

	dev->zoned = g_zoned;

	dev->zone_size = g_zone_size;

	dev->zone_capacity = g_zone_capacity;

	dev->zone_nr_conv = g_zone_nr_conv;

	return dev;

}

drivers/block/null_blk_zoned.c

+15 −1
Original line number Diff line number Diff line
@@ -28,6 +28,15 @@ int null_init_zoned_dev(struct nullb_device *dev, struct request_queue *q) 
		return -EINVAL;

	}



	if (!dev->zone_capacity)

		dev->zone_capacity = dev->zone_size;



	if (dev->zone_capacity > dev->zone_size) {

		pr_err("null_blk: zone capacity (%lu MB) larger than zone size (%lu MB)\n",

					dev->zone_capacity, dev->zone_size);

		return -EINVAL;

	}



	dev->zone_size_sects = dev->zone_size << ZONE_SIZE_SHIFT;

	dev->nr_zones = dev_size >>

				(SECTOR_SHIFT + ilog2(dev->zone_size_sects));
@@ -47,6 +56,7 @@ int null_init_zoned_dev(struct nullb_device *dev, struct request_queue *q) 


		zone->start = sector;

		zone->len = dev->zone_size_sects;

		zone->capacity = zone->len;

		zone->wp = zone->start + zone->len;

		zone->type = BLK_ZONE_TYPE_CONVENTIONAL;

		zone->cond = BLK_ZONE_COND_NOT_WP;
@@ -59,6 +69,7 @@ int null_init_zoned_dev(struct nullb_device *dev, struct request_queue *q) 


		zone->start = zone->wp = sector;

		zone->len = dev->zone_size_sects;

		zone->capacity = dev->zone_capacity << ZONE_SIZE_SHIFT;

		zone->type = BLK_ZONE_TYPE_SEQWRITE_REQ;

		zone->cond = BLK_ZONE_COND_EMPTY;
@@ -185,6 +196,9 @@ static blk_status_t null_zone_write(struct nullb_cmd *cmd, sector_t sector, 
			return BLK_STS_IOERR;

		}



		if (zone->wp + nr_sectors > zone->start + zone->capacity)

			return BLK_STS_IOERR;



		if (zone->cond != BLK_ZONE_COND_EXP_OPEN)

			zone->cond = BLK_ZONE_COND_IMP_OPEN;
@@ -193,7 +207,7 @@ static blk_status_t null_zone_write(struct nullb_cmd *cmd, sector_t sector, 
			return ret;



		zone->wp += nr_sectors;

		if (zone->wp == zone->start + zone->len)

		if (zone->wp == zone->start + zone->capacity)

			zone->cond = BLK_ZONE_COND_FULL;

		return BLK_STS_OK;

	default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE