Commit bafd5909 authored by Guixin Liu's avatar Guixin Liu Committed by Keith Busch
Browse files

nvme: introduce nvme_disk_is_ns_head helper 



We currently rely on gendisk's file operations (fops) to distinguish
between a namespace head (ns_head) and a regular namespace. To enhance
code readability, introduce a helper function.
Additionally, we must ensure that the device is not an ns_head before
calling nvme_get_ns_from_dev(). To enforce this, add a WARN_ON check
within the nvme_get_ns_from_dev().

Signed-off-by: default avatarGuixin Liu <kanie@linux.alibaba.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarLiu Song <liusong@linux.alibaba.com>
[include fix: https://lore.kernel.org/oe-kbuild-all/202401031943.0N72Tkji-lkp@intel.com/

]
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent bd029a02

drivers/nvme/host/nvme.h

+12 −1
Original line number Diff line number Diff line
@@ -920,6 +920,10 @@ extern struct device_attribute dev_attr_ana_grpid; 
extern struct device_attribute dev_attr_ana_state;

extern struct device_attribute subsys_attr_iopolicy;



static inline bool nvme_disk_is_ns_head(struct gendisk *disk)

{

	return disk->fops == &nvme_ns_head_ops;

}

#else

#define multipath false

static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl)
@@ -997,6 +1001,10 @@ static inline void nvme_mpath_start_request(struct request *rq) 
static inline void nvme_mpath_end_request(struct request *rq)

{

}

static inline bool nvme_disk_is_ns_head(struct gendisk *disk)

{

	return false;

}

#endif /* CONFIG_NVME_MULTIPATH */



int nvme_revalidate_zones(struct nvme_ns *ns);
@@ -1025,7 +1033,10 @@ static inline int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) 


static inline struct nvme_ns *nvme_get_ns_from_dev(struct device *dev)

{

	return dev_to_disk(dev)->private_data;

	struct gendisk *disk = dev_to_disk(dev);



	WARN_ON(nvme_disk_is_ns_head(disk));

	return disk->private_data;

}



#ifdef CONFIG_NVME_HWMON

drivers/nvme/host/pr.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int nvme_send_pr_command(struct block_device *bdev, 
		struct nvme_command *c, void *data, unsigned int data_len)

{

	if (IS_ENABLED(CONFIG_NVME_MULTIPATH) &&

	    bdev->bd_disk->fops == &nvme_ns_head_ops)

	    nvme_disk_is_ns_head(bdev->bd_disk))

		return nvme_send_ns_head_pr_command(bdev, c, data, data_len);



	return nvme_send_ns_pr_command(bdev->bd_disk->private_data, c, data,

drivers/nvme/host/sysfs.c

+4 −4
Original line number Diff line number Diff line
@@ -39,10 +39,9 @@ static inline struct nvme_ns_head *dev_to_ns_head(struct device *dev) 
{

	struct gendisk *disk = dev_to_disk(dev);



	if (disk->fops == &nvme_bdev_ops)

		return nvme_get_ns_from_dev(dev)->head;

	else

	if (nvme_disk_is_ns_head(disk))

		return disk->private_data;

	return nvme_get_ns_from_dev(dev)->head;

}



static ssize_t wwid_show(struct device *dev, struct device_attribute *attr,
@@ -233,7 +232,8 @@ static umode_t nvme_ns_attrs_are_visible(struct kobject *kobj, 
	}

#ifdef CONFIG_NVME_MULTIPATH

	if (a == &dev_attr_ana_grpid.attr || a == &dev_attr_ana_state.attr) {

		if (dev_to_disk(dev)->fops != &nvme_bdev_ops) /* per-path attr */

		/* per-path attr */

		if (nvme_disk_is_ns_head(dev_to_disk(dev)))

			return 0;

		if (!nvme_ctrl_use_ana(nvme_get_ns_from_dev(dev)->ctrl))

			return 0;