mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-25 07:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst/include/backport.h, scst_vdisk: Port to Linux kernel v6.8

Browse Source 
Support for the following block layer changes in the Linux kernel v6.8:

- e719b4d15674 ("block: Provide bdev_open_* functions")
- cd34758c5238 ("block: Remove blkdev_get_by_*() functions")
This commit is contained in:
Gleb Chesnokov
2024-02-16 13:04:30 +03:00
parent ff70c9deb7
commit 974001f66f
3 changed files with 96 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
scst/include/backport.h
View File

@@ -282,6 +282,51 @@ static inline void blkdev_put_backport(struct block_device *bdev, void *holder)
#endif #endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 7, 0)
/*
* See also commit e719b4d15674 ("block: Provide bdev_open_* functions") # v6.7.
*/
struct bdev_handle {
struct block_device *bdev;
void *holder;
blk_mode_t mode;
};
static inline struct bdev_handle *
bdev_open_by_path_backport(const char *path, blk_mode_t mode, void *holder,
const struct blk_holder_ops *hops)
{
struct bdev_handle *handle = kmalloc(sizeof(*handle), GFP_KERNEL);
struct block_device *bdev;
if (!handle)
return ERR_PTR(-ENOMEM);
bdev = blkdev_get_by_path(path, mode, holder, hops);
if (IS_ERR(bdev)) {
kfree(handle);
return ERR_CAST(bdev);
}
handle->bdev = bdev;
handle->holder = holder;
handle->mode = mode;
return handle;
}
#define bdev_open_by_path bdev_open_by_path_backport
static inline void bdev_release_backport(struct bdev_handle *handle)
{
blkdev_put(handle->bdev, handle->holder);
kfree(handle);
}
#define bdev_release bdev_release_backport
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 0) && \ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 0) && \
(!defined(RHEL_RELEASE_CODE) || \ (!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 1)) RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 1))

89
scst/src/dev_handlers/scst_vdisk.c
View File

@@ -190,7 +190,7 @@ struct scst_vdisk_dev {
struct file *fd; struct file *fd;
struct file *dif_fd; struct file *dif_fd;
struct block_device *bdev; struct bdev_handle *bdev_handle;
struct bio_set *vdisk_bioset; struct bio_set *vdisk_bioset;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0)
struct bio_set vdisk_bioset_struct; struct bio_set vdisk_bioset_struct;
@@ -494,7 +494,7 @@ out:
static void vdisk_blockio_check_flush_support(struct scst_vdisk_dev *virt_dev) static void vdisk_blockio_check_flush_support(struct scst_vdisk_dev *virt_dev)
{ {
struct block_device *bdev; struct bdev_handle *bdev_handle;
TRACE_ENTRY(); TRACE_ENTRY();
@@ -502,26 +502,26 @@ static void vdisk_blockio_check_flush_support(struct scst_vdisk_dev *virt_dev)
virt_dev->wt_flag || !virt_dev->dev_active) virt_dev->wt_flag || !virt_dev->dev_active)
goto out; goto out;
bdev = blkdev_get_by_path(virt_dev->filename, BLK_OPEN_READ, NULL, NULL); bdev_handle = bdev_open_by_path(virt_dev->filename, BLK_OPEN_READ, NULL, NULL);
if (IS_ERR(bdev)) { if (IS_ERR(bdev_handle)) {
if (PTR_ERR(bdev) == -EMEDIUMTYPE) if (PTR_ERR(bdev_handle) == -EMEDIUMTYPE)
TRACE(TRACE_MINOR, TRACE(TRACE_MINOR,
"Unable to open %s with EMEDIUMTYPE, DRBD passive?", "Unable to open %s with EMEDIUMTYPE, DRBD passive?",
virt_dev->filename); virt_dev->filename);
else else
PRINT_ERROR("blkdev_get_by_path(%s) failed: %ld", PRINT_ERROR("blkdev_get_by_path(%s) failed: %ld",
virt_dev->filename, PTR_ERR(bdev)); virt_dev->filename, PTR_ERR(bdev_handle));
goto out; goto out;
} }
if (vdisk_blockio_flush(bdev, GFP_KERNEL, false, NULL, false) != 0) { if (vdisk_blockio_flush(bdev_handle->bdev, GFP_KERNEL, false, NULL, false) != 0) {
PRINT_WARNING( PRINT_WARNING(
"Device %s doesn't support barriers, switching to NV_CACHE mode. Read README for more details.", "Device %s doesn't support barriers, switching to NV_CACHE mode. Read README for more details.",
virt_dev->filename); virt_dev->filename);
virt_dev->nv_cache = 1; virt_dev->nv_cache = 1;
} }
blkdev_put(bdev, NULL); bdev_release(bdev_handle);
out: out:
TRACE_EXIT(); TRACE_EXIT();
@@ -536,7 +536,7 @@ static bool vdisk_supports_active(const struct scst_vdisk_dev *virt_dev)
static void vdisk_check_tp_support(struct scst_vdisk_dev *virt_dev) static void vdisk_check_tp_support(struct scst_vdisk_dev *virt_dev)
{ {
struct block_device *bdev = NULL; struct bdev_handle *bdev_handle = NULL;
struct file *fd = NULL; struct file *fd = NULL;
bool fd_open = false; bool fd_open = false;
int res; int res;
@@ -549,8 +549,8 @@ static void vdisk_check_tp_support(struct scst_vdisk_dev *virt_dev)
goto check; goto check;
if (virt_dev->blockio) { if (virt_dev->blockio) {
bdev = blkdev_get_by_path(virt_dev->filename, BLK_OPEN_READ, NULL, NULL); bdev_handle = bdev_open_by_path(virt_dev->filename, BLK_OPEN_READ, NULL, NULL);
res = PTR_ERR_OR_ZERO(bdev); res = PTR_ERR_OR_ZERO(bdev_handle);
} else { } else {
fd = filp_open(virt_dev->filename, O_LARGEFILE, 0600); fd = filp_open(virt_dev->filename, O_LARGEFILE, 0600);
res = PTR_ERR_OR_ZERO(fd); res = PTR_ERR_OR_ZERO(fd);
@@ -573,10 +573,10 @@ static void vdisk_check_tp_support(struct scst_vdisk_dev *virt_dev)
(!defined(RHEL_RELEASE_CODE) || \ (!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 1)) RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 1))
virt_dev->dev_thin_provisioned = virt_dev->dev_thin_provisioned =
blk_queue_discard(bdev_get_queue(bdev)); blk_queue_discard(bdev_get_queue(bdev_handle->bdev));
#else #else
virt_dev->dev_thin_provisioned = virt_dev->dev_thin_provisioned =
!!bdev_max_discard_sectors(bdev); !!bdev_max_discard_sectors(bdev_handle->bdev);
#endif #endif
} else { } else {
virt_dev->dev_thin_provisioned = (fd->f_op->fallocate != NULL); virt_dev->dev_thin_provisioned = (fd->f_op->fallocate != NULL);
@@ -613,7 +613,7 @@ check:
struct request_queue *q; struct request_queue *q;
sBUG_ON(!fd_open); sBUG_ON(!fd_open);
q = bdev_get_queue(bdev); q = bdev_get_queue(bdev_handle->bdev);
virt_dev->unmap_opt_gran = q->limits.discard_granularity >> block_shift; virt_dev->unmap_opt_gran = q->limits.discard_granularity >> block_shift;
virt_dev->unmap_align = q->limits.discard_alignment >> block_shift; virt_dev->unmap_align = q->limits.discard_alignment >> block_shift;
if (virt_dev->unmap_opt_gran == virt_dev->unmap_align) if (virt_dev->unmap_opt_gran == virt_dev->unmap_align)
@@ -645,7 +645,7 @@ check:
if (fd_open) { if (fd_open) {
if (virt_dev->blockio) if (virt_dev->blockio)
blkdev_put(bdev, NULL); bdev_release(bdev_handle);
else else
filp_close(fd, NULL); filp_close(fd, NULL);
} }
@@ -964,19 +964,19 @@ static int vdisk_init_block_integrity(struct scst_vdisk_dev *virt_dev)
{ {
int res; int res;
struct scst_device *dev = virt_dev->dev; struct scst_device *dev = virt_dev->dev;
struct block_device *bdev; struct bdev_handle *bdev_handle;
struct blk_integrity *bi; struct blk_integrity *bi;
const char *bi_profile_name; const char *bi_profile_name;
TRACE_ENTRY(); TRACE_ENTRY();
bdev = blkdev_get_by_path(virt_dev->filename, BLK_OPEN_READ, NULL, NULL); bdev_handle = bdev_open_by_path(virt_dev->filename, BLK_OPEN_READ, NULL, NULL);
if (IS_ERR(bdev)) { if (IS_ERR(bdev_handle)) {
res = PTR_ERR(bdev); res = PTR_ERR(bdev_handle);
goto out; goto out;
} }
bi = bdev_get_integrity(bdev); bi = bdev_get_integrity(bdev_handle->bdev);
if (bi == NULL) { if (bi == NULL) {
TRACE_DBG("Block integrity not supported"); TRACE_DBG("Block integrity not supported");
goto out_no_bi; goto out_no_bi;
@@ -1048,7 +1048,7 @@ out_no_bi:
res = 0; res = 0;
out_close: out_close:
blkdev_put(bdev, NULL); bdev_release(bdev_handle);
out: out:
TRACE_EXIT_RES(res); TRACE_EXIT_RES(res);
@@ -1297,7 +1297,7 @@ static void vdisk_detach(struct scst_device *dev)
static bool vdisk_is_open(const struct scst_vdisk_dev *virt_dev) static bool vdisk_is_open(const struct scst_vdisk_dev *virt_dev)
{ {
return virt_dev->fd || virt_dev->bdev; return virt_dev->fd || virt_dev->bdev_handle;
} }
static int vdisk_open_fd(struct scst_vdisk_dev *virt_dev, bool read_only) static int vdisk_open_fd(struct scst_vdisk_dev *virt_dev, bool read_only)
@@ -1317,15 +1317,16 @@ static int vdisk_open_fd(struct scst_vdisk_dev *virt_dev, bool read_only)
if (!read_only) if (!read_only)
bdev_mode |= BLK_OPEN_WRITE; bdev_mode |= BLK_OPEN_WRITE;
virt_dev->bdev = blkdev_get_by_path(virt_dev->filename, bdev_mode, virt_dev, NULL); virt_dev->bdev_handle = bdev_open_by_path(virt_dev->filename, bdev_mode, virt_dev,
res = PTR_ERR_OR_ZERO(virt_dev->bdev); NULL);
res = PTR_ERR_OR_ZERO(virt_dev->bdev_handle);
} else { } else {
virt_dev->fd = vdev_open_fd(virt_dev, virt_dev->filename, virt_dev->fd = vdev_open_fd(virt_dev, virt_dev->filename,
read_only); read_only);
res = PTR_ERR_OR_ZERO(virt_dev->fd); res = PTR_ERR_OR_ZERO(virt_dev->fd);
} }
if (res) { if (res) {
virt_dev->bdev = NULL; virt_dev->bdev_handle = NULL;
virt_dev->fd = NULL; virt_dev->fd = NULL;
goto out; goto out;
} }
@@ -1334,8 +1335,8 @@ static int vdisk_open_fd(struct scst_vdisk_dev *virt_dev, bool read_only)
* For block devices, get the optimal I/O size from the block device * For block devices, get the optimal I/O size from the block device
* characteristics. * characteristics.
*/ */
if (virt_dev->bdev && !virt_dev->opt_trans_len_set) if (virt_dev->bdev_handle && !virt_dev->opt_trans_len_set)
virt_dev->opt_trans_len = bdev_io_opt(virt_dev->bdev) ? : virt_dev->opt_trans_len = bdev_io_opt(virt_dev->bdev_handle->bdev) ? :
virt_dev->opt_trans_len; virt_dev->opt_trans_len;
if (virt_dev->dif_filename != NULL) { if (virt_dev->dif_filename != NULL) {
@@ -1349,15 +1350,15 @@ static int vdisk_open_fd(struct scst_vdisk_dev *virt_dev, bool read_only)
} }
TRACE_DBG("virt_dev %s: fd %p %p open (dif_fd %p)", virt_dev->name, TRACE_DBG("virt_dev %s: fd %p %p open (dif_fd %p)", virt_dev->name,
virt_dev->fd, virt_dev->bdev, virt_dev->dif_fd); virt_dev->fd, virt_dev->bdev_handle, virt_dev->dif_fd);
out: out:
return res; return res;
out_close_fd: out_close_fd:
if (virt_dev->blockio) { if (virt_dev->blockio) {
blkdev_put(virt_dev->bdev, virt_dev); bdev_release(virt_dev->bdev_handle);
virt_dev->bdev = NULL; virt_dev->bdev_handle = NULL;
} else { } else {
filp_close(virt_dev->fd, NULL); filp_close(virt_dev->fd, NULL);
virt_dev->fd = NULL; virt_dev->fd = NULL;
@@ -1368,11 +1369,11 @@ out_close_fd:
static void vdisk_close_fd(struct scst_vdisk_dev *virt_dev) static void vdisk_close_fd(struct scst_vdisk_dev *virt_dev)
{ {
TRACE_DBG("virt_dev %s: closing fd %p %p (dif_fd %p)", virt_dev->name, TRACE_DBG("virt_dev %s: closing fd %p %p (dif_fd %p)", virt_dev->name,
virt_dev->fd, virt_dev->bdev, virt_dev->dif_fd); virt_dev->fd, virt_dev->bdev_handle, virt_dev->dif_fd);
if (virt_dev->bdev) { if (virt_dev->bdev_handle) {
blkdev_put(virt_dev->bdev, virt_dev); bdev_release(virt_dev->bdev_handle);
virt_dev->bdev = NULL; virt_dev->bdev_handle = NULL;
} else if (virt_dev->fd) { } else if (virt_dev->fd) {
filp_close(virt_dev->fd, NULL); filp_close(virt_dev->fd, NULL);
virt_dev->fd = NULL; virt_dev->fd = NULL;
@@ -1458,7 +1459,7 @@ static int vdisk_attach_tgt(struct scst_tgt_dev *tgt_dev)
} }
} else { } else {
virt_dev->fd = NULL; virt_dev->fd = NULL;
virt_dev->bdev = NULL; virt_dev->bdev_handle = NULL;
virt_dev->dif_fd = NULL; virt_dev->dif_fd = NULL;
} }
@@ -1544,7 +1545,7 @@ static int vdisk_fsync_blockio(loff_t loff,
goto out; goto out;
} }
res = vdisk_blockio_flush(virt_dev->bdev, gfp_flags, true, res = vdisk_blockio_flush(virt_dev->bdev_handle->bdev, gfp_flags, true,
cmd, async); cmd, async);
out: out:
@@ -1856,7 +1857,7 @@ static int vdisk_unmap_range(struct scst_cmd *cmd,
(unsigned long long)start_lba, blocks); (unsigned long long)start_lba, blocks);
if (virt_dev->blockio) { if (virt_dev->blockio) {
struct block_device *bdev = virt_dev->bdev; struct block_device *bdev = virt_dev->bdev_handle->bdev;
sector_t start_sector = start_lba << (cmd->dev->block_shift - 9); sector_t start_sector = start_lba << (cmd->dev->block_shift - 9);
sector_t nr_sects = blocks << (cmd->dev->block_shift - 9); sector_t nr_sects = blocks << (cmd->dev->block_shift - 9);
gfp_t gfp = cmd->cmd_gfp_mask; gfp_t gfp = cmd->cmd_gfp_mask;
@@ -2870,7 +2871,7 @@ static ssize_t blockio_read_sync(struct scst_vdisk_dev *virt_dev, void *buf,
struct bio_priv_sync s = { struct bio_priv_sync s = {
COMPLETION_INITIALIZER_ONSTACK(s.c), 0, COMPLETION_INITIALIZER_ONSTACK(s.c), 0,
}; };
struct block_device *bdev = virt_dev->bdev; struct block_device *bdev = virt_dev->bdev_handle->bdev;
const bool is_vmalloc = is_vmalloc_addr(buf); const bool is_vmalloc = is_vmalloc_addr(buf);
struct bio *bio; struct bio *bio;
void *p; void *p;
@@ -3406,7 +3407,7 @@ static enum scst_exec_res blockio_exec(struct scst_cmd *cmd)
if (unlikely(!vdisk_parse_offset(&p, cmd))) if (unlikely(!vdisk_parse_offset(&p, cmd)))
goto err; goto err;
if (unlikely(virt_dev->bdev == NULL)) { if (unlikely(virt_dev->bdev_handle == NULL)) {
if (!vdisk_no_fd_allowed_commands(cmd)) { if (!vdisk_no_fd_allowed_commands(cmd)) {
/* /*
* We should not get here, unless the user space * We should not get here, unless the user space
@@ -4960,7 +4961,7 @@ static enum compl_status_e vdisk_exec_read_capacity16(struct vdisk_cmd_params *p
TRACE_ENTRY(); TRACE_ENTRY();
virt_dev = cmd->dev->dh_priv; virt_dev = cmd->dev->dh_priv;
bdev = virt_dev->bdev; bdev = virt_dev->bdev_handle->bdev;
q = bdev ? bdev_get_queue(bdev) : NULL; q = bdev ? bdev_get_queue(bdev) : NULL;
blocksize = cmd->dev->block_size; blocksize = cmd->dev->block_size;
nblocks = virt_dev->nblocks - 1; nblocks = virt_dev->nblocks - 1;
@@ -5927,7 +5928,7 @@ static void blockio_exec_rw(struct vdisk_cmd_params *p, bool write, bool fua)
struct scst_device *dev = cmd->dev; struct scst_device *dev = cmd->dev;
struct scst_vdisk_dev *virt_dev = dev->dh_priv; struct scst_vdisk_dev *virt_dev = dev->dh_priv;
int block_shift = dev->block_shift; int block_shift = dev->block_shift;
struct block_device *bdev = virt_dev->bdev; struct block_device *bdev = virt_dev->bdev_handle->bdev;
struct bio_set *bs = virt_dev->vdisk_bioset; struct bio_set *bs = virt_dev->vdisk_bioset;
struct request_queue *q = bdev_get_queue(bdev); struct request_queue *q = bdev_get_queue(bdev);
int length, max_nr_vecs = 0, offset; int length, max_nr_vecs = 0, offset;
@@ -6598,7 +6599,7 @@ static int vdisk_resync_size(struct scst_vdisk_dev *virt_dev)
sBUG_ON(virt_dev->nullio); sBUG_ON(virt_dev->nullio);
sBUG_ON(!virt_dev->filename); sBUG_ON(!virt_dev->filename);
if ((!virt_dev->fd && !virt_dev->bdev) || !virt_dev->dev_active) { if ((!virt_dev->fd && !virt_dev->bdev_handle) || !virt_dev->dev_active) {
res = -EMEDIUMTYPE; res = -EMEDIUMTYPE;
goto out; goto out;
} }
@@ -7646,7 +7647,7 @@ static int vcdrom_change(struct scst_vdisk_dev *virt_dev, char *buffer)
err = 0; err = 0;
virt_dev->filename = NULL; virt_dev->filename = NULL;
virt_dev->fd = NULL; virt_dev->fd = NULL;
virt_dev->bdev = NULL; virt_dev->bdev_handle = NULL;
} }
virt_dev->file_size = err; virt_dev->file_size = err;
@@ -7706,7 +7707,7 @@ static ssize_t vdisk_sysfs_sync_store(struct kobject *kobj,
if (virt_dev->nullio) if (virt_dev->nullio)
res = 0; res = 0;
else if (virt_dev->blockio) else if (virt_dev->blockio)
res = vdisk_blockio_flush(virt_dev->bdev, GFP_KERNEL, false, res = vdisk_blockio_flush(virt_dev->bdev_handle->bdev, GFP_KERNEL, false,
NULL, false); NULL, false);
else else
res = __vdisk_fsync_fileio(0, i_size_read(file_inode(virt_dev->fd)), res = __vdisk_fsync_fileio(0, i_size_read(file_inode(virt_dev->fd)),

12
scst/src/scst_lib.c
View File

@@ -5980,14 +5980,14 @@ EXPORT_SYMBOL(scst_file_size);
*/ */
loff_t scst_bdev_size(const char *path) loff_t scst_bdev_size(const char *path)
{ {
struct block_device *bdev; struct bdev_handle *bdev_handle;
loff_t res; loff_t res;
bdev = blkdev_get_by_path(path, BLK_OPEN_READ, NULL, NULL); bdev_handle = bdev_open_by_path(path, BLK_OPEN_READ, NULL, NULL);
if (IS_ERR(bdev)) if (IS_ERR(bdev_handle))
return PTR_ERR(bdev); return PTR_ERR(bdev_handle);
res = i_size_read(bdev->bd_inode); res = i_size_read(bdev_handle->bdev->bd_inode);
blkdev_put(bdev, NULL); bdev_release(bdev_handle);
return res; return res;
} }
EXPORT_SYMBOL(scst_bdev_size); EXPORT_SYMBOL(scst_bdev_size);