mirror of
https://github.com/torvalds/linux.git
synced 2026-06-04 20:46:48 +02:00
Merge patch series "Clean up the SCSI disk driver source code"
Bart Van Assche <bvanassche@acm.org> says: Hi Martin, This patch series removes multiple forward declarations from the SCSI disk (sd) driver and also makes error messages easier to find with grep. Please consider this patch series for the next merge window. Thanks, Bart. Link: https://patch.msgid.link/20260114175054.4118163-1-bvanassche@acm.org Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Martin K. Petersen
commit
a9e03ec01e
|
|
@ -102,14 +102,9 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_ZBC);
|
|||
|
||||
#define SD_MINORS 16
|
||||
|
||||
static void sd_config_discard(struct scsi_disk *sdkp, struct queue_limits *lim,
|
||||
unsigned int mode);
|
||||
static void sd_config_write_same(struct scsi_disk *sdkp,
|
||||
struct queue_limits *lim);
|
||||
static void sd_revalidate_disk(struct gendisk *);
|
||||
static void sd_unlock_native_capacity(struct gendisk *disk);
|
||||
static void sd_shutdown(struct scsi_device *);
|
||||
static void scsi_disk_release(struct device *cdev);
|
||||
|
||||
static DEFINE_IDA(sd_index_ida);
|
||||
|
||||
|
|
@ -121,6 +116,62 @@ static const char *sd_cache_types[] = {
|
|||
"write back, no read (daft)"
|
||||
};
|
||||
|
||||
static void sd_disable_discard(struct scsi_disk *sdkp)
|
||||
{
|
||||
sdkp->provisioning_mode = SD_LBP_DISABLE;
|
||||
blk_queue_disable_discard(sdkp->disk->queue);
|
||||
}
|
||||
|
||||
static void sd_config_discard(struct scsi_disk *sdkp, struct queue_limits *lim,
|
||||
unsigned int mode)
|
||||
{
|
||||
unsigned int logical_block_size = sdkp->device->sector_size;
|
||||
unsigned int max_blocks = 0;
|
||||
|
||||
lim->discard_alignment = sdkp->unmap_alignment * logical_block_size;
|
||||
lim->discard_granularity = max(sdkp->physical_block_size,
|
||||
sdkp->unmap_granularity * logical_block_size);
|
||||
sdkp->provisioning_mode = mode;
|
||||
|
||||
switch (mode) {
|
||||
|
||||
case SD_LBP_FULL:
|
||||
case SD_LBP_DISABLE:
|
||||
break;
|
||||
|
||||
case SD_LBP_UNMAP:
|
||||
max_blocks = min_not_zero(sdkp->max_unmap_blocks,
|
||||
(u32)SD_MAX_WS16_BLOCKS);
|
||||
break;
|
||||
|
||||
case SD_LBP_WS16:
|
||||
if (sdkp->device->unmap_limit_for_ws)
|
||||
max_blocks = sdkp->max_unmap_blocks;
|
||||
else
|
||||
max_blocks = sdkp->max_ws_blocks;
|
||||
|
||||
max_blocks = min_not_zero(max_blocks, (u32)SD_MAX_WS16_BLOCKS);
|
||||
break;
|
||||
|
||||
case SD_LBP_WS10:
|
||||
if (sdkp->device->unmap_limit_for_ws)
|
||||
max_blocks = sdkp->max_unmap_blocks;
|
||||
else
|
||||
max_blocks = sdkp->max_ws_blocks;
|
||||
|
||||
max_blocks = min_not_zero(max_blocks, (u32)SD_MAX_WS10_BLOCKS);
|
||||
break;
|
||||
|
||||
case SD_LBP_ZERO:
|
||||
max_blocks = min_not_zero(sdkp->max_ws_blocks,
|
||||
(u32)SD_MAX_WS10_BLOCKS);
|
||||
break;
|
||||
}
|
||||
|
||||
lim->max_hw_discard_sectors = max_blocks *
|
||||
(logical_block_size >> SECTOR_SHIFT);
|
||||
}
|
||||
|
||||
static void sd_set_flush_flag(struct scsi_disk *sdkp,
|
||||
struct queue_limits *lim)
|
||||
{
|
||||
|
|
@ -698,6 +749,17 @@ static struct attribute *sd_disk_attrs[] = {
|
|||
};
|
||||
ATTRIBUTE_GROUPS(sd_disk);
|
||||
|
||||
static void scsi_disk_release(struct device *dev)
|
||||
{
|
||||
struct scsi_disk *sdkp = to_scsi_disk(dev);
|
||||
|
||||
ida_free(&sd_index_ida, sdkp->index);
|
||||
put_device(&sdkp->device->sdev_gendev);
|
||||
free_opal_dev(sdkp->opal_dev);
|
||||
|
||||
kfree(sdkp);
|
||||
}
|
||||
|
||||
static struct class sd_disk_class = {
|
||||
.name = "scsi_disk",
|
||||
.dev_release = scsi_disk_release,
|
||||
|
|
@ -866,62 +928,6 @@ static unsigned char sd_setup_protect_cmnd(struct scsi_cmnd *scmd,
|
|||
return protect;
|
||||
}
|
||||
|
||||
static void sd_disable_discard(struct scsi_disk *sdkp)
|
||||
{
|
||||
sdkp->provisioning_mode = SD_LBP_DISABLE;
|
||||
blk_queue_disable_discard(sdkp->disk->queue);
|
||||
}
|
||||
|
||||
static void sd_config_discard(struct scsi_disk *sdkp, struct queue_limits *lim,
|
||||
unsigned int mode)
|
||||
{
|
||||
unsigned int logical_block_size = sdkp->device->sector_size;
|
||||
unsigned int max_blocks = 0;
|
||||
|
||||
lim->discard_alignment = sdkp->unmap_alignment * logical_block_size;
|
||||
lim->discard_granularity = max(sdkp->physical_block_size,
|
||||
sdkp->unmap_granularity * logical_block_size);
|
||||
sdkp->provisioning_mode = mode;
|
||||
|
||||
switch (mode) {
|
||||
|
||||
case SD_LBP_FULL:
|
||||
case SD_LBP_DISABLE:
|
||||
break;
|
||||
|
||||
case SD_LBP_UNMAP:
|
||||
max_blocks = min_not_zero(sdkp->max_unmap_blocks,
|
||||
(u32)SD_MAX_WS16_BLOCKS);
|
||||
break;
|
||||
|
||||
case SD_LBP_WS16:
|
||||
if (sdkp->device->unmap_limit_for_ws)
|
||||
max_blocks = sdkp->max_unmap_blocks;
|
||||
else
|
||||
max_blocks = sdkp->max_ws_blocks;
|
||||
|
||||
max_blocks = min_not_zero(max_blocks, (u32)SD_MAX_WS16_BLOCKS);
|
||||
break;
|
||||
|
||||
case SD_LBP_WS10:
|
||||
if (sdkp->device->unmap_limit_for_ws)
|
||||
max_blocks = sdkp->max_unmap_blocks;
|
||||
else
|
||||
max_blocks = sdkp->max_ws_blocks;
|
||||
|
||||
max_blocks = min_not_zero(max_blocks, (u32)SD_MAX_WS10_BLOCKS);
|
||||
break;
|
||||
|
||||
case SD_LBP_ZERO:
|
||||
max_blocks = min_not_zero(sdkp->max_ws_blocks,
|
||||
(u32)SD_MAX_WS10_BLOCKS);
|
||||
break;
|
||||
}
|
||||
|
||||
lim->max_hw_discard_sectors = max_blocks *
|
||||
(logical_block_size >> SECTOR_SHIFT);
|
||||
}
|
||||
|
||||
static void *sd_set_special_bvec(struct request *rq, unsigned int data_len)
|
||||
{
|
||||
struct page *page;
|
||||
|
|
@ -1676,9 +1682,10 @@ static int sd_ioctl(struct block_device *bdev, blk_mode_t mode,
|
|||
struct scsi_device *sdp = sdkp->device;
|
||||
void __user *p = (void __user *)arg;
|
||||
int error;
|
||||
|
||||
SCSI_LOG_IOCTL(1, sd_printk(KERN_INFO, sdkp, "sd_ioctl: disk=%s, "
|
||||
"cmd=0x%x\n", disk->disk_name, cmd));
|
||||
|
||||
SCSI_LOG_IOCTL(1, sd_printk(KERN_INFO, sdkp,
|
||||
"sd_ioctl: disk=%s, cmd=0x%x\n",
|
||||
disk->disk_name, cmd));
|
||||
|
||||
if (bdev_is_partition(bdev) && !capable(CAP_SYS_RAWIO))
|
||||
return -ENOIOCTLCMD;
|
||||
|
|
@ -2177,21 +2184,6 @@ static void scsi_disk_free_disk(struct gendisk *disk)
|
|||
put_device(&sdkp->disk_dev);
|
||||
}
|
||||
|
||||
static const struct block_device_operations sd_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = sd_open,
|
||||
.release = sd_release,
|
||||
.ioctl = sd_ioctl,
|
||||
.getgeo = sd_getgeo,
|
||||
.compat_ioctl = blkdev_compat_ptr_ioctl,
|
||||
.check_events = sd_check_events,
|
||||
.unlock_native_capacity = sd_unlock_native_capacity,
|
||||
.report_zones = sd_zbc_report_zones,
|
||||
.get_unique_id = sd_get_unique_id,
|
||||
.free_disk = scsi_disk_free_disk,
|
||||
.pr_ops = &sd_pr_ops,
|
||||
};
|
||||
|
||||
/**
|
||||
* sd_eh_reset - reset error handling callback
|
||||
* @scmd: sd-issued command that has failed
|
||||
|
|
@ -2602,8 +2594,8 @@ static int sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer
|
|||
type = ((buffer[12] >> 1) & 7) + 1; /* P_TYPE 0 = Type 1 */
|
||||
|
||||
if (type > T10_PI_TYPE3_PROTECTION) {
|
||||
sd_printk(KERN_ERR, sdkp, "formatted with unsupported" \
|
||||
" protection type %u. Disabling disk!\n",
|
||||
sd_printk(KERN_ERR, sdkp,
|
||||
"formatted with unsupported protection type %u. Disabling disk!\n",
|
||||
type);
|
||||
sdkp->protection_type = 0;
|
||||
return -ENODEV;
|
||||
|
|
@ -2880,8 +2872,8 @@ sd_read_capacity(struct scsi_disk *sdkp, struct queue_limits *lim,
|
|||
if ((sizeof(sdkp->capacity) > 4) &&
|
||||
(sdkp->capacity > 0xffffffffULL)) {
|
||||
int old_sector_size = sector_size;
|
||||
sd_printk(KERN_NOTICE, sdkp, "Very big device. "
|
||||
"Trying to use READ CAPACITY(16).\n");
|
||||
sd_printk(KERN_NOTICE, sdkp,
|
||||
"Very big device. Trying to use READ CAPACITY(16).\n");
|
||||
sector_size = read_capacity_16(sdkp, sdp, lim, buffer);
|
||||
if (sector_size < 0) {
|
||||
sd_printk(KERN_NOTICE, sdkp,
|
||||
|
|
@ -2907,17 +2899,17 @@ sd_read_capacity(struct scsi_disk *sdkp, struct queue_limits *lim,
|
|||
*/
|
||||
if (sdp->fix_capacity ||
|
||||
(sdp->guess_capacity && (sdkp->capacity & 0x01))) {
|
||||
sd_printk(KERN_INFO, sdkp, "Adjusting the sector count "
|
||||
"from its reported value: %llu\n",
|
||||
(unsigned long long) sdkp->capacity);
|
||||
sd_printk(KERN_INFO, sdkp,
|
||||
"Adjusting the sector count from its reported value: %llu\n",
|
||||
(unsigned long long) sdkp->capacity);
|
||||
--sdkp->capacity;
|
||||
}
|
||||
|
||||
got_data:
|
||||
if (sector_size == 0) {
|
||||
sector_size = 512;
|
||||
sd_printk(KERN_NOTICE, sdkp, "Sector size 0 reported, "
|
||||
"assuming 512.\n");
|
||||
sd_printk(KERN_NOTICE, sdkp,
|
||||
"Sector size 0 reported, assuming 512.\n");
|
||||
}
|
||||
|
||||
if (sector_size != 512 &&
|
||||
|
|
@ -3122,8 +3114,9 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
|
|||
if (len < 3)
|
||||
goto bad_sense;
|
||||
else if (len > SD_BUF_SIZE) {
|
||||
sd_first_printk(KERN_NOTICE, sdkp, "Truncating mode parameter "
|
||||
"data from %d to %d bytes\n", len, SD_BUF_SIZE);
|
||||
sd_first_printk(KERN_NOTICE, sdkp,
|
||||
"Truncating mode parameter data from %d to %d bytes\n",
|
||||
len, SD_BUF_SIZE);
|
||||
len = SD_BUF_SIZE;
|
||||
}
|
||||
if (modepage == 0x3F && sdp->use_192_bytes_for_3f)
|
||||
|
|
@ -3146,8 +3139,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
|
|||
*/
|
||||
if (len - offset <= 2) {
|
||||
sd_first_printk(KERN_ERR, sdkp,
|
||||
"Incomplete mode parameter "
|
||||
"data\n");
|
||||
"Incomplete mode parameter data\n");
|
||||
goto defaults;
|
||||
} else {
|
||||
modepage = page_code;
|
||||
|
|
@ -3162,8 +3154,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
|
|||
offset += 2 + buffer[offset+1];
|
||||
else {
|
||||
sd_first_printk(KERN_ERR, sdkp,
|
||||
"Incomplete mode "
|
||||
"parameter data\n");
|
||||
"Incomplete mode parameter data\n");
|
||||
goto defaults;
|
||||
}
|
||||
}
|
||||
|
|
@ -3626,8 +3617,7 @@ static bool sd_validate_min_xfer_size(struct scsi_disk *sdkp)
|
|||
|
||||
if (min_xfer_bytes & (sdkp->physical_block_size - 1)) {
|
||||
sd_first_printk(KERN_WARNING, sdkp,
|
||||
"Preferred minimum I/O size %u bytes not a " \
|
||||
"multiple of physical block size (%u bytes)\n",
|
||||
"Preferred minimum I/O size %u bytes not a multiple of physical block size (%u bytes)\n",
|
||||
min_xfer_bytes, sdkp->physical_block_size);
|
||||
sdkp->min_xfer_blocks = 0;
|
||||
return false;
|
||||
|
|
@ -3657,41 +3647,35 @@ static bool sd_validate_opt_xfer_size(struct scsi_disk *sdkp,
|
|||
|
||||
if (sdkp->opt_xfer_blocks > dev_max) {
|
||||
sd_first_printk(KERN_WARNING, sdkp,
|
||||
"Optimal transfer size %u logical blocks " \
|
||||
"> dev_max (%u logical blocks)\n",
|
||||
"Optimal transfer size %u logical blocks > dev_max (%u logical blocks)\n",
|
||||
sdkp->opt_xfer_blocks, dev_max);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (sdkp->opt_xfer_blocks > SD_DEF_XFER_BLOCKS) {
|
||||
sd_first_printk(KERN_WARNING, sdkp,
|
||||
"Optimal transfer size %u logical blocks " \
|
||||
"> sd driver limit (%u logical blocks)\n",
|
||||
"Optimal transfer size %u logical blocks > sd driver limit (%u logical blocks)\n",
|
||||
sdkp->opt_xfer_blocks, SD_DEF_XFER_BLOCKS);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (opt_xfer_bytes < PAGE_SIZE) {
|
||||
sd_first_printk(KERN_WARNING, sdkp,
|
||||
"Optimal transfer size %u bytes < " \
|
||||
"PAGE_SIZE (%u bytes)\n",
|
||||
"Optimal transfer size %u bytes < PAGE_SIZE (%u bytes)\n",
|
||||
opt_xfer_bytes, (unsigned int)PAGE_SIZE);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (min_xfer_bytes && opt_xfer_bytes % min_xfer_bytes) {
|
||||
sd_first_printk(KERN_WARNING, sdkp,
|
||||
"Optimal transfer size %u bytes not a " \
|
||||
"multiple of preferred minimum block " \
|
||||
"size (%u bytes)\n",
|
||||
"Optimal transfer size %u bytes not a multiple of preferred minimum block size (%u bytes)\n",
|
||||
opt_xfer_bytes, min_xfer_bytes);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (opt_xfer_bytes & (sdkp->physical_block_size - 1)) {
|
||||
sd_first_printk(KERN_WARNING, sdkp,
|
||||
"Optimal transfer size %u bytes not a " \
|
||||
"multiple of physical block size (%u bytes)\n",
|
||||
"Optimal transfer size %u bytes not a multiple of physical block size (%u bytes)\n",
|
||||
opt_xfer_bytes, sdkp->physical_block_size);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -3885,6 +3869,21 @@ static void sd_unlock_native_capacity(struct gendisk *disk)
|
|||
sdev->host->hostt->unlock_native_capacity(sdev);
|
||||
}
|
||||
|
||||
static const struct block_device_operations sd_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = sd_open,
|
||||
.release = sd_release,
|
||||
.ioctl = sd_ioctl,
|
||||
.getgeo = sd_getgeo,
|
||||
.compat_ioctl = blkdev_compat_ptr_ioctl,
|
||||
.check_events = sd_check_events,
|
||||
.unlock_native_capacity = sd_unlock_native_capacity,
|
||||
.report_zones = sd_zbc_report_zones,
|
||||
.get_unique_id = sd_get_unique_id,
|
||||
.free_disk = scsi_disk_free_disk,
|
||||
.pr_ops = &sd_pr_ops,
|
||||
};
|
||||
|
||||
/**
|
||||
* sd_format_disk_name - format disk name
|
||||
* @prefix: name prefix - ie. "sd" for SCSI disks
|
||||
|
|
@ -4087,43 +4086,6 @@ static int sd_probe(struct scsi_device *sdp)
|
|||
return error;
|
||||
}
|
||||
|
||||
/**
|
||||
* sd_remove - called whenever a scsi disk (previously recognized by
|
||||
* sd_probe) is detached from the system. It is called (potentially
|
||||
* multiple times) during sd module unload.
|
||||
* @sdp: pointer to device object
|
||||
*
|
||||
* Note: this function is invoked from the scsi mid-level.
|
||||
* This function potentially frees up a device name (e.g. /dev/sdc)
|
||||
* that could be re-used by a subsequent sd_probe().
|
||||
* This function is not called when the built-in sd driver is "exit-ed".
|
||||
**/
|
||||
static void sd_remove(struct scsi_device *sdp)
|
||||
{
|
||||
struct device *dev = &sdp->sdev_gendev;
|
||||
struct scsi_disk *sdkp = dev_get_drvdata(dev);
|
||||
|
||||
scsi_autopm_get_device(sdkp->device);
|
||||
|
||||
device_del(&sdkp->disk_dev);
|
||||
del_gendisk(sdkp->disk);
|
||||
if (!sdkp->suspended)
|
||||
sd_shutdown(sdp);
|
||||
|
||||
put_disk(sdkp->disk);
|
||||
}
|
||||
|
||||
static void scsi_disk_release(struct device *dev)
|
||||
{
|
||||
struct scsi_disk *sdkp = to_scsi_disk(dev);
|
||||
|
||||
ida_free(&sd_index_ida, sdkp->index);
|
||||
put_device(&sdkp->device->sdev_gendev);
|
||||
free_opal_dev(sdkp->opal_dev);
|
||||
|
||||
kfree(sdkp);
|
||||
}
|
||||
|
||||
static int sd_start_stop_device(struct scsi_disk *sdkp, int start)
|
||||
{
|
||||
unsigned char cmd[6] = { START_STOP }; /* START_VALID */
|
||||
|
|
@ -4226,6 +4188,32 @@ static void sd_shutdown(struct scsi_device *sdp)
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* sd_remove - called whenever a scsi disk (previously recognized by
|
||||
* sd_probe) is detached from the system. It is called (potentially
|
||||
* multiple times) during sd module unload.
|
||||
* @sdp: pointer to device object
|
||||
*
|
||||
* Note: this function is invoked from the scsi mid-level.
|
||||
* This function potentially frees up a device name (e.g. /dev/sdc)
|
||||
* that could be re-used by a subsequent sd_probe().
|
||||
* This function is not called when the built-in sd driver is "exit-ed".
|
||||
**/
|
||||
static void sd_remove(struct scsi_device *sdp)
|
||||
{
|
||||
struct device *dev = &sdp->sdev_gendev;
|
||||
struct scsi_disk *sdkp = dev_get_drvdata(dev);
|
||||
|
||||
scsi_autopm_get_device(sdkp->device);
|
||||
|
||||
device_del(&sdkp->disk_dev);
|
||||
del_gendisk(sdkp->disk);
|
||||
if (!sdkp->suspended)
|
||||
sd_shutdown(sdp);
|
||||
|
||||
put_disk(sdkp->disk);
|
||||
}
|
||||
|
||||
static inline bool sd_do_start_stop(struct scsi_device *sdev, bool runtime)
|
||||
{
|
||||
return (sdev->manage_system_start_stop && !runtime) ||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user