github/open-cas-linux
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RHEL8.5 kernel 4.18 support fix

Browse Source 
This patch adds support for RHEL8.5 with kernel 4.18.0.348.2.1.el8 and
later.

Additional request queue operations added for these kernels.
Configure scripts added/updated.

Fixes #1278

Signed-off-by: Krzysztof Majzerowicz-Jaszcz <krzysztof.majzerowicz-jaszcz@intel.com>
This commit is contained in:
Krzysztof Majzerowicz-Jaszcz
2022-08-10 18:03:32 +02:00
parent 24c0335234
commit b983eeb751
4 changed files with 94 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/cas_cache/context.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright(c) 2012-2021 Intel Corporation
* Copyright(c) 2012-2022 Intel Corporation
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -19,6 +19,11 @@ struct bio_vec_iter {
};
struct blk_data {
/**
* @brief bd_object for accessing request queue. Workaround for RHEL8.5
*/
struct bd_object *bvol;
/**
* @brief Atomic counter for core device
*/

23
modules/cas_cache/volume/vol_block_dev_top.c
View File

@@ -182,6 +182,7 @@ static void blkdev_defer_bio(struct bd_object *bvol, struct bio *bio,
if (!context) {
CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio),
CAS_ERRNO_TO_BLK_STS(-ENOMEM));
cas_blk_queue_exit(bvol);
return;
}
@@ -206,6 +207,8 @@ static void blkdev_complete_data_master(struct blk_data *master, int error)
result = map_cas_err_to_generic(master->error);
CAS_BIO_ENDIO(master->bio, master->master_size,
CAS_ERRNO_TO_BLK_STS(result));
cas_blk_queue_exit(master->bvol);
cas_free_blk_data(master);
}
@@ -274,6 +277,7 @@ static int blkdev_handle_data_single(struct bd_object *bvol, struct bio *bio,
data->bio = master_ctx->bio;
data->master_size = master_ctx->master_size;
data->start_time = master_ctx->start_time;
data->bvol = bvol;
master_ctx->data = data;
}
@@ -304,6 +308,7 @@ static void blkdev_handle_data(struct bd_object *bvol, struct bio *bio)
CAS_BIO_OP_FLAGS_FORMAT "\n", CAS_BIO_OP_FLAGS(bio));
CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio),
CAS_ERRNO_TO_BLK_STS(-EINVAL));
cas_blk_queue_exit(bvol);
return;
}
@@ -329,20 +334,26 @@ static void blkdev_handle_data(struct bd_object *bvol, struct bio *bio)
return;
err:
if (split != bio)
if (split != bio) {
bio_put(split);
if (master_ctx.data)
}
if (master_ctx.data) {
blkdev_complete_data_master(master_ctx.data, error);
else
}
else {
CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_ERRNO_TO_BLK_STS(error));
cas_blk_queue_exit(bvol);
}
}
static void blkdev_complete_discard(struct ocf_io *io, int error)
{
struct bio *bio = io->priv1;
struct bd_object *bvol = io->priv2;
int result = map_cas_err_to_generic(error);
CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_ERRNO_TO_BLK_STS(result));
cas_blk_queue_exit(bvol);
ocf_io_put(io);
}
@@ -360,10 +371,11 @@ static void blkdev_handle_discard(struct bd_object *bvol, struct bio *bio)
CAS_PRINT_RL(KERN_CRIT
"Out of memory. Ending IO processing.\n");
CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_ERRNO_TO_BLK_STS(-ENOMEM));
cas_blk_queue_exit(bvol);
return;
}
ocf_io_set_cmpl(io, bio, NULL, blkdev_complete_discard);
ocf_io_set_cmpl(io, bio, bvol, blkdev_complete_discard);
ocf_volume_submit_discard(io);
}
@@ -387,6 +399,7 @@ static void blkdev_complete_flush(struct ocf_io *io, int error)
if (CAS_BIO_BISIZE(bio) == 0 || error) {
CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio),
CAS_ERRNO_TO_BLK_STS(result));
cas_blk_queue_exit(bvol);
return;
}
@@ -409,6 +422,7 @@ static void blkdev_handle_flush(struct bd_object *bvol, struct bio *bio)
CAS_PRINT_RL(KERN_CRIT
"Out of memory. Ending IO processing.\n");
CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_ERRNO_TO_BLK_STS(-ENOMEM));
cas_blk_queue_exit(bvol);
return;
}
@@ -430,6 +444,7 @@ static void blkdev_submit_bio(struct bd_object *bvol, struct bio *bio)
if (blkdev_can_hndl_bio(bio)) {
CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio),
CAS_ERRNO_TO_BLK_STS(-ENOTSUPP));
cas_blk_queue_exit(bvol);
return;
}